feat(cli): complete AGENTS.md generation (#36 Phase 3)

- Replace placeholder with comprehensive coding agent instructions
- Covers: project structure, core concepts, dev workflow, coding
  conventions, template reuse, build/test, common pitfalls
- Add test coverage for AGENTS.md sections and terms

Testing: #48

CLAUDE.md

@@ -97,36 +97,6 @@ type WorkflowEntry = {
 
 Workflow bundles (`.esm.js`) follow the same rule: export `const run` and `const descriptor`, not `export default`.
 
-### Folder Module Discipline
-
-Every folder under `src/` is a **module boundary**. Four rules:
-
-| # | Rule | Rationale |
-|---|------|-----------|
-| 1 | **Every folder exports via `index.ts`** | Single entry point for the module |
-| 2 | **Types live in `types.ts`** | Each folder's type definitions go in `<folder>/types.ts`, not scattered across files |
-| 3 | **Single export source** | Only `index.ts` may re-export. No file may re-export from another module's internals. Cross-module imports must go through `index.ts` — never reach past it to import a specific file |
-| 4 | **`index.ts` is pure re-exports** | No type definitions, no function implementations — only `export { ... } from` statements |
-
-```typescript
-// ✅ Good — import through module boundary
-import { createCasStore } from "../cas/index.js";
-import type { CasStore } from "../cas/index.js";
-
-// ❌ Bad — reaching past index.ts
-import { createCasStore } from "../cas/cas.js";
-
-// ❌ Bad — re-exporting from non-index file
-// in engine/engine.ts:
-export { createCasStore } from "../cas/cas.js";
-
-// ❌ Bad — types defined in index.ts
-// in cas/index.ts:
-export type CasStore = { ... };  // should be in cas/types.ts
-```
-
-**Exception**: The package-level `src/index.ts` is the public API surface and re-exports from folder `index.ts` files. Files that remain at `src/` root (e.g. `types.ts`, `workflow-as-agent.ts`) are not inside a folder module and follow normal rules.
-
 ## Naming
 
 | Type | Style | Example |
@@ -227,8 +197,9 @@ Test files (`__tests__/**`) are exempt.
 ### Commands
 
 ```bash
-bun run check       # tsc --build + biome check
+bun run check       # biome check (lint + format)
 bun run format      # biome format --write
+bun run build       # full build
 bun test            # run tests
 ```
 

README.md

@@ -1,71 +0,0 @@
-# @uncaged/workflow
-
-A workflow engine that executes single-file ESM bundles. Each workflow is a self-contained `.esm.js` file identified by its XXH64 hash (Crockford Base32).
-
-## Core Concepts
-
-| Concept | Description |
-|---------|-------------|
-| **Workflow** | A single-file ESM module exporting `run` (workflow function) and `descriptor` (metadata). Identified by its XXH64 hash. |
-| **Bundle** | The physical `.esm.js` file stored in `~/.uncaged/workflow/bundles/`. |
-| **Thread** | A single execution of a workflow, identified by a ULID. Persisted as `.data.jsonl` + `.info.jsonl`. |
-| **Role** | A named actor within a workflow. Each role produces output with typed `meta`. Roles live inside template packages (`src/roles/`). |
-| **Registry** | `workflow.yaml` — maps workflow names to current/historical bundle hashes. |
-| **CAS** | Content-Addressed Storage — bundles are immutable and addressed by hash. |
-
-## Monorepo Packages
-
-```
-packages/
-  workflow/                      # @uncaged/workflow — core lib (types, engine, hash, ULID, registry)
-  cli-workflow/                  # @uncaged/cli-workflow — CLI (`uncaged-workflow` command)
-  workflow-template-develop/     # @uncaged/workflow-template-develop — develop workflow template (includes roles)
-  workflow-template-solve-issue/ # @uncaged/workflow-template-solve-issue — solve-issue workflow template (includes roles)
-  workflow-agent-hermes/         # @uncaged/workflow-agent-hermes — Hermes agent adapter
-  workflow-agent-cursor/         # @uncaged/workflow-agent-cursor — Cursor agent adapter
-  workflow-agent-llm/            # @uncaged/workflow-agent-llm — LLM agent adapter
-  workflow-util-agent/           # @uncaged/workflow-util-agent — agent utilities (buildAgentPrompt, spawnCli)
-```
-
-Managed with **bun workspace** using the `workspace:*` protocol.
-
-## Quick Start
-
-```bash
-# Install dependencies
-bun install
-
-# Build all packages
-bun run build
-
-# Register a workflow bundle
-uncaged-workflow workflow add solve-issue dist/packages/workflow-template-solve-issue/solve-issue.esm.js
-
-# Run a workflow
-uncaged-workflow run solve-issue --prompt "Fix bug #42"
-```
-
-## CLI Usage
-
-```bash
-uncaged-workflow                   # Print full command usage (exits with status 1)
-uncaged-workflow workflow list     # List registered workflows
-uncaged-workflow run <name>        # Start a workflow thread
-uncaged-workflow thread list       # List all threads
-uncaged-workflow thread show <id>  # Inspect a thread
-uncaged-workflow skill             # Agent-consumable reference docs
-```
-
-Run `uncaged-workflow` with no arguments to print usage, or `uncaged-workflow skill cli` for the full CLI skill reference.
-
-## Development
-
-```bash
-bun run check    # Biome lint + format check
-bun run format   # Auto-format with Biome
-bun test         # Run tests
-```
-
-## Architecture
-
-See [docs/architecture.md](docs/architecture.md) for the full design — three-phase engine loop, bundle contract, storage layout, and design decisions.

docs/architecture.md

@@ -17,8 +17,11 @@ A workflow engine that executes single-file ESM bundles. Each workflow is a self
 | `workflow-agent-cursor` | `@uncaged/workflow-agent-cursor` | Cursor CLI agent (extracts workspace from ctx) |
 | `workflow-agent-hermes` | `@uncaged/workflow-agent-hermes` | Hermes CLI agent |
 | `workflow-agent-llm` | `@uncaged/workflow-agent-llm` | OpenAI-compatible LLM agent |
-| `workflow-template-develop` | `@uncaged/workflow-template-develop` | Develop workflow template (roles in `src/roles/`) |
-| `workflow-template-solve-issue` | `@uncaged/workflow-template-solve-issue` | Solve-issue workflow template (roles in `src/roles/`) |
+| `workflow-role-planner` | `@uncaged/workflow-role-planner` | Pure data: phased planning prompt + schema |
+| `workflow-role-coder` | `@uncaged/workflow-role-coder` | Pure data: coding prompt + schema |
+| `workflow-role-reviewer` | `@uncaged/workflow-role-reviewer` | Pure data: code review prompt + schema |
+| `workflow-role-committer` | `@uncaged/workflow-role-committer` | Pure data: git commit prompt + schema |
+| `workflow-template-solve-issue` | `@uncaged/workflow-template-solve-issue` | Composes roles + moderator into a complete workflow |
 | `workflow-util-agent` | `@uncaged/workflow-util-agent` | `buildAgentPrompt` + `spawnCli` utilities |
 
 Monorepo with **bun workspace**, `workspace:*` protocol.

examples/hello-world.ts

@@ -1,4 +1,4 @@
-import { createWorkflow, END, type RoleDefinition } from "@uncaged/workflow";
+import { createExtract, createWorkflow, END, type RoleDefinition } from "@uncaged/workflow";
 import * as z from "zod/v4";
 
 type Roles = {
@@ -32,6 +32,12 @@ const greeter: RoleDefinition<Roles["greeter"]> = {
   extractMode: "single",
 };
 
+const extract = createExtract({
+  baseUrl: "http://127.0.0.1:9",
+  apiKey: "",
+  model: "",
+});
+
 export const run = createWorkflow<Roles>(
   {
     roles: { greeter },
@@ -42,4 +48,6 @@ export const run = createWorkflow<Roles>(
   {
     agent: async (ctx) => `Hello, ${ctx.start.content}`,
   },
+  extract,
+  null,
 );

package.json

@@ -6,6 +6,7 @@
     "examples"
   ],
   "scripts": {
+    "build": "bun run --filter '*' build",
     "check": "bunx tsc --build && biome check .",
     "typecheck": "bunx tsc --build",
     "format": "biome format --write .",

packages/cli-workflow/README.md

@@ -1,76 +0,0 @@
-# @uncaged/cli-workflow
-
-Command-line interface for the Uncaged workflow engine (`uncaged-workflow`).
-
-The CLI reads and writes the workflow registry, starts and inspects threads, manages CAS blobs, and prints agent-oriented reference docs via `skill`. It uses the same storage layout as `@uncaged/workflow` (default `~/.uncaged/workflow`).
-
-## Install
-
-```bash
-bun add @uncaged/cli-workflow
-```
-
-In this monorepo: `"@uncaged/cli-workflow": "workspace:*"`. Depends on `"@uncaged/workflow": "workspace:*"`.
-
-## Usage
-
-```bash
-uncaged-workflow workflow list
-uncaged-workflow run <name> --prompt "Your task"
-uncaged-workflow thread show <id>
-uncaged-workflow skill
-```
-
-Invoking the CLI with no command (or from this repo: `bun packages/cli-workflow/src/cli.ts`) prints:
-
-```
-uncaged-workflow — workflow engine CLI
-
-Workflow registry:
-  workflow add <name> <file.esm.js> [--types <path>]  Register a workflow bundle in the registry
-  workflow list                                       List all registered workflows
-  workflow show <name>                                Show details of a registered workflow
-  workflow rm <name>                                  Remove a workflow from the registry
-  workflow history <name>                             Show version history of a workflow
-  workflow rollback <name> [hash]                     Rollback a workflow to a previous version
-
-Thread execution:
-  thread run <name> [--prompt <text>] [--max-rounds N]          Start a new thread executing a workflow
-  thread list [name]                                            List threads, optionally filtered by workflow name
-  thread show <id>                                              Show thread details and state
-  thread rm <id>                                                Remove a thread
-  thread fork <thread-id> [--from-role <role>]                  Fork a thread, optionally from a specific role
-  thread ps                                                     List running threads
-  thread kill <thread-id>                                       Kill a running thread
-  thread live <thread-id> | --latest [--debug] [--role <name>]  Attach to a thread and stream output live
-  thread pause <thread-id>                                      Pause a running thread
-  thread resume <thread-id>                                     Resume a paused thread
-
-Content-addressable storage:
-  cas get <hash>     Retrieve content by hash from CAS
-  cas put <content>  Store content in CAS, prints hash
-  cas list           List all hashes in CAS
-  cas rm <hash>      Remove a CAS entry by hash
-  cas gc             Garbage-collect unreferenced CAS entries
-
-Development:
-  init workspace <name>  Initialize a new workflow workspace
-  init template <name>   Initialize a new workflow template
-
-Shortcuts:
-  run <name> [...]  → thread run
-  live <id> [...]   → thread live
-
-Reference:
-  skill [topic]  Agent-consumable docs (cli, develop, author)
-
-Use <command> --help for subcommand details.
-
-Environment variables:
-  WORKFLOW_STORAGE_ROOT              Override storage directory (default: ~/.uncaged/workflow)
-  UNCAGED_WORKFLOW_STORAGE_ROOT      Internal override (takes priority over WORKFLOW_STORAGE_ROOT)
-```
-
-## API overview
-
-This package is bin-only; programmatic use is via `@uncaged/workflow`. Entry: `src/cli.ts` → `runCli` in `src/cli-dispatch.js`.

packages/cli-workflow/__tests__/bundle-fixture.ts

@@ -1,4 +1,4 @@
-import type { ParsedAddArgv } from "../src/commands/workflow/index.js";
+import type { ParsedAddArgv } from "../src/cmd-add.js";
 
 export function addCliArgs(name: string, filePath: string): ParsedAddArgv {
   return { name, filePath, typesPath: null };

packages/cli-workflow/__tests__/commands.test.ts

@@ -4,16 +4,13 @@ import { tmpdir } from "node:os";
 import { join } from "node:path";
 
 import { getGlobalCasDir, getRegisteredWorkflow, readWorkflowRegistry } from "@uncaged/workflow";
-import { cmdCasGet, cmdCasList, cmdCasPut, cmdCasRm } from "../src/commands/cas/index.js";
-import {
-  cmdAdd,
-  cmdHistory,
-  cmdList,
-  cmdRemove,
-  cmdRollback,
-  cmdShow,
-  formatListLines,
-} from "../src/commands/workflow/index.js";
+import { cmdAdd } from "../src/cmd-add.js";
+import { cmdCasGet, cmdCasList, cmdCasPut, cmdCasRm } from "../src/cmd-cas.js";
+import { cmdHistory } from "../src/cmd-history.js";
+import { cmdList, formatListLines } from "../src/cmd-list.js";
+import { cmdRemove } from "../src/cmd-remove.js";
+import { cmdRollback } from "../src/cmd-rollback.js";
+import { cmdShow } from "../src/cmd-show.js";
 import { addCliArgs } from "./bundle-fixture.js";
 
 const fixtureDescriptor = `export const descriptor = { description: "fixture", roles: {} };
@@ -402,7 +399,7 @@ export const run = async function* (input, options) {
   });
 
   test("cas put/get/list/rm use global cas dir (thread id not required for storage)", async () => {
-    const put = await cmdCasPut(storageRoot, "phase doc");
+    const put = await cmdCasPut(storageRoot, "nonexistent-thread-id", "phase doc");
     expect(put.ok).toBe(true);
     if (!put.ok) {
       return;
@@ -411,24 +408,24 @@ export const run = async function* (input, options) {
     const blobPath = join(getGlobalCasDir(storageRoot), `${hash}.txt`);
     expect(await readFile(blobPath, "utf8")).toBe("phase doc");
 
-    const got = await cmdCasGet(storageRoot, hash);
+    const got = await cmdCasGet(storageRoot, "other-thread", hash);
     expect(got.ok).toBe(true);
     if (!got.ok) {
       return;
     }
     expect(got.value).toBe("phase doc");
 
-    const listed = await cmdCasList(storageRoot);
+    const listed = await cmdCasList(storageRoot, "another-thread");
     expect(listed.ok).toBe(true);
     if (!listed.ok) {
       return;
     }
     expect(listed.value).toContain(hash);
 
-    const removed = await cmdCasRm(storageRoot, hash);
+    const removed = await cmdCasRm(storageRoot, "rm-thread", hash);
     expect(removed.ok).toBe(true);
 
-    const missing = await cmdCasGet(storageRoot, hash);
+    const missing = await cmdCasGet(storageRoot, "after-rm", hash);
     expect(missing.ok).toBe(false);
   });
 

packages/cli-workflow/__tests__/fixtures/live/logs/C9NMV6V2TQT81/01LIVECMPLT01DDDDDDDDDDDDG.data.jsonl

@@ -1,4 +0,0 @@
-{"name":"demo-live","hash":"C9NMV6V2TQT81","threadId":"01LIVECMPLT01DDDDDDDDDDDDG","parameters":{"prompt":"hello","options":{"maxRounds":5,"depth":0}},"timestamp":1714963400000}
-{"role":"planner","contentHash":"FF7YQ5W3S2EV6","meta":{"phase":"plan","flags":[1,2]},"refs":[],"timestamp":1714963201000}
-{"role":"coder","contentHash":"EN34XX1W4WAFJ","meta":{},"refs":[],"timestamp":1714963202000}
-{"returnCode":0,"summary":"fixture completed"}

packages/cli-workflow/__tests__/fixtures/live/logs/C9NMV6V2TQT81/01LIVECMPLT01DDDDDDDDDDDDG.info.jsonl

@@ -1,2 +0,0 @@
-{"tag":"DEBUGTAG1","content":"bundle loaded","timestamp":1714963400050}
-{"tag":"DEBUGTAG2","content":"multi\nline","timestamp":1714963400500}

packages/cli-workflow/__tests__/fixtures/live/logs/C9NMV6V2TQT81/01LIVEINFLY01DDDDDDDDDDDDG.data.jsonl

@@ -1,2 +0,0 @@
-{"name":"demo-live","hash":"C9NMV6V2TQT81","threadId":"01LIVEINFLY01DDDDDDDDDDDDG","parameters":{"prompt":"hello","options":{"maxRounds":5,"depth":0}},"timestamp":1714963200000}
-{"role":"planner","contentHash":"P6M9FHE1GSBN0","meta":{"x":1},"refs":[],"timestamp":1714963201000}

packages/cli-workflow/__tests__/fixtures/live/logs/C9NMV6V2TQT81/01LIVEOLDER01DDDDDDDDDDDDG.data.jsonl

@@ -1,2 +0,0 @@
-{"name":"demo-live-old","hash":"C9NMV6V2TQT81","threadId":"01LIVEOLDER01DDDDDDDDDDDDG","parameters":{"prompt":"old","options":{"maxRounds":5,"depth":0}},"timestamp":1714963000000}
-{"returnCode":0,"summary":"older thread"}

packages/cli-workflow/__tests__/fork-cli.test.ts

@@ -3,11 +3,11 @@ import { mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { createCasStore, getContentMerklePayload, getGlobalCasDir } from "@uncaged/workflow";
-import { cmdFork, cmdRun } from "../src/commands/thread/index.js";
-import { cmdAdd } from "../src/commands/workflow/index.js";
+import { cmdAdd } from "../src/cmd-add.js";
+import { cmdFork } from "../src/cmd-fork.js";
+import { cmdRun } from "../src/cmd-run.js";
 import { pathExists } from "../src/fs-utils.js";
 import { addCliArgs } from "./bundle-fixture.js";
-import { ensureTestWorkflowRegistryConfig } from "./workflow-registry-fixture.js";
 
 /** Three-role workflow that respects `input.steps` for fork/resume. */
 const threeRoleBundleSource = `import { putContentMerkleNode } from "@uncaged/workflow";
@@ -78,7 +78,6 @@ describe("cli fork", () => {
     prevEnv = process.env.UNCAGED_WORKFLOW_STORAGE_ROOT;
     storageRoot = await mkdtemp(join(tmpdir(), "uncaged-wf-fork-"));
     process.env.UNCAGED_WORKFLOW_STORAGE_ROOT = storageRoot;
-    await ensureTestWorkflowRegistryConfig(storageRoot);
   });
 
   afterEach(async () => {
@@ -112,7 +111,7 @@ describe("cli fork", () => {
     const sourceData = join(storageRoot, "logs", hash, `${sourceId}.data.jsonl`);
     const sourceRunning = join(storageRoot, "logs", hash, `${sourceId}.running`);
     await waitUntilRunningAbsent(sourceRunning);
-    await waitUntilMinDataLines(sourceData, 5);
+    await waitUntilMinDataLines(sourceData, 4);
 
     const forked = await cmdFork(storageRoot, sourceId, "planner");
     expect(forked.ok).toBe(true);
@@ -123,22 +122,22 @@ describe("cli fork", () => {
     const newData = join(storageRoot, "logs", hash, `${newId}.data.jsonl`);
     const newRunning = join(storageRoot, "logs", hash, `${newId}.running`);
     await waitUntilRunningAbsent(newRunning);
-    await waitUntilMinDataLines(newData, 5);
+    await waitUntilMinDataLines(newData, 4);
 
     const text = await readFile(newData, "utf8");
     const lines = text
       .trim()
       .split("\n")
       .filter((l) => l !== "");
-    expect(lines.length).toBe(5);
+    expect(lines.length).toBe(4);
     const start = JSON.parse(lines[0] ?? "{}") as Record<string, unknown>;
     expect(start.threadId).toBe(newId);
     expect(start.forkFrom).toEqual({ threadId: sourceId });
 
-    const lastRoleLine = JSON.parse(lines[lines.length - 2] ?? "{}") as Record<string, unknown>;
-    expect(lastRoleLine.role).toBe("reviewer");
+    const last = JSON.parse(lines[lines.length - 1] ?? "{}") as Record<string, unknown>;
+    expect(last.role).toBe("reviewer");
     const cas = createCasStore(getGlobalCasDir(storageRoot));
-    expect(await getContentMerklePayload(cas, String(lastRoleLine.contentHash))).toBe("rev-1");
+    expect(await getContentMerklePayload(cas, String(last.contentHash))).toBe("rev-1");
   });
 
   test("fork without --from-role retries last role", async () => {
@@ -163,7 +162,7 @@ describe("cli fork", () => {
     const sourceData = join(storageRoot, "logs", hash, `${sourceId}.data.jsonl`);
     const sourceRunning = join(storageRoot, "logs", hash, `${sourceId}.running`);
     await waitUntilRunningAbsent(sourceRunning);
-    await waitUntilMinDataLines(sourceData, 5);
+    await waitUntilMinDataLines(sourceData, 4);
 
     const forked = await cmdFork(storageRoot, sourceId, null);
     expect(forked.ok).toBe(true);
@@ -174,23 +173,23 @@ describe("cli fork", () => {
     const newData = join(storageRoot, "logs", hash, `${newId}.data.jsonl`);
     const newRunning = join(storageRoot, "logs", hash, `${newId}.running`);
     await waitUntilRunningAbsent(newRunning);
-    await waitUntilMinDataLines(newData, 5);
+    await waitUntilMinDataLines(newData, 4);
 
     const text = await readFile(newData, "utf8");
     const lines = text
       .trim()
       .split("\n")
       .filter((l) => l !== "");
-    expect(lines.length).toBe(5);
+    expect(lines.length).toBe(4);
 
     const replayCoder = JSON.parse(lines[2] ?? "{}") as Record<string, unknown>;
     expect(replayCoder.role).toBe("coder");
     const cas = createCasStore(getGlobalCasDir(storageRoot));
     expect(await getContentMerklePayload(cas, String(replayCoder.contentHash))).toBe("c1");
 
-    const lastRoleLine = JSON.parse(lines[lines.length - 2] ?? "{}") as Record<string, unknown>;
-    expect(lastRoleLine.role).toBe("reviewer");
-    expect(await getContentMerklePayload(cas, String(lastRoleLine.contentHash))).toBe("rev-2");
+    const last = JSON.parse(lines[lines.length - 1] ?? "{}") as Record<string, unknown>;
+    expect(last.role).toBe("reviewer");
+    expect(await getContentMerklePayload(cas, String(last.contentHash))).toBe("rev-2");
   });
 
   test("fork rejects unknown role with available names", async () => {
@@ -214,7 +213,7 @@ describe("cli fork", () => {
     const sourceData = join(storageRoot, "logs", added.value.hash, `${sourceId}.data.jsonl`);
     const sourceRunning = join(storageRoot, "logs", added.value.hash, `${sourceId}.running`);
     await waitUntilRunningAbsent(sourceRunning);
-    await waitUntilMinDataLines(sourceData, 5);
+    await waitUntilMinDataLines(sourceData, 4);
 
     const bad = await cmdFork(storageRoot, sourceId, "ghost-role");
     expect(bad.ok).toBe(false);

packages/cli-workflow/__tests__/gc-cli.test.ts

@@ -10,7 +10,7 @@ import {
   getGlobalCasDir,
   putContentMerkleNode,
 } from "@uncaged/workflow";
-import { cmdThreadRemove } from "../src/commands/thread/index.js";
+import { cmdThreadRemove } from "../src/cmd-thread.js";
 import { pathExists } from "../src/fs-utils.js";
 
 const cliEntryPath = fileURLToPath(new URL("../src/cli.ts", import.meta.url));
@@ -129,10 +129,7 @@ describe("gc cli and garbageCollectCas", () => {
     });
 
     const env = { ...process.env, UNCAGED_WORKFLOW_STORAGE_ROOT: storageRoot };
-    const proc = spawnSync(process.execPath, [cliEntryPath, "cas", "gc"], {
-      env,
-      encoding: "utf8",
-    });
+    const proc = spawnSync(process.execPath, [cliEntryPath, "gc"], { env, encoding: "utf8" });
     expect(proc.status).toBe(0);
     expect(String(proc.stdout).trim()).toBe("scanned 1 threads, 2 active refs, deleted 1 entries");
   });

packages/cli-workflow/__tests__/help.test.ts

@@ -1,233 +0,0 @@
-import { describe, expect, test } from "bun:test";
-import { formatCliUsage, runCli } from "../src/cli-dispatch.js";
-import { formatSkillIndex, formatSkillTopic, getSkillTopics } from "../src/skill.js";
-
-const STORAGE_ROOT = "/tmp/help-test-storage";
-
-describe("runCli usage", () => {
-  test("no args prints usage and returns 1", async () => {
-    const code = await runCli(STORAGE_ROOT, []);
-    expect(code).toBe(1);
-  });
-});
-
-describe("skill command", () => {
-  test("skill (no topic) lists topics and returns 0", async () => {
-    const code = await runCli(STORAGE_ROOT, ["skill"]);
-    expect(code).toBe(0);
-  });
-
-  test("skill cli returns 0", async () => {
-    const code = await runCli(STORAGE_ROOT, ["skill", "cli"]);
-    expect(code).toBe(0);
-  });
-
-  test("skill develop returns 0", async () => {
-    const code = await runCli(STORAGE_ROOT, ["skill", "develop"]);
-    expect(code).toBe(0);
-  });
-
-  test("skill author returns 0", async () => {
-    const code = await runCli(STORAGE_ROOT, ["skill", "author"]);
-    expect(code).toBe(0);
-  });
-
-  test("skill unknown returns 1", async () => {
-    const code = await runCli(STORAGE_ROOT, ["skill", "unknown"]);
-    expect(code).toBe(1);
-  });
-});
-
-describe("--help flag on groups", () => {
-  test("workflow --help returns 0", async () => {
-    const code = await runCli(STORAGE_ROOT, ["workflow", "--help"]);
-    expect(code).toBe(0);
-  });
-
-  test("thread --help returns 0", async () => {
-    const code = await runCli(STORAGE_ROOT, ["thread", "--help"]);
-    expect(code).toBe(0);
-  });
-
-  test("cas --help returns 0", async () => {
-    const code = await runCli(STORAGE_ROOT, ["cas", "--help"]);
-    expect(code).toBe(0);
-  });
-
-  test("init --help returns 0", async () => {
-    const code = await runCli(STORAGE_ROOT, ["init", "--help"]);
-    expect(code).toBe(0);
-  });
-});
-
-describe("getSkillTopics", () => {
-  test("returns all topics", () => {
-    const topics = getSkillTopics();
-    const names = topics.map((t) => t.name);
-    expect(names).toContain("cli");
-    expect(names).toContain("develop");
-    expect(names).toContain("author");
-  });
-});
-
-describe("formatSkillIndex", () => {
-  test("lists all topics", () => {
-    const idx = formatSkillIndex();
-    expect(idx).toContain("# uncaged-workflow skill");
-    expect(idx).not.toContain("# uncaged-workflow help --skill");
-    expect(idx).toContain("cli");
-    expect(idx).toContain("develop");
-    expect(idx).toContain("author");
-    expect(idx).toContain("skill <topic>");
-  });
-});
-
-describe("formatCliUsage", () => {
-  test("has tagline, grouped sections, help hint, and env vars", () => {
-    const u = formatCliUsage();
-    expect(u.startsWith("uncaged-workflow — workflow engine CLI")).toBe(true);
-    expect(u).toContain("Workflow registry:");
-    expect(u).toContain("Thread execution:");
-    expect(u).toContain("Content-addressable storage:");
-    expect(u).toContain("Development:");
-    expect(u).toContain("Shortcuts:");
-    expect(u).toContain("Reference:");
-    expect(u).toContain("skill [topic]");
-    expect(u).toContain("Agent-consumable docs");
-    expect(u).toContain("Use <command> --help for subcommand details.");
-    expect(u).toContain("Environment variables:");
-    expect(u).toContain("WORKFLOW_STORAGE_ROOT");
-    expect(u).toContain("UNCAGED_WORKFLOW_STORAGE_ROOT");
-  });
-
-  test("lists commands from registry with descriptions", () => {
-    const u = formatCliUsage();
-    expect(u).toContain("workflow add");
-    expect(u).toContain("Register a workflow bundle in the registry");
-    expect(u).toContain("thread run");
-    expect(u).toContain("Start a new thread executing a workflow");
-    expect(u).toContain("cas gc");
-    expect(u).toContain("Garbage-collect unreferenced CAS entries");
-  });
-});
-
-const cliSkillDoc = formatSkillTopic("cli");
-if (cliSkillDoc === null) {
-  throw new Error("BUG: cli skill topic missing");
-}
-
-describe("formatSkillTopic('cli')", () => {
-  const doc = cliSkillDoc;
-
-  test("contains title", () => {
-    expect(doc).toContain("# uncaged-workflow CLI Reference");
-  });
-
-  test("contains all command group headers", () => {
-    expect(doc).toContain("### workflow");
-    expect(doc).toContain("### thread");
-    expect(doc).toContain("### cas");
-    expect(doc).toContain("### init");
-    expect(doc).toContain("### Top-level shortcuts");
-  });
-
-  test("contains core concepts", () => {
-    expect(doc).toContain("## Core Concepts");
-    expect(doc).toContain("Workflow");
-    expect(doc).toContain("Bundle");
-    expect(doc).toContain("Thread");
-    expect(doc).toContain("CAS");
-    expect(doc).toContain("Registry");
-  });
-
-  test("mentions all workflow subcommands", () => {
-    for (const sub of ["add", "list", "show", "rm", "history", "rollback"]) {
-      expect(doc).toContain(`workflow ${sub}`);
-    }
-  });
-
-  test("mentions all thread subcommands", () => {
-    for (const sub of [
-      "run",
-      "list",
-      "show",
-      "rm",
-      "fork",
-      "ps",
-      "kill",
-      "live",
-      "pause",
-      "resume",
-    ]) {
-      expect(doc).toContain(`thread ${sub}`);
-    }
-  });
-
-  test("mentions all cas subcommands", () => {
-    for (const sub of ["get", "put", "list", "rm", "gc"]) {
-      expect(doc).toContain(`cas ${sub}`);
-    }
-  });
-
-  test("contains exit codes section", () => {
-    expect(doc).toContain("## Exit Codes");
-  });
-
-  test("contains environment variables section", () => {
-    expect(doc).toContain("## Environment Variables");
-    expect(doc).toContain("UNCAGED_WORKFLOW_STORAGE_ROOT");
-  });
-
-  test("contains typical workflow section", () => {
-    expect(doc).toContain("## Typical Workflow");
-  });
-});
-
-describe("formatSkillTopic('develop')", () => {
-  const doc = formatSkillTopic("develop");
-
-  test("returns non-null", () => {
-    expect(doc).not.toBeNull();
-  });
-
-  test("contains thread ID info", () => {
-    expect(doc).toContain("Thread ID");
-    expect(doc).toContain("Crockford Base32");
-  });
-
-  test("contains CAS commands", () => {
-    expect(doc).toContain("cas put");
-    expect(doc).toContain("cas get");
-  });
-
-  test("contains meta output section", () => {
-    expect(doc).toContain("Meta Output");
-  });
-});
-
-describe("formatSkillTopic('author')", () => {
-  const doc = formatSkillTopic("author");
-
-  test("returns non-null", () => {
-    expect(doc).not.toBeNull();
-  });
-
-  test("contains bundle structure", () => {
-    expect(doc).toContain("Bundle Structure");
-    expect(doc).toContain(".esm.js");
-  });
-
-  test("contains descriptor info", () => {
-    expect(doc).toContain("WorkflowDescriptor");
-  });
-
-  test("contains role definition", () => {
-    expect(doc).toContain("Role Definition");
-  });
-});
-
-describe("formatSkillTopic unknown", () => {
-  test("returns null for unknown topic", () => {
-    expect(formatSkillTopic("nonexistent")).toBeNull();
-  });
-});

packages/cli-workflow/__tests__/init-template.test.ts

@@ -4,7 +4,7 @@ import { tmpdir } from "node:os";
 import { join } from "node:path";
 
 import { runCli } from "../src/cli-dispatch.js";
-import { cmdInitTemplate, cmdInitWorkspace } from "../src/commands/init/index.js";
+import { cmdInitTemplate, cmdInitWorkspace } from "../src/cmd-init.js";
 import { pathExists } from "../src/fs-utils.js";
 
 describe("init template", () => {

packages/cli-workflow/__tests__/init-workspace.test.ts

@@ -4,7 +4,7 @@ import { tmpdir } from "node:os";
 import { join } from "node:path";
 
 import { formatCliUsage, runCli } from "../src/cli-dispatch.js";
-import { cmdInitWorkspace } from "../src/commands/init/index.js";
+import { cmdInitWorkspace } from "../src/cmd-init.js";
 import { pathExists } from "../src/fs-utils.js";
 
 describe("init workspace", () => {
@@ -129,9 +129,8 @@ describe("init workspace", () => {
 
   test("usage lists init subcommands", () => {
     const u = formatCliUsage();
-    expect(u).toContain("init workspace <name>");
-    expect(u).toContain("init template <name>");
-    expect(u).toContain("Development:");
+    expect(u).toContain("uncaged-workflow init workspace <name>");
+    expect(u).toContain("uncaged-workflow init template <name>");
   });
 
   test("runCli rejects unknown init subcommand", async () => {

packages/cli-workflow/__tests__/live.test.ts

@@ -1,369 +0,0 @@
-import { afterEach, beforeEach, describe, expect, test } from "bun:test";
-import { spawn, spawnSync } from "node:child_process";
-import { cp, mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-import { fileURLToPath } from "node:url";
-
-import { createCasStore, getGlobalCasDir, putContentMerkleNode } from "@uncaged/workflow";
-
-import {
-  formatLiveDebugLine,
-  formatLiveTimeLabel,
-  LIVE_CONTENT_MAX_LINES,
-  type LiveRoleRow,
-  renderLiveRoleStepLines,
-} from "../src/commands/thread/index.js";
-import { parseLiveArgv } from "../src/live-argv.js";
-
-const cliEntryPath = fileURLToPath(new URL("../src/cli.ts", import.meta.url));
-const fixtureRoot = fileURLToPath(new URL("./fixtures/live", import.meta.url));
-
-/** Bodies for Merkle content nodes; hashes must match `.data.jsonl` fixtures. */
-const LIVE_FIXTURE_PLANNER_BODY =
-  "alpha\nbeta\ngamma\nLINE4\nLINE5\nLINE6\nLINE7\nLINE8\nLINE9\nLINE10\nLINE11";
-
-describe("live helpers", () => {
-  test("formatLiveTimeLabel pads HH:MM:SS", () => {
-    const label = formatLiveTimeLabel(new Date("2024-06-01T09:08:07.000Z").getTime());
-    expect(label).toMatch(/^\d{2}:\d{2}:\d{2}$/);
-  });
-
-  test("formatLiveDebugLine flattens newlines in message", () => {
-    const line = formatLiveDebugLine(0, "TAG1", "a\nb");
-    expect(line).toContain("[TAG1]");
-    expect(line).toContain("a b");
-    expect(line).not.toContain("\n");
-  });
-
-  test("renderLiveRoleStepLines truncates content to LIVE_CONTENT_MAX_LINES", () => {
-    const lines = Array.from({ length: LIVE_CONTENT_MAX_LINES + 3 }, (_, i) => `L${i + 1}`);
-    const row: LiveRoleRow = {
-      role: "r",
-      content: lines.join("\n"),
-      meta: { k: "v" },
-      timestamp: 0,
-    };
-    const out = renderLiveRoleStepLines(row, "r");
-    const body = out.filter((l) => l.startsWith("  L"));
-    expect(body.length).toBe(LIVE_CONTENT_MAX_LINES);
-    expect(out.some((l) => l.includes("more line"))).toBe(true);
-    expect(out.some((l) => l.startsWith("  meta: "))).toBe(true);
-  });
-});
-
-describe("parseLiveArgv", () => {
-  test("parses thread id and flags in any order", () => {
-    const a = parseLiveArgv(["01ABC", "--debug", "--role", "planner"]);
-    expect(a.ok).toBe(true);
-    if (a.ok) {
-      expect(a.value.threadId).toBe("01ABC");
-      expect(a.value.latest).toBe(false);
-      expect(a.value.debug).toBe(true);
-      expect(a.value.role).toBe("planner");
-    }
-    const b = parseLiveArgv(["--latest", "--role", "x"]);
-    expect(b.ok).toBe(true);
-    if (b.ok) {
-      expect(b.value.latest).toBe(true);
-      expect(b.value.threadId).toBe(null);
-      expect(b.value.role).toBe("x");
-    }
-  });
-
-  test("rejects --latest with thread id", () => {
-    const r = parseLiveArgv(["--latest", "01ABC"]);
-    expect(r.ok).toBe(false);
-  });
-});
-
-describe("live CLI", () => {
-  let prevEnv: string | undefined;
-  let storageRoot: string;
-
-  beforeEach(async () => {
-    prevEnv = process.env.UNCAGED_WORKFLOW_STORAGE_ROOT;
-    storageRoot = await mkdtemp(join(tmpdir(), "uncaged-wf-live-"));
-    process.env.UNCAGED_WORKFLOW_STORAGE_ROOT = storageRoot;
-    await mkdir(join(storageRoot, "logs", "C9NMV6V2TQT81"), { recursive: true });
-    await cp(
-      join(fixtureRoot, "logs", "C9NMV6V2TQT81", "01LIVECMPLT01DDDDDDDDDDDDG.data.jsonl"),
-      join(storageRoot, "logs", "C9NMV6V2TQT81", "01LIVECMPLT01DDDDDDDDDDDDG.data.jsonl"),
-    );
-    await cp(
-      join(fixtureRoot, "logs", "C9NMV6V2TQT81", "01LIVECMPLT01DDDDDDDDDDDDG.info.jsonl"),
-      join(storageRoot, "logs", "C9NMV6V2TQT81", "01LIVECMPLT01DDDDDDDDDDDDG.info.jsonl"),
-    );
-    await cp(
-      join(fixtureRoot, "logs", "C9NMV6V2TQT81", "01LIVEINFLY01DDDDDDDDDDDDG.data.jsonl"),
-      join(storageRoot, "logs", "C9NMV6V2TQT81", "01LIVEINFLY01DDDDDDDDDDDDG.data.jsonl"),
-    );
-    await cp(
-      join(fixtureRoot, "logs", "C9NMV6V2TQT81", "01LIVEOLDER01DDDDDDDDDDDDG.data.jsonl"),
-      join(storageRoot, "logs", "C9NMV6V2TQT81", "01LIVEOLDER01DDDDDDDDDDDDG.data.jsonl"),
-    );
-
-    const cas = createCasStore(getGlobalCasDir(storageRoot));
-    await putContentMerkleNode(cas, LIVE_FIXTURE_PLANNER_BODY);
-    await putContentMerkleNode(cas, "patch");
-    await putContentMerkleNode(cas, "still running");
-  });
-
-  afterEach(async () => {
-    if (prevEnv === undefined) {
-      delete process.env.UNCAGED_WORKFLOW_STORAGE_ROOT;
-    } else {
-      process.env.UNCAGED_WORKFLOW_STORAGE_ROOT = prevEnv;
-    }
-    await rm(storageRoot, { recursive: true, force: true });
-  });
-
-  test("prints role steps and summary for a completed thread", async () => {
-    const env = { ...process.env, UNCAGED_WORKFLOW_STORAGE_ROOT: storageRoot };
-    const proc = spawn(process.execPath, [cliEntryPath, "live", "01LIVECMPLT01DDDDDDDDDDDDG"], {
-      env,
-      stdio: ["ignore", "pipe", "pipe"],
-    });
-    const stdout = await new Promise<string>((resolve, reject) => {
-      let buf = "";
-      proc.stdout?.on("data", (c: Buffer) => {
-        buf += c.toString("utf8");
-      });
-      proc.stderr?.on("data", (c: Buffer) => {
-        buf += c.toString("utf8");
-      });
-      proc.on("error", reject);
-      proc.on("exit", (code: number | null) => {
-        if (code === 0) {
-          resolve(buf);
-        } else {
-          reject(new Error(`exit ${code}: ${buf}`));
-        }
-      });
-    });
-
-    expect(stdout).toContain("planner");
-    expect(stdout).toContain("coder");
-    expect(stdout).toContain("meta:");
-    expect(stdout).toContain('"phase":"plan"');
-    expect(stdout).toContain("LINE10");
-    expect(stdout).not.toContain("LINE11");
-    expect(stdout).toContain("more line");
-    expect(stdout).toContain("completed: returnCode=0");
-    expect(stdout).toContain("fixture completed");
-  });
-
-  test("--latest tails the newest thread by start timestamp", async () => {
-    const env = { ...process.env, UNCAGED_WORKFLOW_STORAGE_ROOT: storageRoot };
-    const proc = spawn(process.execPath, [cliEntryPath, "live", "--latest"], {
-      env,
-      stdio: ["ignore", "pipe", "pipe"],
-    });
-    const stdout = await new Promise<string>((resolve, reject) => {
-      let buf = "";
-      proc.stdout?.on("data", (c: Buffer) => {
-        buf += c.toString("utf8");
-      });
-      proc.stderr?.on("data", (c: Buffer) => {
-        buf += c.toString("utf8");
-      });
-      proc.on("error", reject);
-      proc.on("exit", (code: number | null) => {
-        if (code === 0) {
-          resolve(buf);
-        } else {
-          reject(new Error(`exit ${code}: ${buf}`));
-        }
-      });
-    });
-
-    expect(stdout).toContain("fixture completed");
-    expect(stdout).not.toContain("older thread");
-  });
-
-  test("--debug prints .info.jsonl records after data output", async () => {
-    const env = { ...process.env, UNCAGED_WORKFLOW_STORAGE_ROOT: storageRoot };
-    const proc = spawn(
-      process.execPath,
-      [cliEntryPath, "live", "01LIVECMPLT01DDDDDDDDDDDDG", "--debug"],
-      {
-        env,
-        stdio: ["ignore", "pipe", "pipe"],
-      },
-    );
-    const stdout = await new Promise<string>((resolve, reject) => {
-      let buf = "";
-      proc.stdout?.on("data", (c: Buffer) => {
-        buf += c.toString("utf8");
-      });
-      proc.stderr?.on("data", (c: Buffer) => {
-        buf += c.toString("utf8");
-      });
-      proc.on("error", reject);
-      proc.on("exit", (code: number | null) => {
-        if (code === 0) {
-          resolve(buf);
-        } else {
-          reject(new Error(`exit ${code}: ${buf}`));
-        }
-      });
-    });
-
-    expect(stdout).toContain("[DEBUGTAG1]");
-    expect(stdout).toContain("bundle loaded");
-    expect(stdout).toContain("[DEBUGTAG2]");
-    expect(stdout).toContain("multi line");
-  });
-
-  test("--role filters out non-matching roles", async () => {
-    const env = { ...process.env, UNCAGED_WORKFLOW_STORAGE_ROOT: storageRoot };
-    const proc = spawn(
-      process.execPath,
-      [cliEntryPath, "live", "01LIVECMPLT01DDDDDDDDDDDDG", "--role", "planner"],
-      {
-        env,
-        stdio: ["ignore", "pipe", "pipe"],
-      },
-    );
-    const stdout = await new Promise<string>((resolve, reject) => {
-      let buf = "";
-      proc.stdout?.on("data", (c: Buffer) => {
-        buf += c.toString("utf8");
-      });
-      proc.stderr?.on("data", (c: Buffer) => {
-        buf += c.toString("utf8");
-      });
-      proc.on("error", reject);
-      proc.on("exit", (code: number | null) => {
-        if (code === 0) {
-          resolve(buf);
-        } else {
-          reject(new Error(`exit ${code}: ${buf}`));
-        }
-      });
-    });
-
-    expect(stdout).toContain("planner");
-    expect(stdout).not.toContain("patch");
-    expect(stdout).toContain("completed: returnCode=0");
-  });
-
-  test("--latest --debug --role combine", async () => {
-    const env = { ...process.env, UNCAGED_WORKFLOW_STORAGE_ROOT: storageRoot };
-    const proc = spawn(
-      process.execPath,
-      [cliEntryPath, "live", "--latest", "--debug", "--role", "planner"],
-      {
-        env,
-        stdio: ["ignore", "pipe", "pipe"],
-      },
-    );
-    const stdout = await new Promise<string>((resolve, reject) => {
-      let buf = "";
-      proc.stdout?.on("data", (c: Buffer) => {
-        buf += c.toString("utf8");
-      });
-      proc.stderr?.on("data", (c: Buffer) => {
-        buf += c.toString("utf8");
-      });
-      proc.on("error", reject);
-      proc.on("exit", (code: number | null) => {
-        if (code === 0) {
-          resolve(buf);
-        } else {
-          reject(new Error(`exit ${code}: ${buf}`));
-        }
-      });
-    });
-
-    expect(stdout).toContain("[DEBUGTAG1]");
-    expect(stdout).toContain("planner");
-    expect(stdout).not.toContain("patch");
-    expect(stdout).toContain("fixture completed");
-  });
-
-  test("unknown thread id exits 1", () => {
-    const env = { ...process.env, UNCAGED_WORKFLOW_STORAGE_ROOT: storageRoot };
-    const r = spawnSync(process.execPath, [cliEntryPath, "live", "01UNKNOWNXXXXXXXXXXXXXXXXX"], {
-      env,
-      encoding: "utf8",
-    });
-    expect(r.status).toBe(1);
-    expect(String(r.stderr ?? "")).toContain("thread not found");
-  });
-
-  test("follows file until WorkflowResult is appended", async () => {
-    const env = { ...process.env, UNCAGED_WORKFLOW_STORAGE_ROOT: storageRoot };
-    const dataPath = join(
-      storageRoot,
-      "logs",
-      "C9NMV6V2TQT81",
-      "01LIVEINFLY01DDDDDDDDDDDDG.data.jsonl",
-    );
-
-    const proc = spawn(process.execPath, [cliEntryPath, "live", "01LIVEINFLY01DDDDDDDDDDDDG"], {
-      env,
-      stdio: ["ignore", "pipe", "pipe"],
-    });
-
-    await new Promise((r) => setTimeout(r, 120));
-    const prior = await readFile(dataPath, "utf8");
-    await writeFile(
-      dataPath,
-      `${prior.replace(/\s*$/, "")}\n${JSON.stringify({ returnCode: 0, summary: "caught up" })}\n`,
-      "utf8",
-    );
-
-    const stdout = await new Promise<string>((resolve, reject) => {
-      let buf = "";
-      proc.stdout?.on("data", (c: Buffer) => {
-        buf += c.toString("utf8");
-      });
-      proc.stderr?.on("data", (c: Buffer) => {
-        buf += c.toString("utf8");
-      });
-      proc.on("error", reject);
-      proc.on("exit", (code: number | null) => {
-        if (code === 0) {
-          resolve(buf);
-        } else {
-          reject(new Error(`exit ${code}: ${buf}`));
-        }
-      });
-    });
-
-    expect(stdout).toContain("planner");
-    expect(stdout).toContain("completed: returnCode=0");
-    expect(stdout).toContain("caught up");
-  });
-});
-
-describe("live --latest with empty storage", () => {
-  let prevEnv: string | undefined;
-  let emptyRoot: string;
-
-  beforeEach(async () => {
-    prevEnv = process.env.UNCAGED_WORKFLOW_STORAGE_ROOT;
-    emptyRoot = await mkdtemp(join(tmpdir(), "uncaged-wf-live-empty-"));
-    process.env.UNCAGED_WORKFLOW_STORAGE_ROOT = emptyRoot;
-  });
-
-  afterEach(async () => {
-    if (prevEnv === undefined) {
-      delete process.env.UNCAGED_WORKFLOW_STORAGE_ROOT;
-    } else {
-      process.env.UNCAGED_WORKFLOW_STORAGE_ROOT = prevEnv;
-    }
-    await rm(emptyRoot, { recursive: true, force: true });
-  });
-
-  test("exits 1 when no threads exist", () => {
-    const env = { ...process.env, UNCAGED_WORKFLOW_STORAGE_ROOT: emptyRoot };
-    const r = spawnSync(process.execPath, [cliEntryPath, "live", "--latest"], {
-      env,
-      encoding: "utf8",
-    });
-    expect(r.status).toBe(1);
-    expect(String(r.stderr ?? "")).toContain("no threads");
-  });
-});

packages/cli-workflow/__tests__/storage-env.test.ts

@@ -1,54 +0,0 @@
-import { afterEach, beforeEach, describe, expect, test } from "bun:test";
-import { getDefaultWorkflowStorageRoot } from "@uncaged/workflow";
-import { resolveWorkflowStorageRoot } from "../src/storage-env.js";
-
-describe("resolveWorkflowStorageRoot", () => {
-  let savedInternal: string | undefined;
-  let savedUser: string | undefined;
-
-  beforeEach(() => {
-    savedInternal = process.env.UNCAGED_WORKFLOW_STORAGE_ROOT;
-    savedUser = process.env.WORKFLOW_STORAGE_ROOT;
-    delete process.env.UNCAGED_WORKFLOW_STORAGE_ROOT;
-    delete process.env.WORKFLOW_STORAGE_ROOT;
-  });
-
-  afterEach(() => {
-    if (savedInternal === undefined) {
-      delete process.env.UNCAGED_WORKFLOW_STORAGE_ROOT;
-    } else {
-      process.env.UNCAGED_WORKFLOW_STORAGE_ROOT = savedInternal;
-    }
-    if (savedUser === undefined) {
-      delete process.env.WORKFLOW_STORAGE_ROOT;
-    } else {
-      process.env.WORKFLOW_STORAGE_ROOT = savedUser;
-    }
-  });
-
-  test("returns default when no env vars are set", () => {
-    expect(resolveWorkflowStorageRoot()).toBe(getDefaultWorkflowStorageRoot());
-  });
-
-  test("WORKFLOW_STORAGE_ROOT overrides default", () => {
-    process.env.WORKFLOW_STORAGE_ROOT = "/tmp/custom-storage";
-    expect(resolveWorkflowStorageRoot()).toBe("/tmp/custom-storage");
-  });
-
-  test("UNCAGED_WORKFLOW_STORAGE_ROOT takes priority over WORKFLOW_STORAGE_ROOT", () => {
-    process.env.WORKFLOW_STORAGE_ROOT = "/tmp/user-path";
-    process.env.UNCAGED_WORKFLOW_STORAGE_ROOT = "/tmp/internal-path";
-    expect(resolveWorkflowStorageRoot()).toBe("/tmp/internal-path");
-  });
-
-  test("ignores empty WORKFLOW_STORAGE_ROOT", () => {
-    process.env.WORKFLOW_STORAGE_ROOT = "";
-    expect(resolveWorkflowStorageRoot()).toBe(getDefaultWorkflowStorageRoot());
-  });
-
-  test("ignores empty UNCAGED_WORKFLOW_STORAGE_ROOT and falls through to WORKFLOW_STORAGE_ROOT", () => {
-    process.env.UNCAGED_WORKFLOW_STORAGE_ROOT = "";
-    process.env.WORKFLOW_STORAGE_ROOT = "/tmp/user-fallback";
-    expect(resolveWorkflowStorageRoot()).toBe("/tmp/user-fallback");
-  });
-});

packages/cli-workflow/__tests__/thread-cli.test.ts

@@ -5,21 +5,17 @@ import { tmpdir } from "node:os";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { getGlobalCasDir } from "@uncaged/workflow";
-import { cmdCasPut } from "../src/commands/cas/index.js";
-import {
-  cmdKill,
-  cmdPause,
-  cmdPs,
-  cmdResume,
-  cmdRun,
-  cmdThreadRemove,
-  cmdThreadShow,
-  cmdThreads,
-} from "../src/commands/thread/index.js";
-import { cmdAdd } from "../src/commands/workflow/index.js";
+import { cmdAdd } from "../src/cmd-add.js";
+import { cmdCasPut } from "../src/cmd-cas.js";
+import { cmdKill } from "../src/cmd-kill.js";
+import { cmdPause } from "../src/cmd-pause.js";
+import { cmdPs } from "../src/cmd-ps.js";
+import { cmdResume } from "../src/cmd-resume.js";
+import { cmdRun } from "../src/cmd-run.js";
+import { cmdThreadRemove, cmdThreadShow } from "../src/cmd-thread.js";
+import { cmdThreads } from "../src/cmd-threads.js";
 import { pathExists, readTextFileIfExists } from "../src/fs-utils.js";
 import { addCliArgs } from "./bundle-fixture.js";
-import { ensureTestWorkflowRegistryConfig } from "./workflow-registry-fixture.js";
 
 const wfPutImport = `import { putContentMerkleNode } from "@uncaged/workflow";
 `;
@@ -143,7 +139,6 @@ describe("cli thread commands", () => {
     prevEnv = process.env.UNCAGED_WORKFLOW_STORAGE_ROOT;
     storageRoot = await mkdtemp(join(tmpdir(), "uncaged-wf-thread-"));
     process.env.UNCAGED_WORKFLOW_STORAGE_ROOT = storageRoot;
-    await ensureTestWorkflowRegistryConfig(storageRoot);
   });
 
   afterEach(async () => {
@@ -238,7 +233,7 @@ describe("cli thread commands", () => {
     const runningPath = join(dirname(dataPath), `${threadId}.running`);
     await waitUntilRunningFileAbsent(runningPath, 120);
 
-    const put = await cmdCasPut(storageRoot, "keep-after-thread-rm");
+    const put = await cmdCasPut(storageRoot, threadId, "keep-after-thread-rm");
     expect(put.ok).toBe(true);
     if (!put.ok) {
       return;
@@ -255,16 +250,13 @@ describe("cli thread commands", () => {
 
   test("cli entrypoint dispatches threads / ps (spawn)", () => {
     const env = { ...process.env, UNCAGED_WORKFLOW_STORAGE_ROOT: storageRoot };
-    const threads = spawnSync(process.execPath, [cliEntryPath, "thread", "list"], {
+    const threads = spawnSync(process.execPath, [cliEntryPath, "threads"], {
       env,
       encoding: "utf8",
     });
     expect(threads.status).toBe(0);
 
-    const ps = spawnSync(process.execPath, [cliEntryPath, "thread", "ps"], {
-      env,
-      encoding: "utf8",
-    });
+    const ps = spawnSync(process.execPath, [cliEntryPath, "ps"], { env, encoding: "utf8" });
     expect(ps.status).toBe(0);
   });
 
@@ -331,7 +323,7 @@ describe("cli thread commands", () => {
       .trim()
       .split("\n")
       .filter((l) => l !== "");
-    expect(lines.length).toBe(3);
+    expect(lines.length).toBe(2);
 
     const runningPath = join(dirname(dataPath), `${threadId}.running`);
     expect(await pathExists(runningPath)).toBe(false);
@@ -370,8 +362,8 @@ describe("cli thread commands", () => {
     const resumed = await cmdResume(storageRoot, threadId);
     expect(resumed.ok).toBe(true);
 
-    await waitUntilMinDataLines(dataPath, 4, 120);
-    expect(await countDataJsonlLines(dataPath)).toBe(4);
+    await waitUntilMinDataLines(dataPath, 3, 120);
+    expect(await countDataJsonlLines(dataPath)).toBe(3);
 
     const runningPath = join(dirname(dataPath), `${threadId}.running`);
     await waitUntilRunningFileAbsent(runningPath, 100);

packages/cli-workflow/__tests__/workflow-registry-fixture.ts

@@ -1,18 +0,0 @@
-import { writeFile } from "node:fs/promises";
-import { join } from "node:path";
-
-/** Minimal valid global config so {@link executeThread} can resolve the extract scene (CLI integration tests). */
-export const TEST_WORKFLOW_REGISTRY_YAML = `config:
-  maxDepth: 3
-  providers:
-    stub:
-      baseUrl: http://127.0.0.1:9
-      apiKey: test
-  models:
-    default: stub/m
-workflows: {}
-`;
-
-export async function ensureTestWorkflowRegistryConfig(storageRoot: string): Promise<void> {
-  await writeFile(join(storageRoot, "workflow.yaml"), TEST_WORKFLOW_REGISTRY_YAML, "utf8");
-}

packages/cli-workflow/package.json

@@ -10,6 +10,7 @@
     "yaml": "^2.8.4"
   },
   "scripts": {
+    "build": "echo 'TODO'",
     "test": "bun test"
   }
 }

packages/cli-workflow/src/bundle-store.ts

@@ -1,9 +1,16 @@
-import { mkdir, readFile, writeFile } from "node:fs/promises";
+import { mkdir, readFile, stat, writeFile } from "node:fs/promises";
 import { join } from "node:path";
 
 import { err, ok, type Result } from "@uncaged/workflow";
 
-import { pathExists } from "./fs-utils.js";
+async function pathExists(path: string): Promise<boolean> {
+  try {
+    await stat(path);
+    return true;
+  } catch {
+    return false;
+  }
+}
 
 export type BundleFileSource = { kind: "text"; text: string } | { kind: "path"; path: string };
 

packages/cli-workflow/src/cli-color.ts

@@ -1,17 +0,0 @@
-export function shouldUseColor(): boolean {
-  return process.stdout.isTTY === true && process.env.NO_COLOR === undefined;
-}
-
-export function highlightLiveRole(name: string): string {
-  if (!shouldUseColor()) {
-    return name;
-  }
-  return `\x1b[1m\x1b[36m${name}\x1b[0m`;
-}
-
-export function dimGreyLine(line: string): string {
-  if (!shouldUseColor()) {
-    return line;
-  }
-  return `\x1b[2m\x1b[90m${line}\x1b[0m`;
-}

packages/cli-workflow/src/cli-command-types.ts

@@ -1,19 +0,0 @@
-export type DispatchFn = (storageRoot: string, argv: string[]) => Promise<number>;
-
-export type CommandEntry = {
-  handler: DispatchFn;
-  args: string;
-  description: string;
-};
-
-export type CommandGroup = {
-  name: string;
-  commands: ReadonlyArray<{ name: string; args: string; description: string }>;
-};
-
-export type DispatchGroupFn = (
-  tableName: string,
-  table: Record<string, CommandEntry>,
-  storageRoot: string,
-  argv: string[],
-) => Promise<number> | null;

packages/cli-workflow/src/cli-dispatch.ts

@@ -1,95 +1,466 @@
-import type { CommandEntry, DispatchFn } from "./cli-command-types.js";
-import { printCliError, printCliLine } from "./cli-output.js";
-import { getCommandRegistry } from "./cli-registry.js";
-import { formatCliUsage as formatCliUsageWithGroups } from "./cli-usage.js";
-import { createCasDispatcher } from "./commands/cas/index.js";
-import { createInitDispatcher } from "./commands/init/index.js";
-import { createThreadDispatcher, dispatchLive, dispatchRun } from "./commands/thread/index.js";
-import { createWorkflowDispatcher } from "./commands/workflow/index.js";
-import { formatSkillIndex, formatSkillTopic, getSkillTopics } from "./skill.js";
-
-export type { CommandEntry, CommandGroup, DispatchFn } from "./cli-command-types.js";
-export { getCommandRegistry } from "./cli-registry.js";
-
-function dispatchGroup(
-  tableName: string,
-  table: Record<string, CommandEntry>,
-  storageRoot: string,
-  argv: string[],
-): Promise<number> | null {
-  const sub = argv[0];
-  if (sub === undefined || sub === "--help" || sub === "-h") {
-    const entries = Object.entries(table);
-    const lines = [`${tableName} subcommands:\n`];
-    for (const [name, e] of entries) {
-      const args = e.args ? ` ${e.args}` : "";
-      lines.push(`  uncaged-workflow ${tableName} ${name}${args}`);
-      lines.push(`      ${e.description}\n`);
-    }
-    printCliLine(lines.join("\n"));
-    return Promise.resolve(sub === undefined ? 1 : 0);
-  }
-  const entry = table[sub];
-  if (entry === undefined) {
-    return null;
-  }
-  return entry.handler(storageRoot, argv.slice(1));
-}
+import { printCliError, printCliLine, printCliWarn } from "./cli-output.js";
+import { cmdAdd, formatAddSuccess, parseAddArgv } from "./cmd-add.js";
+import { cmdCasGet, cmdCasList, cmdCasPut, cmdCasRm } from "./cmd-cas.js";
+import { cmdFork, parseForkArgv } from "./cmd-fork.js";
+import { cmdGc } from "./cmd-gc.js";
+import { cmdHistory } from "./cmd-history.js";
+import { cmdInitTemplate, cmdInitWorkspace } from "./cmd-init.js";
+import { cmdKill } from "./cmd-kill.js";
+import { cmdList, formatListLines } from "./cmd-list.js";
+import { cmdPause } from "./cmd-pause.js";
+import { cmdPs } from "./cmd-ps.js";
+import { cmdRemove } from "./cmd-remove.js";
+import { cmdResume } from "./cmd-resume.js";
+import { cmdRollback } from "./cmd-rollback.js";
+import { cmdRun } from "./cmd-run.js";
+import { cmdShow, formatShowYaml } from "./cmd-show.js";
+import { cmdThreadRemove, cmdThreadShow } from "./cmd-thread.js";
+import { cmdThreads } from "./cmd-threads.js";
+import { parseRunArgv } from "./run-argv.js";
 
 export function formatCliUsage(): string {
-  return formatCliUsageWithGroups(getCommandRegistry(), getSkillTopics());
+  return [
+    "Usage:",
+    "  uncaged-workflow add <name> <file.esm.js> [--types <path>]",
+    "  uncaged-workflow list",
+    "  uncaged-workflow show <name>",
+    "  uncaged-workflow remove <name>",
+    "  uncaged-workflow run <name> [--prompt <text>] [--max-rounds N]",
+    "  uncaged-workflow ps",
+    "  uncaged-workflow kill <thread-id>",
+    "  uncaged-workflow history <name>",
+    "  uncaged-workflow rollback <name> [hash]",
+    "  uncaged-workflow pause <thread-id>",
+    "  uncaged-workflow resume <thread-id>",
+    "  uncaged-workflow threads [name]",
+    "  uncaged-workflow thread <id>",
+    "  uncaged-workflow thread rm <id>",
+    "  uncaged-workflow fork <thread-id> [--from-role <role>]",
+    "  uncaged-workflow gc",
+    "  uncaged-workflow cas get <thread-id> <hash>",
+    "  uncaged-workflow cas put <thread-id> <content>",
+    "  uncaged-workflow cas list <thread-id>",
+    "  uncaged-workflow cas rm <thread-id> <hash>",
+    "  uncaged-workflow init workspace <name>",
+    "  uncaged-workflow init template <name>",
+  ].join("\n");
 }
 
-const dispatchWorkflow = createWorkflowDispatcher({ dispatchGroup });
-const dispatchThread = createThreadDispatcher({ dispatchGroup });
-const dispatchCas = createCasDispatcher({ dispatchGroup });
-const dispatchInit = createInitDispatcher({ dispatchGroup });
-
-async function showSkillDocOrIndex(topic: string | undefined): Promise<number> {
-  if (topic === undefined) {
-    printCliLine(formatSkillIndex());
-    return 0;
-  }
-  const doc = formatSkillTopic(topic);
-  if (doc === null) {
-    printCliError(`unknown skill topic: ${topic}\n\n${formatSkillIndex()}`);
+async function dispatchInit(_storageRoot: string, argv: string[]): Promise<number> {
+  const sub = argv[0];
+  const name = argv[1];
+  if (sub === undefined || name === undefined || argv.length > 2) {
+    printCliError(`${formatCliUsage()}\n\nerror: init requires workspace|template <name>`);
     return 1;
   }
-  printCliLine(doc);
+
+  if (sub === "workspace") {
+    const result = await cmdInitWorkspace(process.cwd(), name);
+    if (!result.ok) {
+      printCliError(result.error);
+      return 1;
+    }
+    printCliLine(`initialized workflow workspace at ${result.value.rootPath}`);
+    return 0;
+  }
+
+  if (sub === "template") {
+    const result = await cmdInitTemplate(process.cwd(), name);
+    if (!result.ok) {
+      printCliError(result.error);
+      return 1;
+    }
+    printCliLine(`initialized template at ${result.value.templatePath}`);
+    return 0;
+  }
+
+  printCliError(`${formatCliUsage()}\n\nerror: unknown init subcommand: ${sub}`);
+  return 1;
+}
+
+async function dispatchAdd(storageRoot: string, argv: string[]): Promise<number> {
+  const parsed = parseAddArgv(argv);
+  if (!parsed.ok) {
+    printCliError(`${formatCliUsage()}\n\nerror: ${parsed.error}`);
+    return 1;
+  }
+  const result = await cmdAdd(storageRoot, parsed.value);
+  if (!result.ok) {
+    printCliError(result.error);
+    return 1;
+  }
+  for (const w of result.value.warnings) {
+    printCliWarn(w);
+  }
+  printCliLine(formatAddSuccess(parsed.value.name, parsed.value.filePath, result.value.hash));
   return 0;
 }
 
-async function dispatchSkill(_storageRoot: string, argv: string[]): Promise<number> {
-  return showSkillDocOrIndex(argv[0]);
+async function dispatchList(storageRoot: string, argv: string[]): Promise<number> {
+  if (argv.length > 0) {
+    printCliError(`${formatCliUsage()}\n\nerror: list takes no arguments`);
+    return 1;
+  }
+  const result = await cmdList(storageRoot);
+  if (!result.ok) {
+    printCliError(result.error);
+    return 1;
+  }
+  for (const line of formatListLines(result.value)) {
+    printCliLine(line);
+  }
+  return 0;
 }
 
+async function dispatchShow(storageRoot: string, argv: string[]): Promise<number> {
+  const name = argv[0];
+  if (name === undefined || argv.length > 1) {
+    printCliError(`${formatCliUsage()}\n\nerror: show requires <name>`);
+    return 1;
+  }
+  const result = await cmdShow(storageRoot, name);
+  if (!result.ok) {
+    printCliError(result.error);
+    return 1;
+  }
+  printCliLine(formatShowYaml(name, result.value));
+  return 0;
+}
+
+async function dispatchRemove(storageRoot: string, argv: string[]): Promise<number> {
+  const name = argv[0];
+  if (name === undefined || argv.length > 1) {
+    printCliError(`${formatCliUsage()}\n\nerror: remove requires <name>`);
+    return 1;
+  }
+  const result = await cmdRemove(storageRoot, name);
+  if (!result.ok) {
+    printCliError(result.error);
+    return 1;
+  }
+  printCliLine(`removed workflow "${name}" from registry`);
+  return 0;
+}
+
+async function dispatchRun(storageRoot: string, argv: string[]): Promise<number> {
+  const parsed = parseRunArgv(argv);
+  if (!parsed.ok) {
+    printCliError(`${formatCliUsage()}\n\nerror: ${parsed.error}`);
+    return 1;
+  }
+
+  const result = await cmdRun(
+    storageRoot,
+    parsed.value.name,
+    parsed.value.prompt,
+    parsed.value.maxRounds,
+  );
+  if (!result.ok) {
+    printCliError(result.error);
+    return 1;
+  }
+
+  printCliLine(result.value.threadId);
+  return 0;
+}
+
+async function dispatchPs(storageRoot: string, argv: string[]): Promise<number> {
+  if (argv.length > 0) {
+    printCliError(`${formatCliUsage()}\n\nerror: ps takes no arguments`);
+    return 1;
+  }
+  for (const line of await cmdPs(storageRoot)) {
+    printCliLine(line);
+  }
+  return 0;
+}
+
+async function dispatchKill(storageRoot: string, argv: string[]): Promise<number> {
+  const threadId = argv[0];
+  if (threadId === undefined || argv.length > 1) {
+    printCliError(`${formatCliUsage()}\n\nerror: kill requires <thread-id>`);
+    return 1;
+  }
+  const result = await cmdKill(storageRoot, threadId);
+  if (!result.ok) {
+    printCliError(result.error);
+    return 1;
+  }
+  printCliLine(`kill sent for thread ${threadId}`);
+  return 0;
+}
+
+async function dispatchHistory(storageRoot: string, argv: string[]): Promise<number> {
+  const name = argv[0];
+  if (name === undefined || argv.length > 1) {
+    printCliError(`${formatCliUsage()}\n\nerror: history requires <name>`);
+    return 1;
+  }
+  const result = await cmdHistory(storageRoot, name);
+  if (!result.ok) {
+    printCliError(result.error);
+    return 1;
+  }
+  for (const line of result.value) {
+    printCliLine(line);
+  }
+  return 0;
+}
+
+async function dispatchRollback(storageRoot: string, argv: string[]): Promise<number> {
+  const name = argv[0];
+  if (name === undefined || argv.length > 2) {
+    printCliError(`${formatCliUsage()}\n\nerror: rollback requires <name> [hash]`);
+    return 1;
+  }
+  const hashArg = argv[1];
+  const result = await cmdRollback(storageRoot, name, hashArg === undefined ? null : hashArg);
+  if (!result.ok) {
+    printCliError(result.error);
+    return 1;
+  }
+  printCliLine(`rolled back workflow "${name}"`);
+  return 0;
+}
+
+async function dispatchPause(storageRoot: string, argv: string[]): Promise<number> {
+  const threadId = argv[0];
+  if (threadId === undefined || argv.length > 1) {
+    printCliError(`${formatCliUsage()}\n\nerror: pause requires <thread-id>`);
+    return 1;
+  }
+  const result = await cmdPause(storageRoot, threadId);
+  if (!result.ok) {
+    printCliError(result.error);
+    return 1;
+  }
+  printCliLine(`pause sent for thread ${threadId}`);
+  return 0;
+}
+
+async function dispatchResume(storageRoot: string, argv: string[]): Promise<number> {
+  const threadId = argv[0];
+  if (threadId === undefined || argv.length > 1) {
+    printCliError(`${formatCliUsage()}\n\nerror: resume requires <thread-id>`);
+    return 1;
+  }
+  const result = await cmdResume(storageRoot, threadId);
+  if (!result.ok) {
+    printCliError(result.error);
+    return 1;
+  }
+  printCliLine(`resume sent for thread ${threadId}`);
+  return 0;
+}
+
+async function dispatchThreads(storageRoot: string, argv: string[]): Promise<number> {
+  const result = await cmdThreads(storageRoot, argv);
+  if (!result.ok) {
+    printCliError(result.error);
+    return 1;
+  }
+  for (const line of result.value) {
+    printCliLine(line);
+  }
+  return 0;
+}
+
+async function dispatchThread(storageRoot: string, argv: string[]): Promise<number> {
+  const id = argv[0];
+  if (id === undefined || argv.length > 1) {
+    printCliError(`${formatCliUsage()}\n\nerror: thread requires <id>`);
+    return 1;
+  }
+  const result = await cmdThreadShow(storageRoot, id);
+  if (!result.ok) {
+    printCliError(result.error);
+    return 1;
+  }
+  printCliLine(result.value);
+  return 0;
+}
+
+async function dispatchThreadRm(storageRoot: string, argv: string[]): Promise<number> {
+  const id = argv[0];
+  if (id === undefined || argv.length > 1) {
+    printCliError(`${formatCliUsage()}\n\nerror: thread rm requires <id>`);
+    return 1;
+  }
+  const result = await cmdThreadRemove(storageRoot, id);
+  if (!result.ok) {
+    printCliError(result.error);
+    return 1;
+  }
+  printCliLine(`removed thread ${id}`);
+  return 0;
+}
+
+async function dispatchThreadBranch(storageRoot: string, rest: string[]): Promise<number> {
+  const sub = rest[0];
+  if (sub === "rm") {
+    return dispatchThreadRm(storageRoot, rest.slice(1));
+  }
+  return dispatchThread(storageRoot, rest);
+}
+
+async function dispatchGc(storageRoot: string, argv: string[]): Promise<number> {
+  if (argv.length > 0) {
+    printCliError(`${formatCliUsage()}\n\nerror: gc takes no arguments`);
+    return 1;
+  }
+  const result = await cmdGc(storageRoot);
+  if (!result.ok) {
+    printCliError(result.error);
+    return 1;
+  }
+  const stats = result.value;
+  printCliLine(
+    `scanned ${stats.scannedThreads} threads, ${stats.activeRefs} active refs, deleted ${stats.deletedEntries} entries`,
+  );
+  return 0;
+}
+
+async function dispatchFork(storageRoot: string, argv: string[]): Promise<number> {
+  const parsed = parseForkArgv(argv);
+  if (!parsed.ok) {
+    printCliError(`${formatCliUsage()}\n\nerror: ${parsed.error}`);
+    return 1;
+  }
+  const result = await cmdFork(storageRoot, parsed.value.threadId, parsed.value.fromRole);
+  if (!result.ok) {
+    printCliError(result.error);
+    return 1;
+  }
+  printCliLine(result.value.threadId);
+  return 0;
+}
+
+async function dispatchCasGet(storageRoot: string, rest: string[]): Promise<number> {
+  const threadId = rest[0];
+  const hash = rest[1];
+  if (threadId === undefined || hash === undefined || rest.length > 2) {
+    printCliError(`${formatCliUsage()}\n\nerror: cas get requires <thread-id> <hash>`);
+    return 1;
+  }
+  const result = await cmdCasGet(storageRoot, threadId, hash);
+  if (!result.ok) {
+    printCliError(result.error);
+    return 1;
+  }
+  printCliLine(result.value);
+  return 0;
+}
+
+async function dispatchCasPut(storageRoot: string, rest: string[]): Promise<number> {
+  const threadId = rest[0];
+  const content = rest[1];
+  if (threadId === undefined || content === undefined || rest.length > 2) {
+    printCliError(`${formatCliUsage()}\n\nerror: cas put requires <thread-id> <content>`);
+    return 1;
+  }
+  const result = await cmdCasPut(storageRoot, threadId, content);
+  if (!result.ok) {
+    printCliError(result.error);
+    return 1;
+  }
+  printCliLine(result.value);
+  return 0;
+}
+
+async function dispatchCasList(storageRoot: string, rest: string[]): Promise<number> {
+  const threadId = rest[0];
+  if (threadId === undefined || rest.length > 1) {
+    printCliError(`${formatCliUsage()}\n\nerror: cas list requires <thread-id>`);
+    return 1;
+  }
+  const result = await cmdCasList(storageRoot, threadId);
+  if (!result.ok) {
+    printCliError(result.error);
+    return 1;
+  }
+  for (const hash of result.value) {
+    printCliLine(hash);
+  }
+  return 0;
+}
+
+async function dispatchCasRm(storageRoot: string, rest: string[]): Promise<number> {
+  const threadId = rest[0];
+  const hash = rest[1];
+  if (threadId === undefined || hash === undefined || rest.length > 2) {
+    printCliError(`${formatCliUsage()}\n\nerror: cas rm requires <thread-id> <hash>`);
+    return 1;
+  }
+  const result = await cmdCasRm(storageRoot, threadId, hash);
+  if (!result.ok) {
+    printCliError(result.error);
+    return 1;
+  }
+  printCliLine(`removed cas entry ${hash}`);
+  return 0;
+}
+
+const CAS_SUBCOMMAND_TABLE: Record<
+  string,
+  (storageRoot: string, rest: string[]) => Promise<number>
+> = {
+  get: dispatchCasGet,
+  put: dispatchCasPut,
+  list: dispatchCasList,
+  rm: dispatchCasRm,
+};
+
+async function dispatchCas(storageRoot: string, argv: string[]): Promise<number> {
+  const sub = argv[0];
+  if (sub === undefined) {
+    printCliError(`${formatCliUsage()}\n\nerror: unknown cas subcommand: (none)`);
+    return 1;
+  }
+  const handler = CAS_SUBCOMMAND_TABLE[sub];
+  if (handler === undefined) {
+    printCliError(`${formatCliUsage()}\n\nerror: unknown cas subcommand: ${sub}`);
+    return 1;
+  }
+  return handler(storageRoot, argv.slice(1));
+}
+
+type DispatchFn = (storageRoot: string, argv: string[]) => Promise<number>;
+
 const COMMAND_TABLE: Record<string, DispatchFn> = {
-  workflow: dispatchWorkflow,
-  thread: dispatchThread,
-  cas: dispatchCas,
+  add: dispatchAdd,
   init: dispatchInit,
-  skill: dispatchSkill,
+  list: dispatchList,
+  show: dispatchShow,
+  remove: dispatchRemove,
   run: dispatchRun,
-  live: dispatchLive,
+  ps: dispatchPs,
+  kill: dispatchKill,
+  history: dispatchHistory,
+  rollback: dispatchRollback,
+  pause: dispatchPause,
+  resume: dispatchResume,
+  threads: dispatchThreads,
+  thread: dispatchThreadBranch,
+  fork: dispatchFork,
+  gc: dispatchGc,
+  cas: dispatchCas,
 };
 
 export async function runCli(storageRoot: string, argv: string[]): Promise<number> {
   if (argv.length === 0) {
-    printCliLine(formatCliUsage());
+    printCliError(formatCliUsage());
     return 1;
   }
   const command = argv[0];
   if (command === undefined) {
-    printCliLine(formatCliUsage());
+    printCliError(formatCliUsage());
     return 1;
   }
   const rest = argv.slice(1);
-
   const dispatch = COMMAND_TABLE[command];
-  if (dispatch !== undefined) {
-    return dispatch(storageRoot, rest);
+  if (dispatch === undefined) {
+    printCliError(`${formatCliUsage()}\n\nerror: unknown command ${command}`);
+    return 1;
   }
-
-  printCliError(`${formatCliUsage()}\n\nerror: unknown command ${command}`);
-  return 1;
+  return dispatch(storageRoot, rest);
 }

packages/cli-workflow/src/cli-registry.ts

@@ -1,45 +0,0 @@
-import type { CommandGroup } from "./cli-command-types.js";
-import { setCommandGroupsForUsage } from "./cli-usage-context.js";
-import { CAS_SUBCOMMAND_TABLE } from "./commands/cas/index.js";
-import { INIT_SUBCOMMAND_TABLE } from "./commands/init/index.js";
-import { THREAD_SUBCOMMAND_TABLE } from "./commands/thread/index.js";
-import { WORKFLOW_SUBCOMMAND_TABLE } from "./commands/workflow/index.js";
-
-export function getCommandRegistry(): ReadonlyArray<CommandGroup> {
-  return [
-    {
-      name: "workflow",
-      commands: Object.entries(WORKFLOW_SUBCOMMAND_TABLE).map(([name, e]) => ({
-        name,
-        args: e.args,
-        description: e.description,
-      })),
-    },
-    {
-      name: "thread",
-      commands: Object.entries(THREAD_SUBCOMMAND_TABLE).map(([name, e]) => ({
-        name,
-        args: e.args,
-        description: e.description,
-      })),
-    },
-    {
-      name: "cas",
-      commands: Object.entries(CAS_SUBCOMMAND_TABLE).map(([name, e]) => ({
-        name,
-        args: e.args,
-        description: e.description,
-      })),
-    },
-    {
-      name: "init",
-      commands: Object.entries(INIT_SUBCOMMAND_TABLE).map(([name, e]) => ({
-        name,
-        args: e.args,
-        description: e.description,
-      })),
-    },
-  ];
-}
-
-setCommandGroupsForUsage(getCommandRegistry());

packages/cli-workflow/src/cli-usage-context.ts

@@ -1,14 +0,0 @@
-import type { CommandGroup } from "./cli-command-types.js";
-
-let commandGroupsForUsage: ReadonlyArray<CommandGroup> | null = null;
-
-export function setCommandGroupsForUsage(groups: ReadonlyArray<CommandGroup>): void {
-  commandGroupsForUsage = groups;
-}
-
-export function getCommandGroupsForUsage(): ReadonlyArray<CommandGroup> {
-  if (commandGroupsForUsage === null) {
-    throw new Error("BUG: command groups for usage not initialized");
-  }
-  return commandGroupsForUsage;
-}

packages/cli-workflow/src/cli-usage.ts

@@ -1,81 +0,0 @@
-import type { CommandGroup } from "./cli-command-types.js";
-
-/** Keep aligned with `getSkillTopics()` in skill.ts (names only, for error usage lines). */
-export const USAGE_SKILL_TOPIC_ROWS: ReadonlyArray<{ name: string }> = [
-  { name: "cli" },
-  { name: "develop" },
-  { name: "author" },
-];
-
-const USAGE_SECTION_BY_GROUP: Record<string, string> = {
-  workflow: "Workflow registry:",
-  thread: "Thread execution:",
-  cas: "Content-addressable storage:",
-  init: "Development:",
-};
-
-export function formatUsageCommandLines(
-  rows: ReadonlyArray<{ prefix: string; description: string }>,
-): string[] {
-  const maxPrefix = rows.reduce((max, row) => Math.max(max, row.prefix.length), 0);
-  const gap = 2;
-  return rows.map((row) => {
-    const pad = " ".repeat(maxPrefix - row.prefix.length + gap);
-    return `  ${row.prefix}${pad}${row.description}`;
-  });
-}
-
-export function formatCliUsage(
-  groups: ReadonlyArray<CommandGroup>,
-  skillTopics: ReadonlyArray<{ name: string }>,
-): string {
-  const lines: string[] = ["uncaged-workflow — workflow engine CLI", ""];
-
-  for (const group of groups) {
-    const sectionTitle = USAGE_SECTION_BY_GROUP[group.name];
-    if (sectionTitle === undefined) {
-      throw new Error(`BUG: missing usage section title for group "${group.name}"`);
-    }
-    lines.push(sectionTitle);
-    const rows = group.commands.map((cmd) => {
-      const args = cmd.args ? ` ${cmd.args}` : "";
-      return {
-        prefix: `${group.name} ${cmd.name}${args}`,
-        description: cmd.description,
-      };
-    });
-    lines.push(...formatUsageCommandLines(rows));
-    lines.push("");
-  }
-
-  lines.push("Shortcuts:");
-  lines.push(
-    ...formatUsageCommandLines([
-      { prefix: "run <name> [...]", description: "→ thread run" },
-      { prefix: "live <id> [...]", description: "→ thread live" },
-    ]),
-  );
-  lines.push("");
-
-  lines.push("Reference:");
-  const skillTopicNames = skillTopics.map((t) => t.name).join(", ");
-  lines.push(
-    ...formatUsageCommandLines([
-      {
-        prefix: "skill [topic]",
-        description: `Agent-consumable docs (${skillTopicNames})`,
-      },
-    ]),
-  );
-  lines.push("");
-  lines.push("Use <command> --help for subcommand details.");
-  lines.push("");
-  lines.push("Environment variables:");
-  lines.push(
-    "  WORKFLOW_STORAGE_ROOT              Override storage directory (default: ~/.uncaged/workflow)",
-  );
-  lines.push(
-    "  UNCAGED_WORKFLOW_STORAGE_ROOT      Internal override (takes priority over WORKFLOW_STORAGE_ROOT)",
-  );
-  return lines.join("\n");
-}

packages/cli-workflow/src/cmd-add.ts

@@ -14,10 +14,20 @@ import {
   writeWorkflowRegistry,
 } from "@uncaged/workflow";
 
-import { storeWorkflowBundleArtifacts } from "../../bundle-store.js";
-import { validateCliWorkflowName } from "../../workflow-name.js";
+import { storeWorkflowBundleArtifacts } from "./bundle-store.js";
+import { validateCliWorkflowName } from "./workflow-name.js";
 
-import type { CmdAddSuccess, ParsedAddArgv } from "./types.js";
+export type ParsedAddArgv = {
+  name: string;
+  filePath: string;
+  /** Override path to `.d.ts` when adding a bundle. */
+  typesPath: string | null;
+};
+
+export type CmdAddSuccess = {
+  hash: string;
+  warnings: ReadonlyArray<string>;
+};
 
 function isEsmBundle(path: string): boolean {
   return path.endsWith(".esm.js");
@@ -27,6 +37,75 @@ function defaultTypesPath(bundlePath: string): string {
   return bundlePath.replace(/\.esm\.js$/i, ".d.ts");
 }
 
+type ParsedLongFlag = { advance: 2; kind: "types"; value: string };
+
+function tryParseAddLongFlag(argv: string[], index: number): Result<ParsedLongFlag | null, string> {
+  const tok = argv[index];
+  if (tok !== "--types") {
+    return ok(null);
+  }
+  const value = argv[index + 1];
+  if (value === undefined || value.startsWith("--")) {
+    return err("missing value for --types");
+  }
+  return ok({ advance: 2, kind: "types", value });
+}
+
+type PositionalSlots = {
+  name: string | undefined;
+  filePath: string | undefined;
+};
+
+function assignPositional(tok: string, slots: PositionalSlots): Result<void, string> {
+  if (slots.name === undefined) {
+    slots.name = tok;
+    return ok(undefined);
+  }
+  if (slots.filePath === undefined) {
+    slots.filePath = tok;
+    return ok(undefined);
+  }
+  return err("too many arguments");
+}
+
+export function parseAddArgv(argv: string[]): Result<ParsedAddArgv, string> {
+  const slots: PositionalSlots = { name: undefined, filePath: undefined };
+  let typesPath: string | null = null;
+
+  let i = 0;
+  while (i < argv.length) {
+    const flag = tryParseAddLongFlag(argv, i);
+    if (!flag.ok) {
+      return flag;
+    }
+    if (flag.value !== null) {
+      typesPath = flag.value.value;
+      i += flag.value.advance;
+      continue;
+    }
+
+    const tok = argv[i];
+    if (tok?.startsWith("--")) {
+      return err(`unknown add flag: ${tok}`);
+    }
+    if (tok === undefined) {
+      break;
+    }
+    const placed = assignPositional(tok, slots);
+    if (!placed.ok) {
+      return placed;
+    }
+    i += 1;
+  }
+
+  const { name, filePath } = slots;
+  if (name === undefined || name === "" || filePath === undefined || filePath === "") {
+    return err("add requires <name> <file>");
+  }
+
+  return ok({ name, filePath, typesPath });
+}
+
 async function registerHash(
   storageRoot: string,
   name: string,

packages/cli-workflow/src/cmd-cas.ts

@@ -0,0 +1,43 @@
+import { createCasStore, err, getGlobalCasDir, ok, type Result } from "@uncaged/workflow";
+
+export async function cmdCasGet(
+  storageRoot: string,
+  _threadId: string,
+  hash: string,
+): Promise<Result<string, string>> {
+  const cas = createCasStore(getGlobalCasDir(storageRoot));
+  const content = await cas.get(hash);
+  if (content === null) {
+    return err(`cas entry not found: ${hash}`);
+  }
+  return ok(content);
+}
+
+export async function cmdCasPut(
+  storageRoot: string,
+  _threadId: string,
+  content: string,
+): Promise<Result<string, string>> {
+  const cas = createCasStore(getGlobalCasDir(storageRoot));
+  const hash = await cas.put(content);
+  return ok(hash);
+}
+
+export async function cmdCasList(
+  storageRoot: string,
+  _threadId: string,
+): Promise<Result<string[], string>> {
+  const cas = createCasStore(getGlobalCasDir(storageRoot));
+  const hashes = await cas.list();
+  return ok(hashes);
+}
+
+export async function cmdCasRm(
+  storageRoot: string,
+  _threadId: string,
+  hash: string,
+): Promise<Result<void, string>> {
+  const cas = createCasStore(getGlobalCasDir(storageRoot));
+  await cas.delete(hash);
+  return ok(undefined);
+}

packages/cli-workflow/src/cmd-fork.ts

@@ -2,9 +2,36 @@ import { join } from "node:path";
 
 import { buildForkPlan, err, generateUlid, ok, type Result } from "@uncaged/workflow";
 
-import { pathExists, readTextFileIfExists } from "../../fs-utils.js";
-import { resolveThreadDataPath } from "../../thread-scan.js";
-import { ensureWorkerForHash, sendWorkerTcpCommand } from "../../worker-spawn.js";
+import { pathExists, readTextFileIfExists } from "./fs-utils.js";
+import { resolveThreadDataPath } from "./thread-scan.js";
+import { ensureWorkerForHash, sendWorkerTcpCommand } from "./worker-spawn.js";
+
+export function parseForkArgv(
+  argv: string[],
+): Result<{ threadId: string; fromRole: string | null }, string> {
+  if (argv.length === 0) {
+    return err("fork requires <thread-id>");
+  }
+  const threadId = argv[0];
+  if (threadId === undefined || threadId === "") {
+    return err("fork requires <thread-id>");
+  }
+  let fromRole: string | null = null;
+  for (let i = 1; i < argv.length; i++) {
+    const a = argv[i];
+    if (a === "--from-role") {
+      const r = argv[i + 1];
+      if (r === undefined || r === "") {
+        return err("--from-role requires a role name");
+      }
+      fromRole = r;
+      i++;
+      continue;
+    }
+    return err(`unexpected argument: ${a}`);
+  }
+  return ok({ threadId, fromRole });
+}
 
 export async function cmdFork(
   storageRoot: string,

packages/cli-workflow/src/cmd-history.ts

@@ -6,7 +6,7 @@ import {
   readWorkflowRegistry,
 } from "@uncaged/workflow";
 
-import { validateCliWorkflowName } from "../../workflow-name.js";
+import { validateCliWorkflowName } from "./workflow-name.js";
 
 export async function cmdHistory(
   storageRoot: string,

packages/cli-workflow/src/cmd-init.ts

@@ -1,11 +1,30 @@
-import { mkdir, writeFile } from "node:fs/promises";
-import { join } from "node:path";
+import { mkdir, readFile, writeFile } from "node:fs/promises";
+import { dirname, join, resolve } from "node:path";
 
 import { err, ok, type Result } from "@uncaged/workflow";
 
-import { pathExists } from "../../fs-utils.js";
-import type { CmdInitWorkspaceSuccess } from "./types.js";
-import { validateWorkspaceSegment } from "./validate.js";
+import { pathExists } from "./fs-utils.js";
+
+export type CmdInitWorkspaceSuccess = {
+  rootPath: string;
+};
+
+export type CmdInitTemplateSuccess = {
+  templatePath: string;
+};
+
+function validateWorkspaceSegment(name: string): Result<void, string> {
+  if (name.length === 0) {
+    return err("workspace name must not be empty");
+  }
+  if (name === "." || name === "..") {
+    return err("invalid workspace name");
+  }
+  if (name.includes("/") || name.includes("\\")) {
+    return err("workspace name must not contain path separators");
+  }
+  return ok(undefined);
+}
 
 function rootPackageJson(workspaceName: string): string {
   return `${JSON.stringify(
@@ -107,7 +126,7 @@ Init 生成的骨架：\`templates/\` 下放可复用定义，\`workflows/\` 下
 2. **编写 RoleDefinition**：为每个角色写 Zod \`schema\`，补齐 \`systemPrompt\` / \`extractPrompt\` / \`description\`。
 3. **编写 Moderator**：根据 \`ctx.steps\` 与业务状态返回下一个角色名或 \`END\`。
 4. **组装 WorkflowDefinition**：在模板 \`index\` 中导出 definition（以及必要的角色 / moderator 导出）。
-5. **实例化**：在 workflow 包中使用 \`createWorkflow(def, binding)\`（或项目约定的封装）绑定 **AgentFn**；**ExtractFn** 由引擎从 **workflow.yaml** 注入 \`WorkflowFnOptions\`。
+5. **实例化**：在 workflow 包中使用 \`createWorkflow(def, binding, extract)\`（或项目约定的封装）绑定 **AgentFn** / **ExtractFn**。
 6. **构建**：打包为单个 **.esm.js** bundle，使用 **uncaged-workflow add** 注册。
 
 ## 4. 编码规范
@@ -214,3 +233,183 @@ export async function cmdInitWorkspace(
 
   return ok({ rootPath });
 }
+
+function hasTemplatesWorkspaceGlob(workspaces: unknown): boolean {
+  return Array.isArray(workspaces) && workspaces.includes("templates/*");
+}
+
+async function readPackageJsonWorkspaces(dir: string): Promise<unknown | null> {
+  const pkgPath = join(dir, "package.json");
+  if (!(await pathExists(pkgPath))) {
+    return null;
+  }
+  let raw: string;
+  try {
+    raw = await readFile(pkgPath, "utf8");
+  } catch {
+    return null;
+  }
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(raw) as unknown;
+  } catch {
+    return null;
+  }
+  if (typeof parsed !== "object" || parsed === null || !("workspaces" in parsed)) {
+    return null;
+  }
+  return (parsed as { workspaces: unknown }).workspaces;
+}
+
+/** Resolve uncaged-workflow workspace root (package.json with `templates/*` in `workspaces`). */
+async function findWorkflowWorkspaceRoot(startDir: string): Promise<Result<string, string>> {
+  let dir = resolve(startDir);
+  for (;;) {
+    const workspaces = await readPackageJsonWorkspaces(dir);
+    if (workspaces !== null && hasTemplatesWorkspaceGlob(workspaces)) {
+      return ok(dir);
+    }
+    const parent = dirname(dir);
+    if (parent === dir) {
+      return err(
+        'not inside a workflow workspace (no package.json with workspaces containing "templates/*")',
+      );
+    }
+    dir = parent;
+  }
+}
+
+function templatePackageJson(templateName: string): string {
+  return `${JSON.stringify(
+    {
+      name: `template-${templateName}`,
+      version: "0.0.0",
+      private: true,
+      type: "module",
+      dependencies: {
+        "@uncaged/workflow": "^0.1.0",
+        zod: "^4.0.0",
+      },
+    },
+    null,
+    2,
+  )}\n`;
+}
+
+function templateTsconfigJson(): string {
+  return `${JSON.stringify(
+    {
+      extends: "../../tsconfig.json",
+      compilerOptions: {
+        rootDir: "src",
+        outDir: "dist",
+      },
+      include: ["src/**/*.ts"],
+    },
+    null,
+    2,
+  )}\n`;
+}
+
+function templateRolesTs(): string {
+  return `import type { RoleDefinition } from "@uncaged/workflow";
+import * as z from "zod/v4";
+
+export const HELLO_TEMPLATE_DESCRIPTION =
+  "Minimal starter template: one greeter role, then END.";
+
+export type HelloTemplateMeta = {
+  greeter: {
+    message: string;
+  };
+};
+
+const greeterMetaSchema = z.object({
+  message: z.string(),
+});
+
+export const greeterRole: RoleDefinition<HelloTemplateMeta["greeter"]> = {
+  description: "Says hello — replace with your first role.",
+  systemPrompt: "You are a helpful assistant. Reply with one short friendly sentence.",
+  extractPrompt: "Extract the assistant's greeting as message.",
+  schema: greeterMetaSchema,
+  extractRefs: null,
+};
+`;
+}
+
+function templateModeratorTs(): string {
+  return `import { END, type Moderator, type ModeratorContext } from "@uncaged/workflow";
+
+import type { HelloTemplateMeta } from "./roles.js";
+
+export const helloTemplateModerator: Moderator<HelloTemplateMeta> = (
+  ctx: ModeratorContext<HelloTemplateMeta>,
+) => {
+  if (ctx.steps.length === 0) {
+    return "greeter";
+  }
+  return END;
+};
+`;
+}
+
+function templateIndexTs(): string {
+  return `import type { WorkflowDefinition } from "@uncaged/workflow";
+
+import { helloTemplateModerator } from "./moderator.js";
+import {
+  HELLO_TEMPLATE_DESCRIPTION,
+  type HelloTemplateMeta,
+  greeterRole,
+} from "./roles.js";
+
+export {
+  HELLO_TEMPLATE_DESCRIPTION,
+  type HelloTemplateMeta,
+  greeterRole,
+} from "./roles.js";
+export { helloTemplateModerator } from "./moderator.js";
+
+export const helloTemplateWorkflowDefinition: WorkflowDefinition<HelloTemplateMeta> = {
+  description: HELLO_TEMPLATE_DESCRIPTION,
+  roles: {
+    greeter: greeterRole,
+  },
+  moderator: helloTemplateModerator,
+};
+`;
+}
+
+export async function cmdInitTemplate(
+  startDir: string,
+  templateName: string,
+): Promise<Result<CmdInitTemplateSuccess, string>> {
+  const validated = validateWorkspaceSegment(templateName);
+  if (!validated.ok) {
+    return validated;
+  }
+
+  const rootResult = await findWorkflowWorkspaceRoot(startDir);
+  if (!rootResult.ok) {
+    return rootResult;
+  }
+
+  const workspaceRoot = rootResult.value;
+  const templateDir = join(workspaceRoot, "templates", templateName);
+  if (await pathExists(templateDir)) {
+    return err(`template already exists: ${templateDir}`);
+  }
+
+  await mkdir(join(templateDir, "src"), { recursive: true });
+
+  await Promise.all([
+    writeFile(join(templateDir, "package.json"), templatePackageJson(templateName), "utf8"),
+    writeFile(join(templateDir, "tsconfig.json"), templateTsconfigJson(), "utf8"),
+    writeFile(join(templateDir, "src", "roles.ts"), templateRolesTs(), "utf8"),
+    writeFile(join(templateDir, "src", "moderator.ts"), templateModeratorTs(), "utf8"),
+    writeFile(join(templateDir, "src", "index.ts"), templateIndexTs(), "utf8"),
+  ]);
+
+  return ok({ templatePath: templateDir });
+}

packages/cli-workflow/src/cmd-kill.ts

@@ -0,0 +1,43 @@
+import { join } from "node:path";
+
+import { err, type Result } from "@uncaged/workflow";
+
+import { readTextFileIfExists } from "./fs-utils.js";
+import {
+  resolveRunningHashForThread,
+  sendWorkerTcpCommand,
+  type WorkerCtl,
+} from "./worker-spawn.js";
+
+export async function cmdKill(
+  storageRoot: string,
+  threadId: string,
+): Promise<Result<void, string>> {
+  const hashResult = await resolveRunningHashForThread(storageRoot, threadId);
+  if (!hashResult.ok) {
+    return hashResult;
+  }
+
+  const ctlPath = join(storageRoot, "workers", `${hashResult.value}.json`);
+  const ctlText = await readTextFileIfExists(ctlPath);
+  if (ctlText === null) {
+    return err(`worker control file missing for bundle hash ${hashResult.value}`);
+  }
+
+  let ctl: WorkerCtl;
+  try {
+    ctl = JSON.parse(ctlText) as WorkerCtl;
+  } catch {
+    return err(`corrupt worker control file: ${ctlPath}`);
+  }
+
+  if (typeof ctl.port !== "number" || ctl.port <= 0) {
+    return err(`invalid worker control file: ${ctlPath}`);
+  }
+
+  return await sendWorkerTcpCommand(
+    ctl.port,
+    { type: "kill", threadId },
+    { awaitResponseLine: true },
+  );
+}

packages/cli-workflow/src/cmd-pause.ts

@@ -0,0 +1,43 @@
+import { join } from "node:path";
+
+import { err, type Result } from "@uncaged/workflow";
+
+import { readTextFileIfExists } from "./fs-utils.js";
+import {
+  resolveRunningHashForThread,
+  sendWorkerTcpCommand,
+  type WorkerCtl,
+} from "./worker-spawn.js";
+
+export async function cmdPause(
+  storageRoot: string,
+  threadId: string,
+): Promise<Result<void, string>> {
+  const hashResult = await resolveRunningHashForThread(storageRoot, threadId);
+  if (!hashResult.ok) {
+    return hashResult;
+  }
+
+  const ctlPath = join(storageRoot, "workers", `${hashResult.value}.json`);
+  const ctlText = await readTextFileIfExists(ctlPath);
+  if (ctlText === null) {
+    return err(`worker control file missing for bundle hash ${hashResult.value}`);
+  }
+
+  let ctl: WorkerCtl;
+  try {
+    ctl = JSON.parse(ctlText) as WorkerCtl;
+  } catch {
+    return err(`corrupt worker control file: ${ctlPath}`);
+  }
+
+  if (typeof ctl.port !== "number" || ctl.port <= 0) {
+    return err(`invalid worker control file: ${ctlPath}`);
+  }
+
+  return await sendWorkerTcpCommand(
+    ctl.port,
+    { type: "pause", threadId },
+    { awaitResponseLine: true },
+  );
+}

packages/cli-workflow/src/cmd-ps.ts

@@ -1,4 +1,4 @@
-import { listRunningThreads } from "../../thread-scan.js";
+import { listRunningThreads } from "./thread-scan.js";
 
 export async function cmdPs(storageRoot: string): Promise<string[]> {
   const rows = await listRunningThreads(storageRoot);

packages/cli-workflow/src/cmd-remove.ts

@@ -7,7 +7,7 @@ import {
   writeWorkflowRegistry,
 } from "@uncaged/workflow";
 
-import { validateCliWorkflowName } from "../../workflow-name.js";
+import { validateCliWorkflowName } from "./workflow-name.js";
 
 export async function cmdRemove(storageRoot: string, name: string): Promise<Result<void, string>> {
   const nameOk = validateCliWorkflowName(name);

packages/cli-workflow/src/cmd-resume.ts

@@ -0,0 +1,43 @@
+import { join } from "node:path";
+
+import { err, type Result } from "@uncaged/workflow";
+
+import { readTextFileIfExists } from "./fs-utils.js";
+import {
+  resolveRunningHashForThread,
+  sendWorkerTcpCommand,
+  type WorkerCtl,
+} from "./worker-spawn.js";
+
+export async function cmdResume(
+  storageRoot: string,
+  threadId: string,
+): Promise<Result<void, string>> {
+  const hashResult = await resolveRunningHashForThread(storageRoot, threadId);
+  if (!hashResult.ok) {
+    return hashResult;
+  }
+
+  const ctlPath = join(storageRoot, "workers", `${hashResult.value}.json`);
+  const ctlText = await readTextFileIfExists(ctlPath);
+  if (ctlText === null) {
+    return err(`worker control file missing for bundle hash ${hashResult.value}`);
+  }
+
+  let ctl: WorkerCtl;
+  try {
+    ctl = JSON.parse(ctlText) as WorkerCtl;
+  } catch {
+    return err(`corrupt worker control file: ${ctlPath}`);
+  }
+
+  if (typeof ctl.port !== "number" || ctl.port <= 0) {
+    return err(`invalid worker control file: ${ctlPath}`);
+  }
+
+  return await sendWorkerTcpCommand(
+    ctl.port,
+    { type: "resume", threadId },
+    { awaitResponseLine: true },
+  );
+}

packages/cli-workflow/src/cmd-rollback.ts

@@ -10,8 +10,8 @@ import {
   writeWorkflowRegistry,
 } from "@uncaged/workflow";
 
-import { pathExists } from "../../fs-utils.js";
-import { validateCliWorkflowName } from "../../workflow-name.js";
+import { pathExists } from "./fs-utils.js";
+import { validateCliWorkflowName } from "./workflow-name.js";
 
 export async function cmdRollback(
   storageRoot: string,

packages/cli-workflow/src/cmd-run.ts

@@ -8,8 +8,8 @@ import {
   type Result,
   readWorkflowRegistry,
 } from "@uncaged/workflow";
-import { ensureWorkerForHash, sendWorkerTcpCommand } from "../../worker-spawn.js";
-import { validateCliWorkflowName } from "../../workflow-name.js";
+import { ensureWorkerForHash, sendWorkerTcpCommand } from "./worker-spawn.js";
+import { validateCliWorkflowName } from "./workflow-name.js";
 
 export async function cmdRun(
   storageRoot: string,

packages/cli-workflow/src/cmd-show.ts

@@ -8,7 +8,7 @@ import {
 } from "@uncaged/workflow";
 import { stringify } from "yaml";
 
-import { validateCliWorkflowName } from "../../workflow-name.js";
+import { validateCliWorkflowName } from "./workflow-name.js";
 
 export async function cmdShow(
   storageRoot: string,

packages/cli-workflow/src/cmd-thread.ts

@@ -3,7 +3,23 @@ import { dirname, join } from "node:path";
 
 import { err, garbageCollectCas, ok, type Result } from "@uncaged/workflow";
 
-import { resolveThreadDataPath } from "../../thread-scan.js";
+import { readTextFileIfExists } from "./fs-utils.js";
+import { resolveThreadDataPath } from "./thread-scan.js";
+
+export async function cmdThreadShow(
+  storageRoot: string,
+  threadId: string,
+): Promise<Result<string, string>> {
+  const dataPath = await resolveThreadDataPath(storageRoot, threadId);
+  if (dataPath === null) {
+    return err(`thread not found: ${threadId}`);
+  }
+  const text = await readTextFileIfExists(dataPath);
+  if (text === null) {
+    return err(`thread data missing: ${threadId}`);
+  }
+  return ok(text.endsWith("\n") ? text.slice(0, -1) : text);
+}
 
 export async function cmdThreadRemove(
   storageRoot: string,

packages/cli-workflow/src/cmd-threads.ts

@@ -1,7 +1,7 @@
 import { err, ok, type Result } from "@uncaged/workflow";
 
-import { listHistoricalThreads } from "../../thread-scan.js";
-import { validateCliWorkflowName } from "../../workflow-name.js";
+import { listHistoricalThreads } from "./thread-scan.js";
+import { validateCliWorkflowName } from "./workflow-name.js";
 
 export async function cmdThreads(
   storageRoot: string,

packages/cli-workflow/src/commands/cas/dispatch.ts

@@ -1,125 +0,0 @@
-import type { CommandEntry } from "../../cli-command-types.js";
-import { printCliError, printCliLine } from "../../cli-output.js";
-import { formatCliUsage, USAGE_SKILL_TOPIC_ROWS } from "../../cli-usage.js";
-import { getCommandGroupsForUsage } from "../../cli-usage-context.js";
-import { cmdGc } from "./gc.js";
-import { cmdCasGet } from "./get.js";
-import { cmdCasList } from "./list.js";
-import { cmdCasPut } from "./put.js";
-import { cmdCasRm } from "./rm.js";
-import type { CasDispatchDeps } from "./types.js";
-
-function usageText(): string {
-  return formatCliUsage(getCommandGroupsForUsage(), USAGE_SKILL_TOPIC_ROWS);
-}
-
-export async function dispatchGc(storageRoot: string, argv: string[]): Promise<number> {
-  if (argv.length > 0) {
-    printCliError(`${usageText()}\n\nerror: gc takes no arguments`);
-    return 1;
-  }
-  const result = await cmdGc(storageRoot);
-  if (!result.ok) {
-    printCliError(result.error);
-    return 1;
-  }
-  const stats = result.value;
-  printCliLine(
-    `scanned ${stats.scannedThreads} threads, ${stats.activeRefs} active refs, deleted ${stats.deletedEntries} entries`,
-  );
-  return 0;
-}
-
-export async function dispatchCasGet(storageRoot: string, rest: string[]): Promise<number> {
-  const hash = rest[0];
-  if (hash === undefined || rest.length > 1) {
-    printCliError(`${usageText()}\n\nerror: cas get requires <hash>`);
-    return 1;
-  }
-  const result = await cmdCasGet(storageRoot, hash);
-  if (!result.ok) {
-    printCliError(result.error);
-    return 1;
-  }
-  printCliLine(result.value);
-  return 0;
-}
-
-export async function dispatchCasPut(storageRoot: string, rest: string[]): Promise<number> {
-  const content = rest[0];
-  if (content === undefined || rest.length > 1) {
-    printCliError(`${usageText()}\n\nerror: cas put requires <content>`);
-    return 1;
-  }
-  const result = await cmdCasPut(storageRoot, content);
-  if (!result.ok) {
-    printCliError(result.error);
-    return 1;
-  }
-  printCliLine(result.value);
-  return 0;
-}
-
-export async function dispatchCasList(storageRoot: string, rest: string[]): Promise<number> {
-  if (rest.length > 0) {
-    printCliError(`${usageText()}\n\nerror: cas list takes no arguments`);
-    return 1;
-  }
-  const result = await cmdCasList(storageRoot);
-  if (!result.ok) {
-    printCliError(result.error);
-    return 1;
-  }
-  for (const hash of result.value) {
-    printCliLine(hash);
-  }
-  return 0;
-}
-
-export async function dispatchCasRm(storageRoot: string, rest: string[]): Promise<number> {
-  const hash = rest[0];
-  if (hash === undefined || rest.length > 1) {
-    printCliError(`${usageText()}\n\nerror: cas rm requires <hash>`);
-    return 1;
-  }
-  const result = await cmdCasRm(storageRoot, hash);
-  if (!result.ok) {
-    printCliError(result.error);
-    return 1;
-  }
-  printCliLine(`removed cas entry ${hash}`);
-  return 0;
-}
-
-export const CAS_SUBCOMMAND_TABLE: Record<string, CommandEntry> = {
-  get: {
-    handler: dispatchCasGet,
-    args: "<hash>",
-    description: "Retrieve content by hash from CAS",
-  },
-  put: {
-    handler: dispatchCasPut,
-    args: "<content>",
-    description: "Store content in CAS, prints hash",
-  },
-  list: {
-    handler: dispatchCasList,
-    args: "",
-    description: "List all hashes in CAS",
-  },
-  rm: { handler: dispatchCasRm, args: "<hash>", description: "Remove a CAS entry by hash" },
-  gc: { handler: dispatchGc, args: "", description: "Garbage-collect unreferenced CAS entries" },
-};
-
-export function createCasDispatcher(deps: CasDispatchDeps) {
-  const { dispatchGroup } = deps;
-  return async function dispatchCas(storageRoot: string, argv: string[]): Promise<number> {
-    const result = dispatchGroup("cas", CAS_SUBCOMMAND_TABLE, storageRoot, argv);
-    if (result !== null) {
-      return result;
-    }
-    const sub = argv[0];
-    printCliError(`${usageText()}\n\nerror: unknown cas subcommand: ${sub}`);
-    return 1;
-  };
-}

packages/cli-workflow/src/commands/cas/get.ts

@@ -1,13 +0,0 @@
-import { createCasStore, err, getGlobalCasDir, ok, type Result } from "@uncaged/workflow";
-
-export async function cmdCasGet(
-  storageRoot: string,
-  hash: string,
-): Promise<Result<string, string>> {
-  const cas = createCasStore(getGlobalCasDir(storageRoot));
-  const content = await cas.get(hash);
-  if (content === null) {
-    return err(`cas entry not found: ${hash}`);
-  }
-  return ok(content);
-}

packages/cli-workflow/src/commands/cas/index.ts

@@ -1,14 +0,0 @@
-export {
-  CAS_SUBCOMMAND_TABLE,
-  createCasDispatcher,
-  dispatchCasGet,
-  dispatchCasList,
-  dispatchCasPut,
-  dispatchCasRm,
-  dispatchGc,
-} from "./dispatch.js";
-export { cmdGc } from "./gc.js";
-export { cmdCasGet } from "./get.js";
-export { cmdCasList } from "./list.js";
-export { cmdCasPut } from "./put.js";
-export { cmdCasRm } from "./rm.js";

packages/cli-workflow/src/commands/cas/list.ts

@@ -1,7 +0,0 @@
-import { createCasStore, getGlobalCasDir, ok, type Result } from "@uncaged/workflow";
-
-export async function cmdCasList(storageRoot: string): Promise<Result<string[], string>> {
-  const cas = createCasStore(getGlobalCasDir(storageRoot));
-  const hashes = await cas.list();
-  return ok(hashes);
-}

packages/cli-workflow/src/commands/cas/put.ts

@@ -1,10 +0,0 @@
-import { createCasStore, getGlobalCasDir, ok, type Result } from "@uncaged/workflow";
-
-export async function cmdCasPut(
-  storageRoot: string,
-  content: string,
-): Promise<Result<string, string>> {
-  const cas = createCasStore(getGlobalCasDir(storageRoot));
-  const hash = await cas.put(content);
-  return ok(hash);
-}

packages/cli-workflow/src/commands/cas/rm.ts

@@ -1,7 +0,0 @@
-import { createCasStore, getGlobalCasDir, ok, type Result } from "@uncaged/workflow";
-
-export async function cmdCasRm(storageRoot: string, hash: string): Promise<Result<void, string>> {
-  const cas = createCasStore(getGlobalCasDir(storageRoot));
-  await cas.delete(hash);
-  return ok(undefined);
-}

packages/cli-workflow/src/commands/cas/types.ts

@@ -1,5 +0,0 @@
-import type { DispatchGroupFn } from "../../cli-command-types.js";
-
-export type CasDispatchDeps = {
-  dispatchGroup: DispatchGroupFn;
-};

packages/cli-workflow/src/commands/init/dispatch.ts

@@ -1,67 +0,0 @@
-import type { CommandEntry } from "../../cli-command-types.js";
-import { printCliError, printCliLine } from "../../cli-output.js";
-import { formatCliUsage, USAGE_SKILL_TOPIC_ROWS } from "../../cli-usage.js";
-import { getCommandGroupsForUsage } from "../../cli-usage-context.js";
-import { cmdInitTemplate } from "./template.js";
-import type { InitDispatchDeps } from "./types.js";
-import { cmdInitWorkspace } from "./workspace.js";
-
-function usageText(): string {
-  return formatCliUsage(getCommandGroupsForUsage(), USAGE_SKILL_TOPIC_ROWS);
-}
-
-export async function dispatchInitWorkspace(_storageRoot: string, argv: string[]): Promise<number> {
-  const name = argv[0];
-  if (name === undefined || argv.length > 1) {
-    printCliError(`${usageText()}\n\nerror: init workspace requires <name>`);
-    return 1;
-  }
-  const result = await cmdInitWorkspace(process.cwd(), name);
-  if (!result.ok) {
-    printCliError(result.error);
-    return 1;
-  }
-  printCliLine(`initialized workflow workspace at ${result.value.rootPath}`);
-  return 0;
-}
-
-export async function dispatchInitTemplate(_storageRoot: string, argv: string[]): Promise<number> {
-  const name = argv[0];
-  if (name === undefined || argv.length > 1) {
-    printCliError(`${usageText()}\n\nerror: init template requires <name>`);
-    return 1;
-  }
-  const result = await cmdInitTemplate(process.cwd(), name);
-  if (!result.ok) {
-    printCliError(result.error);
-    return 1;
-  }
-  printCliLine(`initialized template at ${result.value.templatePath}`);
-  return 0;
-}
-
-export const INIT_SUBCOMMAND_TABLE: Record<string, CommandEntry> = {
-  workspace: {
-    handler: dispatchInitWorkspace,
-    args: "<name>",
-    description: "Initialize a new workflow workspace",
-  },
-  template: {
-    handler: dispatchInitTemplate,
-    args: "<name>",
-    description: "Initialize a new workflow template",
-  },
-};
-
-export function createInitDispatcher(deps: InitDispatchDeps) {
-  const { dispatchGroup } = deps;
-  return async function dispatchInit(storageRoot: string, argv: string[]): Promise<number> {
-    const result = dispatchGroup("init", INIT_SUBCOMMAND_TABLE, storageRoot, argv);
-    if (result !== null) {
-      return result;
-    }
-    const sub = argv[0];
-    printCliError(`${usageText()}\n\nerror: unknown init subcommand: ${sub}`);
-    return 1;
-  };
-}

packages/cli-workflow/src/commands/init/index.ts

@@ -1,9 +0,0 @@
-export {
-  createInitDispatcher,
-  dispatchInitTemplate,
-  dispatchInitWorkspace,
-  INIT_SUBCOMMAND_TABLE,
-} from "./dispatch.js";
-export { cmdInitTemplate } from "./template.js";
-export type { CmdInitTemplateSuccess, CmdInitWorkspaceSuccess } from "./types.js";
-export { cmdInitWorkspace } from "./workspace.js";

packages/cli-workflow/src/commands/init/template.ts

@@ -1,94 +0,0 @@
-import { mkdir, readFile, writeFile } from "node:fs/promises";
-import { dirname, join, resolve } from "node:path";
-
-import { err, ok, type Result } from "@uncaged/workflow";
-
-import { pathExists } from "../../fs-utils.js";
-
-import {
-  templateIndexTs,
-  templateModeratorTs,
-  templatePackageJson,
-  templateRolesTs,
-  templateTsconfigJson,
-} from "./templates.js";
-import type { CmdInitTemplateSuccess } from "./types.js";
-import { validateWorkspaceSegment } from "./validate.js";
-
-function hasTemplatesWorkspaceGlob(workspaces: unknown): boolean {
-  return Array.isArray(workspaces) && workspaces.includes("templates/*");
-}
-
-async function readPackageJsonWorkspaces(dir: string): Promise<unknown | null> {
-  const pkgPath = join(dir, "package.json");
-  if (!(await pathExists(pkgPath))) {
-    return null;
-  }
-  let raw: string;
-  try {
-    raw = await readFile(pkgPath, "utf8");
-  } catch {
-    return null;
-  }
-  let parsed: unknown;
-  try {
-    parsed = JSON.parse(raw) as unknown;
-  } catch {
-    return null;
-  }
-  if (typeof parsed !== "object" || parsed === null || !("workspaces" in parsed)) {
-    return null;
-  }
-  return (parsed as { workspaces: unknown }).workspaces;
-}
-
-/** Resolve uncaged-workflow workspace root (package.json with `templates/*` in `workspaces`). */
-async function findWorkflowWorkspaceRoot(startDir: string): Promise<Result<string, string>> {
-  let dir = resolve(startDir);
-  for (;;) {
-    const workspaces = await readPackageJsonWorkspaces(dir);
-    if (workspaces !== null && hasTemplatesWorkspaceGlob(workspaces)) {
-      return ok(dir);
-    }
-    const parent = dirname(dir);
-    if (parent === dir) {
-      return err(
-        'not inside a workflow workspace (no package.json with workspaces containing "templates/*")',
-      );
-    }
-    dir = parent;
-  }
-}
-
-export async function cmdInitTemplate(
-  startDir: string,
-  templateName: string,
-): Promise<Result<CmdInitTemplateSuccess, string>> {
-  const validated = validateWorkspaceSegment(templateName);
-  if (!validated.ok) {
-    return validated;
-  }
-
-  const rootResult = await findWorkflowWorkspaceRoot(startDir);
-  if (!rootResult.ok) {
-    return rootResult;
-  }
-
-  const workspaceRoot = rootResult.value;
-  const templateDir = join(workspaceRoot, "templates", templateName);
-  if (await pathExists(templateDir)) {
-    return err(`template already exists: ${templateDir}`);
-  }
-
-  await mkdir(join(templateDir, "src"), { recursive: true });
-
-  await Promise.all([
-    writeFile(join(templateDir, "package.json"), templatePackageJson(templateName), "utf8"),
-    writeFile(join(templateDir, "tsconfig.json"), templateTsconfigJson(), "utf8"),
-    writeFile(join(templateDir, "src", "roles.ts"), templateRolesTs(), "utf8"),
-    writeFile(join(templateDir, "src", "moderator.ts"), templateModeratorTs(), "utf8"),
-    writeFile(join(templateDir, "src", "index.ts"), templateIndexTs(), "utf8"),
-  ]);
-
-  return ok({ templatePath: templateDir });
-}

packages/cli-workflow/src/commands/init/templates.ts

@@ -1,101 +0,0 @@
-export function templatePackageJson(templateName: string): string {
-  return `${JSON.stringify(
-    {
-      name: `template-${templateName}`,
-      version: "0.0.0",
-      private: true,
-      type: "module",
-      dependencies: {
-        "@uncaged/workflow": "^0.1.0",
-        zod: "^4.0.0",
-      },
-    },
-    null,
-    2,
-  )}\n`;
-}
-
-export function templateTsconfigJson(): string {
-  return `${JSON.stringify(
-    {
-      extends: "../../tsconfig.json",
-      compilerOptions: {
-        rootDir: "src",
-        outDir: "dist",
-      },
-      include: ["src/**/*.ts"],
-    },
-    null,
-    2,
-  )}\n`;
-}
-
-export function templateRolesTs(): string {
-  return `import type { RoleDefinition } from "@uncaged/workflow";
-import * as z from "zod/v4";
-
-export const HELLO_TEMPLATE_DESCRIPTION =
-  "Minimal starter template: one greeter role, then END.";
-
-export type HelloTemplateMeta = {
-  greeter: {
-    message: string;
-  };
-};
-
-const greeterMetaSchema = z.object({
-  message: z.string(),
-});
-
-export const greeterRole: RoleDefinition<HelloTemplateMeta["greeter"]> = {
-  description: "Says hello — replace with your first role.",
-  systemPrompt: "You are a helpful assistant. Reply with one short friendly sentence.",
-  extractPrompt: "Extract the assistant's greeting as message.",
-  schema: greeterMetaSchema,
-  extractRefs: null,
-};
-`;
-}
-
-export function templateModeratorTs(): string {
-  return `import { END, type Moderator, type ModeratorContext } from "@uncaged/workflow";
-
-import type { HelloTemplateMeta } from "./roles.js";
-
-export const helloTemplateModerator: Moderator<HelloTemplateMeta> = (
-  ctx: ModeratorContext<HelloTemplateMeta>,
-) => {
-  if (ctx.steps.length === 0) {
-    return "greeter";
-  }
-  return END;
-};
-`;
-}
-
-export function templateIndexTs(): string {
-  return `import type { WorkflowDefinition } from "@uncaged/workflow";
-
-import { helloTemplateModerator } from "./moderator.js";
-import {
-  HELLO_TEMPLATE_DESCRIPTION,
-  type HelloTemplateMeta,
-  greeterRole,
-} from "./roles.js";
-
-export {
-  HELLO_TEMPLATE_DESCRIPTION,
-  type HelloTemplateMeta,
-  greeterRole,
-} from "./roles.js";
-export { helloTemplateModerator } from "./moderator.js";
-
-export const helloTemplateWorkflowDefinition: WorkflowDefinition<HelloTemplateMeta> = {
-  description: HELLO_TEMPLATE_DESCRIPTION,
-  roles: {
-    greeter: greeterRole,
-  },
-  moderator: helloTemplateModerator,
-};
-`;
-}

packages/cli-workflow/src/commands/init/types.ts

@@ -1,13 +0,0 @@
-import type { DispatchGroupFn } from "../../cli-command-types.js";
-
-export type CmdInitTemplateSuccess = {
-  templatePath: string;
-};
-
-export type CmdInitWorkspaceSuccess = {
-  rootPath: string;
-};
-
-export type InitDispatchDeps = {
-  dispatchGroup: DispatchGroupFn;
-};

packages/cli-workflow/src/commands/init/validate.ts

@@ -1,15 +0,0 @@
-import { err, ok, type Result } from "@uncaged/workflow";
-
-/** Validates a single path segment for workspace / template names (no separators, not `.` / `..`). */
-export function validateWorkspaceSegment(name: string): Result<void, string> {
-  if (name.length === 0) {
-    return err("workspace name must not be empty");
-  }
-  if (name === "." || name === "..") {
-    return err("invalid workspace name");
-  }
-  if (name.includes("/") || name.includes("\\")) {
-    return err("workspace name must not contain path separators");
-  }
-  return ok(undefined);
-}

packages/cli-workflow/src/commands/thread/control.ts

@@ -1,52 +0,0 @@
-import type { Result } from "@uncaged/workflow";
-
-import {
-  readWorkerCtl,
-  resolveRunningHashForThread,
-  sendWorkerTcpCommand,
-} from "../../worker-spawn.js";
-
-type ThreadControlAction = "kill" | "pause" | "resume";
-
-async function cmdThreadControl(
-  storageRoot: string,
-  threadId: string,
-  action: ThreadControlAction,
-): Promise<Result<void, string>> {
-  const hashResult = await resolveRunningHashForThread(storageRoot, threadId);
-  if (!hashResult.ok) {
-    return hashResult;
-  }
-
-  const ctlResult = await readWorkerCtl(storageRoot, hashResult.value);
-  if (!ctlResult.ok) {
-    return ctlResult;
-  }
-
-  return await sendWorkerTcpCommand(
-    ctlResult.value.port,
-    { type: action, threadId },
-    { awaitResponseLine: true },
-  );
-}
-
-export async function cmdKill(
-  storageRoot: string,
-  threadId: string,
-): Promise<Result<void, string>> {
-  return cmdThreadControl(storageRoot, threadId, "kill");
-}
-
-export async function cmdPause(
-  storageRoot: string,
-  threadId: string,
-): Promise<Result<void, string>> {
-  return cmdThreadControl(storageRoot, threadId, "pause");
-}
-
-export async function cmdResume(
-  storageRoot: string,
-  threadId: string,
-): Promise<Result<void, string>> {
-  return cmdThreadControl(storageRoot, threadId, "resume");
-}

packages/cli-workflow/src/commands/thread/dispatch.ts

@@ -1,206 +0,0 @@
-import type { CommandEntry } from "../../cli-command-types.js";
-import { printCliError, printCliLine } from "../../cli-output.js";
-import { formatCliUsage, USAGE_SKILL_TOPIC_ROWS } from "../../cli-usage.js";
-import { getCommandGroupsForUsage } from "../../cli-usage-context.js";
-import { parseLiveArgv } from "../../live-argv.js";
-import { parseRunArgv } from "../../run-argv.js";
-import { cmdKill, cmdPause, cmdResume } from "./control.js";
-import { cmdFork } from "./fork.js";
-import { parseForkArgv } from "./fork-argv.js";
-import { cmdThreads } from "./list.js";
-import { cmdLive } from "./live.js";
-import { cmdPs } from "./ps.js";
-import { cmdThreadRemove } from "./rm.js";
-import { cmdRun } from "./run.js";
-import { cmdThreadShow } from "./show.js";
-import type { ThreadDispatchDeps } from "./types.js";
-
-function usageText(): string {
-  return formatCliUsage(getCommandGroupsForUsage(), USAGE_SKILL_TOPIC_ROWS);
-}
-
-export async function dispatchRun(storageRoot: string, argv: string[]): Promise<number> {
-  const parsed = parseRunArgv(argv);
-  if (!parsed.ok) {
-    printCliError(`${usageText()}\n\nerror: ${parsed.error}`);
-    return 1;
-  }
-
-  const result = await cmdRun(
-    storageRoot,
-    parsed.value.name,
-    parsed.value.prompt,
-    parsed.value.maxRounds,
-  );
-  if (!result.ok) {
-    printCliError(result.error);
-    return 1;
-  }
-
-  printCliLine(result.value.threadId);
-  return 0;
-}
-
-export async function dispatchPs(storageRoot: string, argv: string[]): Promise<number> {
-  if (argv.length > 0) {
-    printCliError(`${usageText()}\n\nerror: ps takes no arguments`);
-    return 1;
-  }
-  for (const line of await cmdPs(storageRoot)) {
-    printCliLine(line);
-  }
-  return 0;
-}
-
-export async function dispatchKill(storageRoot: string, argv: string[]): Promise<number> {
-  const threadId = argv[0];
-  if (threadId === undefined || argv.length > 1) {
-    printCliError(`${usageText()}\n\nerror: kill requires <thread-id>`);
-    return 1;
-  }
-  const result = await cmdKill(storageRoot, threadId);
-  if (!result.ok) {
-    printCliError(result.error);
-    return 1;
-  }
-  printCliLine(`kill sent for thread ${threadId}`);
-  return 0;
-}
-
-export async function dispatchLive(storageRoot: string, argv: string[]): Promise<number> {
-  const parsed = parseLiveArgv(argv);
-  if (!parsed.ok) {
-    printCliError(`${usageText()}\n\nerror: ${parsed.error}`);
-    return 1;
-  }
-  return cmdLive(storageRoot, parsed.value);
-}
-
-export async function dispatchPause(storageRoot: string, argv: string[]): Promise<number> {
-  const threadId = argv[0];
-  if (threadId === undefined || argv.length > 1) {
-    printCliError(`${usageText()}\n\nerror: pause requires <thread-id>`);
-    return 1;
-  }
-  const result = await cmdPause(storageRoot, threadId);
-  if (!result.ok) {
-    printCliError(result.error);
-    return 1;
-  }
-  printCliLine(`pause sent for thread ${threadId}`);
-  return 0;
-}
-
-export async function dispatchResume(storageRoot: string, argv: string[]): Promise<number> {
-  const threadId = argv[0];
-  if (threadId === undefined || argv.length > 1) {
-    printCliError(`${usageText()}\n\nerror: resume requires <thread-id>`);
-    return 1;
-  }
-  const result = await cmdResume(storageRoot, threadId);
-  if (!result.ok) {
-    printCliError(result.error);
-    return 1;
-  }
-  printCliLine(`resume sent for thread ${threadId}`);
-  return 0;
-}
-
-export async function dispatchThreadList(storageRoot: string, argv: string[]): Promise<number> {
-  const result = await cmdThreads(storageRoot, argv);
-  if (!result.ok) {
-    printCliError(result.error);
-    return 1;
-  }
-  for (const line of result.value) {
-    printCliLine(line);
-  }
-  return 0;
-}
-
-export async function dispatchThreadShow(storageRoot: string, argv: string[]): Promise<number> {
-  const id = argv[0];
-  if (id === undefined || argv.length > 1) {
-    printCliError(`${usageText()}\n\nerror: thread show requires <id>`);
-    return 1;
-  }
-  const result = await cmdThreadShow(storageRoot, id);
-  if (!result.ok) {
-    printCliError(result.error);
-    return 1;
-  }
-  printCliLine(result.value);
-  return 0;
-}
-
-export async function dispatchThreadRm(storageRoot: string, argv: string[]): Promise<number> {
-  const id = argv[0];
-  if (id === undefined || argv.length > 1) {
-    printCliError(`${usageText()}\n\nerror: thread rm requires <id>`);
-    return 1;
-  }
-  const result = await cmdThreadRemove(storageRoot, id);
-  if (!result.ok) {
-    printCliError(result.error);
-    return 1;
-  }
-  printCliLine(`removed thread ${id}`);
-  return 0;
-}
-
-export async function dispatchFork(storageRoot: string, argv: string[]): Promise<number> {
-  const parsed = parseForkArgv(argv);
-  if (!parsed.ok) {
-    printCliError(`${usageText()}\n\nerror: ${parsed.error}`);
-    return 1;
-  }
-  const result = await cmdFork(storageRoot, parsed.value.threadId, parsed.value.fromRole);
-  if (!result.ok) {
-    printCliError(result.error);
-    return 1;
-  }
-  printCliLine(result.value.threadId);
-  return 0;
-}
-
-export const THREAD_SUBCOMMAND_TABLE: Record<string, CommandEntry> = {
-  run: {
-    handler: dispatchRun,
-    args: "<name> [--prompt <text>] [--max-rounds N]",
-    description: "Start a new thread executing a workflow",
-  },
-  list: {
-    handler: dispatchThreadList,
-    args: "[name]",
-    description: "List threads, optionally filtered by workflow name",
-  },
-  show: { handler: dispatchThreadShow, args: "<id>", description: "Show thread details and state" },
-  rm: { handler: dispatchThreadRm, args: "<id>", description: "Remove a thread" },
-  fork: {
-    handler: dispatchFork,
-    args: "<thread-id> [--from-role <role>]",
-    description: "Fork a thread, optionally from a specific role",
-  },
-  ps: { handler: dispatchPs, args: "", description: "List running threads" },
-  kill: { handler: dispatchKill, args: "<thread-id>", description: "Kill a running thread" },
-  live: {
-    handler: dispatchLive,
-    args: "<thread-id> | --latest [--debug] [--role <name>]",
-    description: "Attach to a thread and stream output live",
-  },
-  pause: { handler: dispatchPause, args: "<thread-id>", description: "Pause a running thread" },
-  resume: { handler: dispatchResume, args: "<thread-id>", description: "Resume a paused thread" },
-};
-
-export function createThreadDispatcher(deps: ThreadDispatchDeps) {
-  const { dispatchGroup } = deps;
-  return async function dispatchThread(storageRoot: string, argv: string[]): Promise<number> {
-    const result = dispatchGroup("thread", THREAD_SUBCOMMAND_TABLE, storageRoot, argv);
-    if (result !== null) {
-      return result;
-    }
-    const sub = argv[0];
-    printCliError(`${usageText()}\n\nerror: unknown thread subcommand: ${sub}`);
-    return 1;
-  };
-}

packages/cli-workflow/src/commands/thread/fork-argv.ts

@@ -1,28 +0,0 @@
-import { err, ok, type Result } from "@uncaged/workflow";
-
-import type { ParsedForkArgv } from "./types.js";
-
-export function parseForkArgv(argv: string[]): Result<ParsedForkArgv, string> {
-  if (argv.length === 0) {
-    return err("fork requires <thread-id>");
-  }
-  const threadId = argv[0];
-  if (threadId === undefined || threadId === "") {
-    return err("fork requires <thread-id>");
-  }
-  let fromRole: string | null = null;
-  for (let i = 1; i < argv.length; i++) {
-    const a = argv[i];
-    if (a === "--from-role") {
-      const r = argv[i + 1];
-      if (r === undefined || r === "") {
-        return err("--from-role requires a role name");
-      }
-      fromRole = r;
-      i++;
-      continue;
-    }
-    return err(`unexpected argument: ${a}`);
-  }
-  return ok({ threadId, fromRole });
-}

packages/cli-workflow/src/commands/thread/index.ts

@@ -1,30 +0,0 @@
-export { cmdKill, cmdPause, cmdResume } from "./control.js";
-export {
-  createThreadDispatcher,
-  dispatchFork,
-  dispatchKill,
-  dispatchLive,
-  dispatchPause,
-  dispatchPs,
-  dispatchResume,
-  dispatchRun,
-  dispatchThreadList,
-  dispatchThreadRm,
-  dispatchThreadShow,
-  THREAD_SUBCOMMAND_TABLE,
-} from "./dispatch.js";
-export { cmdFork } from "./fork.js";
-export { parseForkArgv } from "./fork-argv.js";
-export { cmdThreads } from "./list.js";
-export {
-  cmdLive,
-  formatLiveDebugLine,
-  formatLiveTimeLabel,
-  LIVE_CONTENT_MAX_LINES,
-  renderLiveRoleStepLines,
-} from "./live.js";
-export { cmdPs } from "./ps.js";
-export { cmdThreadRemove } from "./rm.js";
-export { cmdRun } from "./run.js";
-export { cmdThreadShow } from "./show.js";
-export type { LiveRoleRow } from "./types.js";

packages/cli-workflow/src/commands/thread/live.ts

@@ -1,440 +0,0 @@
-import { watch } from "node:fs";
-import { readFile } from "node:fs/promises";
-import { dirname, join } from "node:path";
-
-import {
-  type CasStore,
-  createCasStore,
-  getContentMerklePayload,
-  getGlobalCasDir,
-  tryParseRoleStepRecord,
-  tryParseWorkflowResultRecord,
-  type WorkflowCompletion,
-} from "@uncaged/workflow";
-
-import { dimGreyLine, highlightLiveRole } from "../../cli-color.js";
-import { printCliError, printCliLine } from "../../cli-output.js";
-import { pathExists } from "../../fs-utils.js";
-import type { ParsedLiveArgv } from "../../live-argv.js";
-import { findLatestThreadDataPath, resolveThreadDataPath } from "../../thread-scan.js";
-import type { LiveRoleRow } from "./types.js";
-
-export const LIVE_CONTENT_MAX_LINES = 10;
-
-export function formatLiveTimeLabel(timestampMs: number): string {
-  const d = new Date(timestampMs);
-  const hh = String(d.getHours()).padStart(2, "0");
-  const mm = String(d.getMinutes()).padStart(2, "0");
-  const ss = String(d.getSeconds()).padStart(2, "0");
-  return `${hh}:${mm}:${ss}`;
-}
-
-export function formatLiveDebugLine(timestampMs: number, tag: string, message: string): string {
-  const label = `[${formatLiveTimeLabel(timestampMs)}] [${tag}] ${message.replace(/\n/g, " ")}`;
-  return dimGreyLine(label);
-}
-
-export function renderLiveRoleStepLines(row: LiveRoleRow, roleDisplay: string): string[] {
-  const header = `[${formatLiveTimeLabel(row.timestamp)}] ▶ ${roleDisplay}`;
-  const lines: string[] = [header];
-  const parts = row.content.split("\n");
-  const shown = parts.slice(0, LIVE_CONTENT_MAX_LINES);
-  for (const ln of shown) {
-    lines.push(`  ${ln}`);
-  }
-  const omitted = parts.length - shown.length;
-  if (omitted > 0) {
-    lines.push(`  … (${omitted} more line${omitted === 1 ? "" : "s"})`);
-  }
-  lines.push(`  meta: ${JSON.stringify(row.meta)}`);
-  return lines;
-}
-
-function printSummary(result: WorkflowCompletion): void {
-  printCliLine(`completed: returnCode=${result.returnCode} — ${result.summary}`);
-}
-
-type LiveSessionState = {
-  sawStart: boolean;
-  completed: boolean;
-  carry: string;
-  contentOffset: number;
-};
-
-type InfoLiveState = {
-  carry: string;
-  contentOffset: number;
-};
-
-function tryParseInfoRecord(obj: Record<string, unknown>): {
-  tag: string;
-  content: string;
-  timestamp: number;
-} | null {
-  const tag = obj.tag;
-  const content = obj.content;
-  const timestamp = obj.timestamp;
-  if (
-    typeof tag !== "string" ||
-    typeof content !== "string" ||
-    typeof timestamp !== "number" ||
-    !Number.isFinite(timestamp)
-  ) {
-    return null;
-  }
-  return { tag, content, timestamp };
-}
-
-async function handleJsonlLine(
-  rawLine: string,
-  state: LiveSessionState,
-  roleFilter: string | null,
-  cas: CasStore,
-): Promise<{ parseError: string | null; workflowResult: WorkflowCompletion | null }> {
-  const trimmed = rawLine.trim();
-  if (trimmed === "") {
-    return { parseError: null, workflowResult: null };
-  }
-
-  let rec: unknown;
-  try {
-    rec = JSON.parse(trimmed) as unknown;
-  } catch {
-    return { parseError: "invalid JSON in thread data file", workflowResult: null };
-  }
-  if (rec === null || typeof rec !== "object") {
-    return { parseError: "invalid record in thread data file", workflowResult: null };
-  }
-  const obj = rec as Record<string, unknown>;
-
-  if (!state.sawStart) {
-    state.sawStart = true;
-    return { parseError: null, workflowResult: null };
-  }
-
-  const wf = tryParseWorkflowResultRecord(obj);
-  if (wf !== null) {
-    state.completed = true;
-    return { parseError: null, workflowResult: wf };
-  }
-
-  const roleRow = tryParseRoleStepRecord(obj);
-  if (roleRow === null) {
-    return {
-      parseError: "unrecognized record in thread data (expected role step or result)",
-      workflowResult: null,
-    };
-  }
-
-  if (roleFilter !== null && roleRow.role !== roleFilter) {
-    return { parseError: null, workflowResult: null };
-  }
-
-  const payload = await getContentMerklePayload(cas, roleRow.contentHash);
-  const content =
-    payload !== null ? payload : `(content not in CAS; contentHash=${roleRow.contentHash})`;
-
-  const row: LiveRoleRow = {
-    role: roleRow.role,
-    content,
-    meta: roleRow.meta,
-    timestamp: roleRow.timestamp,
-  };
-  for (const outLine of renderLiveRoleStepLines(row, highlightLiveRole(row.role))) {
-    printCliLine(outLine);
-  }
-  return { parseError: null, workflowResult: null };
-}
-
-async function pumpNewContent(
-  dataPath: string,
-  state: LiveSessionState,
-  roleFilter: string | null,
-  cas: CasStore,
-): Promise<number | null> {
-  let text: string;
-  try {
-    text = await readFile(dataPath, "utf8");
-  } catch {
-    return null;
-  }
-
-  if (text.length < state.contentOffset) {
-    state.contentOffset = 0;
-    state.carry = "";
-  }
-
-  const chunk = text.slice(state.contentOffset);
-  state.contentOffset = text.length;
-  state.carry += chunk;
-
-  const parts = state.carry.split("\n");
-  state.carry = parts.pop() ?? "";
-
-  for (const line of parts) {
-    const { parseError, workflowResult } = await handleJsonlLine(line, state, roleFilter, cas);
-    if (parseError !== null) {
-      printCliError(parseError);
-      return 1;
-    }
-    if (workflowResult !== null) {
-      printSummary(workflowResult);
-      return 0;
-    }
-  }
-
-  return null;
-}
-
-async function pumpNewInfoContent(infoPath: string, state: InfoLiveState): Promise<void> {
-  let text: string;
-  try {
-    text = await readFile(infoPath, "utf8");
-  } catch {
-    return;
-  }
-
-  if (text.length < state.contentOffset) {
-    state.contentOffset = 0;
-    state.carry = "";
-  }
-
-  const chunk = text.slice(state.contentOffset);
-  state.contentOffset = text.length;
-  state.carry += chunk;
-
-  const parts = state.carry.split("\n");
-  state.carry = parts.pop() ?? "";
-
-  for (const line of parts) {
-    const trimmed = line.trim();
-    if (trimmed === "") {
-      continue;
-    }
-    let rec: unknown;
-    try {
-      rec = JSON.parse(trimmed) as unknown;
-    } catch {
-      continue;
-    }
-    if (rec === null || typeof rec !== "object") {
-      continue;
-    }
-    const parsed = tryParseInfoRecord(rec as Record<string, unknown>);
-    if (parsed === null) {
-      continue;
-    }
-    printCliLine(formatLiveDebugLine(parsed.timestamp, parsed.tag, parsed.content));
-  }
-}
-
-type WatchPumpTask = {
-  path: string;
-  pump: () => Promise<number | null>;
-};
-
-async function runWatchPumpStep(
-  settled: () => boolean,
-  pump: () => Promise<number | null>,
-  closeAll: () => void,
-  finish: (code: number) => void,
-): Promise<void> {
-  if (settled()) {
-    return;
-  }
-  try {
-    const code = await pump();
-    if (code !== null) {
-      closeAll();
-      finish(code);
-    }
-  } catch (e) {
-    closeAll();
-    throw e instanceof Error ? e : new Error(String(e));
-  }
-}
-
-function watchLivePaths(params: { tasks: WatchPumpTask[]; signal: AbortSignal }): Promise<number> {
-  const { tasks, signal } = params;
-
-  return new Promise((resolve, reject) => {
-    let settled = false;
-    const finish = (code: number): void => {
-      if (settled) {
-        return;
-      }
-      settled = true;
-      resolve(code);
-    };
-
-    const pumpChains = new Map<string, Promise<void>>();
-    for (const t of tasks) {
-      pumpChains.set(t.path, Promise.resolve());
-    }
-
-    const watchers: ReturnType<typeof watch>[] = [];
-
-    const closeAll = (): void => {
-      for (const w of watchers) {
-        w.close();
-      }
-    };
-
-    function schedulePump(path: string, pump: () => Promise<number | null>): void {
-      const prev = pumpChains.get(path) ?? Promise.resolve();
-      const next = (async () => {
-        await prev;
-        await runWatchPumpStep(() => settled, pump, closeAll, finish);
-      })();
-      pumpChains.set(path, next);
-    }
-
-    for (const { path, pump } of tasks) {
-      const watcher = watch(path, (eventType) => {
-        if (eventType === "rename") {
-          return;
-        }
-        schedulePump(path, pump);
-      });
-      watchers.push(watcher);
-      watcher.on("error", (err: Error) => {
-        closeAll();
-        reject(err);
-      });
-    }
-
-    const onAbort = (): void => {
-      closeAll();
-      finish(0);
-    };
-    signal.addEventListener("abort", onAbort, { once: true });
-
-    for (const { path, pump } of tasks) {
-      schedulePump(path, pump);
-    }
-  });
-}
-
-type LiveThreadTarget = {
-  threadId: string;
-  dataPath: string;
-};
-
-async function resolveLiveThreadTarget(
-  storageRoot: string,
-  parsed: ParsedLiveArgv,
-): Promise<LiveThreadTarget | null> {
-  if (parsed.latest) {
-    const found = await findLatestThreadDataPath(storageRoot);
-    if (found === null) {
-      printCliError("live: no threads found");
-      return null;
-    }
-    return found;
-  }
-
-  const id = parsed.threadId;
-  if (id === null) {
-    printCliError("live: internal error: missing thread id");
-    return null;
-  }
-  const resolved = await resolveThreadDataPath(storageRoot, id);
-  if (resolved === null) {
-    printCliError(`thread not found: ${id}`);
-    return null;
-  }
-  return { threadId: id, dataPath: resolved };
-}
-
-async function buildLiveWatchTasks(params: {
-  dataPath: string;
-  infoPath: string;
-  debug: boolean;
-  dataState: LiveSessionState;
-  infoState: InfoLiveState;
-  roleFilter: string | null;
-  cas: CasStore;
-}): Promise<WatchPumpTask[]> {
-  const { dataPath, infoPath, debug, dataState, infoState, roleFilter, cas } = params;
-  const tasks: WatchPumpTask[] = [
-    {
-      path: dataPath,
-      pump: () => pumpNewContent(dataPath, dataState, roleFilter, cas),
-    },
-  ];
-
-  if (debug && (await pathExists(infoPath))) {
-    tasks.push({
-      path: infoPath,
-      pump: async () => {
-        await pumpNewInfoContent(infoPath, infoState);
-        return null;
-      },
-    });
-  }
-
-  return tasks;
-}
-
-export async function cmdLive(storageRoot: string, parsed: ParsedLiveArgv): Promise<number> {
-  const target = await resolveLiveThreadTarget(storageRoot, parsed);
-  if (target === null) {
-    return 1;
-  }
-
-  const { threadId, dataPath } = target;
-  const roleFilter = parsed.role;
-  const infoPath = join(dirname(dataPath), `${threadId}.info.jsonl`);
-  const cas = createCasStore(getGlobalCasDir(storageRoot));
-
-  const dataState: LiveSessionState = {
-    sawStart: false,
-    completed: false,
-    carry: "",
-    contentOffset: 0,
-  };
-
-  const infoState: InfoLiveState = {
-    carry: "",
-    contentOffset: 0,
-  };
-
-  const controller = new AbortController();
-  const onSigInt = (): void => {
-    controller.abort();
-  };
-  process.on("SIGINT", onSigInt);
-
-  try {
-    const firstData = await pumpNewContent(dataPath, dataState, roleFilter, cas);
-    if (firstData === 1) {
-      return 1;
-    }
-
-    if (parsed.debug && (await pathExists(infoPath))) {
-      await pumpNewInfoContent(infoPath, infoState);
-    }
-
-    if (firstData === 0 || dataState.completed) {
-      return 0;
-    }
-
-    const tasks = await buildLiveWatchTasks({
-      dataPath,
-      infoPath,
-      debug: parsed.debug,
-      dataState,
-      infoState,
-      roleFilter,
-      cas,
-    });
-
-    return await watchLivePaths({ tasks, signal: controller.signal });
-  } catch (e) {
-    const message = e instanceof Error ? e.message : String(e);
-    printCliError(`live: ${message}`);
-    return 1;
-  } finally {
-    process.off("SIGINT", onSigInt);
-  }
-}

packages/cli-workflow/src/commands/thread/show.ts

@@ -1,19 +0,0 @@
-import { err, ok, type Result } from "@uncaged/workflow";
-
-import { readTextFileIfExists } from "../../fs-utils.js";
-import { resolveThreadDataPath } from "../../thread-scan.js";
-
-export async function cmdThreadShow(
-  storageRoot: string,
-  threadId: string,
-): Promise<Result<string, string>> {
-  const dataPath = await resolveThreadDataPath(storageRoot, threadId);
-  if (dataPath === null) {
-    return err(`thread not found: ${threadId}`);
-  }
-  const text = await readTextFileIfExists(dataPath);
-  if (text === null) {
-    return err(`thread data missing: ${threadId}`);
-  }
-  return ok(text.endsWith("\n") ? text.slice(0, -1) : text);
-}

packages/cli-workflow/src/commands/thread/types.ts

@@ -1,17 +0,0 @@
-import type { DispatchGroupFn } from "../../cli-command-types.js";
-
-export type LiveRoleRow = {
-  role: string;
-  content: string;
-  meta: Record<string, unknown>;
-  timestamp: number;
-};
-
-export type ParsedForkArgv = {
-  threadId: string;
-  fromRole: string | null;
-};
-
-export type ThreadDispatchDeps = {
-  dispatchGroup: DispatchGroupFn;
-};

packages/cli-workflow/src/commands/workflow/add-argv.ts

@@ -1,72 +0,0 @@
-import { err, ok, type Result } from "@uncaged/workflow";
-
-import type { ParsedAddArgv } from "./types.js";
-
-type ParsedLongFlag = { advance: 2; kind: "types"; value: string };
-
-function tryParseAddLongFlag(argv: string[], index: number): Result<ParsedLongFlag | null, string> {
-  const tok = argv[index];
-  if (tok !== "--types") {
-    return ok(null);
-  }
-  const value = argv[index + 1];
-  if (value === undefined || value.startsWith("--")) {
-    return err("missing value for --types");
-  }
-  return ok({ advance: 2, kind: "types", value });
-}
-
-type PositionalSlots = {
-  name: string | undefined;
-  filePath: string | undefined;
-};
-
-function assignPositional(tok: string, slots: PositionalSlots): Result<void, string> {
-  if (slots.name === undefined) {
-    slots.name = tok;
-    return ok(undefined);
-  }
-  if (slots.filePath === undefined) {
-    slots.filePath = tok;
-    return ok(undefined);
-  }
-  return err("too many arguments");
-}
-
-export function parseAddArgv(argv: string[]): Result<ParsedAddArgv, string> {
-  const slots: PositionalSlots = { name: undefined, filePath: undefined };
-  let typesPath: string | null = null;
-
-  let i = 0;
-  while (i < argv.length) {
-    const flag = tryParseAddLongFlag(argv, i);
-    if (!flag.ok) {
-      return flag;
-    }
-    if (flag.value !== null) {
-      typesPath = flag.value.value;
-      i += flag.value.advance;
-      continue;
-    }
-
-    const tok = argv[i];
-    if (tok?.startsWith("--")) {
-      return err(`unknown add flag: ${tok}`);
-    }
-    if (tok === undefined) {
-      break;
-    }
-    const placed = assignPositional(tok, slots);
-    if (!placed.ok) {
-      return placed;
-    }
-    i += 1;
-  }
-
-  const { name, filePath } = slots;
-  if (name === undefined || name === "" || filePath === undefined || filePath === "") {
-    return err("add requires <name> <file>");
-  }
-
-  return ok({ name, filePath, typesPath });
-}

packages/cli-workflow/src/commands/workflow/dispatch.ts

@@ -1,158 +0,0 @@
-import type { CommandEntry } from "../../cli-command-types.js";
-import { printCliError, printCliLine, printCliWarn } from "../../cli-output.js";
-import { formatCliUsage, USAGE_SKILL_TOPIC_ROWS } from "../../cli-usage.js";
-import { getCommandGroupsForUsage } from "../../cli-usage-context.js";
-import { cmdAdd, formatAddSuccess } from "./add.js";
-import { parseAddArgv } from "./add-argv.js";
-import { cmdHistory } from "./history.js";
-import { cmdList, formatListLines } from "./list.js";
-import { cmdRemove } from "./rm.js";
-import { cmdRollback } from "./rollback.js";
-import { cmdShow, formatShowYaml } from "./show.js";
-import type { WorkflowDispatchDeps } from "./types.js";
-
-function usageText(): string {
-  return formatCliUsage(getCommandGroupsForUsage(), USAGE_SKILL_TOPIC_ROWS);
-}
-
-export async function dispatchAdd(storageRoot: string, argv: string[]): Promise<number> {
-  const parsed = parseAddArgv(argv);
-  if (!parsed.ok) {
-    printCliError(`${usageText()}\n\nerror: ${parsed.error}`);
-    return 1;
-  }
-  const result = await cmdAdd(storageRoot, parsed.value);
-  if (!result.ok) {
-    printCliError(result.error);
-    return 1;
-  }
-  for (const w of result.value.warnings) {
-    printCliWarn(w);
-  }
-  printCliLine(formatAddSuccess(parsed.value.name, parsed.value.filePath, result.value.hash));
-  return 0;
-}
-
-export async function dispatchList(storageRoot: string, argv: string[]): Promise<number> {
-  if (argv.length > 0) {
-    printCliError(`${usageText()}\n\nerror: list takes no arguments`);
-    return 1;
-  }
-  const result = await cmdList(storageRoot);
-  if (!result.ok) {
-    printCliError(result.error);
-    return 1;
-  }
-  for (const line of formatListLines(result.value)) {
-    printCliLine(line);
-  }
-  return 0;
-}
-
-export async function dispatchShow(storageRoot: string, argv: string[]): Promise<number> {
-  const name = argv[0];
-  if (name === undefined || argv.length > 1) {
-    printCliError(`${usageText()}\n\nerror: show requires <name>`);
-    return 1;
-  }
-  const result = await cmdShow(storageRoot, name);
-  if (!result.ok) {
-    printCliError(result.error);
-    return 1;
-  }
-  printCliLine(formatShowYaml(name, result.value));
-  return 0;
-}
-
-export async function dispatchRemove(storageRoot: string, argv: string[]): Promise<number> {
-  const name = argv[0];
-  if (name === undefined || argv.length > 1) {
-    printCliError(`${usageText()}\n\nerror: remove requires <name>`);
-    return 1;
-  }
-  const result = await cmdRemove(storageRoot, name);
-  if (!result.ok) {
-    printCliError(result.error);
-    return 1;
-  }
-  printCliLine(`removed workflow "${name}" from registry`);
-  return 0;
-}
-
-export async function dispatchHistory(storageRoot: string, argv: string[]): Promise<number> {
-  const name = argv[0];
-  if (name === undefined || argv.length > 1) {
-    printCliError(`${usageText()}\n\nerror: history requires <name>`);
-    return 1;
-  }
-  const result = await cmdHistory(storageRoot, name);
-  if (!result.ok) {
-    printCliError(result.error);
-    return 1;
-  }
-  for (const line of result.value) {
-    printCliLine(line);
-  }
-  return 0;
-}
-
-export async function dispatchRollback(storageRoot: string, argv: string[]): Promise<number> {
-  const name = argv[0];
-  if (name === undefined || argv.length > 2) {
-    printCliError(`${usageText()}\n\nerror: rollback requires <name> [hash]`);
-    return 1;
-  }
-  const hashArg = argv[1];
-  const result = await cmdRollback(storageRoot, name, hashArg === undefined ? null : hashArg);
-  if (!result.ok) {
-    printCliError(result.error);
-    return 1;
-  }
-  printCliLine(`rolled back workflow "${name}"`);
-  return 0;
-}
-
-export const WORKFLOW_SUBCOMMAND_TABLE: Record<string, CommandEntry> = {
-  add: {
-    handler: dispatchAdd,
-    args: "<name> <file.esm.js> [--types <path>]",
-    description: "Register a workflow bundle in the registry",
-  },
-  list: { handler: dispatchList, args: "", description: "List all registered workflows" },
-  show: {
-    handler: dispatchShow,
-    args: "<name>",
-    description: "Show details of a registered workflow",
-  },
-  rm: {
-    handler: dispatchRemove,
-    args: "<name>",
-    description: "Remove a workflow from the registry",
-  },
-  history: {
-    handler: dispatchHistory,
-    args: "<name>",
-    description: "Show version history of a workflow",
-  },
-  rollback: {
-    handler: dispatchRollback,
-    args: "<name> [hash]",
-    description: "Rollback a workflow to a previous version",
-  },
-};
-
-export function createWorkflowDispatcher(deps: WorkflowDispatchDeps) {
-  const { dispatchGroup } = deps;
-  return async function dispatchWorkflow(storageRoot: string, argv: string[]): Promise<number> {
-    const result = dispatchGroup("workflow", WORKFLOW_SUBCOMMAND_TABLE, storageRoot, argv);
-    if (result !== null) {
-      return result;
-    }
-    const sub = argv[0];
-    if (sub === "remove") {
-      return dispatchRemove(storageRoot, argv.slice(1));
-    }
-    printCliError(`${usageText()}\n\nerror: unknown workflow subcommand: ${sub}`);
-    return 1;
-  };
-}

packages/cli-workflow/src/commands/workflow/index.ts

@@ -1,18 +0,0 @@
-export { cmdAdd, formatAddSuccess } from "./add.js";
-export { parseAddArgv } from "./add-argv.js";
-export {
-  createWorkflowDispatcher,
-  dispatchAdd,
-  dispatchHistory,
-  dispatchList,
-  dispatchRemove,
-  dispatchRollback,
-  dispatchShow,
-  WORKFLOW_SUBCOMMAND_TABLE,
-} from "./dispatch.js";
-export { cmdHistory } from "./history.js";
-export { cmdList, formatListLines } from "./list.js";
-export { cmdRemove } from "./rm.js";
-export { cmdRollback } from "./rollback.js";
-export { cmdShow, formatShowYaml } from "./show.js";
-export type { CmdAddSuccess, ParsedAddArgv } from "./types.js";

packages/cli-workflow/src/commands/workflow/types.ts

@@ -1,17 +0,0 @@
-import type { DispatchGroupFn } from "../../cli-command-types.js";
-
-export type ParsedAddArgv = {
-  name: string;
-  filePath: string;
-  /** Override path to `.d.ts` when adding a bundle. */
-  typesPath: string | null;
-};
-
-export type CmdAddSuccess = {
-  hash: string;
-  warnings: ReadonlyArray<string>;
-};
-
-export type WorkflowDispatchDeps = {
-  dispatchGroup: DispatchGroupFn;
-};

packages/cli-workflow/src/live-argv.ts

@@ -1,75 +0,0 @@
-import { err, ok, type Result } from "@uncaged/workflow";
-
-export type ParsedLiveArgv = {
-  threadId: string | null;
-  latest: boolean;
-  debug: boolean;
-  role: string | null;
-};
-
-type LiveArgvScan = {
-  latest: boolean;
-  debug: boolean;
-  role: string | null;
-  threadId: string | null;
-};
-
-function applyLiveArgvToken(argv: string[], i: number, s: LiveArgvScan): Result<number, string> {
-  const a = argv[i];
-  if (a === "--latest") {
-    s.latest = true;
-    return ok(i + 1);
-  }
-  if (a === "--debug") {
-    s.debug = true;
-    return ok(i + 1);
-  }
-  if (a === "--role") {
-    const v = argv[i + 1];
-    if (v === undefined || v.startsWith("--")) {
-      return err("missing value for --role");
-    }
-    s.role = v;
-    return ok(i + 2);
-  }
-  if (a.startsWith("--")) {
-    return err(`unknown live flag: ${a}`);
-  }
-  if (s.threadId !== null) {
-    return err("unexpected extra argument");
-  }
-  s.threadId = a;
-  return ok(i + 1);
-}
-
-export function parseLiveArgv(argv: string[]): Result<ParsedLiveArgv, string> {
-  const s: LiveArgvScan = {
-    latest: false,
-    debug: false,
-    role: null,
-    threadId: null,
-  };
-
-  let i = 0;
-  while (i < argv.length) {
-    const step = applyLiveArgvToken(argv, i, s);
-    if (!step.ok) {
-      return step;
-    }
-    i = step.value;
-  }
-
-  if (s.latest && s.threadId !== null) {
-    return err("live --latest does not take <thread-id>");
-  }
-  if (!s.latest && s.threadId === null) {
-    return err("live requires <thread-id> or --latest");
-  }
-
-  return ok({
-    threadId: s.threadId,
-    latest: s.latest,
-    debug: s.debug,
-    role: s.role,
-  });
-}

packages/cli-workflow/src/skill.ts

@@ -1,231 +0,0 @@
-import { getCommandRegistry } from "./cli-registry.js";
-
-type SkillTopic = {
-  name: string;
-  description: string;
-  format: () => string;
-};
-
-const SKILL_TOPICS: ReadonlyArray<SkillTopic> = [
-  { name: "cli", description: "Full CLI command reference", format: formatSkillCli },
-  {
-    name: "develop",
-    description: "Guide for agents executing roles inside a workflow",
-    format: formatSkillDevelop,
-  },
-  {
-    name: "author",
-    description: "Guide for building and publishing workflow bundles",
-    format: formatSkillAuthor,
-  },
-];
-
-export function getSkillTopics(): ReadonlyArray<{ name: string; description: string }> {
-  return SKILL_TOPICS.map((t) => ({ name: t.name, description: t.description }));
-}
-
-export function formatSkillTopic(topic: string): string | null {
-  const entry = SKILL_TOPICS.find((t) => t.name === topic);
-  if (entry === undefined) {
-    return null;
-  }
-  return entry.format();
-}
-
-export function formatSkillIndex(): string {
-  const rows = SKILL_TOPICS.map((t) => `| \`${t.name}\` | ${t.description} |`);
-  return `# uncaged-workflow skill
-
-Available topics:
-
-| Topic | Description |
-|-------|-------------|
-${rows.join("\n")}
-
-Usage: \`uncaged-workflow skill <topic>\`
-`;
-}
-
-// ── cli topic (existing full reference) ────────────────────────────────
-
-function formatSkillCli(): string {
-  const groups = getCommandRegistry();
-
-  const commandSections: string[] = [];
-  for (const group of groups) {
-    const rows = group.commands.map((cmd) => {
-      const args = cmd.args ? `\`${cmd.args}\`` : "(none)";
-      return `| \`${group.name} ${cmd.name}\` | ${args} | ${cmd.description} |`;
-    });
-    commandSections.push(
-      `### ${group.name}\n\n| Command | Args | Description |\n|---------|------|-------------|\n${rows.join("\n")}`,
-    );
-  }
-
-  return `# uncaged-workflow CLI Reference
-
-## Core Concepts
-
-| Concept | Description |
-|---------|-------------|
-| **Workflow** | A single-file ESM bundle (\`.esm.js\`) that exports \`run\` and \`descriptor\`. Identified by name and XXH64 hash. |
-| **Bundle** | The physical \`.esm.js\` file stored in the bundles directory. Immutable once written. |
-| **Thread** | A single execution of a workflow, identified by a ULID. Persists state as JSONL files. |
-| **CAS** | Content-Addressable Storage. Per-thread key-value store keyed by content hash. |
-| **Registry** | \`workflow.yaml\` — maps workflow names to their current and historical bundle hashes. |
-
-## Commands
-
-${commandSections.join("\n\n")}
-
-### Top-level shortcuts
-
-| Command | Equivalent | Description |
-|---------|------------|-------------|
-| \`run\` | \`thread run\` | Shortcut to start a thread |
-| \`live\` | \`thread live\` | Shortcut to attach to a thread |
-
-## Typical Workflow
-
-1. \`uncaged-workflow workflow add my-wf ./my-wf.esm.js\` — register a workflow
-2. \`uncaged-workflow run my-wf --prompt "do the thing"\` — start a thread
-3. \`uncaged-workflow live --latest\` — attach and watch output
-4. \`uncaged-workflow thread show <thread-id>\` — inspect completed thread
-
-## Exit Codes
-
-| Code | Meaning |
-|------|---------|
-| 0 | Success |
-| 1 | Error |
-
-## Environment Variables
-
-| Variable | Description |
-|----------|-------------|
-| \`UNCAGED_WORKFLOW_STORAGE_ROOT\` | Override the default storage directory for all workflow data |
-`;
-}
-
-// ── develop topic (for agents inside a workflow) ───────────────────────
-
-function formatSkillDevelop(): string {
-  return `# Workflow Role Guide
-
-Reference for agents executing roles (planner, coder, reviewer, etc.) inside a running workflow thread.
-
-## Thread ID
-
-Every thread has a 26-character Crockford Base32 ULID (e.g. \`06F03H5V6JTMDST6P3TVH42RWM\`).
-
-It appears in the **first message** of the conversation. If unsure:
-
-\`\`\`
-uncaged-workflow thread list
-\`\`\`
-
-## CAS (Content-Addressable Storage)
-
-Store and retrieve content by hash in workflow storage (global CAS directory).
-
-| Operation | Command |
-|-----------|---------|
-| **Store** | \`uncaged-workflow cas put '<content>'\` → prints hash |
-| **Read** | \`uncaged-workflow cas get <HASH>\` → prints content |
-| **List** | \`uncaged-workflow cas list\` |
-
-CAS is the **only** supported way to persist structured data (phase plans, review notes, etc.) within a thread. Do not use temp files.
-
-## Meta Output
-
-Each role must produce structured output that the moderator extracts. The exact schema depends on the role, but the pattern is:
-
-1. Do your work (write code, run tests, etc.)
-2. Output a compact JSON object matching the role's schema
-3. The moderator extracts and validates it automatically
-
-## Thread Context
-
-The conversation history contains outputs from previous roles. Read it to understand:
-- What task was requested (from the initial prompt)
-- What previous roles produced (plans, code changes, review results)
-- What the moderator decided (which phase to work on, whether to retry)
-`;
-}
-
-// ── author topic (for workflow developers) ─────────────────────────────
-
-function formatSkillAuthor(): string {
-  return `# Workflow Authoring Guide
-
-How to build, test, and publish workflow bundles for uncaged-workflow.
-
-## Bundle Structure
-
-A workflow bundle is a single ESM file (\`.esm.js\`) that exports:
-
-\`\`\`typescript
-// Required exports
-export const descriptor: WorkflowDescriptor;
-export const run: WorkflowRun;
-\`\`\`
-
-## WorkflowDescriptor
-
-Defines the workflow's metadata and role sequence:
-
-\`\`\`typescript
-type WorkflowDescriptor = {
-  name: string;           // verb-first kebab-case, e.g. "solve-issue"
-  description: string;    // one-line summary
-  roles: string[];        // ordered role names, e.g. ["planner", "coder", "reviewer"]
-};
-\`\`\`
-
-## WorkflowRun
-
-The main function that creates and returns a moderator:
-
-\`\`\`typescript
-type WorkflowRun = (ctx: WorkflowContext) => Moderator;
-\`\`\`
-
-The **Moderator** controls the flow — it decides which role runs next, handles retries, and determines when the workflow is complete.
-
-## Role Definition
-
-Each role has:
-
-| Field | Type | Purpose |
-|-------|------|---------|
-| \`description\` | string | What the role does |
-| \`systemPrompt\` | string | System prompt for the agent |
-| \`extractPrompt\` | string | Instruction for extracting structured meta |
-| \`schema\` | ZodSchema | Validates the extracted meta |
-| \`extractRefs\` | fn or null | Extracts CAS hashes from meta for DAG linking |
-| \`extractMode\` | "single" | Extraction mode |
-
-## Development Workflow
-
-\`\`\`bash
-# 1. Initialize a workspace
-uncaged-workflow init workspace my-workflow
-
-# 2. Write your template (roles + moderator + descriptor)
-
-# 3. Build the ESM bundle
-bun run build
-
-# 4. Register locally
-uncaged-workflow workflow add my-workflow ./dist/my-workflow.esm.js
-
-# 5. Test
-uncaged-workflow run my-workflow --prompt "test task"
-uncaged-workflow live --latest
-\`\`\`
-
-## Versioning
-
-Bundles are immutable and identified by XXH64 hash. Re-registering a workflow with a new bundle creates a new version. Use \`workflow history\` and \`workflow rollback\` to manage versions.
-`;
-}

packages/cli-workflow/src/storage-env.ts

@@ -1,21 +1,10 @@
 import { getDefaultWorkflowStorageRoot } from "@uncaged/workflow";
 
-/**
- * Resolve storage root with env var override support.
- *
- * Priority (highest first):
- *  1. `UNCAGED_WORKFLOW_STORAGE_ROOT` — internal/test override
- *  2. `WORKFLOW_STORAGE_ROOT` — user-facing override
- *  3. Default (`~/.uncaged/workflow`)
- */
+/** Resolve storage root, honoring `UNCAGED_WORKFLOW_STORAGE_ROOT` for tests/tools. */
 export function resolveWorkflowStorageRoot(): string {
-  const internal = process.env.UNCAGED_WORKFLOW_STORAGE_ROOT;
-  if (internal !== undefined && internal !== "") {
-    return internal;
-  }
-  const userOverride = process.env.WORKFLOW_STORAGE_ROOT;
-  if (userOverride !== undefined && userOverride !== "") {
-    return userOverride;
+  const override = process.env.UNCAGED_WORKFLOW_STORAGE_ROOT;
+  if (override !== undefined && override !== "") {
+    return override;
   }
   return getDefaultWorkflowStorageRoot();
 }

packages/cli-workflow/src/thread-scan.ts

@@ -1,25 +1,8 @@
-import { readdir, stat } from "node:fs/promises";
+import { readdir } from "node:fs/promises";
 import { join } from "node:path";
 
 import { pathExists, readTextFileIfExists } from "./fs-utils.js";
 
-function parseFirstJsonLineObject(text: string): Record<string, unknown> | null {
-  const firstLine = text.split("\n")[0];
-  if (firstLine === undefined || firstLine.trim() === "") {
-    return null;
-  }
-  let parsed: unknown;
-  try {
-    parsed = JSON.parse(firstLine) as unknown;
-  } catch {
-    return null;
-  }
-  if (parsed === null || typeof parsed !== "object") {
-    return null;
-  }
-  return parsed as Record<string, unknown>;
-}
-
 export type RunningThreadRow = {
   threadId: string;
   hash: string;
@@ -32,29 +15,25 @@ export type HistoricalThreadRow = {
   workflowName: string | null;
 };
 
-async function readThreadStartTimestampMs(dataPath: string): Promise<number | null> {
-  const text = await readTextFileIfExists(dataPath);
-  if (text === null) {
-    return null;
-  }
-  const parsed = parseFirstJsonLineObject(text);
-  if (parsed === null) {
-    return null;
-  }
-  const ts = parsed.timestamp;
-  return typeof ts === "number" && Number.isFinite(ts) ? ts : null;
-}
-
 async function readWorkflowNameFromDataJsonl(dataPath: string): Promise<string | null> {
   const text = await readTextFileIfExists(dataPath);
   if (text === null) {
     return null;
   }
-  const parsed = parseFirstJsonLineObject(text);
-  if (parsed === null) {
+  const firstLine = text.split("\n")[0];
+  if (firstLine === undefined || firstLine.trim() === "") {
     return null;
   }
-  const name = parsed.name;
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(firstLine) as unknown;
+  } catch {
+    return null;
+  }
+  if (parsed === null || typeof parsed !== "object") {
+    return null;
+  }
+  const name = (parsed as Record<string, unknown>).name;
   return typeof name === "string" ? name : null;
 }
 
@@ -145,50 +124,6 @@ export async function listHistoricalThreads(
   return out;
 }
 
-/**
- * Picks the thread whose `.data.jsonl` is newest by start-record `timestamp`,
- * falling back to file `mtime` when the timestamp is missing.
- * Tie-breaker: larger `mtime` wins when start timestamps are equal.
- */
-export async function findLatestThreadDataPath(
-  storageRoot: string,
-): Promise<{ threadId: string; dataPath: string } | null> {
-  const threads = await listHistoricalThreads(storageRoot, null);
-  if (threads.length === 0) {
-    return null;
-  }
-
-  let best: {
-    threadId: string;
-    dataPath: string;
-    primary: number;
-    secondary: number;
-  } | null = null;
-
-  for (const t of threads) {
-    const dataPath = join(storageRoot, "logs", t.hash, `${t.threadId}.data.jsonl`);
-    let mtimeMs = 0;
-    try {
-      const st = await stat(dataPath);
-      mtimeMs = st.mtimeMs;
-    } catch {
-      continue;
-    }
-    const startTs = await readThreadStartTimestampMs(dataPath);
-    const primary = startTs !== null ? startTs : mtimeMs;
-    const secondary = mtimeMs;
-    if (
-      best === null ||
-      primary > best.primary ||
-      (primary === best.primary && secondary > best.secondary)
-    ) {
-      best = { threadId: t.threadId, dataPath, primary, secondary };
-    }
-  }
-
-  return best === null ? null : { threadId: best.threadId, dataPath: best.dataPath };
-}
-
 export async function resolveThreadDataPath(
   storageRoot: string,
   threadId: string,

packages/cli-workflow/src/worker-spawn.ts

@@ -237,30 +237,6 @@ export async function sendWorkerTcpCommand(
   });
 }
 
-export async function readWorkerCtl(
-  storageRoot: string,
-  hash: string,
-): Promise<Result<WorkerCtl, string>> {
-  const ctlPath = join(storageRoot, "workers", `${hash}.json`);
-  const ctlText = await readTextFileIfExists(ctlPath);
-  if (ctlText === null) {
-    return err(`worker control file missing for bundle hash ${hash}`);
-  }
-
-  let ctl: WorkerCtl;
-  try {
-    ctl = JSON.parse(ctlText) as WorkerCtl;
-  } catch {
-    return err(`corrupt worker control file: ${ctlPath}`);
-  }
-
-  if (typeof ctl.port !== "number" || ctl.port <= 0) {
-    return err(`invalid worker control file: ${ctlPath}`);
-  }
-
-  return ok(ctl);
-}
-
 export async function resolveRunningHashForThread(
   storageRoot: string,
   threadId: string,

packages/workflow-agent-cursor/README.md

@@ -1,36 +0,0 @@
-# @uncaged/workflow-agent-cursor
-
-`AgentFn` adapter that runs the `cursor-agent` CLI against a workspace path derived from the thread.
-
-The agent builds a full prompt (system + task + step history via `@uncaged/workflow-util-agent`), extracts the absolute workspace path with your `extract` + Zod schema, then spawns `cursor-agent` with `--workspace`, model, and non-interactive flags.
-
-## Install
-
-```bash
-bun add @uncaged/workflow-agent-cursor @uncaged/workflow @uncaged/workflow-util-agent zod
-```
-
-In this monorepo: `"@uncaged/workflow-agent-cursor": "workspace:*"` plus `workspace:*` for `@uncaged/workflow` and `@uncaged/workflow-util-agent`.
-
-## Usage
-
-```typescript
-import { createCursorAgent } from "@uncaged/workflow-agent-cursor";
-
-const agent = createCursorAgent({
-  model: null, // null → "auto"
-  timeout: 0, // ms; 0 = no limit (spawnCli timeout disabled)
-  extract: myExtractFn,
-});
-```
-
-## API overview
-
-| Export | Description |
-|--------|-------------|
-| `createCursorAgent(config)` | Returns `AgentFn` that runs `cursor-agent` with `buildAgentPrompt(ctx)` |
-| `CursorAgentConfig` | `model`, `timeout`, `extract` (must supply workspace path) |
-| `validateCursorAgentConfig` | Config validation result |
-| `buildAgentPrompt` | Re-exported from `@uncaged/workflow-util-agent` |
-
-Requires `cursor-agent` on `PATH` at runtime.

packages/workflow-agent-cursor/package.json

@@ -5,6 +5,7 @@
   "main": "src/index.ts",
   "types": "src/index.ts",
   "scripts": {
+    "build": "echo 'TODO'",
     "test": "bun test"
   },
   "dependencies": {

packages/workflow-agent-hermes/README.md

@@ -1,35 +0,0 @@
-# @uncaged/workflow-agent-hermes
-
-`AgentFn` adapter that runs the `hermes` CLI in non-interactive `chat` mode (Nerve-style flags: `-q`, `--yolo`, `--quiet`, bounded `--max-turns`).
-
-The agent composes the same thread-aware prompt as other CLI-backed agents via `buildAgentPrompt` from `@uncaged/workflow-util-agent`, then spawns `hermes` and returns stdout on success.
-
-## Install
-
-```bash
-bun add @uncaged/workflow-agent-hermes @uncaged/workflow @uncaged/workflow-util-agent
-```
-
-In this monorepo: use `workspace:*` for all three `@uncaged/*` packages.
-
-## Usage
-
-```typescript
-import { createHermesAgent } from "@uncaged/workflow-agent-hermes";
-
-const agent = createHermesAgent({
-  model: "your-model", // or null to omit --model
-  timeout: 600_000, // ms, or null for no timeout
-});
-```
-
-## API overview
-
-| Export | Description |
-|--------|-------------|
-| `createHermesAgent(config)` | Returns `AgentFn` wrapping `hermes chat -q ...` |
-| `HermesAgentConfig` | `model`, `timeout` |
-| `validateHermesAgentConfig` | Config validation result |
-| `buildAgentPrompt` | Re-exported from `@uncaged/workflow-util-agent` |
-
-Requires `hermes` on `PATH` at runtime.

packages/workflow-agent-hermes/package.json

@@ -5,6 +5,7 @@
   "main": "src/index.ts",
   "types": "src/index.ts",
   "scripts": {
+    "build": "echo 'TODO'",
     "test": "bun test"
   },
   "dependencies": {

packages/workflow-agent-llm/README.md

@@ -1,34 +0,0 @@
-# @uncaged/workflow-agent-llm
-
-`AgentFn` adapter that calls an OpenAI-compatible `POST /chat/completions` endpoint using `@uncaged/workflow`’s `LlmProvider` (base URL, API key, model).
-
-Single-turn: system text is the current role’s `systemPrompt`, user text is the thread’s initial prompt (`ctx.start.content`). Errors from HTTP, JSON, or empty choices are thrown as `Error` with a JSON payload string.
-
-## Install
-
-```bash
-bun add @uncaged/workflow-agent-llm @uncaged/workflow
-```
-
-In this monorepo: `"@uncaged/workflow-agent-llm": "workspace:*"`, `"@uncaged/workflow": "workspace:*"`.
-
-## Usage
-
-```typescript
-import { createLlmAdapter } from "@uncaged/workflow-agent-llm";
-
-const agent = createLlmAdapter({
-  baseUrl: "https://api.openai.com/v1",
-  apiKey: process.env.OPENAI_API_KEY!,
-  model: "gpt-4.1-mini",
-});
-```
-
-## API overview
-
-| Export | Description |
-|--------|-------------|
-| `createLlmAdapter(provider)` | `LlmProvider` → `AgentFn` |
-| `chatCompletionText({ provider, messages })` | Low-level `Result<string, LlmChatError>` helper |
-| `LlmMessage` | `{ role: "system" \| "user" \| "assistant"; content: string }` |
-| `LlmChatError` | Discriminated error kinds for failed completions |

packages/workflow-agent-llm/package.json

@@ -5,6 +5,7 @@
   "main": "src/index.ts",
   "types": "src/index.ts",
   "scripts": {
+    "build": "echo 'TODO'",
     "test": "bun test"
   },
   "dependencies": {

packages/workflow-role-coder/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "@uncaged/workflow-role-coder",
+  "version": "0.1.0",
+  "type": "module",
+  "main": "src/index.ts",
+  "types": "src/index.ts",
+  "scripts": {
+    "build": "echo 'TODO'",
+    "test": "echo no tests"
+  },
+  "dependencies": {
+    "@uncaged/workflow": "workspace:*",
+    "zod": "^4.0.0"
+  }
+}

packages/workflow-role-coder/src/coder.ts

@@ -11,13 +11,21 @@ export type CoderMeta = z.infer<typeof coderMetaSchema>;
 
 const CODER_SYSTEM = `You are a **coder**. Read the thread for the plan and work on the NEXT incomplete phase only.
 
-Run \`uncaged-workflow skill develop\` for thread ID lookup, CAS commands, and meta output guide.
+## Finding the current thread ID
+
+The thread ID is a 26-character Crockford Base32 string (e.g. \`06F03H5V6JTMDST6P3TVH42RWM\`). It appears in the first message of this conversation. If you are unsure, run:
+
+  uncaged-workflow threads
+
+and use the ID of the active thread.
 
 ## Reading phase details
 
-Each planner phase has a content-hash and title. Read full details with \`uncaged-workflow cas get <HASH>\`.
+Each planner phase is identified by a content-hash and a title. To read a phase's full details (name, description, acceptance criteria), run:
 
-The thread ID (26-char Crockford Base32) appears in the first message. If unsure, run \`uncaged-workflow thread list\`.
+  uncaged-workflow cas get <THREAD_ID> <HASH>
+
+Replace \`<THREAD_ID>\` with the actual thread ID and \`<HASH>\` with the phase hash from the plan.
 
 ## Completing a phase
 

packages/workflow-role-coder/src/index.ts

@@ -0,0 +1 @@
+export { type CoderMeta, coderMetaSchema, coderRole } from "./coder.js";

packages/workflow-role-committer/__tests__/committer.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, test } from "bun:test";
 
-import { committerMetaSchema, committerRole } from "../src/roles/committer.js";
+import { committerMetaSchema, committerRole } from "../src/committer.js";
 
 describe("committerRole", () => {
   test("committed sample validates against schema", () => {

packages/workflow-role-committer/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "@uncaged/workflow-role-committer",
+  "version": "0.1.0",
+  "type": "module",
+  "main": "src/index.ts",
+  "types": "src/index.ts",
+  "scripts": {
+    "build": "echo 'TODO'",
+    "test": "bun test"
+  },
+  "dependencies": {
+    "@uncaged/workflow": "workspace:*",
+    "zod": "^4.0.0"
+  }
+}

packages/workflow-role-committer/src/committer.ts

@@ -21,12 +21,12 @@ export const committerMetaSchema = z.discriminatedUnion("status", [
 
 export type CommitterMeta = z.infer<typeof committerMetaSchema>;
 
-const COMMITTER_SYSTEM = `You are the git committer. Create a branch and commit the changes.
+const COMMITTER_SYSTEM = `You are the git committer. Create a branch, commit the changes, and push.
 Report the branch name and commit SHA. On failure, classify as recoverable or unrecoverable.
 Do not attempt to fix failures yourself.`;
 
 export const committerRole: RoleDefinition<CommitterMeta> = {
-  description: "Creates a branch and commits changes.",
+  description: "Creates branch, commits, and pushes when review passes.",
   systemPrompt: COMMITTER_SYSTEM,
   extractPrompt:
     "Extract the commit result: committed (with branch and SHA), recoverable failure, or unrecoverable failure. Include error details and log references if applicable.",

packages/workflow-role-committer/src/index.ts

@@ -0,0 +1 @@
+export { type CommitterMeta, committerMetaSchema, committerRole } from "./committer.js";

packages/workflow-role-committer/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "rootDir": "src",
+    "outDir": "dist",
+    "composite": true
+  },
+  "include": ["src/**/*.ts"],
+  "references": [{ "path": "../workflow" }]
+}

packages/workflow-role-planner/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "@uncaged/workflow-role-planner",
+  "version": "0.1.0",
+  "type": "module",
+  "main": "src/index.ts",
+  "types": "src/index.ts",
+  "scripts": {
+    "build": "echo 'TODO'",
+    "test": "echo no tests"
+  },
+  "dependencies": {
+    "@uncaged/workflow": "workspace:*",
+    "zod": "^4.0.0"
+  }
+}

packages/workflow-role-planner/src/index.ts

@@ -0,0 +1,6 @@
+export {
+  type PlannerMeta,
+  phaseSchema,
+  plannerMetaSchema,
+  plannerRole,
+} from "./planner.js";

packages/workflow-role-planner/src/planner.ts

@@ -14,25 +14,27 @@ export type PlannerMeta = z.infer<typeof plannerMetaSchema>;
 
 const PLANNER_SYSTEM = `You are a **planner** for a software task. Break the work into **sequential phases** the coder will execute one at a time.
 
-Run \`uncaged-workflow skill develop\` for thread ID lookup, CAS commands, and meta output guide.
+## Finding the current thread ID
+
+The thread ID is a 26-character Crockford Base32 string (e.g. \`06F03H5V6JTMDST6P3TVH42RWM\`). It appears in the first message of this conversation. If you are unsure, run:
+
+  uncaged-workflow threads
+
+and use the ID of the active thread.
 
 ## Storing phase details — MANDATORY
 
-For each phase, store its full detail text in CAS via \`uncaged-workflow cas put '<content>'\`. The command prints a content-hash — use that as the phase identifier.
+For each phase you MUST store its full detail text in CAS using this exact CLI command:
 
-The thread ID (26-char Crockford Base32) appears in the first message. If unsure, run \`uncaged-workflow thread list\`.
+  uncaged-workflow cas put <THREAD_ID> '# <name>
 
-**Do NOT store phase details in any other way** — the CLI is the only supported storage mechanism.
+Description: <description>
 
-## Phase granularity
+Acceptance: <acceptance>'
 
-Match the number of phases to task complexity:
-- Trivial (add a config option, fix a typo, rename): 1 phase
-- Small (a new feature touching 2-3 files): 1-2 phases
-- Medium (cross-module refactor): 2-3 phases
-- Large (new subsystem, architectural change): 3-5 phases
+Replace \`<THREAD_ID>\` with the actual thread ID you found above. The command prints a content-hash to stdout — use that hash as the phase identifier.
 
-Fewer phases is always better. Each phase must justify its existence — if two phases would be tested together anyway, merge them.
+**Do NOT store phase details in any other way** (no temp files, no invented paths). The CLI command is the only supported storage mechanism.
 
 ## Output format
 

packages/workflow-role-planner/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "rootDir": "src",
+    "outDir": "dist",
+    "composite": true
+  },
+  "include": ["src/**/*.ts"],
+  "references": [{ "path": "../workflow" }]
+}

packages/workflow-role-preparer/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "@uncaged/workflow-role-preparer",
+  "version": "0.1.0",
+  "type": "module",
+  "main": "src/index.ts",
+  "types": "src/index.ts",
+  "scripts": {
+    "build": "echo 'TODO'",
+    "test": "echo no tests"
+  },
+  "dependencies": {
+    "@uncaged/workflow": "workspace:*",
+    "zod": "^4.0.0"
+  }
+}

packages/workflow-role-preparer/src/index.ts

@@ -3,4 +3,3 @@ export {
   preparerMetaSchema,
   preparerRole,
 } from "./preparer.js";
-export { type SubmitterMeta, submitterMetaSchema, submitterRole } from "./submitter.js";

packages/workflow-role-preparer/tsconfig.json

@@ -0,0 +1,8 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "rootDir": "src",
+    "outDir": "dist"
+  },
+  "include": ["src"]
+}

packages/workflow-role-reviewer/__tests__/reviewer.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, test } from "bun:test";
 
-import { reviewerMetaSchema, reviewerRole } from "../src/roles/reviewer.js";
+import { reviewerMetaSchema, reviewerRole } from "../src/reviewer.js";
 
 describe("reviewerRole", () => {
   test("approved sample validates against schema", () => {

packages/workflow-role-reviewer/package.json

@@ -1,10 +1,11 @@
 {
-  "name": "@uncaged/workflow-template-develop",
+  "name": "@uncaged/workflow-role-reviewer",
   "version": "0.1.0",
   "type": "module",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "scripts": {
+    "build": "echo 'TODO'",
     "test": "bun test"
   },
   "dependencies": {