@united-workforce/cli 0.6.1 → 0.8.1

package/src/store.ts

@@ -4,9 +4,16 @@ import { access, mkdir, readdir, readFile, rename } from "node:fs/promises";
 import { homedir } from "node:os";
 import { dirname, join, resolve as resolvePath } from "node:path";
 
-import { bootstrap, type Hash, type Store, type VarStore } from "@ocas/core";
+import { bootstrap, type Hash, putSchema, type Store, type VarStore } from "@ocas/core";
 import { createFsStore, createSqliteVarStore } from "@ocas/fs";
-import type { CasRef, ThreadId, ThreadIndexEntry, ThreadsIndex } from "@united-workforce/protocol";
+import type {
+  CasRef,
+  StepStartPayload,
+  ThreadId,
+  ThreadIndexEntry,
+  ThreadsIndex,
+  TurnNodePayload,
+} from "@united-workforce/protocol";
 import { parseThreadsIndex } from "@united-workforce/protocol";
 import { parse } from "yaml";
 
@@ -20,6 +27,232 @@ export const REGISTRY_VAR_PREFIX = "@uwf/registry/";
 /** Variable name prefix for active thread entries (`@uwf/thread/<thread-id>`). */
 export const THREAD_VAR_PREFIX = "@uwf/thread/";
 
+/**
+ * Variable name prefix for the in-flight turn list of a running step
+ * (`@uwf/active-turns/<thread-id>/<role>`). Phase 2 of the realtime-turns RFC
+ * (#398): broker-step appends each assistant turn hash here as it arrives, so
+ * an independent process can observe a step's progress mid-flight. The var is a
+ * mutable head pointer at an immutable CAS array node; it is cleared at the
+ * start of each step and deleted once the turns are solidified into the
+ * step's immutable `detail.turns`.
+ *
+ * @deprecated Phase 2 (#419) — role-keyed vars replaced by thread-keyed:
+ * - `@uwf/active-step/<threadId>` — current in-flight step-start hash
+ * - `@uwf/active-turn-head/<threadId>` — head of the turn chain
+ */
+export const ACTIVE_TURNS_VAR_PREFIX = "@uwf/active-turns/";
+
+/**
+ * Schema for the active-turns list node: a bare ordered array of turn-hash
+ * `ocas_ref`s. Because an ocas variable is keyed by `(name, schema)` where the
+ * schema is the pointed-at node's `type`, this schema must be stable so that
+ * re-pointing the var (append), removing it (clear/solidify), and listing it by
+ * exact name all address the same variable. The hash is content-addressed and
+ * therefore identical across processes.
+ *
+ * @deprecated Phase 2 (#419) — role-keyed vars replaced by thread-keyed vars.
+ */
+export const ACTIVE_TURNS_LIST_SCHEMA = {
+  title: "uwf-active-turns",
+  type: "array" as const,
+  items: { type: "string" as const, format: "ocas_ref" },
+};
+
+/**
+ * Build the active-turns variable name for a `(threadId, role)` pair.
+ *
+ * @deprecated Phase 2 (#419) — role-keyed vars replaced by thread-keyed vars.
+ */
+export function activeTurnsVarName(threadId: ThreadId, role: string): string {
+  return `${ACTIVE_TURNS_VAR_PREFIX}${threadId}/${role}`;
+}
+
+/**
+ * Register (idempotently) and return the CAS schema hash for the active-turns
+ * list node. Used both as the array node's type and — implicitly — as the
+ * variable's schema key.
+ *
+ * @deprecated Phase 2 (#419) — role-keyed vars replaced by thread-keyed vars.
+ */
+export function activeTurnsListSchemaHash(store: Store): Hash {
+  return putSchema(store, ACTIVE_TURNS_LIST_SCHEMA);
+}
+
+/**
+ * Read the ordered turn-hash list currently pointed at by
+ * `@uwf/active-turns/<threadId>/<role>`. Returns `[]` when the var does not
+ * exist (no turns appended yet, or already solidified/cleared).
+ *
+ * @deprecated Phase 2 (#419) — use `turnsOfStep()` with thread-keyed vars instead.
+ */
+export function readActiveTurns(store: Store, threadId: ThreadId, role: string): CasRef[] {
+  const name = activeTurnsVarName(threadId, role);
+  const vars = store.var.list({ exactName: name });
+  const v = vars[0];
+  if (v === undefined) {
+    return [];
+  }
+  const node = store.cas.get(v.value as CasRef);
+  if (node === null || !Array.isArray(node.payload)) {
+    return [];
+  }
+  return node.payload as CasRef[];
+}
+
+/**
+ * Discover every in-flight role for a thread by scanning the
+ * `@uwf/active-turns/<threadId>/` var namespace. Returns each role whose active
+ * var currently holds a **non-empty** ordered turn-hash list, in var-creation
+ * order (a chronological proxy for "which in-flight step started first"). Used by
+ * `step turns` to append the running step(s) to the whole-chain panorama — the
+ * in-flight step has no settled StepNode hash, so it is found via its
+ * `(threadId, role)` active var rather than the chain.
+ *
+ * @deprecated Phase 2 (#419) — use `getActiveStep()` with thread-keyed vars instead.
+ */
+export function readActiveTurnRoles(
+  store: Store,
+  threadId: ThreadId,
+): { role: string; turns: CasRef[] }[] {
+  const prefix = `${ACTIVE_TURNS_VAR_PREFIX}${threadId}/`;
+  const vars = store.var.list({ namePrefix: prefix });
+  const sorted = [...vars].sort((a, b) => a.created - b.created);
+  const result: { role: string; turns: CasRef[] }[] = [];
+  for (const v of sorted) {
+    const role = v.name.slice(prefix.length);
+    if (role === "" || role.includes("/")) {
+      continue;
+    }
+    const node = store.cas.get(v.value as CasRef);
+    if (node === null || !Array.isArray(node.payload)) {
+      continue;
+    }
+    const turns = node.payload as CasRef[];
+    if (turns.length === 0) {
+      continue;
+    }
+    result.push({ role, turns });
+  }
+  return result;
+}
+
+/**
+ * Append a turn hash to `@uwf/active-turns/<threadId>/<role>` (read-modify-write
+ * on the array node, then re-point the var). The var is a single mutable
+ * pointer re-pointed on each append — not one var per turn. Returns the full
+ * updated list.
+ *
+ * @deprecated Phase 2 (#419) — turns now written directly with prev+owner chain.
+ */
+export function appendActiveTurn(
+  store: Store,
+  threadId: ThreadId,
+  role: string,
+  turnHash: CasRef,
+): CasRef[] {
+  const name = activeTurnsVarName(threadId, role);
+  const current = readActiveTurns(store, threadId, role);
+  const next = [...current, turnHash];
+  const schemaHash = activeTurnsListSchemaHash(store);
+  const listHash = store.cas.put(schemaHash, next) as CasRef;
+  store.var.set(name, listHash);
+  return next;
+}
+
+/**
+ * Clear (delete) the `@uwf/active-turns/<threadId>/<role>` pointer. Removing a
+ * missing var is a no-op, so this is safe to call at the start of a clean run.
+ * Targets the exact `(threadId, role)` var only — concurrent active vars for
+ * other roles/threads are untouched.
+ *
+ * @deprecated Phase 2 (#419) — turns now written directly with prev+owner chain.
+ */
+export function clearActiveTurns(store: Store, threadId: ThreadId, role: string): void {
+  const name = activeTurnsVarName(threadId, role);
+  store.var.remove(name);
+}
+
+// ── Thread-keyed Active Vars (Phase 2 #419) ──────────────────────────
+
+/**
+ * Variable name prefix for in-flight step (`@uwf/active-step/<thread-id>`).
+ * Phase 2 (#419): points to the current step-start hash while a step is in-flight.
+ * Cleared when the step completes (step-complete written).
+ */
+export const ACTIVE_STEP_VAR_PREFIX = "@uwf/active-step/";
+
+/**
+ * Variable name prefix for the turn chain head (`@uwf/active-turn-head/<thread-id>`).
+ * Phase 2 (#419): points to the most recent turn hash. Updated as each turn arrives.
+ * Remains after step completion (turns are immutable).
+ */
+export const ACTIVE_TURN_HEAD_VAR_PREFIX = "@uwf/active-turn-head/";
+
+/** Build the active-step variable name for a thread. */
+export function activeStepVarName(threadId: ThreadId): string {
+  return `${ACTIVE_STEP_VAR_PREFIX}${threadId}`;
+}
+
+/** Build the active-turn-head variable name for a thread. */
+export function activeTurnHeadVarName(threadId: ThreadId): string {
+  return `${ACTIVE_TURN_HEAD_VAR_PREFIX}${threadId}`;
+}
+
+/**
+ * Get the current in-flight step-start hash for a thread, or null if no step
+ * is in-flight. Phase 2 (#419): thread-keyed, not role-keyed.
+ */
+export function getActiveStep(store: Store, threadId: ThreadId): CasRef | null {
+  const name = activeStepVarName(threadId);
+  const vars = store.var.list({ exactName: name });
+  const v = vars[0];
+  if (v === undefined) {
+    return null;
+  }
+  return v.value as CasRef;
+}
+
+/**
+ * Set the in-flight step-start hash for a thread. Called at step start.
+ * Phase 2 (#419): thread-keyed, not role-keyed.
+ */
+export function setActiveStep(store: Store, threadId: ThreadId, stepStartHash: CasRef): void {
+  const name = activeStepVarName(threadId);
+  store.var.set(name, stepStartHash);
+}
+
+/**
+ * Clear the in-flight step-start for a thread. Called at step completion.
+ * Phase 2 (#419): thread-keyed, not role-keyed.
+ */
+export function clearActiveStep(store: Store, threadId: ThreadId): void {
+  const name = activeStepVarName(threadId);
+  store.var.remove(name);
+}
+
+/**
+ * Get the current turn chain head hash for a thread, or null if no turns exist.
+ * Phase 2 (#419): thread-keyed, not role-keyed.
+ */
+export function getActiveTurnHead(store: Store, threadId: ThreadId): CasRef | null {
+  const name = activeTurnHeadVarName(threadId);
+  const vars = store.var.list({ exactName: name });
+  const v = vars[0];
+  if (v === undefined) {
+    return null;
+  }
+  return v.value as CasRef;
+}
+
+/**
+ * Set the turn chain head hash for a thread. Called after each turn is written.
+ * Phase 2 (#419): thread-keyed, not role-keyed.
+ */
+export function setActiveTurnHead(store: Store, threadId: ThreadId, turnHash: CasRef): void {
+  const name = activeTurnHeadVarName(threadId);
+  store.var.set(name, turnHash);
+}
+
 /** A workflow entry discovered from the project-local .workflows/ (primary) or .workflow/ (legacy) directory. */
 export type ProjectWorkflowEntry = {
   /** Workflow name (from YAML `name` field, equals filename stem). */
@@ -567,3 +800,65 @@ export function migrateHistoryVarsToThreadVars(varStore: VarStore): void {
     varStore.remove(v.name);
   }
 }
+
+// ── Turn Chain Functions (Phase 1) ─────────────────────────────────
+
+/**
+ * Write a step-start node to CAS. Returns the CAS hash.
+ */
+export function writeStepStart(uwfStore: UwfStore, payload: StepStartPayload): CasRef {
+  const hash = uwfStore.store.cas.put(uwfStore.schemas.stepStart, payload);
+  return hash as CasRef;
+}
+
+/**
+ * Write a turn node to CAS. Returns the CAS hash.
+ */
+export function writeTurnNode(uwfStore: UwfStore, payload: TurnNodePayload): CasRef {
+  const hash = uwfStore.store.cas.put(uwfStore.schemas.turnNode, payload);
+  return hash as CasRef;
+}
+
+/**
+ * Walk the turn chain from head back to the first turn via `prev` pointers.
+ * Returns turns in chronological order (oldest first).
+ */
+export function walkTurnChain(uwfStore: UwfStore, headHash: CasRef): CasRef[] {
+  const chain: CasRef[] = [];
+  let currentHash: CasRef | null = headHash;
+
+  while (currentHash !== null) {
+    chain.push(currentHash);
+    const node = uwfStore.store.cas.get(currentHash);
+    if (node === null) {
+      break;
+    }
+    const payload = node.payload as TurnNodePayload | { prev?: CasRef | null };
+    currentHash = payload.prev ?? null;
+  }
+
+  // Reverse to get chronological order (oldest first)
+  return chain.reverse();
+}
+
+/**
+ * Get turns belonging to a specific step-start by filtering the turn chain
+ * via the `owner` field. Returns turns in chronological order (oldest first).
+ */
+export function turnsOfStep(uwfStore: UwfStore, headHash: CasRef, stepStartHash: CasRef): CasRef[] {
+  const allTurns = walkTurnChain(uwfStore, headHash);
+  const result: CasRef[] = [];
+
+  for (const turnHash of allTurns) {
+    const node = uwfStore.store.cas.get(turnHash);
+    if (node === null) {
+      continue;
+    }
+    const payload = node.payload as TurnNodePayload | { owner?: CasRef | null };
+    if (payload.owner === stepStartHash) {
+      result.push(turnHash);
+    }
+  }
+
+  return result;
+}

package/src/text-renderers.ts

@@ -81,6 +81,13 @@ type ThreadStopPayload = {
   stopped: boolean;
 };
 
+type StepDetailUsage = {
+  turns: number;
+  inputTokens: number;
+  outputTokens: number;
+  duration: number;
+};
+
 type StepDetailPayload = {
   hash: string;
   role: string;
@@ -89,8 +96,10 @@ type StepDetailPayload = {
   startedAtMs: number | null;
   completedAtMs: number | null;
   durationMs: number | null;
+  usage: StepDetailUsage | null;
   frontmatter: Record<string, unknown>;
   turns: Array<{ role: string; content: string; timestamp: number | null }>;
+  detail: Record<string, unknown> | null;
 };
 
 function asObject(data: unknown): Record<string, unknown> {
@@ -223,15 +232,39 @@ export function renderStepList(data: unknown): string {
   return lines.join("\n");
 }
 
+function renderUsageLine(usage: unknown): string | null {
+  if (usage === null || usage === undefined || typeof usage !== "object") return null;
+  const u = usage as StepDetailUsage;
+  const inputTokens = typeof u.inputTokens === "number" ? u.inputTokens : 0;
+  const outputTokens = typeof u.outputTokens === "number" ? u.outputTokens : 0;
+  const turns = typeof u.turns === "number" ? u.turns : 0;
+  return `Usage   ${inputTokens} in / ${outputTokens} out / ${turns} turns`;
+}
+
 export function renderStepShow(data: unknown): string {
   const p = asObject(data) as Partial<StepDetailPayload>;
-  return [
+  const lines: string[] = [
     `Step    ${asString(p.hash)}`,
     `Role    ${asString(p.role)}`,
     `Agent   ${asString(p.agent)}`,
     `Status  ${asString(p.status)}`,
     `Duration ${formatDuration(p.durationMs)}`,
-  ].join("\n");
+  ];
+  const usageLine = renderUsageLine(p.usage);
+  if (usageLine !== null) lines.push(usageLine);
+  const turnsArr = Array.isArray(p.turns) ? p.turns : [];
+  if (turnsArr.length > 0) {
+    lines.push(`Turns   ${turnsArr.length}`);
+    lines.push("");
+    lines.push("--- Content ---");
+    for (const turn of turnsArr) {
+      const t = asObject(turn);
+      const role = asString(t.role, "assistant");
+      const content = typeof t.content === "string" ? t.content : "";
+      lines.push(`[${role}] ${content}`);
+    }
+  }
+  return lines.join("\n");
 }
 
 export function renderThreadCancel(data: unknown): string {

package/dist/__tests__/adapter-json-roundtrip.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=adapter-json-roundtrip.test.d.ts.map

package/dist/__tests__/adapter-json-roundtrip.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"adapter-json-roundtrip.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/adapter-json-roundtrip.test.ts"],"names":[],"mappings":""}

package/dist/__tests__/adapter-json-roundtrip.test.js

@@ -1,160 +0,0 @@
-import { execFileSync } from "node:child_process";
-import { mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import { dirname, join } from "node:path";
-import { fileURLToPath } from "node:url";
-import { putSchema } from "@ocas/core";
-import { openStore } from "@ocas/fs";
-import { afterEach, beforeEach, describe, expect, test } from "vitest";
-import { registerUwfSchemas } from "../schemas.js";
-import { seedThreads } from "./thread-test-helpers.js";
-// ── schemas ──────────────────────────────────────────────────────────────────
-const OUTPUT_SCHEMA = {
-    type: "object",
-    properties: {
-        $status: { type: "string", enum: ["done", "failed"] },
-        result: { type: "string" },
-    },
-    required: ["$status"],
-    additionalProperties: false,
-};
-// ── fixture ──────────────────────────────────────────────────────────────────
-let tmpDir;
-let savedOcasHome;
-beforeEach(async () => {
-    savedOcasHome = process.env.OCAS_HOME;
-    tmpDir = await mkdtemp(join(tmpdir(), "cli-uwf-roundtrip-test-"));
-});
-afterEach(async () => {
-    if (savedOcasHome === undefined) {
-        delete process.env.OCAS_HOME;
-    }
-    else {
-        process.env.OCAS_HOME = savedOcasHome;
-    }
-    await rm(tmpDir, { recursive: true, force: true });
-});
-describe("C1: adapter JSON round-trip integration", () => {
-    test("mock agent outputs JSON, CLI parses it and updates thread head in CAS", async () => {
-        // 1. Set up CAS store with workflow, start node, and output schema
-        const casDir = join(tmpDir, "cas");
-        await mkdir(casDir, { recursive: true });
-        const store = await openStore(casDir);
-        const schemas = await registerUwfSchemas(store);
-        const outputSchemaHash = await putSchema(store, OUTPUT_SCHEMA);
-        const workflowHash = await store.cas.put(schemas.workflow, {
-            name: "test-roundtrip",
-            description: "roundtrip integration test",
-            roles: {
-                worker: {
-                    description: "Worker role",
-                    goal: "Do work",
-                    capabilities: [],
-                    procedure: "work",
-                    output: "result",
-                    frontmatter: outputSchemaHash,
-                },
-            },
-            graph: {
-                $START: {
-                    new: { role: "worker", prompt: "Do the work", location: null },
-                    resume: { role: "worker", prompt: "Resume the work", location: null },
-                },
-                worker: { done: { role: "$END", prompt: "completed", location: null } },
-            },
-        });
-        const startHash = await store.cas.put(schemas.startNode, {
-            workflow: workflowHash,
-            prompt: "Test round-trip task",
-        });
-        process.env.OCAS_HOME = casDir;
-        const threadId = "01ROUNDTRIPTEST0000000000";
-        await seedThreads(tmpDir, { [threadId]: startHash });
-        // 2. Pre-create CAS nodes that the mock agent would produce
-        const outputHash = await store.cas.put(outputSchemaHash, {
-            $status: "done",
-            result: "test-ok",
-        });
-        // Use text schema for detail (simple placeholder)
-        const detailHash = await store.cas.put(schemas.text, "mock detail");
-        const startedAtMs = 1716600000000;
-        const completedAtMs = 1716600001500;
-        const stepHash = await store.cas.put(schemas.stepNode, {
-            start: startHash,
-            prev: null,
-            role: "worker",
-            output: outputHash,
-            detail: detailHash,
-            agent: "uwf-mock",
-            edgePrompt: "Do the work",
-            startedAtMs,
-            completedAtMs,
-            cwd: tmpDir,
-        });
-        // 3. Create a minimal mock agent shell script that just outputs JSON
-        //    The step node is already in CAS — the agent just needs to print the JSON line
-        const mockAgentPath = join(tmpDir, "mock-agent.sh");
-        const adapterJson = JSON.stringify({
-            stepHash,
-            detailHash,
-            role: "worker",
-            frontmatter: { $status: "done", result: "test-ok" },
-            body: "",
-            startedAtMs,
-            completedAtMs,
-        });
-        await writeFile(mockAgentPath, `#!/bin/sh\necho '${adapterJson}'\n`, { mode: 0o755 });
-        // 4. Write config.yaml
-        const configPath = join(tmpDir, "config.yaml");
-        await writeFile(configPath, `defaultAgent: uwf-hermes\nagentOverrides: null\nagents:\n  uwf-hermes:\n    command: uwf-hermes\n`);
-        // 5. Run CLI with agent override pointing to our mock
-        const cliPath = join(dirname(fileURLToPath(import.meta.url)), "..", "..", "dist", "cli.js");
-        let stdout;
-        let stderr;
-        let exitCode;
-        try {
-            stdout = execFileSync(process.execPath, [cliPath, "--format", "raw-json", "thread", "exec", threadId, "--agent", mockAgentPath], {
-                encoding: "utf8",
-                stdio: ["ignore", "pipe", "pipe"],
-                env: {
-                    ...process.env,
-                    UWF_HOME: tmpDir,
-                    OCAS_HOME: casDir,
-                },
-                cwd: tmpDir,
-                timeout: 30000,
-            });
-            stderr = "";
-            exitCode = 0;
-        }
-        catch (e) {
-            const err = e;
-            stdout = err.stdout ?? "";
-            stderr = err.stderr ?? "";
-            exitCode = err.status ?? 1;
-        }
-        // 6. Verify
-        if (exitCode !== 0) {
-            throw new Error(`CLI exited with code ${exitCode}\nstdout: ${stdout}\nstderr: ${stderr}`);
-        }
-        // Parse CLI output (raw-json envelope value: { threadId, workflowHash, steps: [...] })
-        const cliOutput = JSON.parse(stdout.trim());
-        expect(cliOutput).toHaveProperty("threadId", threadId);
-        expect(cliOutput.steps).toHaveLength(1);
-        const firstStep = cliOutput.steps[0];
-        expect(firstStep).toHaveProperty("head", stepHash);
-        expect(firstStep.head).toMatch(/^[0-9A-HJ-NP-TV-Z]{13}$/);
-        // Verify the CAS step node exists and has correct metadata
-        const storeAfter = await openStore(casDir);
-        const stepNode = storeAfter.cas.get(firstStep.head);
-        expect(stepNode).not.toBeNull();
-        const payload = stepNode.payload;
-        expect(payload.role).toBe("worker");
-        expect(payload.agent).toBe("uwf-mock");
-        expect(payload.startedAtMs).toBe(1716600000000);
-        expect(payload.completedAtMs).toBe(1716600001500);
-        expect(payload.output).toBe(outputHash);
-        expect(payload.detail).toBe(detailHash);
-    });
-});
-//# sourceMappingURL=adapter-json-roundtrip.test.js.map

package/dist/__tests__/adapter-json-roundtrip.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"adapter-json-roundtrip.test.js","sourceRoot":"","sources":["../../src/__tests__/adapter-json-roundtrip.test.ts"],"names":[],"mappings":"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"}

package/dist/__tests__/spawn-agent-json.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=spawn-agent-json.test.d.ts.map

package/dist/__tests__/spawn-agent-json.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"spawn-agent-json.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/spawn-agent-json.test.ts"],"names":[],"mappings":""}

package/dist/__tests__/spawn-agent-json.test.js

@@ -1,79 +0,0 @@
-import { describe, expect, test } from "vitest";
-/**
- * B-group tests: validate JSON parsing logic used by spawnAgent.
- *
- * We test the parsing logic inline since spawnAgent is a private function.
- * These tests verify the contract: last line of stdout must be valid JSON
- * with a valid stepHash CasRef.
- */
-const CASREF_PATTERN = /^[0-9A-HJ-NP-TV-Z]{13}$/;
-function isCasRef(s) {
-    return CASREF_PATTERN.test(s);
-}
-function parseAgentStdout(stdout) {
-    const line = stdout.trim().split("\n").pop()?.trim() ?? "";
-    let parsed;
-    try {
-        parsed = JSON.parse(line);
-    }
-    catch {
-        throw new Error(`agent stdout last line is not valid JSON: ${line || "(empty)"}`);
-    }
-    const obj = parsed;
-    if (typeof obj !== "object" ||
-        obj === null ||
-        typeof obj.stepHash !== "string" ||
-        !isCasRef(obj.stepHash)) {
-        throw new Error(`agent stdout JSON missing valid stepHash: ${line}`);
-    }
-    return obj;
-}
-const VALID_OUTPUT = {
-    stepHash: "0123456789ABC",
-    detailHash: "DEFGH12345678",
-    role: "planner",
-    frontmatter: { $status: "ready", plan: "somehash" },
-    body: "Plan body",
-    startedAtMs: 1000,
-    completedAtMs: 2000,
-};
-describe("spawnAgent JSON parsing", () => {
-    test("B1. parses valid JSON from agent stdout", () => {
-        const stdout = `${JSON.stringify(VALID_OUTPUT)}\n`;
-        const result = parseAgentStdout(stdout);
-        expect(result.stepHash).toBe("0123456789ABC");
-        expect(result.detailHash).toBe("DEFGH12345678");
-        expect(result.role).toBe("planner");
-        expect(result.frontmatter).toEqual({ $status: "ready", plan: "somehash" });
-        expect(result.body).toBe("Plan body");
-        expect(result.startedAtMs).toBe(1000);
-        expect(result.completedAtMs).toBe(2000);
-    });
-    test("B2. extracts stepHash for head pointer", () => {
-        const stdout = `${JSON.stringify(VALID_OUTPUT)}\n`;
-        const result = parseAgentStdout(stdout);
-        expect(result.stepHash).toBe("0123456789ABC");
-        expect(isCasRef(result.stepHash)).toBe(true);
-    });
-    test("B3. handles debug lines before JSON", () => {
-        const debugLines = "[debug] loading context...\n[debug] running agent...\n";
-        const stdout = `${debugLines + JSON.stringify(VALID_OUTPUT)}\n`;
-        const result = parseAgentStdout(stdout);
-        expect(result.stepHash).toBe("0123456789ABC");
-    });
-    test("B4. rejects non-JSON last line", () => {
-        const stdout = "not-json-at-all\n";
-        expect(() => parseAgentStdout(stdout)).toThrow("not valid JSON");
-    });
-    test("B5. rejects JSON missing stepHash", () => {
-        const incomplete = { detailHash: "DEFGH12345678", role: "planner" };
-        const stdout = `${JSON.stringify(incomplete)}\n`;
-        expect(() => parseAgentStdout(stdout)).toThrow("missing valid stepHash");
-    });
-    test("B6. rejects JSON with invalid stepHash", () => {
-        const bad = { ...VALID_OUTPUT, stepHash: "not-a-hash" };
-        const stdout = `${JSON.stringify(bad)}\n`;
-        expect(() => parseAgentStdout(stdout)).toThrow("missing valid stepHash");
-    });
-});
-//# sourceMappingURL=spawn-agent-json.test.js.map

package/dist/__tests__/spawn-agent-json.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"spawn-agent-json.test.js","sourceRoot":"","sources":["../../src/__tests__/spawn-agent-json.test.ts"],"names":[],"mappings":"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"}