fix: reload CAS store after agent spawn + share schemas via uwf-protocol
The agent subprocess writes StepNode to CAS on disk, but the parent process had an in-memory cache from createFsStore init. Fix: re-create store after agent spawn to pick up new nodes. Also centralized JSON Schemas in uwf-protocol so cli-uwf and agent-kit produce identical type hashes. E2E smoke test passing: workflow put → thread start → 3x step → done Refs #309
This commit is contained in:
@@ -408,16 +408,18 @@ export async function cmdThreadStep(
|
|||||||
loadDotenv({ path: getEnvPath(storageRoot) });
|
loadDotenv({ path: getEnvPath(storageRoot) });
|
||||||
const newHead = spawnAgent(agent, threadId, role);
|
const newHead = spawnAgent(agent, threadId, role);
|
||||||
|
|
||||||
const newNode = uwf.store.get(newHead);
|
// Re-create store to pick up nodes written by the agent subprocess
|
||||||
if (newNode === null || newNode.type !== uwf.schemas.stepNode) {
|
const uwfAfter = await createUwfStore(storageRoot);
|
||||||
|
const newNode = uwfAfter.store.get(newHead);
|
||||||
|
if (newNode === null || newNode.type !== uwfAfter.schemas.stepNode) {
|
||||||
fail(`agent returned hash that is not a StepNode: ${newHead}`);
|
fail(`agent returned hash that is not a StepNode: ${newHead}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
index[threadId] = newHead;
|
index[threadId] = newHead;
|
||||||
await saveThreadsIndex(storageRoot, index);
|
await saveThreadsIndex(storageRoot, index);
|
||||||
|
|
||||||
const chainAfter = walkChain(uwf, newHead);
|
const chainAfter = walkChain(uwfAfter, newHead);
|
||||||
const contextAfter = buildModeratorContext(uwf, chainAfter);
|
const contextAfter = buildModeratorContext(uwfAfter, chainAfter);
|
||||||
const afterResult = evaluate(workflow, contextAfter);
|
const afterResult = evaluate(workflow, contextAfter);
|
||||||
if (!afterResult.ok) {
|
if (!afterResult.ok) {
|
||||||
fail(afterResult.error.message);
|
fail(afterResult.error.message);
|
||||||
|
|||||||
@@ -1,87 +1,10 @@
|
|||||||
import type { Hash, JSONSchema, Store } from "@uncaged/json-cas";
|
import type { Hash, Store } from "@uncaged/json-cas";
|
||||||
import { putSchema } from "@uncaged/json-cas";
|
import { putSchema } from "@uncaged/json-cas";
|
||||||
|
import {
|
||||||
const ROLE_DEFINITION: JSONSchema = {
|
START_NODE_SCHEMA,
|
||||||
type: "object",
|
STEP_NODE_SCHEMA,
|
||||||
required: ["description", "systemPrompt", "outputSchema"],
|
WORKFLOW_SCHEMA,
|
||||||
properties: {
|
} from "@uncaged/uwf-protocol";
|
||||||
description: { type: "string" },
|
|
||||||
systemPrompt: { type: "string" },
|
|
||||||
outputSchema: { type: "string", format: "cas_ref" },
|
|
||||||
},
|
|
||||||
additionalProperties: false,
|
|
||||||
};
|
|
||||||
|
|
||||||
const CONDITION_DEFINITION: JSONSchema = {
|
|
||||||
type: "object",
|
|
||||||
required: ["description", "expression"],
|
|
||||||
properties: {
|
|
||||||
description: { type: "string" },
|
|
||||||
expression: { type: "string" },
|
|
||||||
},
|
|
||||||
additionalProperties: false,
|
|
||||||
};
|
|
||||||
|
|
||||||
const TRANSITION: JSONSchema = {
|
|
||||||
type: "object",
|
|
||||||
required: ["role", "condition"],
|
|
||||||
properties: {
|
|
||||||
role: { type: "string" },
|
|
||||||
condition: { anyOf: [{ type: "string" }, { type: "null" }] },
|
|
||||||
},
|
|
||||||
additionalProperties: false,
|
|
||||||
};
|
|
||||||
|
|
||||||
const WORKFLOW: JSONSchema = {
|
|
||||||
type: "object",
|
|
||||||
required: ["name", "description", "roles", "conditions", "graph"],
|
|
||||||
properties: {
|
|
||||||
name: { type: "string" },
|
|
||||||
description: { type: "string" },
|
|
||||||
roles: {
|
|
||||||
type: "object",
|
|
||||||
additionalProperties: ROLE_DEFINITION,
|
|
||||||
},
|
|
||||||
conditions: {
|
|
||||||
type: "object",
|
|
||||||
additionalProperties: CONDITION_DEFINITION,
|
|
||||||
},
|
|
||||||
graph: {
|
|
||||||
type: "object",
|
|
||||||
additionalProperties: {
|
|
||||||
type: "array",
|
|
||||||
items: TRANSITION,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
additionalProperties: false,
|
|
||||||
};
|
|
||||||
|
|
||||||
const START_NODE: JSONSchema = {
|
|
||||||
type: "object",
|
|
||||||
required: ["workflow", "prompt"],
|
|
||||||
properties: {
|
|
||||||
workflow: { type: "string", format: "cas_ref" },
|
|
||||||
prompt: { type: "string" },
|
|
||||||
},
|
|
||||||
additionalProperties: false,
|
|
||||||
};
|
|
||||||
|
|
||||||
const STEP_NODE: JSONSchema = {
|
|
||||||
type: "object",
|
|
||||||
required: ["start", "prev", "role", "output", "detail", "agent"],
|
|
||||||
properties: {
|
|
||||||
start: { type: "string", format: "cas_ref" },
|
|
||||||
prev: {
|
|
||||||
anyOf: [{ type: "string", format: "cas_ref" }, { type: "null" }],
|
|
||||||
},
|
|
||||||
role: { type: "string" },
|
|
||||||
output: { type: "string", format: "cas_ref" },
|
|
||||||
detail: { type: "string", format: "cas_ref" },
|
|
||||||
agent: { type: "string" },
|
|
||||||
},
|
|
||||||
additionalProperties: false,
|
|
||||||
};
|
|
||||||
|
|
||||||
export type UwfSchemaHashes = {
|
export type UwfSchemaHashes = {
|
||||||
workflow: Hash;
|
workflow: Hash;
|
||||||
@@ -95,9 +18,9 @@ export type UwfSchemaHashes = {
|
|||||||
*/
|
*/
|
||||||
export async function registerUwfSchemas(store: Store): Promise<UwfSchemaHashes> {
|
export async function registerUwfSchemas(store: Store): Promise<UwfSchemaHashes> {
|
||||||
const [workflow, startNode, stepNode] = await Promise.all([
|
const [workflow, startNode, stepNode] = await Promise.all([
|
||||||
putSchema(store, WORKFLOW),
|
putSchema(store, WORKFLOW_SCHEMA),
|
||||||
putSchema(store, START_NODE),
|
putSchema(store, START_NODE_SCHEMA),
|
||||||
putSchema(store, STEP_NODE),
|
putSchema(store, STEP_NODE_SCHEMA),
|
||||||
]);
|
]);
|
||||||
return { workflow, startNode, stepNode };
|
return { workflow, startNode, stepNode };
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,56 +1,10 @@
|
|||||||
import type { Hash, JSONSchema, Store } from "@uncaged/json-cas";
|
import type { Hash, Store } from "@uncaged/json-cas";
|
||||||
import { putSchema } from "@uncaged/json-cas";
|
import { putSchema } from "@uncaged/json-cas";
|
||||||
|
import {
|
||||||
const STEP_NODE: JSONSchema = {
|
START_NODE_SCHEMA,
|
||||||
type: "object",
|
STEP_NODE_SCHEMA,
|
||||||
required: ["start", "prev", "role", "output", "detail", "agent"],
|
WORKFLOW_SCHEMA,
|
||||||
properties: {
|
} from "@uncaged/uwf-protocol";
|
||||||
start: { type: "string", format: "cas_ref" },
|
|
||||||
prev: {
|
|
||||||
anyOf: [{ type: "string", format: "cas_ref" }, { type: "null" }],
|
|
||||||
},
|
|
||||||
role: { type: "string" },
|
|
||||||
output: { type: "string", format: "cas_ref" },
|
|
||||||
detail: { type: "string", format: "cas_ref" },
|
|
||||||
agent: { type: "string" },
|
|
||||||
},
|
|
||||||
additionalProperties: false,
|
|
||||||
};
|
|
||||||
|
|
||||||
const START_NODE: JSONSchema = {
|
|
||||||
type: "object",
|
|
||||||
required: ["workflow", "prompt"],
|
|
||||||
properties: {
|
|
||||||
workflow: { type: "string", format: "cas_ref" },
|
|
||||||
prompt: { type: "string" },
|
|
||||||
},
|
|
||||||
additionalProperties: false,
|
|
||||||
};
|
|
||||||
|
|
||||||
const WORKFLOW: JSONSchema = {
|
|
||||||
type: "object",
|
|
||||||
required: ["name", "description", "roles", "conditions", "graph"],
|
|
||||||
properties: {
|
|
||||||
name: { type: "string" },
|
|
||||||
description: { type: "string" },
|
|
||||||
roles: {
|
|
||||||
type: "object",
|
|
||||||
additionalProperties: {
|
|
||||||
type: "object",
|
|
||||||
required: ["description", "systemPrompt", "outputSchema"],
|
|
||||||
properties: {
|
|
||||||
description: { type: "string" },
|
|
||||||
systemPrompt: { type: "string" },
|
|
||||||
outputSchema: { type: "string", format: "cas_ref" },
|
|
||||||
},
|
|
||||||
additionalProperties: false,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
conditions: { type: "object" },
|
|
||||||
graph: { type: "object" },
|
|
||||||
},
|
|
||||||
additionalProperties: false,
|
|
||||||
};
|
|
||||||
|
|
||||||
export type UwfAgentSchemaHashes = {
|
export type UwfAgentSchemaHashes = {
|
||||||
workflow: Hash;
|
workflow: Hash;
|
||||||
@@ -64,9 +18,9 @@ export type UwfAgentSchemaHashes = {
|
|||||||
*/
|
*/
|
||||||
export async function registerAgentSchemas(store: Store): Promise<UwfAgentSchemaHashes> {
|
export async function registerAgentSchemas(store: Store): Promise<UwfAgentSchemaHashes> {
|
||||||
const [workflow, startNode, stepNode] = await Promise.all([
|
const [workflow, startNode, stepNode] = await Promise.all([
|
||||||
putSchema(store, WORKFLOW),
|
putSchema(store, WORKFLOW_SCHEMA),
|
||||||
putSchema(store, START_NODE),
|
putSchema(store, START_NODE_SCHEMA),
|
||||||
putSchema(store, STEP_NODE),
|
putSchema(store, STEP_NODE_SCHEMA),
|
||||||
]);
|
]);
|
||||||
return { workflow, startNode, stepNode };
|
return { workflow, startNode, stepNode };
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,6 +14,9 @@
|
|||||||
"import": "./dist/index.js"
|
"import": "./dist/index.js"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"@uncaged/json-cas": "workspace:^"
|
||||||
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"typescript": "^5.8.3"
|
"typescript": "^5.8.3"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,3 +1,8 @@
|
|||||||
|
export {
|
||||||
|
START_NODE_SCHEMA,
|
||||||
|
STEP_NODE_SCHEMA,
|
||||||
|
WORKFLOW_SCHEMA,
|
||||||
|
} from "./schemas.js";
|
||||||
export type {
|
export type {
|
||||||
AgentAlias,
|
AgentAlias,
|
||||||
AgentConfig,
|
AgentConfig,
|
||||||
|
|||||||
@@ -0,0 +1,83 @@
|
|||||||
|
import type { JSONSchema } from "@uncaged/json-cas";
|
||||||
|
|
||||||
|
const ROLE_DEFINITION: JSONSchema = {
|
||||||
|
type: "object",
|
||||||
|
required: ["description", "systemPrompt", "outputSchema"],
|
||||||
|
properties: {
|
||||||
|
description: { type: "string" },
|
||||||
|
systemPrompt: { type: "string" },
|
||||||
|
outputSchema: { type: "string", format: "cas_ref" },
|
||||||
|
},
|
||||||
|
additionalProperties: false,
|
||||||
|
};
|
||||||
|
|
||||||
|
const CONDITION_DEFINITION: JSONSchema = {
|
||||||
|
type: "object",
|
||||||
|
required: ["description", "expression"],
|
||||||
|
properties: {
|
||||||
|
description: { type: "string" },
|
||||||
|
expression: { type: "string" },
|
||||||
|
},
|
||||||
|
additionalProperties: false,
|
||||||
|
};
|
||||||
|
|
||||||
|
const TRANSITION: JSONSchema = {
|
||||||
|
type: "object",
|
||||||
|
required: ["role", "condition"],
|
||||||
|
properties: {
|
||||||
|
role: { type: "string" },
|
||||||
|
condition: { anyOf: [{ type: "string" }, { type: "null" }] },
|
||||||
|
},
|
||||||
|
additionalProperties: false,
|
||||||
|
};
|
||||||
|
|
||||||
|
export const WORKFLOW_SCHEMA: JSONSchema = {
|
||||||
|
type: "object",
|
||||||
|
required: ["name", "description", "roles", "conditions", "graph"],
|
||||||
|
properties: {
|
||||||
|
name: { type: "string" },
|
||||||
|
description: { type: "string" },
|
||||||
|
roles: {
|
||||||
|
type: "object",
|
||||||
|
additionalProperties: ROLE_DEFINITION,
|
||||||
|
},
|
||||||
|
conditions: {
|
||||||
|
type: "object",
|
||||||
|
additionalProperties: CONDITION_DEFINITION,
|
||||||
|
},
|
||||||
|
graph: {
|
||||||
|
type: "object",
|
||||||
|
additionalProperties: {
|
||||||
|
type: "array",
|
||||||
|
items: TRANSITION,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
additionalProperties: false,
|
||||||
|
};
|
||||||
|
|
||||||
|
export const START_NODE_SCHEMA: JSONSchema = {
|
||||||
|
type: "object",
|
||||||
|
required: ["workflow", "prompt"],
|
||||||
|
properties: {
|
||||||
|
workflow: { type: "string", format: "cas_ref" },
|
||||||
|
prompt: { type: "string" },
|
||||||
|
},
|
||||||
|
additionalProperties: false,
|
||||||
|
};
|
||||||
|
|
||||||
|
export const STEP_NODE_SCHEMA: JSONSchema = {
|
||||||
|
type: "object",
|
||||||
|
required: ["start", "prev", "role", "output", "detail", "agent"],
|
||||||
|
properties: {
|
||||||
|
start: { type: "string", format: "cas_ref" },
|
||||||
|
prev: {
|
||||||
|
anyOf: [{ type: "string", format: "cas_ref" }, { type: "null" }],
|
||||||
|
},
|
||||||
|
role: { type: "string" },
|
||||||
|
output: { type: "string", format: "cas_ref" },
|
||||||
|
detail: { type: "string", format: "cas_ref" },
|
||||||
|
agent: { type: "string" },
|
||||||
|
},
|
||||||
|
additionalProperties: false,
|
||||||
|
};
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
#!/usr/bin/env bun
|
||||||
|
// Mock agent for smoke testing
|
||||||
|
import { createAgent } from "../packages/uwf-agent-kit/src/index.js";
|
||||||
|
|
||||||
|
const agent = createAgent({
|
||||||
|
name: "mock",
|
||||||
|
run: async (ctx) => {
|
||||||
|
return `Mock output for role ${ctx.role}: task was "${ctx.prompt}"`;
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
await agent();
|
||||||
Reference in New Issue
Block a user