@scp-dev/cli 0.1.2 → 0.2.0

package/README.md

@@ -3,21 +3,25 @@
 The `swarm` command line tool, the reference binding of SCP for shells, hooks and MCP.
 
 ```sh
-npm install -g @scp-dev/cli
+npm i -g @scp-dev/cli
 ```
 
 ## Usage
 
 ```sh
-swarm login
-swarm setup --write
-swarm spawn --name parser -- claude "Fix the parser tests"
+swarm up                  # browser login, links this machine to the org hub, installs hooks and MCP
+swarm claude --name lead  # start a named orchestrator that wakes on peer messages
+```
+
+From the orchestrator's shell:
+
+```sh
+swarm spawn --name parser -- claude -p "Fix the parser tests"
 swarm send parser "Also cover the empty-input case."
 swarm list --tree
-swarm inbox --wait 30
 ```
 
-Headless (CI, cron, cloud runners): `swarm login --token scp_t_...` or `SCP_TOKEN`. `swarm up --token ...` logs in, links the broker to the hub and runs setup in one step. The default relay is https://app.scp.dev; `swarm relay use <url>` picks another. Runs on Node 22.13 or later.
+Headless (CI, cron, cloud runners): `swarm up --token scp_t_... [--machine NAME]`. The default relay is https://app.scp.dev; `swarm relay use <url>` picks another. Runs on Node 22.13 or later.
 
 ## Provides
 

package/dist/{chunk-4QYUPPGV.js → chunk-3RRPUYTE.js}

@@ -1,9 +1,9 @@
 import {
   RelayUsage
-} from "./chunk-7KP6TAJW.js";
+} from "./chunk-3V3DRXB2.js";
 import {
   note
-} from "./chunk-DA3EB2YF.js";
+} from "./chunk-M2DCR2J4.js";
 
 // src/relay.ts
 import { chmodSync, mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from "fs";
@@ -119,7 +119,7 @@ function relayVerb(positionals, asJson, env = process.env) {
 }
 async function loginMain(positionals, values) {
   if (positionals.length) throw new RelayUsage(`${CLI_NAME} login takes only flags`);
-  return (await import("./login-JTRUWG6Q.js")).login(values);
+  return (await import("./login-V2WT7QX5.js")).login(values);
 }
 function logoutMain(positionals, asJson, env = process.env) {
   if (positionals.length) throw new RelayUsage(`${CLI_NAME} logout takes no arguments`);

package/dist/{chunk-7KP6TAJW.js → chunk-3V3DRXB2.js}

@@ -1,12 +1,14 @@
 import {
-  SELF,
   harnessLineage,
   hiddenHarness,
   labelsFor,
   lineage,
-  parseSeconds,
   readPsTable
-} from "./chunk-DA3EB2YF.js";
+} from "./chunk-E53YHYEP.js";
+import {
+  SELF,
+  parseSeconds
+} from "./chunk-M2DCR2J4.js";
 
 // src/common.ts
 import { spawn } from "child_process";
@@ -184,7 +186,7 @@ async function open(verb, values, cwd, bodyFromStdin, walk) {
         `${CLI_NAME} ${verb} needs an identity: --as HANDLE (or $SCP_NAME) for an agent, or --human for your own inbox me/ (no terminal is attached, so me/ is not assumed)`
       );
     }
-    const { machineName, openCloud } = await import("./remote-3BWFISXJ.js");
+    const { machineName, openCloud } = await import("./remote-FYN5ZXE4.js");
     const handle2 = named ? localHandle(named) : void 0;
     const claim = handle2 ? {
       handle: handle2,
@@ -317,6 +319,7 @@ function stamp(iso) {
   const at = new Date(iso);
   return Number.isNaN(at.getTime()) ? iso : `${at.getFullYear()}-${pad(at.getMonth() + 1)}-${pad(at.getDate())} ${time(iso)}`;
 }
+var CHANNELS_ENV = "SCP_CHANNELS";
 
 export {
   RelayUsage,
@@ -332,5 +335,6 @@ export {
   peekGrant,
   grantParams,
   time,
-  stamp
+  stamp,
+  CHANNELS_ENV
 };

package/dist/{chunk-4DNQFATX.js → chunk-5DYFYLAQ.js}

@@ -1,6 +1,6 @@
 import {
   RelayUsage
-} from "./chunk-7KP6TAJW.js";
+} from "./chunk-3V3DRXB2.js";
 import {
   AGY_HOOK_SET,
   AGY_UNVERIFIED,
@@ -13,10 +13,10 @@ import {
   mergeHooks,
   musePlugin,
   opencodePlugin
-} from "./chunk-XWLF7ON2.js";
+} from "./chunk-RXKBND3T.js";
 import {
   gitToplevel
-} from "./chunk-DA3EB2YF.js";
+} from "./chunk-E53YHYEP.js";
 
 // src/install.ts
 import { chmodSync, copyFileSync, existsSync, lstatSync, mkdirSync, readFileSync, realpathSync, renameSync, statSync, unlinkSync, writeFileSync } from "fs";
@@ -185,7 +185,7 @@ function mcpInstall(harness, as, out) {
   const line = (cli, extra = []) => out([...cli, CLI_NAME, ...args(extra)].map(shellWord).join(" "));
   switch (harness) {
     case "claude":
-      line(["claude", "mcp", "add", "scp", "--"]);
+      line(["claude", "mcp", "add", "scp", "--"], ["--harness", "claude", "--channels"]);
       return 0;
     case "codex":
       line(["codex", "mcp", "add", "scp", "--"], ["--harness", "codex"]);

package/dist/{chunk-DA3EB2YF.js → chunk-E53YHYEP.js}

@@ -1,56 +1,6 @@
-// src/term.ts
-import { spawnSync } from "child_process";
-import { CLI_NAME } from "@scp-dev/core";
-var FAILED = 125;
-var SELF = [process.execPath, ...process.versions.bun ? ["--no-env-file", "--config=/dev/null"] : [], process.argv[1]];
-function capture(argv, env) {
-  const result = spawnSync(argv[0], argv.slice(1), { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], ...env ? { env } : {} });
-  return result.status === 0 ? result.stdout : void 0;
-}
-function note(message) {
-  process.stderr.write(`${message.startsWith(`${CLI_NAME} `) ? "" : `${CLI_NAME}: `}${message}
-`);
-}
-async function exitFlushed(code, waitMs = 1e4) {
-  const ended = (stream) => new Promise((resolve2) => {
-    try {
-      stream.end(() => resolve2());
-    } catch {
-      resolve2();
-    }
-  });
-  let timer;
-  await Promise.race([Promise.all([ended(process.stdout), ended(process.stderr)]), new Promise((resolve2) => timer = setTimeout(resolve2, waitMs))]);
-  clearTimeout(timer);
-  process.exit(code);
-}
-function printTable(rows) {
-  const widths = rows[0].map((_, column) => Math.max(...rows.map((row) => row[column].length)));
-  for (const row of rows)
-    console.log(
-      row.map((cell, column) => cell.padEnd(widths[column])).join("  ").trimEnd()
-    );
-}
-var DURATION_PART = /(\d+(?:\.\d+)?)(ms|s|m|h|d)/g;
-var DURATION_UNITS = { ms: 1e-3, s: 1, m: 60, h: 3600, d: 86400 };
-function parseSeconds(text, flag) {
-  const trimmed = text.trim();
-  let seconds;
-  if (/^\d+(?:\.\d+)?$/.test(trimmed)) seconds = Number(trimmed);
-  else {
-    seconds = 0;
-    let consumed = "";
-    for (const match of trimmed.matchAll(DURATION_PART)) {
-      seconds += Number(match[1]) * DURATION_UNITS[match[2]];
-      consumed += match[0];
-    }
-    if (consumed !== trimmed || consumed === "") {
-      throw new Error(`${flag} ${JSON.stringify(text)} is not a duration like 90s, 30m or 1h30m`);
-    }
-  }
-  if (!(seconds > 0)) throw new Error(`${flag} must be more than zero`);
-  return Math.max(1, Math.ceil(seconds));
-}
+import {
+  capture
+} from "./chunk-M2DCR2J4.js";
 
 // src/identity.ts
 import { existsSync, realpathSync } from "fs";
@@ -182,7 +132,8 @@ var HARNESSES = /* @__PURE__ */ new Set([
   "agy",
   "antigravity",
   "gemini",
-  "gemini-cli"
+  "gemini-cli",
+  "pi-coding-agent"
 ]);
 var INSTALLED = /(^|\/)(node_modules|site-packages|dist-packages|\.npm|\.bun|\.cache|\.local|\.cargo|\.volta|\.nvm|\.pyenv|\.rbenv|Cellar|Applications)(\/|$)|^\/(opt|usr|Library|nix)\//;
 function command(args) {
@@ -337,12 +288,6 @@ function relayIdentity(input) {
 }
 
 export {
-  FAILED,
-  SELF,
-  note,
-  exitFlushed,
-  printTable,
-  parseSeconds,
   shortHostname,
   detectHarness,
   hookHarness,
@@ -353,6 +298,7 @@ export {
   hiddenHarness,
   lineage,
   spawnerKey,
+  psParent,
   harnessPid,
   hookHarnessPid,
   relayIdentity

package/dist/{chunk-V5I7KEU7.js → chunk-GH7AXFUL.js}

@@ -3,7 +3,7 @@ import {
   agySettingsFile,
   mcpFile,
   mountedEntry
-} from "./chunk-N3ZROLFA.js";
+} from "./chunk-WV5FINTW.js";
 import {
   OPTIONS,
   RelayUsage,
@@ -13,16 +13,18 @@ import {
   open,
   selectorList,
   walkNow
-} from "./chunk-7KP6TAJW.js";
+} from "./chunk-3V3DRXB2.js";
 import {
   steerPrompt
-} from "./chunk-XWLF7ON2.js";
+} from "./chunk-RXKBND3T.js";
 import {
-  SELF,
   detectHarness,
-  note,
   spawnerKey
-} from "./chunk-DA3EB2YF.js";
+} from "./chunk-E53YHYEP.js";
+import {
+  SELF,
+  note
+} from "./chunk-M2DCR2J4.js";
 
 // src/spawn.ts
 import { spawn, spawnSync } from "child_process";

package/dist/chunk-M2DCR2J4.js

@@ -0,0 +1,63 @@
+// src/term.ts
+import { spawnSync } from "child_process";
+import { CLI_NAME } from "@scp-dev/core";
+var FAILED = 125;
+var SELF = [process.execPath, ...process.versions.bun ? ["--no-env-file", "--config=/dev/null"] : [], process.argv[1]];
+function capture(argv, env) {
+  const result = spawnSync(argv[0], argv.slice(1), { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], ...env ? { env } : {} });
+  return result.status === 0 ? result.stdout : void 0;
+}
+function note(message) {
+  process.stderr.write(`${message.startsWith(`${CLI_NAME} `) ? "" : `${CLI_NAME}: `}${message}
+`);
+}
+async function exitFlushed(code, waitMs = 1e4) {
+  const ended = (stream) => new Promise((resolve) => {
+    try {
+      stream.end(() => resolve());
+    } catch {
+      resolve();
+    }
+  });
+  let timer;
+  await Promise.race([Promise.all([ended(process.stdout), ended(process.stderr)]), new Promise((resolve) => timer = setTimeout(resolve, waitMs))]);
+  clearTimeout(timer);
+  process.exit(code);
+}
+function printTable(rows) {
+  const widths = rows[0].map((_, column) => Math.max(...rows.map((row) => row[column].length)));
+  for (const row of rows)
+    console.log(
+      row.map((cell, column) => cell.padEnd(widths[column])).join("  ").trimEnd()
+    );
+}
+var DURATION_PART = /(\d+(?:\.\d+)?)(ms|s|m|h|d)/g;
+var DURATION_UNITS = { ms: 1e-3, s: 1, m: 60, h: 3600, d: 86400 };
+function parseSeconds(text, flag) {
+  const trimmed = text.trim();
+  let seconds;
+  if (/^\d+(?:\.\d+)?$/.test(trimmed)) seconds = Number(trimmed);
+  else {
+    seconds = 0;
+    let consumed = "";
+    for (const match of trimmed.matchAll(DURATION_PART)) {
+      seconds += Number(match[1]) * DURATION_UNITS[match[2]];
+      consumed += match[0];
+    }
+    if (consumed !== trimmed || consumed === "") {
+      throw new Error(`${flag} ${JSON.stringify(text)} is not a duration like 90s, 30m or 1h30m`);
+    }
+  }
+  if (!(seconds > 0)) throw new Error(`${flag} must be more than zero`);
+  return Math.max(1, Math.ceil(seconds));
+}
+
+export {
+  FAILED,
+  SELF,
+  capture,
+  note,
+  exitFlushed,
+  printTable,
+  parseSeconds
+};

package/dist/{chunk-XWLF7ON2.js → chunk-RXKBND3T.js}

@@ -7,7 +7,7 @@ import {
   hookHarness,
   hookHarnessPid,
   relayIdentity
-} from "./chunk-DA3EB2YF.js";
+} from "./chunk-E53YHYEP.js";
 
 // src/hooks.ts
 import { Readable } from "stream";

package/dist/{chunk-6UFMKYPH.js → chunk-U2RSSTNW.js}

@@ -4,14 +4,14 @@ import {
   configDir,
   relayCredential,
   writePrivateJson
-} from "./chunk-4QYUPPGV.js";
+} from "./chunk-3RRPUYTE.js";
 import {
   RelayUsage
-} from "./chunk-7KP6TAJW.js";
+} from "./chunk-3V3DRXB2.js";
 import {
   note,
   printTable
-} from "./chunk-DA3EB2YF.js";
+} from "./chunk-M2DCR2J4.js";
 
 // src/remote.ts
 import { existsSync, readFileSync, rmSync } from "fs";
@@ -202,7 +202,7 @@ async function cloudMain(positionals, values, brokerStatus) {
     writePrivateJson(path, file);
     if (values.json) json({ file: path, ...file, token: problem ? "missing" : "found" });
     else {
-      out(`the relay broker links to ${url} as machine ${machine} the next time it starts (${path})`);
+      out(`the relay broker links to ${url} as machine ${machine} (${path})`);
       if (problem) note(problem);
     }
     return 0;

package/dist/{chunk-N3ZROLFA.js → chunk-WV5FINTW.js}

@@ -1,9 +1,9 @@
 import {
   hooksTarget
-} from "./chunk-4DNQFATX.js";
+} from "./chunk-5DYFYLAQ.js";
 import {
   RelayUsage
-} from "./chunk-7KP6TAJW.js";
+} from "./chunk-3V3DRXB2.js";
 import {
   AGY_HOOK_SET,
   BLOCK_STOP,
@@ -15,10 +15,10 @@ import {
   mergeHooks,
   musePlugin,
   opencodePlugin
-} from "./chunk-XWLF7ON2.js";
+} from "./chunk-RXKBND3T.js";
 import {
   gitToplevel
-} from "./chunk-DA3EB2YF.js";
+} from "./chunk-E53YHYEP.js";
 
 // src/setup.ts
 import { spawnSync } from "child_process";
@@ -179,7 +179,7 @@ function entryRight(harness, entry, argv) {
 }
 var withoutRemote = (entry) => Object.fromEntries(Object.entries(entry).filter(([key]) => !REMOTE_KEYS.includes(key)));
 function mountArgv(harness, bin) {
-  return [bin, "mcp", "--harness", harness];
+  return [bin, "mcp", "--harness", harness, ...harness === "claude" ? ["--channels"] : []];
 }
 function agyRules() {
   return TOOLS.map((tool) => `mcp(${SERVER}/${tool.name})`);
@@ -1172,6 +1172,7 @@ export {
   agySettingsFile,
   manifestFile,
   mountedEntry,
+  entryArgv,
   mountArgv,
   agyRules,
   verifyMount,

package/dist/claude-YJLGFQ2P.js

@@ -0,0 +1,88 @@
+import {
+  entryArgv,
+  mcpFile,
+  mountedEntry,
+  whichOnPath
+} from "./chunk-WV5FINTW.js";
+import "./chunk-5DYFYLAQ.js";
+import {
+  CHANNELS_ENV,
+  RelayUsage
+} from "./chunk-3V3DRXB2.js";
+import "./chunk-RXKBND3T.js";
+import "./chunk-YYSLYVNZ.js";
+import "./chunk-E53YHYEP.js";
+import "./chunk-M2DCR2J4.js";
+
+// src/claude.ts
+import { spawn } from "child_process";
+import { CLI_NAME, validHandle } from "@scp-dev/core";
+var CHANNEL_FLAGS = ["--dangerously-load-development-channels", "server:scp"];
+function claudeArgv(argv) {
+  let name;
+  let i = 0;
+  if (argv[0] === "--name") {
+    if (argv[1] === void 0) throw new RelayUsage(`${CLI_NAME} claude --name takes a handle`);
+    name = argv[1];
+    i = 2;
+  } else if (argv[0]?.startsWith("--name=")) {
+    name = argv[0].slice("--name=".length);
+    i = 1;
+  }
+  if (argv[i] === "--") i++;
+  if (name !== void 0 && !validHandle(name)) throw new RelayUsage(`--name ${JSON.stringify(name)} is not a valid agent handle`);
+  return { ...name !== void 0 ? { name } : {}, args: argv.slice(i) };
+}
+function mountHint(env) {
+  const file = mcpFile("claude", env);
+  let entry;
+  try {
+    entry = mountedEntry("claude", file);
+  } catch {
+    return `${CLI_NAME} claude: ${file} is unreadable, so the scp mount is unchecked`;
+  }
+  if (!entry) return `${CLI_NAME} claude: Claude Code has no scp MCP mount; run ${CLI_NAME} setup --write`;
+  if (!entryArgv("claude", entry).includes("--channels"))
+    return `${CLI_NAME} claude: the scp mount lacks --channels, so messages will not wake this session; re-run ${CLI_NAME} setup --write`;
+  return void 0;
+}
+async function claudeCommand(argv, env = process.env, err = (line) => void process.stderr.write(`${line}
+`)) {
+  if (argv[0] === "--help" || argv[0] === "-h") {
+    process.stdout.write(`${CLI_NAME} claude [--name N] [--] [claude args...]   start Claude Code with the scp channel loaded, so peer messages wake it
+`);
+    return 0;
+  }
+  const { name, args } = claudeArgv(argv);
+  const bin = whichOnPath("claude", env);
+  if (!bin) throw new RelayUsage("claude is not on PATH");
+  const hint = mountHint(env);
+  if (hint) err(hint);
+  const child = spawn(bin, [...CHANNEL_FLAGS, ...args], {
+    stdio: "inherit",
+    env: { ...env, ...name !== void 0 ? { SCP_NAME: name } : {}, [CHANNELS_ENV]: String(process.pid) }
+  });
+  const forward = (signal) => () => void child.kill(signal);
+  const handlers = ["SIGTERM", "SIGHUP"].map((signal) => [signal, forward(signal)]);
+  const ignore = () => {
+  };
+  process.on("SIGINT", ignore);
+  for (const [signal, handler] of handlers) process.on(signal, handler);
+  try {
+    return await new Promise((resolve, reject) => {
+      child.once("error", reject);
+      child.once("exit", (code, signal) => resolve(code ?? (signal ? 128 + (signalNumber(signal) ?? 1) : 1)));
+    });
+  } finally {
+    process.off("SIGINT", ignore);
+    for (const [signal, handler] of handlers) process.off(signal, handler);
+  }
+}
+var SIGNALS = { SIGHUP: 1, SIGINT: 2, SIGKILL: 9, SIGTERM: 15 };
+var signalNumber = (signal) => SIGNALS[signal];
+export {
+  CHANNEL_FLAGS,
+  claudeArgv,
+  claudeCommand,
+  mountHint
+};

package/dist/cli.js

@@ -17,6 +17,6 @@ function quietSqliteWarning() {
 // src/cli.ts
 if (!await subagentFastPath(process.argv.slice(2))) {
   quietSqliteWarning();
-  const { run } = await import("./main-5CAHHN55.js");
+  const { run } = await import("./main-HPBTO3JK.js");
   await run(process.argv.slice(2));
 }

package/dist/daemon-SUTLTY5U.js

@@ -0,0 +1,52 @@
+import {
+  capture
+} from "./chunk-M2DCR2J4.js";
+
+// src/daemon.ts
+import { readFileSync } from "fs";
+import { join } from "path";
+import { setTimeout as sleep } from "timers/promises";
+function brokerPid(dir) {
+  let pid;
+  try {
+    pid = Number(readFileSync(join(dir, "broker.lock"), "utf8").split(":")[0]);
+  } catch {
+    return null;
+  }
+  if (!Number.isInteger(pid) || pid <= 0) return null;
+  const command = capture(["ps", "-p", String(pid), "-o", "command="])?.trim() ?? "";
+  return /(^|\s)daemon(\s|$)/.test(command) && (/scp|swarm/.test(command) || command.includes(process.argv[1] ?? "\0")) ? pid : null;
+}
+function alive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (error) {
+    return error.code === "EPERM";
+  }
+}
+async function exited(pid, ms = 5e3) {
+  const deadline = Date.now() + ms;
+  while (alive(pid)) {
+    if (Date.now() >= deadline) return false;
+    await sleep(50);
+  }
+  return true;
+}
+async function stopBroker(dir) {
+  const pid = brokerPid(dir);
+  if (pid === null) return null;
+  try {
+    process.kill(pid, "SIGTERM");
+  } catch (error) {
+    if (error.code === "ESRCH") return null;
+    throw error;
+  }
+  if (!await exited(pid)) throw new Error(`the relay broker (pid ${pid}) did not stop within 5 s`);
+  return pid;
+}
+export {
+  brokerPid,
+  exited,
+  stopBroker
+};

package/dist/{hooks-O3UZXDYG.js → hooks-EI7M3YKY.js}

@@ -30,11 +30,12 @@ import {
   subagentIntro,
   summarize,
   unreadPointer
-} from "./chunk-XWLF7ON2.js";
+} from "./chunk-RXKBND3T.js";
 import {
   SUBAGENT
 } from "./chunk-YYSLYVNZ.js";
-import "./chunk-DA3EB2YF.js";
+import "./chunk-E53YHYEP.js";
+import "./chunk-M2DCR2J4.js";
 export {
   AGY_HOOK_SET,
   AGY_UNVERIFIED,

package/dist/install-MYHVFKT4.js

@@ -0,0 +1,15 @@
+import {
+  hooksTarget,
+  installHooks,
+  mcpInstall
+} from "./chunk-5DYFYLAQ.js";
+import "./chunk-3V3DRXB2.js";
+import "./chunk-RXKBND3T.js";
+import "./chunk-YYSLYVNZ.js";
+import "./chunk-E53YHYEP.js";
+import "./chunk-M2DCR2J4.js";
+export {
+  hooksTarget,
+  installHooks,
+  mcpInstall
+};

package/dist/{login-JTRUWG6Q.js → login-V2WT7QX5.js}

@@ -1,16 +1,17 @@
 import {
   machineName
-} from "./chunk-6UFMKYPH.js";
+} from "./chunk-U2RSSTNW.js";
 import {
   activeRelay,
   saveCredential
-} from "./chunk-4QYUPPGV.js";
+} from "./chunk-3RRPUYTE.js";
 import {
   RelayUsage
-} from "./chunk-7KP6TAJW.js";
+} from "./chunk-3V3DRXB2.js";
+import "./chunk-E53YHYEP.js";
 import {
   note
-} from "./chunk-DA3EB2YF.js";
+} from "./chunk-M2DCR2J4.js";
 
 // src/login.ts
 import { spawn } from "child_process";

package/dist/{main-5CAHHN55.js → main-HPBTO3JK.js}

@@ -14,15 +14,17 @@ import {
   stamp,
   startDaemon,
   time
-} from "./chunk-7KP6TAJW.js";
+} from "./chunk-3V3DRXB2.js";
+import {
+  shortHostname
+} from "./chunk-E53YHYEP.js";
 import {
   FAILED,
   exitFlushed,
   note,
   parseSeconds,
-  printTable,
-  shortHostname
-} from "./chunk-DA3EB2YF.js";
+  printTable
+} from "./chunk-M2DCR2J4.js";
 
 // src/main.ts
 import { text as readAll } from "stream/consumers";
@@ -33,7 +35,7 @@ import { parseArgs } from "util";
 // package.json
 var package_default = {
   name: "@scp-dev/cli",
-  version: "0.1.2",
+  version: "0.2.0",
   description: "The swarm command line tool.",
   license: "Apache-2.0",
   homepage: "https://scp.dev",
@@ -223,6 +225,8 @@ scopes (selectors are comma-separated, e.g. tree:parent,tree:children,group:team
                                                  messages with the relay MCP tools (relay_send, relay_inbox, relay_reply). A
                                                  ${CLI_NAME} command from codex's workspace-write sandbox also needs
                                                  -c sandbox_workspace_write.network_access=true (the relay socket counts as network)
+  ${CLI_NAME} pi [--name N] [--] [pi args...]    runs pi with the @scp-dev/pi extension: the relay tools, and each new
+                                                 message as a turn (steering a running one, waking an idle session)
   ${CLI_NAME} peers [--all] [--roots]            who you may message: title, status and the rule that admits each; offline ones and
                                                  sessions nobody spawned that spawned nobody only with --all (--roots: those sessions)
   ${CLI_NAME} why <from> <to>                    whether from may message to, and why
@@ -230,6 +234,7 @@ scopes (selectors are comma-separated, e.g. tree:parent,tree:children,group:team
   other process under an agent they may only narrow. An ancestor always reaches its descendants, and a recipient
   may always reply in the thread to a message it got; a reply to another message of the thread is checked as a send.
   ${CLI_NAME} daemon [--idle DURATION] [--policy FILE]   run the broker in the foreground (it otherwise starts on demand)
+  ${CLI_NAME} daemon stop|restart                stop the running broker, or replace it with a fresh one
 
 agent sessions:
   ${CLI_NAME} mcp [--as NAME] [--harness H] [--channels]   the MCP shim a harness mounts: relay tools for one agent, never me/
@@ -254,7 +259,9 @@ agent sessions:
   A Claude Code subagent's hooks give it a child endpoint, <session handle>-<type>-<first 6 of its id>, whose messages
   reach it after its tools; its shell is the session's, so it acts as that child with --as.
   Grok runs the Claude Code hooks, labelled grok; Muse takes them as a plugin; Codex runs new hooks after /hooks review.
-  --channels pushes messages into Claude Code started with --dangerously-load-development-channels server:scp.
+  ${CLI_NAME} claude [--name N] [--] [claude args...]   start Claude Code with the scp channel loaded, so peer messages wake
+                                                 it while idle (claude --dangerously-load-development-channels server:scp; SCP_NAME=N)
+  --channels pushes messages into a Claude Code that ${CLI_NAME} claude started; setup mounts claude's shim with it.
 
 relay:
   ${CLI_NAME} relay use <url> | show            select a relay, or show its source and credential status
@@ -491,10 +498,12 @@ async function relayMain(argv, cwd = process.cwd()) {
     out(package_default.version);
     return 0;
   }
-  if (verb === "hook") return (await import("./hooks-O3UZXDYG.js")).relayHookCommand(rest, startDaemon);
-  if (verb === "setup") return (await import("./setup-RDPVGE4H.js")).relaySetupCommand(rest, cwd, out);
+  if (verb === "hook") return (await import("./hooks-EI7M3YKY.js")).relayHookCommand(rest, startDaemon);
+  if (verb === "setup") return (await import("./setup-LXG346FJ.js")).relaySetupCommand(rest, cwd, out);
+  if (verb === "claude") return (await import("./claude-YJLGFQ2P.js")).claudeCommand(rest);
+  if (verb === "pi") return (await import("./pi-HMESQA64.js")).piCommand(rest);
   if (verb === "spawn") {
-    const { splitSpawn, spawnCommand } = await import("./spawn-TQ3HOZTQ.js");
+    const { splitSpawn, spawnCommand } = await import("./spawn-DLPMAS5M.js");
     const { flags } = splitSpawn(rest);
     if (flags.includes("--help") || flags.includes("-h")) {
       out(flags.includes("--all") ? RELAY_HELP : SPAWN_HELP);
@@ -516,13 +525,16 @@ async function relayMain(argv, cwd = process.cwd()) {
     return 0;
   }
   for (const key of Object.keys(values)) if (!allowed.includes(key)) throw new RelayUsage(`${CLI_NAME} ${verb} does not take --${key}`);
-  if (verb === "daemon") return daemon(values.idle, values.policy);
+  if (verb === "daemon") {
+    if (positionals.length) return daemonControl(positionals, values);
+    return daemon(values.idle, values.policy);
+  }
   if (verb === "mcp")
-    return (await import("./mcp-P2AZYP5G.js")).relayMcpCommand(values, positionals);
+    return (await import("./mcp-DGAQNFKO.js")).relayMcpCommand(values, positionals);
   if (verb === "hooks") {
     if (positionals[0] !== "install" || positionals.length > 1) throw new RelayUsage(`${CLI_NAME} hooks takes install --harness claude|codex|opencode|agy|muse`);
     if (values.write && values.print) throw new RelayUsage("--print and --write: pick one");
-    return (await import("./install-HFBSKSTG.js")).installHooks({
+    return (await import("./install-MYHVFKT4.js")).installHooks({
       harness: values.harness,
       scope: values.scope,
       write: values.write === true,
@@ -533,18 +545,25 @@ async function relayMain(argv, cwd = process.cwd()) {
       out
     });
   }
-  if (verb === "relay") return (await import("./relay-VVJPYVXE.js")).relayVerb(positionals, values.json === true);
-  if (verb === "up") return (await import("./up-KXOYO7QV.js")).up(positionals, values, cwd, cloudStatus);
-  if (verb === "login")
-    return (await import("./relay-VVJPYVXE.js")).loginMain(positionals, values);
-  if (verb === "logout") return (await import("./relay-VVJPYVXE.js")).logoutMain(positionals, values.json === true);
-  if (verb === "cloud") return (await import("./remote-3BWFISXJ.js")).cloudMain(positionals, values, cloudStatus);
+  if (verb === "relay") return (await import("./relay-5Z7IEXKD.js")).relayVerb(positionals, values.json === true);
+  if (verb === "up") return (await import("./up-GPM4LWY3.js")).up(positionals, values, cwd, relinkBroker);
+  if (verb === "login") {
+    const code = await (await import("./relay-5Z7IEXKD.js")).loginMain(positionals, values);
+    if (code === 0) await relinkRunning();
+    return code;
+  }
+  if (verb === "logout") return (await import("./relay-5Z7IEXKD.js")).logoutMain(positionals, values.json === true);
+  if (verb === "cloud") {
+    const code = await (await import("./remote-FYN5ZXE4.js")).cloudMain(positionals, values, cloudStatus);
+    if (code === 0 && positionals[0] === "enable") await relinkRunning();
+    return code;
+  }
   if (verb === "holds") holdsArgs(values, positionals);
   const bodyFromStdin = (verb === "send" || verb === "ask" || verb === "reply") && (positionals[1] === void 0 || positionals[1] === "-");
   const opened = await open(verb, values, cwd, bodyFromStdin);
   const { client } = opened;
   try {
-    if (verb === "machines") return await (await import("./remote-3BWFISXJ.js")).machinesVerb(client, positionals, values.json === true);
+    if (verb === "machines") return await (await import("./remote-FYN5ZXE4.js")).machinesVerb(client, positionals, values.json === true);
     return await runVerb(opened, verb, values, positionals, cwd);
   } finally {
     client.close();
@@ -560,6 +579,55 @@ async function cloudStatus() {
     client.close();
   }
 }
+async function relinkBroker() {
+  const dir = relayDir();
+  const client = await connectBroker(dir, () => startDaemon(dir));
+  let result;
+  let pid;
+  try {
+    pid = (await client.hello({ observe: true })).broker.pid;
+    result = await client.request("bridge_relink");
+  } catch (error) {
+    if (error instanceof RelayError && error.code === "method_not_found") return cloudStatus();
+    throw error;
+  } finally {
+    client.close();
+  }
+  if (!result.restarting) return result;
+  await (await import("./daemon-SUTLTY5U.js")).exited(pid);
+  return cloudStatus();
+}
+async function relinkRunning() {
+  try {
+    await connectBroker(relayDir()).then((client) => client.close());
+  } catch {
+    return;
+  }
+  try {
+    await relinkBroker();
+  } catch (error) {
+    note(`the running broker did not link again (${error instanceof Error ? error.message : String(error)}); run \`${CLI_NAME} daemon restart\``);
+  }
+}
+async function daemonControl(positionals, values) {
+  const [action] = positionals;
+  if (positionals.length !== 1 || action !== "stop" && action !== "restart" || values.idle !== void 0 || values.policy !== void 0)
+    throw new RelayUsage(`${CLI_NAME} daemon takes stop or restart, or --idle and --policy to run in the foreground`);
+  const dir = relayDir();
+  const pid = await (await import("./daemon-SUTLTY5U.js")).stopBroker(dir);
+  if (action === "stop") {
+    out(pid === null ? "no relay broker runs" : `stopped the relay broker (pid ${pid}); the next command starts a fresh one`);
+    return 0;
+  }
+  const client = await connectBroker(dir, () => startDaemon(dir));
+  try {
+    const { broker } = await client.hello({ observe: true });
+    out(`${pid === null ? "started" : `replaced the relay broker (pid ${pid}) with`} a fresh one (pid ${broker.pid})`);
+  } finally {
+    client.close();
+  }
+  return 0;
+}
 async function runVerb({ client, me, broker, where, bound, harnessPid }, verb, values, positionals, cwd) {
   const asJson = values.json === true;
   const attachments = (values.attach ?? []).map((path) => ({ kind: "path", path: path.startsWith("/") ? path : `${cwd}/${path}` }));
@@ -672,9 +740,9 @@ async function runVerb({ client, me, broker, where, bound, harnessPid }, verb, v
       return 0;
     }
     case "peek":
-      return (await import("./peek-YCOWBEPD.js")).peekCommand(localClient(client, broker, verb), values, positionals);
+      return (await import("./peek-WLG3ZROU.js")).peekCommand(localClient(client, broker, verb), values, positionals);
     case "set-peek":
-      return (await import("./peek-YCOWBEPD.js")).setPeekCommand(localClient(client, broker, verb), values, positionals);
+      return (await import("./peek-WLG3ZROU.js")).setPeekCommand(localClient(client, broker, verb), values, positionals);
     case "why": {
       const [from, to] = positionals;
       if (!from || !to || positionals.length > 2) throw new RelayUsage(`${CLI_NAME} why takes <from> <to>`);
@@ -747,9 +815,10 @@ async function runVerb({ client, me, broker, where, bound, harnessPid }, verb, v
     }
     case "inbox": {
       if (values.ack && values.keep) throw new RelayUsage("--ack and --keep: pick one");
-      const { messages } = await client.request("inbox", { wait_s: waitArg(values.wait, 0) });
+      const waited = waitArg(values.wait, 0);
+      const { messages } = await client.request("inbox", { wait_s: waited });
       if (asJson) json({ preamble: PREAMBLE, messages });
-      else if (!messages.length) note("no unread messages");
+      else if (!messages.length) note(`no unread messages${waited > LIMITS.waitMaxS ? `; waited ${LIMITS.waitMaxS} s (cap)` : ""}`);
       else {
         out(PREAMBLE);
         out();
@@ -1226,11 +1295,12 @@ async function daemon(idle, policyFile) {
   });
   let broker;
   try {
-    const { daemonBridge } = await import("./remote-3BWFISXJ.js");
+    const { daemonBridge } = await import("./remote-FYN5ZXE4.js");
     const bridge = await daemonBridge();
     broker = await startBroker({
       dir: relayDir(),
       ...bridge ? { bridge } : {},
+      bridgeConfig: () => daemonBridge(),
       ...idleMs !== void 0 ? { idleMs } : {},
       ...policyFile ? { policyPath: resolve(policyFile) } : {}
     });

package/dist/{mcp-P2AZYP5G.js → mcp-DGAQNFKO.js}

@@ -1,21 +1,24 @@
 import {
   spawnDetached
-} from "./chunk-V5I7KEU7.js";
+} from "./chunk-GH7AXFUL.js";
 import "./chunk-KN7WEIE4.js";
-import "./chunk-N3ZROLFA.js";
+import "./chunk-WV5FINTW.js";
 import {
   mcpInstall
-} from "./chunk-4DNQFATX.js";
+} from "./chunk-5DYFYLAQ.js";
 import {
+  CHANNELS_ENV,
   RelayUsage,
   startDaemon
-} from "./chunk-7KP6TAJW.js";
-import "./chunk-XWLF7ON2.js";
+} from "./chunk-3V3DRXB2.js";
+import "./chunk-RXKBND3T.js";
 import "./chunk-YYSLYVNZ.js";
 import {
   harnessPid,
+  psParent,
   relayIdentity
-} from "./chunk-DA3EB2YF.js";
+} from "./chunk-E53YHYEP.js";
+import "./chunk-M2DCR2J4.js";
 
 // src/mcp.ts
 import { CLI_NAME, validHandle } from "@scp-dev/core";
@@ -46,6 +49,7 @@ async function relayMcpCommand(values, positionals) {
     output: (line) => void process.stdout.write(line),
     env: process.env,
     channels: values.channels === true,
+    launchedWithChannels: values.channels === true && launchedWithChannels(process.env),
     spawn: (request) => spawnDetached(spawnWords(request), request.cwd ?? claim.cwd),
     log: (line) => void process.stderr.write(`${line}
 `)
@@ -66,7 +70,12 @@ function spawnWords(request) {
     ...request.command
   ];
 }
+function launchedWithChannels(env, harness = harnessPid, parentOf = psParent) {
+  const launcher = Number(env[CHANNELS_ENV]);
+  return Number.isInteger(launcher) && launcher > 1 && parentOf(harness())?.ppid === launcher;
+}
 export {
+  launchedWithChannels,
   relayMcpCommand,
   spawnWords
 };

package/dist/{peek-YCOWBEPD.js → peek-WLG3ZROU.js}

@@ -2,10 +2,11 @@ import {
   RelayUsage,
   peekGrant,
   stamp
-} from "./chunk-7KP6TAJW.js";
+} from "./chunk-3V3DRXB2.js";
+import "./chunk-E53YHYEP.js";
 import {
   note
-} from "./chunk-DA3EB2YF.js";
+} from "./chunk-M2DCR2J4.js";
 
 // src/peek.ts
 import { PREAMBLE, wrapPeek, CLI_NAME } from "@scp-dev/core";

package/dist/pi-HMESQA64.js

@@ -0,0 +1,72 @@
+import {
+  RelayUsage
+} from "./chunk-3V3DRXB2.js";
+import "./chunk-E53YHYEP.js";
+import "./chunk-M2DCR2J4.js";
+
+// src/pi.ts
+import { spawn } from "child_process";
+import { fileURLToPath } from "url";
+import { CLI_NAME, validHandle } from "@scp-dev/core";
+var PI_HELP = `${CLI_NAME} pi [--name NAME | --as NAME] [--] [pi args...]
+  runs pi with the @scp-dev/pi extension: the relay tools, and each new message as a turn, waking the session when idle.
+  $SCP_PI_BIN picks the pi binary (default pi on PATH), $SCP_PI_EXTENSION the extension file.`;
+function piLaunch(args, env, extension) {
+  let name;
+  const rest = [];
+  for (let i = 0; i < args.length; i++) {
+    const arg = args[i];
+    if (arg === "--") {
+      rest.push(...args.slice(i + 1));
+      break;
+    }
+    if (arg === "--name" || arg === "--as") {
+      name = args[++i];
+      if (name === void 0) throw new RelayUsage(`${CLI_NAME} pi ${arg} takes a name`);
+    } else if (arg.startsWith("--name=") || arg.startsWith("--as=")) name = arg.slice(arg.indexOf("=") + 1);
+    else rest.push(arg);
+  }
+  name = name?.replace(/^me\//, "");
+  if (name !== void 0 && !validHandle(name)) throw new RelayUsage(`${JSON.stringify(name)} is not a valid agent handle`);
+  return {
+    argv: [env.SCP_PI_BIN || "pi", "--extension", extension, ...rest],
+    env: { ...env, SCP_HARNESS: "pi", ...name !== void 0 ? { SCP_NAME: name } : {} }
+  };
+}
+function extensionPath(env) {
+  if (env.SCP_PI_EXTENSION) return env.SCP_PI_EXTENSION;
+  try {
+    return fileURLToPath(import.meta.resolve("@scp-dev/pi"));
+  } catch {
+    throw new RelayUsage(`${CLI_NAME} pi needs the @scp-dev/pi extension: install it next to ${CLI_NAME}, or set $SCP_PI_EXTENSION to its file`);
+  }
+}
+async function piCommand(args) {
+  const own = args.includes("--") ? args.slice(0, args.indexOf("--")) : args;
+  if (own.includes("--help") || own.includes("-h")) {
+    process.stdout.write(`${PI_HELP}
+`);
+    return 0;
+  }
+  const launch = piLaunch(args, process.env, extensionPath(process.env));
+  return await new Promise((resolve, reject) => {
+    const child = spawn(launch.argv[0], launch.argv.slice(1), { env: launch.env, stdio: "inherit" });
+    const forward = (signal) => child.kill(signal);
+    const signals = ["SIGTERM", "SIGHUP"];
+    const ignore = () => {
+    };
+    for (const signal of signals) process.on(signal, forward);
+    process.on("SIGINT", ignore);
+    child.once("error", (error) => reject(new RelayUsage(`could not start ${launch.argv[0]}: ${error.message}`)));
+    child.once("exit", (code, signal) => {
+      for (const each of signals) process.off(each, forward);
+      process.off("SIGINT", ignore);
+      resolve(code ?? (signal ? 1 : 0));
+    });
+  });
+}
+export {
+  PI_HELP,
+  piCommand,
+  piLaunch
+};

package/dist/{relay-VVJPYVXE.js → relay-5Z7IEXKD.js}

@@ -11,9 +11,10 @@ import {
   removeCredential,
   saveCredential,
   writePrivateJson
-} from "./chunk-4QYUPPGV.js";
-import "./chunk-7KP6TAJW.js";
-import "./chunk-DA3EB2YF.js";
+} from "./chunk-3RRPUYTE.js";
+import "./chunk-3V3DRXB2.js";
+import "./chunk-E53YHYEP.js";
+import "./chunk-M2DCR2J4.js";
 export {
   DEFAULT_RELAY,
   activeRelay,

package/dist/{remote-3BWFISXJ.js → remote-FYN5ZXE4.js}

@@ -9,10 +9,11 @@ import {
   machinesVerb,
   openCloud,
   readCloudFile
-} from "./chunk-6UFMKYPH.js";
-import "./chunk-4QYUPPGV.js";
-import "./chunk-7KP6TAJW.js";
-import "./chunk-DA3EB2YF.js";
+} from "./chunk-U2RSSTNW.js";
+import "./chunk-3RRPUYTE.js";
+import "./chunk-3V3DRXB2.js";
+import "./chunk-E53YHYEP.js";
+import "./chunk-M2DCR2J4.js";
 export {
   CloudRelayClient,
   CloudUsage,

package/dist/{setup-RDPVGE4H.js → setup-LXG346FJ.js}

@@ -4,6 +4,7 @@ import {
   agyRules,
   agySettingsFile,
   detectHarnesses,
+  entryArgv,
   manifestFile,
   mcpFile,
   mountArgv,
@@ -14,18 +15,20 @@ import {
   verifyMount,
   verifyMusePlugin,
   whichOnPath
-} from "./chunk-N3ZROLFA.js";
-import "./chunk-4DNQFATX.js";
-import "./chunk-7KP6TAJW.js";
-import "./chunk-XWLF7ON2.js";
+} from "./chunk-WV5FINTW.js";
+import "./chunk-5DYFYLAQ.js";
+import "./chunk-3V3DRXB2.js";
+import "./chunk-RXKBND3T.js";
 import "./chunk-YYSLYVNZ.js";
-import "./chunk-DA3EB2YF.js";
+import "./chunk-E53YHYEP.js";
+import "./chunk-M2DCR2J4.js";
 export {
   SETUP_HARNESSES,
   SETUP_HELP,
   agyRules,
   agySettingsFile,
   detectHarnesses,
+  entryArgv,
   manifestFile,
   mcpFile,
   mountArgv,

package/dist/{spawn-TQ3HOZTQ.js → spawn-DLPMAS5M.js}

@@ -29,16 +29,17 @@ import {
   steerArgv,
   transcriptReplies,
   workerName
-} from "./chunk-V5I7KEU7.js";
+} from "./chunk-GH7AXFUL.js";
 import {
   SPAWN_HELP
 } from "./chunk-KN7WEIE4.js";
-import "./chunk-N3ZROLFA.js";
-import "./chunk-4DNQFATX.js";
-import "./chunk-7KP6TAJW.js";
-import "./chunk-XWLF7ON2.js";
+import "./chunk-WV5FINTW.js";
+import "./chunk-5DYFYLAQ.js";
+import "./chunk-3V3DRXB2.js";
+import "./chunk-RXKBND3T.js";
 import "./chunk-YYSLYVNZ.js";
-import "./chunk-DA3EB2YF.js";
+import "./chunk-E53YHYEP.js";
+import "./chunk-M2DCR2J4.js";
 export {
   MESSAGING,
   SPAWN_HELP,

package/dist/{up-KXOYO7QV.js → up-GPM4LWY3.js}

@@ -1,11 +1,12 @@
 import {
   activeRelay,
   relayCredential
-} from "./chunk-4QYUPPGV.js";
+} from "./chunk-3RRPUYTE.js";
 import {
   RelayUsage
-} from "./chunk-7KP6TAJW.js";
-import "./chunk-DA3EB2YF.js";
+} from "./chunk-3V3DRXB2.js";
+import "./chunk-E53YHYEP.js";
+import "./chunk-M2DCR2J4.js";
 
 // src/up.ts
 import { CLI_NAME } from "@scp-dev/core";
@@ -16,19 +17,19 @@ async function up(positionals, values, cwd, brokerStatus) {
   const { url } = activeRelay(process.env);
   const headless = values.token !== void 0 || Boolean(process.env.SCP_TOKEN?.trim());
   if (headless || !relayCredential(process.env, url).token) {
-    const code = await (await import("./login-JTRUWG6Q.js")).login({
+    const code = await (await import("./login-V2WT7QX5.js")).login({
       ...values.token !== void 0 ? { token: values.token } : {},
       ...values.label !== void 0 ? { label: values.label } : {},
       ...values["no-browser"] ? { "no-browser": true } : {}
     });
     if (code !== 0) return code;
   } else out(`already logged in to ${url}`);
-  const enabled = await (await import("./remote-3BWFISXJ.js")).cloudMain(["enable"], values.machine !== void 0 ? { machine: values.machine } : {}, brokerStatus);
+  const enabled = await (await import("./remote-FYN5ZXE4.js")).cloudMain(["enable"], values.machine !== void 0 ? { machine: values.machine } : {}, brokerStatus);
   if (enabled !== 0) return enabled;
-  const setup = (await import("./setup-RDPVGE4H.js")).relaySetupCommand(["--write"], cwd, out);
+  const setup = (await import("./setup-LXG346FJ.js")).relaySetupCommand(["--write"], cwd, out);
   if (setup !== 0) return setup;
   const broker = await brokerStatus();
-  if (!broker.enabled) out(`the broker that was already running stays local-only until it exits (it stops when idle); the next one links to ${url}`);
+  if (!broker.enabled) out(`the broker is still local-only; run \`${CLI_NAME} daemon restart\` to link it to ${url}`);
   else out(`broker linked to ${broker.url ?? url}${broker.connected ? "" : " (connecting)"}`);
   return 0;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scp-dev/cli",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "description": "The swarm command line tool.",
   "license": "Apache-2.0",
   "homepage": "https://scp.dev",
@@ -25,9 +25,9 @@
   },
   "dependencies": {
     "@scp-dev/core": "0.1.1",
-    "@scp-dev/broker": "0.1.1",
+    "@scp-dev/broker": "0.1.2",
     "@scp-dev/hub": "0.1.1",
-    "@scp-dev/mcp": "0.1.1",
+    "@scp-dev/mcp": "0.1.2",
     "smol-toml": "^1.9.1"
   },
   "devDependencies": {

package/dist/install-HFBSKSTG.js

@@ -1,14 +0,0 @@
-import {
-  hooksTarget,
-  installHooks,
-  mcpInstall
-} from "./chunk-4DNQFATX.js";
-import "./chunk-7KP6TAJW.js";
-import "./chunk-XWLF7ON2.js";
-import "./chunk-YYSLYVNZ.js";
-import "./chunk-DA3EB2YF.js";
-export {
-  hooksTarget,
-  installHooks,
-  mcpInstall
-};