@united-workforce/cli 0.6.1 → 0.8.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@united-workforce/cli",
-  "version": "0.6.1",
+  "version": "0.8.1",
   "files": [
     "src",
     "dist",
@@ -14,13 +14,15 @@
   "dependencies": {
     "@ocas/core": "^0.5.0",
     "@ocas/fs": "^0.4.1",
-    "commander": "^14.0.3",
+    "@ocas/cli-kit": "^0.2.1",
     "dotenv": "^16.6.1",
     "liquidjs": "^10.27.0",
     "yaml": "^2.8.4",
-    "@united-workforce/util": "^0.2.0",
-    "@united-workforce/util-agent": "^0.2.1",
-    "@united-workforce/protocol": "^0.3.0"
+    "zod": "^4.1.12",
+    "@united-workforce/broker": "^0.3.0",
+    "@united-workforce/util": "^0.3.0",
+    "@united-workforce/protocol": "^0.5.0",
+    "@united-workforce/util-agent": "^0.4.0"
   },
   "publishConfig": {
     "access": "public"

package/src/__tests__/agent-resolution-llm-free.test.ts

@@ -14,12 +14,14 @@ describe("agent resolution works without LLM fields in config.yaml (issue #143)"
     tempDir = mkdtempSync(join(tmpdir(), "uwf-engine-cfg-"));
     writeFileSync(
       join(tempDir, "config.yaml"),
-      "agents:\n  hermes: { command: uwf-hermes, args: [] }\ndefaultAgent: hermes\n",
+      "agents:\n  hermes: { host: 'http://127.0.0.1:7900', gateway: hermes }\ndefaultAgent: hermes\n",
       "utf8",
     );
     const cfg = await loadWorkflowConfig(tempDir);
     expect(cfg.defaultAgent).toBe("hermes");
     expect(cfg.agents.hermes).toBeDefined();
+    expect(cfg.agents.hermes.host).toBe("http://127.0.0.1:7900");
+    expect(cfg.agents.hermes.gateway).toBe("hermes");
     expect(cfg.agentOverrides).toBeNull();
   });
 
@@ -27,7 +29,7 @@ describe("agent resolution works without LLM fields in config.yaml (issue #143)"
     tempDir = mkdtempSync(join(tmpdir(), "uwf-engine-cfg-"));
     writeFileSync(
       join(tempDir, "config.yaml"),
-      "providers:\n  openai: { baseUrl: x, apiKey: y }\nmodels:\n  default: { provider: openai, name: gpt-4o }\ndefaultModel: default\nagents:\n  hermes: { command: uwf-hermes, args: [] }\ndefaultAgent: hermes\n",
+      "providers:\n  openai: { baseUrl: x, apiKey: y }\nmodels:\n  default: { provider: openai, name: gpt-4o }\ndefaultModel: default\nagents:\n  hermes: { host: 'http://127.0.0.1:7900', gateway: hermes }\ndefaultAgent: hermes\n",
       "utf8",
     );
     const cfg = (await loadWorkflowConfig(tempDir)) as Record<string, unknown>;
@@ -36,4 +38,14 @@ describe("agent resolution works without LLM fields in config.yaml (issue #143)"
     expect(cfg.models).toBeUndefined();
     expect(cfg.defaultModel).toBeUndefined();
   });
+
+  test("loadWorkflowConfig rejects legacy {command, args} agent shape", async () => {
+    tempDir = mkdtempSync(join(tmpdir(), "uwf-engine-cfg-"));
+    writeFileSync(
+      join(tempDir, "config.yaml"),
+      "agents:\n  hermes: { command: uwf-hermes, args: [] }\ndefaultAgent: hermes\n",
+      "utf8",
+    );
+    await expect(loadWorkflowConfig(tempDir)).rejects.toThrow(/legacy \{command, args\} fields/);
+  });
 });

package/src/__tests__/broker-prompt.test.ts

@@ -0,0 +1,142 @@
+/**
+ * Unit tests for `assembleBrokerPrompt` (#387).
+ *
+ * Verifies the broker path assembles the same five-part prompt the legacy
+ * spawned-agent path produced: output-format instruction, thread progress,
+ * role prompt (goal/procedure/output), task prompt, and the
+ * continuation/edge-prompt context (branching on first visit vs re-entry).
+ */
+
+import type { CasRef, StepContext, ThreadId, WorkflowPayload } from "@united-workforce/protocol";
+import { describe, expect, test } from "vitest";
+import { assembleBrokerPrompt } from "../commands/broker-step.js";
+
+const THREAD_ID = "06FCBROKERPROMPTTEST000001" as ThreadId;
+
+const OUTPUT_FORMAT_INSTRUCTION = "## Deliverable Format\n\nemit YAML frontmatter";
+
+function buildWorkflow(): WorkflowPayload {
+  return {
+    version: 1,
+    name: "review-flow",
+    description: "two-role review flow",
+    roles: {
+      developer: {
+        description: "writes code",
+        goal: "implement the requested behavior",
+        capabilities: ["coding"],
+        procedure: "follow the spec and write tests",
+        output: "a patch plus a short summary",
+        frontmatter: "schema_developer" as CasRef,
+      },
+      reviewer: {
+        description: "reviews code",
+        goal: "review the implementation",
+        capabilities: [],
+        procedure: "check the diff carefully",
+        output: "approve or reject",
+        frontmatter: "schema_reviewer" as CasRef,
+      },
+    },
+    graph: {},
+  };
+}
+
+function stepContext(role: string, content: string | null, output: unknown): StepContext {
+  return {
+    role,
+    output,
+    detail: "detail_ref" as CasRef,
+    agent: "test-agent",
+    edgePrompt: "",
+    startedAtMs: 0,
+    completedAtMs: 1,
+    cwd: "",
+    assembledPrompt: null,
+    usage: null,
+    previousAttempts: null,
+    content,
+  };
+}
+
+describe("assembleBrokerPrompt", () => {
+  test("first visit with no prior steps embeds role prompt, task, and edge prompt", () => {
+    const prompt = assembleBrokerPrompt({
+      workflow: buildWorkflow(),
+      role: "developer",
+      threadId: THREAD_ID,
+      startPrompt: "Build the login form",
+      steps: [],
+      edgePrompt: "Implement the behavior defined in the spec files",
+      outputFormatInstruction: OUTPUT_FORMAT_INSTRUCTION,
+    });
+
+    // 1. output-format instruction
+    expect(prompt).toContain("## Deliverable Format");
+    // 2. thread progress
+    expect(prompt).toContain("## Thread Progress");
+    expect(prompt).toContain("This is the first step of the thread");
+    // 3. role prompt (goal + procedure + output)
+    expect(prompt).toContain("## Goal");
+    expect(prompt).toContain("implement the requested behavior");
+    expect(prompt).toContain("## Procedure");
+    expect(prompt).toContain("follow the spec and write tests");
+    expect(prompt).toContain("## Output");
+    expect(prompt).toContain("a patch plus a short summary");
+    // 4. task prompt
+    expect(prompt).toContain("## Task");
+    expect(prompt).toContain("Build the login form");
+    // 5. edge prompt (no prior steps → "Current Instruction")
+    expect(prompt).toContain("## Current Instruction");
+    expect(prompt).toContain("Implement the behavior defined in the spec files");
+  });
+
+  test("first visit with prior steps includes step content as continuation context", () => {
+    const steps: StepContext[] = [
+      stepContext("planner", "Here is the detailed plan for the feature.", { $status: "done" }),
+    ];
+
+    const prompt = assembleBrokerPrompt({
+      workflow: buildWorkflow(),
+      role: "developer",
+      threadId: THREAD_ID,
+      startPrompt: "Build the login form",
+      steps,
+      edgePrompt: "Implement the plan",
+      outputFormatInstruction: OUTPUT_FORMAT_INSTRUCTION,
+    });
+
+    // Developer has not spoken yet → first visit, prior steps shown WITH content.
+    expect(prompt).toContain("## What Happened Since Your Last Turn");
+    expect(prompt).toContain("Here is the detailed plan for the feature.");
+    expect(prompt).toContain("## Moderator Instruction");
+    expect(prompt).toContain("Implement the plan");
+    // Thread progress reflects the prior step.
+    expect(prompt).toContain("Thread step 2");
+  });
+
+  test("re-entry shows only steps since last visit (meta-only continuation)", () => {
+    const steps: StepContext[] = [
+      stepContext("developer", "My first implementation attempt.", { $status: "done" }),
+      stepContext("reviewer", "Please fix the validation logic.", { $status: "reject" }),
+    ];
+
+    const prompt = assembleBrokerPrompt({
+      workflow: buildWorkflow(),
+      role: "developer",
+      threadId: THREAD_ID,
+      startPrompt: "Build the login form",
+      steps,
+      edgePrompt: "Address the reviewer feedback",
+      outputFormatInstruction: OUTPUT_FORMAT_INSTRUCTION,
+    });
+
+    // Re-entry: continuation lists the reviewer step since the last developer turn.
+    expect(prompt).toContain("## What Happened Since Your Last Turn");
+    expect(prompt).toContain("reviewer");
+    expect(prompt).toContain("## Moderator Instruction");
+    expect(prompt).toContain("Address the reviewer feedback");
+    // Meta-only re-entry omits raw step content from before the last visit.
+    expect(prompt).not.toContain("My first implementation attempt.");
+  });
+});