@united-workforce/cli 0.3.0 → 0.4.0

package/src/__tests__/thread-show-status.test.ts

@@ -1,21 +1,12 @@
 import { mkdir, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
-import { putSchema } from "@ocas/core";
 import type { CasRef, ThreadId } from "@united-workforce/protocol";
 import { describe, expect, test } from "vitest";
-import { createMarker, deleteMarker } from "../background/index.js";
+import { createMarker, deleteMarker, getProcessStartTime } from "../background/index.js";
 import { cmdThreadShow, cmdThreadStart } from "../commands/thread.js";
 import { completeThread, createUwfStore, loadAllThreads, setThread } from "../store.js";
 
-const OUTPUT_SCHEMA = {
-  type: "object" as const,
-  properties: {
-    $status: { type: "string" as const },
-    question: { type: "string" as const },
-  },
-};
-
 const TEST_WORKFLOW_YAML = `
 name: test-status
 description: Test workflow for status field
@@ -59,15 +50,12 @@ roles:
     capabilities: ["coding"]
     procedure: Work
     output: |
-      $status: "needs_input"
-      question: "Which API?"
+      $status: "done"
     frontmatter:
-      oneOf:
-        - type: object
-          required: ["$status", "question"]
-          properties:
-            $status: { const: "needs_input" }
-            question: { type: string }
+      type: object
+      required: ["$status"]
+      properties:
+        $status: { const: "done" }
 graph:
   $START:
     new:
@@ -79,9 +67,9 @@ graph:
       prompt: "Resume work"
       location: null
   worker:
-    needs_input:
-      role: $SUSPEND
-      prompt: "Please clarify: {{{question}}}"
+    done:
+      role: $END
+      prompt: "Done"
       location: null
 `;
 
@@ -97,8 +85,7 @@ async function insertStepNode(
   if (headEntry === undefined) throw new Error(`thread ${threadId} not in index`);
   const head = headEntry.head;
 
-  const outputSchemaHash = await putSchema(uwf.store, OUTPUT_SCHEMA);
-  const outputHash = await uwf.store.cas.put(outputSchemaHash, outputPayload);
+  const outputHash = await uwf.store.cas.put(uwf.schemas.suspendOutput, outputPayload);
   const detailHash = await uwf.store.cas.put(uwf.schemas.text, "detail-placeholder");
 
   const headNode = uwf.store.cas.get(head);
@@ -183,6 +170,7 @@ describe("thread show status field", () => {
       workflow,
       pid: process.pid,
       startedAt: Date.now(),
+      processStartTime: getProcessStartTime(process.pid),
     });
 
     try {
@@ -216,11 +204,11 @@ describe("thread show status field", () => {
     const head = index[threadId]!.head;
     if (!head) throw new Error("Thread not found in index");
 
-    completeThread(uwfForIndex.varStore, threadId, "completed");
+    completeThread(uwfForIndex.varStore, threadId, "end");
 
     const result = await cmdThreadShow(storageRoot, threadId);
 
-    expect(result.status).toBe("completed");
+    expect(result.status).toBe("end");
     expect(result.done).toBe(true);
     expect(result.background).toBe(null);
     expect(result.thread).toBe(threadId);
@@ -274,11 +262,11 @@ describe("thread show status field", () => {
     const head = index[threadId]!.head;
     if (!head) throw new Error("Thread not found in index");
 
-    completeThread(uwfForIndex.varStore, threadId, "completed");
+    completeThread(uwfForIndex.varStore, threadId, "end");
 
     const result = await cmdThreadShow(storageRoot, threadId);
 
-    expect(result.status).toBe("completed");
+    expect(result.status).toBe("end");
     expect(result.done).toBe(true);
     expect(result.background).toBe(null);
 
@@ -300,8 +288,8 @@ describe("thread show status field", () => {
       const threadId = startResult.thread as ThreadId;
 
       await insertStepNode(storageRoot, threadId, "worker", {
-        $status: "needs_input",
-        question: "Which API?",
+        $status: "$SUSPEND",
+        reason: "Please clarify: Which API?",
       });
 
       const result = await cmdThreadShow(storageRoot, threadId);

package/src/__tests__/thread-suspend-step.test.ts

@@ -62,13 +62,7 @@ describe("suspend step CAS chain and threads.yaml metadata", () => {
             new: { role: "worker", prompt: "Start work", location: null },
             resume: { role: "worker", prompt: "Resume work", location: null },
           },
-          worker: {
-            needs_input: {
-              role: "$SUSPEND",
-              prompt: "Please clarify: {{{question}}}",
-              location: null,
-            },
-          },
+          worker: {},
         },
       });
 
@@ -81,9 +75,9 @@ describe("suspend step CAS chain and threads.yaml metadata", () => {
       const threadId = "01SUSPENDSTEPTEST0000000" as ThreadId;
       await seedThreads(tmpDir, { [threadId]: startHash });
 
-      const outputHash = await store.cas.put(outputSchemaHash, {
-        $status: "needs_input",
-        question: "Which API?",
+      const outputHash = await store.cas.put(schemas.suspendOutput, {
+        $status: "$SUSPEND",
+        reason: "Please clarify: Which API?",
       });
       const detailHash = await store.cas.put(schemas.text, "mock detail");
 
@@ -109,7 +103,7 @@ describe("suspend step CAS chain and threads.yaml metadata", () => {
         stepHash,
         detailHash,
         role: "worker",
-        frontmatter: { $status: "needs_input", question: "Which API?" },
+        frontmatter: { $status: "$SUSPEND", reason: "Please clarify: Which API?" },
         body: "",
         startedAtMs,
         completedAtMs,
@@ -119,7 +113,7 @@ describe("suspend step CAS chain and threads.yaml metadata", () => {
       const configPath = join(tmpDir, "config.yaml");
       await writeFile(
         configPath,
-        `defaultAgent: uwf-hermes\ndefaultModel: test-model\nagentOverrides: null\nagents: {}\nproviders: {}\nmodels: {}\n`,
+        `defaultAgent: uwf-hermes\nagentOverrides: null\nagents:\n  uwf-hermes:\n    command: uwf-hermes\n`,
       );
 
       const cliPath = join(dirname(fileURLToPath(import.meta.url)), "..", "..", "dist", "cli.js");
@@ -154,8 +148,8 @@ describe("suspend step CAS chain and threads.yaml metadata", () => {
 
       const outputNode = storeAfter.cas.get(outputHash);
       expect(outputNode?.payload).toEqual({
-        $status: "needs_input",
-        question: "Which API?",
+        $status: "$SUSPEND",
+        reason: "Please clarify: Which API?",
       });
 
       const { createUwfStore, getThread } = await import("../store.js");

package/src/__tests__/thread-suspended-display.test.ts

@@ -59,13 +59,7 @@ describe("suspended thread display", () => {
             new: { role: "worker", prompt: "Start work", location: null },
             resume: { role: "worker", prompt: "Resume work", location: null },
           },
-          worker: {
-            needs_input: {
-              role: "$SUSPEND",
-              prompt: "Please provide more details: {{{question}}}",
-              location: null,
-            },
-          },
+          worker: {},
         },
       });
 
@@ -77,9 +71,9 @@ describe("suspended thread display", () => {
 
       // Create suspended thread
       const suspendedThreadId = "01SUSPENDEDTHREAD0000000" as ThreadId;
-      const outputHash = await uwf.store.cas.put(outputSchemaHash, {
-        $status: "needs_input",
-        question: "What is the target API?",
+      const outputHash = await uwf.store.cas.put(uwf.schemas.suspendOutput, {
+        $status: "$SUSPEND",
+        reason: "Please provide more details: What is the target API?",
       });
       const detailHash = await uwf.store.cas.put(uwf.schemas.text, "mock detail");
 
@@ -118,8 +112,8 @@ describe("suspended thread display", () => {
         [idleThreadId]: idleEntry,
       });
 
-      // Test thread list
-      const listResult = await cmdThreadList(tmpDir, null, null, null, null, null);
+      // Test thread list — pass showAll=true to include suspended threads
+      const listResult = await cmdThreadList(tmpDir, null, null, null, null, null, true);
 
       // Find the suspended and idle threads in results
       const suspendedItem = listResult.find((item) => item.thread === suspendedThreadId);
@@ -169,13 +163,7 @@ describe("suspended thread display", () => {
             new: { role: "worker", prompt: "Start work", location: null },
             resume: { role: "worker", prompt: "Resume work", location: null },
           },
-          worker: {
-            needs_input: {
-              role: "$SUSPEND",
-              prompt: "Need clarification: {{{question}}}",
-              location: null,
-            },
-          },
+          worker: {},
         },
       });
 
@@ -186,9 +174,9 @@ describe("suspended thread display", () => {
       });
 
       const threadId = "01SUSPENDSHOW000000000" as ThreadId;
-      const outputHash = await uwf.store.cas.put(outputSchemaHash, {
-        $status: "needs_input",
-        question: "Which database to use?",
+      const outputHash = await uwf.store.cas.put(uwf.schemas.suspendOutput, {
+        $status: "$SUSPEND",
+        reason: "Need clarification: Which database to use?",
       });
       const detailHash = await uwf.store.cas.put(uwf.schemas.text, "mock detail");
 

package/src/__tests__/thread.test.ts

@@ -752,7 +752,7 @@ describe("cmdStepList with completed threads", () => {
       suspendMessage: null,
       completedAt: null,
     });
-    completeThread(uwf.varStore, threadId, "completed");
+    completeThread(uwf.varStore, threadId, "end");
 
     const result = await cmdStepList(tmpDir, threadId);
 
@@ -881,7 +881,7 @@ describe("cmdStepShow with completed threads", () => {
       suspendMessage: null,
       completedAt: null,
     });
-    completeThread(uwf.varStore, threadId, "completed");
+    completeThread(uwf.varStore, threadId, "end");
 
     const result = await cmdStepShow(tmpDir, stepHash);
 
@@ -944,7 +944,7 @@ describe("cmdThreadRead with completed threads", () => {
       suspendMessage: null,
       completedAt: null,
     });
-    completeThread(uwf.varStore, threadId, "completed");
+    completeThread(uwf.varStore, threadId, "end");
 
     const markdown = await cmdThreadRead(tmpDir, threadId, THREAD_READ_DEFAULT_QUOTA, null, false);
 
@@ -1007,7 +1007,7 @@ describe("cmdThreadRead with completed threads", () => {
       suspendMessage: null,
       completedAt: null,
     });
-    completeThread(uwf.varStore, threadId, "completed");
+    completeThread(uwf.varStore, threadId, "end");
 
     const markdown = await cmdThreadRead(
       tmpDir,

package/src/__tests__/validate-semantic.test.ts

@@ -5,6 +5,7 @@ import { validateWorkflow } from "../validate-semantic.js";
 /** Build a valid two-role workflow that passes all checks. */
 function makeWorkflow(overrides?: Partial<WorkflowPayload>): WorkflowPayload {
   const base: WorkflowPayload = {
+    version: 1,
     name: "test-workflow",
     description: "A test workflow",
     roles: {
@@ -55,10 +56,10 @@ function makeWorkflow(overrides?: Partial<WorkflowPayload>): WorkflowPayload {
         new: { role: "writer", prompt: "Begin writing", location: null },
         resume: { role: "writer", prompt: "Review previous output and continue", location: null },
       },
-      writer: { done: { role: "reviewer", prompt: "Review this: {{{plan}}}", location: null } },
+      writer: { done: { role: "reviewer", prompt: "Review this: {{ plan }}", location: null } },
       reviewer: {
-        approved: { role: "$END", prompt: "Done: {{{summary}}}", location: null },
-        rejected: { role: "writer", prompt: "Fix: {{{reason}}}", location: null },
+        approved: { role: "$END", prompt: "Done: {{ summary }}", location: null },
+        rejected: { role: "writer", prompt: "Fix: {{ reason }}", location: null },
       },
     },
   };
@@ -208,8 +209,6 @@ describe("Suite 2: Graph Structure", () => {
 
 describe("Suite 3: Status-Edge Consistency", () => {
   test("3.1 user role using _ graph key is treated as an unknown status", () => {
-    // "_" is no longer special-cased — it's just a status key that does not
-    // match the role's $status enum, so it surfaces as extra/missing keys.
     const wf = makeWorkflow();
     wf.graph.writer = { _: { role: "reviewer", prompt: "Review", location: null } };
     const errors = validateWorkflow(wf);
@@ -288,7 +287,7 @@ describe("Suite 3b: Enum-Based $status is Rejected", () => {
     };
     wf.graph.reviewer = {
       approved: { role: "$END", prompt: "Done", location: null },
-      rejected: { role: "writer", prompt: "Fix: {{{comments}}}", location: null },
+      rejected: { role: "writer", prompt: "Fix: {{ comments }}", location: null },
     };
     const errors = validateWorkflow(wf);
     expect(errors.some((e) => e.includes("must define") && e.includes("const"))).toBe(true);
@@ -307,7 +306,9 @@ describe("Suite 3b: Enum-Based $status is Rejected", () => {
         required: ["$status", "plan"],
       } as unknown as string,
     };
-    wf.graph.writer = { ready: { role: "reviewer", prompt: "Review: {{{plan}}}", location: null } };
+    wf.graph.writer = {
+      ready: { role: "reviewer", prompt: "Review: {{ plan }}", location: null },
+    };
     const errors = validateWorkflow(wf);
     expect(errors.some((e) => e.includes("must define") && e.includes("const"))).toBe(true);
   });
@@ -352,7 +353,7 @@ describe("Suite 3c: Const-Based Flat Schema", () => {
     expect(errors.some((e) => e.includes("extra status keys") && e.includes("extra"))).toBe(true);
   });
 
-  test("3c.3 flat schema with const $status validates mustache vars", () => {
+  test("3c.3 flat schema with const $status validates template vars", () => {
     const wf = makeWorkflow();
     wf.roles.writer = {
       ...wf.roles.writer,
@@ -366,46 +367,36 @@ describe("Suite 3c: Const-Based Flat Schema", () => {
       } as unknown as string,
     };
     wf.graph.writer = {
-      done: { role: "reviewer", prompt: "Review: {{{nonexistent}}}", location: null },
+      done: { role: "reviewer", prompt: "Review: {{ nonexistent }}", location: null },
     };
     const errors = validateWorkflow(wf);
-    expect(
-      errors.some(
-        (e) => e.includes('prompt variable "nonexistent"') && e.includes('role "writer"'),
-      ),
-    ).toBe(true);
+    expect(errors.some((e) => e.includes("nonexistent") && e.includes('role "writer"'))).toBe(true);
   });
 });
 
-describe("Suite 4: Mustache Template Variable Existence", () => {
-  test("4.1 prompt references nonexistent variable (enum status)", () => {
+describe("Suite 4: Template Variable Existence (LiquidJS strict-render)", () => {
+  test("4.1 prompt references nonexistent variable (flat schema)", () => {
     const wf = makeWorkflow();
     wf.graph.writer = {
-      done: { role: "reviewer", prompt: "Review: {{{branch}}}", location: null },
+      done: { role: "reviewer", prompt: "Review: {{ branch }}", location: null },
     };
     const errors = validateWorkflow(wf);
-    expect(
-      errors.some(
-        (e) => e.includes('prompt variable "branch"') && e.includes('role "writer" frontmatter'),
-      ),
-    ).toBe(true);
+    expect(errors.some((e) => e.includes("branch") && e.includes('role "writer"'))).toBe(true);
   });
 
   test("4.2 prompt references nonexistent variable (multi-exit)", () => {
     const wf = makeWorkflow();
     wf.graph.reviewer = {
-      approved: { role: "$END", prompt: "Done: {{{branch}}}", location: null },
-      rejected: { role: "writer", prompt: "Fix: {{{reason}}}", location: null },
+      approved: { role: "$END", prompt: "Done: {{ branch }}", location: null },
+      rejected: { role: "writer", prompt: "Fix: {{ reason }}", location: null },
     };
     const errors = validateWorkflow(wf);
     expect(
-      errors.some((e) =>
-        e.includes('prompt variable "branch" not found in role "reviewer" variant "approved"'),
-      ),
+      errors.some((e) => e.includes("branch") && e.includes("reviewer") && e.includes("approved")),
     ).toBe(true);
   });
 
-  test("4.3 valid mustache variables pass", () => {
+  test("4.3 valid template variables pass", () => {
     const wf = makeWorkflow();
     const errors = validateWorkflow(wf);
     expect(errors).toEqual([]);
@@ -413,7 +404,9 @@ describe("Suite 4: Mustache Template Variable Existence", () => {
 
   test("4.4 $status variable is always valid", () => {
     const wf = makeWorkflow();
-    wf.graph.writer = { done: { role: "reviewer", prompt: "Status: {{$status}}", location: null } };
+    wf.graph.writer = {
+      done: { role: "reviewer", prompt: "Status: {{ $status }}", location: null },
+    };
     const errors = validateWorkflow(wf);
     expect(errors).toEqual([]);
   });
@@ -469,6 +462,41 @@ describe("Suite 5: oneOf Discriminant Validity", () => {
   });
 });
 
+describe("Suite 7: $SUSPEND is no longer a valid graph target", () => {
+  test("7.1 edge targeting $SUSPEND is rejected with a migration hint", () => {
+    const wf = makeWorkflow();
+    wf.graph.writer = {
+      done: { role: "$SUSPEND", prompt: "Need more info", location: null },
+    };
+    const errors = validateWorkflow(wf);
+    expect(
+      errors.some(
+        (e) =>
+          e.includes("$SUSPEND") &&
+          e.includes("no longer a valid graph target") &&
+          e.includes('Emit $status: "$SUSPEND"'),
+      ),
+    ).toBe(true);
+  });
+
+  test("7.2 $SUSPEND as a graph node is rejected", () => {
+    const wf = makeWorkflow();
+    (wf.graph as Record<string, unknown>).$SUSPEND = {
+      done: { role: "$END", prompt: "done", location: null },
+    };
+    const errors = validateWorkflow(wf);
+    expect(
+      errors.some((e) => e.includes("$SUSPEND") && e.includes("no longer a valid graph node")),
+    ).toBe(true);
+  });
+
+  test("7.3 a role emitting $SUSPEND from its output (not the graph) passes", () => {
+    const wf = makeWorkflow();
+    const errors = validateWorkflow(wf);
+    expect(errors.some((e) => e.includes("$SUSPEND"))).toBe(false);
+  });
+});
+
 describe("Suite 6: Multiple Errors Collection", () => {
   test("6.1 multiple errors collected", () => {
     const wf = makeWorkflow();
@@ -487,8 +515,8 @@ describe("Suite 6: Multiple Errors Collection", () => {
     };
     // unknown graph reference
     wf.graph.nonexistent = { done: { role: "$END", prompt: "done", location: null } };
-    // bad mustache var
-    wf.graph.writer = { done: { role: "reviewer", prompt: "{{{badvar}}}", location: null } };
+    // bad template var
+    wf.graph.writer = { done: { role: "reviewer", prompt: "{{ badvar }}", location: null } };
     const errors = validateWorkflow(wf);
     expect(errors.length).toBeGreaterThanOrEqual(3);
   });