@united-workforce/cli 0.6.1 → 0.8.1

package/src/commands/config.ts

@@ -14,7 +14,7 @@ const VALID_CONFIG_KEYS: Record<
 > = {
   agents: {
     nested: true,
-    knownFields: ["command", "args"],
+    knownFields: ["host", "gateway"],
   },
   agentOverrides: {
     nested: true,
@@ -203,26 +203,6 @@ export async function cmdConfigGet(storageRoot: string, key: string): Promise<un
   return value;
 }
 
-/**
- * Parse value for args key (must be JSON array)
- */
-function parseArgsValue(value: string): unknown {
-  if (value.startsWith("[")) {
-    try {
-      const parsed = JSON.parse(value);
-      if (!Array.isArray(parsed)) {
-        throw new Error("Value must be an array");
-      }
-      return parsed;
-    } catch (error) {
-      throw new Error(
-        `Invalid JSON array for args key: ${error instanceof Error ? error.message : String(error)}`,
-      );
-    }
-  }
-  throw new Error("Value for 'args' key must be a JSON array starting with '['");
-}
-
 /**
  * Parse value for a top-level string array key (must be JSON array of strings).
  */
@@ -292,12 +272,10 @@ export async function cmdConfigSet(
 
   const lastSegment = path[path.length - 1];
 
-  // Parse value if it's for an array key (args, workflowPaths)
+  // Parse value if it's for an array key (workflowPaths)
   let parsedValue: unknown = value;
   if (path[0] === "workflowPaths") {
     parsedValue = parseStringArrayValue(value, "workflowPaths");
-  } else if (lastSegment === "args") {
-    parsedValue = parseArgsValue(value);
   } else if (lastSegment === "maxRunning") {
     const num = Number(value);
     if (!Number.isInteger(num) || num < 1) {

package/src/commands/prompt.ts

@@ -82,71 +82,57 @@ npm prefix -g     # global prefix; bin is <prefix>/bin
 
 **All checks must pass before continuing.** If you had to modify PATH, verify the change persists by opening a new shell or sourcing your shell config.
 
-### Step 1 — Discover agents and install adapter
+### Step 1 — Install the CLI and pick an integration path
 
-**First, detect which supported agents are already installed on the user's machine:**
+uwf reaches an LLM/agent backend through one of two paths after Phase 4
+cleanup (#381):
 
-\`\`\`bash
-# Check for Hermes Agent
-which hermes 2>/dev/null && hermes --version
-
-# Check for Claude Code
-which claude 2>/dev/null && claude --version   # should show "X.Y.Z (Claude Code)"
-\`\`\`
-
-**Based on the results:**
+- **Sumeru gateway via broker (preferred)** — your gateway runs out-of-process
+  and listens on \`http://host:port\`. The broker
+  (\`@united-workforce/broker\`) calls its \`send\` / \`resume\` / \`poke\` HTTP
+  endpoints. Most agents (chat sessions, hosted services, CLI subprocesses you
+  wrap) should ship as gateways.
+- **In-process \`createAgent\` adapter** — a local Node binary that runs inside
+  the same process as \`uwf\`. Used for tools-bearing OpenAI-compatible loops
+  (\`@united-workforce/agent-builtin\` ships \`uwf-builtin\`) or scripted E2E
+  fixtures (\`@united-workforce/agent-mock\` ships \`uwf-mock\`).
 
-- **Only hermes found** → install \`uwf-hermes\` adapter
-- **Only claude found** → install \`uwf-claude-code\` adapter
-- **Both found** → ask the user which agent they want uwf to use as default
-- **Neither found** → the user must install at least one agent first:
-  - Hermes Agent: https://hermes-agent.nousresearch.com/docs
-  - Claude Code: \`npm install -g @anthropic-ai/claude-code\`
-
-**Install the uwf CLI and the chosen adapter** using pnpm or npm:
+**Install the uwf CLI** with pnpm or npm:
 
 \`\`\`bash
-# CLI (required)
 pnpm add -g @united-workforce/cli       # or: npm install -g @united-workforce/cli
-
-# Adapter — install the one matching the detected agent:
-pnpm add -g @united-workforce/agent-hermes       # or: npm i -g @united-workforce/agent-hermes
-pnpm add -g @united-workforce/agent-claude-code   # or: npm i -g @united-workforce/agent-claude-code
 \`\`\`
 
-**⚠ Adapter versions are independent from CLI versions.** Do NOT try to match adapter version to CLI version. Just install \`@latest\` (the default).
+If you plan to use the in-process built-in adapter, install it too:
+
+\`\`\`bash
+pnpm add -g @united-workforce/agent-builtin   # ships uwf-builtin
+\`\`\`
 
-**After installing, verify that \`uwf\` and the adapter are available in PATH:**
+**Verify that \`uwf\` is available in PATH:**
 
 \`\`\`bash
 uwf --version          # should print ${CLI_VERSION}
-uwf-hermes --version   # or: uwf-claude-code --version
 \`\`\`
 
-If either command is not found, the global bin directory is not in the current shell's PATH. **You must fix this before continuing:**
+If \`uwf\` is not found, the global bin directory is not in the current shell's PATH. **You must fix this before continuing:**
 
 1. Find where the binary was installed:
    \`\`\`bash
-   find ~/.local ~/.hermes /usr/local -name uwf -type f 2>/dev/null
-   npm prefix -g    # global prefix — bin is <prefix>/bin
+   pnpm bin -g       # for pnpm
+   npm prefix -g     # for npm (bin is <prefix>/bin)
    \`\`\`
 2. Add the directory to PATH permanently by appending to the user's shell config (e.g. \`~/.bashrc\`, \`~/.zshrc\`, \`~/.profile\`, or fish config):
    \`\`\`bash
    export PATH="<global-bin-dir>:$PATH"
    \`\`\`
-3. Source the updated config or open a new shell, then re-verify the commands work.
-
-**uwf-hermes** also requires the Hermes ACP plugin. Verify with \`hermes acp --help\`. If not available, install it:
-\`\`\`bash
-# Option A: install into hermes venv (recommended)
-source ~/.hermes/hermes-agent/.venv/bin/activate && pip install hermes-agent[acp]
+3. Source the updated config or open a new shell, then re-verify the command works.
 
-# Option B: pipx
-pipx install 'hermes-agent[acp]'
-
-# Option C: if installed from source
-pip install -e '.[acp]'
-\`\`\`
+**Legacy note:** The old per-agent CLI binaries and their npm packages have
+been moved to \`legacy-packages/\` and are no longer published. If you
+previously installed any \`@united-workforce/agent-*\` package targeting an
+external chat CLI, uninstall it and either run a Sumeru gateway or use
+\`uwf-builtin\`.
 
 ### Step 2 — Configure default agent
 
@@ -162,20 +148,20 @@ Or configure non-interactively:
 uwf setup --agent <adapter-command>
 \`\`\`
 
-**Note:** \`--agent\` takes the adapter **command name** (e.g. \`uwf-hermes\`, \`uwf-claude-code\`), not the npm package name.
+**Note:** \`--agent\` takes an alias declared in your \`agents\` map (e.g. \`builtin\`, \`my-gateway\`) — **not** an adapter command name. Each alias resolves to a \`{host, gateway}\` Sumeru endpoint that the broker contacts over HTTP. \`uwf thread exec --agent\` additionally accepts an inline \`"<host> <gateway>"\` pair for ad-hoc routing.
 
 Config is saved to \`~/.uwf/config.yaml\`:
 
 \`\`\`yaml
 agents:
-  hermes:
-    command: uwf-hermes
-    args: []
-defaultAgent: hermes
+  my-gateway:
+    host: http://127.0.0.1:7900
+    gateway: my-gateway
+defaultAgent: my-gateway
 agentOverrides: {}
 \`\`\`
 
-**LLM configuration** is per-adapter — each adapter manages its own provider, model, and API key settings independently (typically via environment variables like \`CLAUDE_MODEL\`, \`ANTHROPIC_API_KEY\`, etc.). The engine config (\`~/.uwf/config.yaml\`) is LLM-free.
+**LLM configuration** is per-adapter — Sumeru gateways own their own provider/model/API-key settings, and in-process adapters store theirs under \`~/.uwf/agents/<name>.yaml\`. The engine config (\`~/.uwf/config.yaml\`) is LLM-free.
 
 Verify with \`cat ~/.uwf/config.yaml\`.
 
@@ -261,16 +247,22 @@ npm install -g @united-workforce/cli@latest
 uwf --version   # should print ${CLI_VERSION}
 \`\`\`
 
-Also update your adapter(s):
+Also update any in-process adapter you have installed (skip if you only use
+Sumeru gateways via the broker):
 
 \`\`\`bash
 # pnpm
-pnpm add -g @united-workforce/agent-hermes@latest
+pnpm add -g @united-workforce/agent-builtin@latest
 
 # npm
-npm install -g @united-workforce/agent-hermes@latest
+npm install -g @united-workforce/agent-builtin@latest
 \`\`\`
 
+If you previously had any \`@united-workforce/agent-*\` package targeting an
+external chat CLI installed globally, uninstall it — those packages are
+archived under \`legacy-packages/\` as of #381 and no longer published. Reach
+the same backends via a Sumeru gateway in \`~/.uwf/config.yaml\` instead.
+
 ### Step 2 — Regenerate skills
 
 Skill content is bundled with the CLI — always regenerate after upgrading:

package/src/commands/setup.ts

@@ -92,7 +92,7 @@ export function _parseWhichOutput(text: string): string[] {
 
 /**
  * Discover uwf-* agent binaries in PATH.
- * Returns sorted list of binary names (e.g., ["uwf-hermes", "uwf-claude-code"]).
+ * Returns sorted list of binary names (e.g., ["uwf-builtin", "uwf-mock"]).
  */
 export async function _discoverAgents(): Promise<string[]> {
   try {
@@ -106,7 +106,7 @@ export async function _discoverAgents(): Promise<string[]> {
 
 async function _tryWhichDiscovery(): Promise<string[] | null> {
   try {
-    const text = execFileSync("which", ["-a", "uwf-hermes", "uwf-claude-code", "uwf-cursor"], {
+    const text = execFileSync("which", ["-a", "uwf-builtin", "uwf-mock"], {
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"],
     });
@@ -136,13 +136,11 @@ export function _isBackspace(c: string): boolean {
 
 /** Known agent binary → display label mapping. */
 const KNOWN_AGENTS: Record<string, string> = {
-  "uwf-hermes": "Hermes (hermes-agent)",
-  "uwf-claude-code": "Claude Code",
-  "uwf-cursor": "Cursor",
-  "uwf-builtin": "Built-in (lightweight, no external agent)",
+  "uwf-builtin": "Built-in (in-process OpenAI-compatible tools loop)",
+  "uwf-mock": "Mock (scripted fixtures for E2E tests)",
 };
 
-/** Extract short agent name from binary name: uwf-claude-code → claude-code */
+/** Extract short agent name from binary name: uwf-builtin → builtin */
 export function _agentNameFromBinary(binary: string): string {
   return binary.replace(/^uwf-/, "");
 }
@@ -161,7 +159,7 @@ export function _printAgentMenu(agents: string[]): void {
 
 /**
  * Interactive agent selection. Discovers uwf-* binaries, lets user pick default.
- * Returns short agent name (e.g. "hermes", "claude-code").
+ * Returns short agent name (e.g. "builtin", "my-gateway").
  */
 export async function _promptAgentSelection(
   rl: ReturnType<typeof createInterface>,
@@ -172,17 +170,17 @@ export async function _promptAgentSelection(
   if (agents.length === 0) {
     console.log("  No uwf-* agent binaries found in PATH.\n");
     console.log("  Install one first, for example:");
-    console.log("    npm i -g @united-workforce/agent-hermes");
-    console.log("    npm i -g @united-workforce/agent-claude-code\n");
+    console.log("    npm i -g @united-workforce/agent-builtin");
+    console.log("  Or configure a Sumeru gateway in ~/.uwf/config.yaml under agents.<name>.host\n");
     const manual = (
-      await rl.question("Agent binary name (e.g. uwf-hermes), or press Enter to skip: ")
+      await rl.question("Agent name (e.g. uwf-builtin or my-gateway), or press Enter to skip: ")
     ).trim();
-    if (!manual) return "hermes";
+    if (!manual) return "builtin";
     return _agentNameFromBinary(manual.startsWith("uwf-") ? manual : `uwf-${manual}`);
   }
 
   if (agents.length === 1) {
-    const name = _agentNameFromBinary(agents[0] ?? "uwf-hermes");
+    const name = _agentNameFromBinary(agents[0] ?? "uwf-builtin");
     const label = KNOWN_AGENTS[agents[0] ?? ""] ?? agents[0];
     console.log(`  Found 1 agent: ${label} — auto-selected.\n`);
     return name;
@@ -192,7 +190,7 @@ export async function _promptAgentSelection(
   const choice = (await rl.question(`Choose default agent [1-${agents.length}]: `)).trim();
   const n = Number.parseInt(choice, 10);
   if (!Number.isNaN(n) && n >= 1 && n <= agents.length) {
-    const selected = agents[n - 1] ?? "uwf-hermes";
+    const selected = agents[n - 1] ?? "uwf-builtin";
     const name = _agentNameFromBinary(selected);
     console.log(`  → ${name}\n`);
     return name;
@@ -205,6 +203,14 @@ export async function _promptAgentSelection(
 
 // ──────────────────────────────────────────────────────────────────────────────
 
+/**
+ * Default Sumeru host used when seeding a fresh agents.<alias> entry.
+ * Phase 3 (#380) breaking change — agents are routed through the broker via
+ * `host` + `gateway`, replacing the legacy `command` + `args` CLI binary
+ * path.
+ */
+const DEFAULT_SUMERU_HOST = "http://127.0.0.1:7900";
+
 /**
  * Merge setup args into config.yaml structure. Non-destructive — preserves
  * existing entries (including agentOverrides). Engine config is LLM-free, so
@@ -219,7 +225,7 @@ function mergeConfig(existing: Record<string, unknown>, args: SetupArgs): Record
 
   const agentName = _agentNameFromBinary(args.agent);
   if (!agents[agentName]) {
-    agents[agentName] = { command: `uwf-${agentName}`, args: [] };
+    agents[agentName] = { host: DEFAULT_SUMERU_HOST, gateway: agentName };
   }
 
   const merged: Record<string, unknown> = {
@@ -233,7 +239,9 @@ function mergeConfig(existing: Record<string, unknown>, args: SetupArgs): Record
 }
 
 /**
- * Check if the configured adapter binary (and its dependencies) are in PATH.
+ * Check if the configured adapter binary is in PATH (for in-process adapters).
+ * Sumeru gateway agents (configured via host/gateway in config.yaml) skip
+ * this check since they are reached over HTTP rather than as local binaries.
  * Returns warnings array — empty means all good.
  */
 export function _checkAdapterAvailability(agentName: string): string[] {
@@ -244,20 +252,8 @@ export function _checkAdapterAvailability(agentName: string): string[] {
     execFileSync("which", [binary], { encoding: "utf8", stdio: ["pipe", "pipe", "pipe"] });
   } catch {
     warnings.push(
-      `${binary} not found in PATH. Install it: pnpm add -g @united-workforce/agent-${agentName}`,
+      `${binary} not found in PATH. Install it (e.g. pnpm add -g @united-workforce/agent-${agentName}), or configure a Sumeru gateway under agents.${agentName}.host in ~/.uwf/config.yaml.`,
     );
-    return warnings; // skip dependency check if adapter itself is missing
-  }
-
-  // uwf-hermes depends on hermes CLI
-  if (agentName === "hermes") {
-    try {
-      execFileSync("which", ["hermes"], { encoding: "utf8", stdio: ["pipe", "pipe", "pipe"] });
-    } catch {
-      warnings.push(
-        'hermes CLI not found in PATH (required by uwf-hermes). Fix: export PATH="$HOME/.hermes/hermes-agent/.venv/bin:$PATH"',
-      );
-    }
   }
 
   return warnings;