patchcord 0.5.105 → 0.5.107

package/bin/patchcord.mjs

@@ -67,22 +67,48 @@ function detectFolder(dir) {
 
 
 if (cmd === "help" || cmd === "--help" || cmd === "-h") {
-  console.log(`patchcord — agent messaging for AI coding agents
-
-Usage:
-  patchcord                                               Setup via browser (patchcord.dev)
-  patchcord --token <token> [--server <url>]              Headless / self-hosted setup
-  patchcord --full                                        Same + full statusline
-  patchcord --rename <new-name> [--agent-type <type>]     Rename this agent
-  patchcord whoami                                        Show your identity + project
-  patchcord whoami --propose "<text>"                     Update your whoami (two-shot: first call asks you to show human, second call applies)
-  patchcord agents                                        List every agent (with whoami)
-  patchcord agents <name>                                 Show one agent's whoami
-  patchcord upload <file> [--mime <type>] [--as <name>]   Upload a file as a patchcord attachment (prints the storage path)
-  patchcord subscribe [interval]                          Start the realtime listener (Kimi: background poll, default 30s)
-  patchcord update                                        Update to the latest version
-  patchcord --version                                     Show installed version
-  patchcord --help                                        Show this help
+  console.log(`patchcord — cross-agent messaging + team orchestration for AI coding agents
+
+Two layers: THIS AGENT (a per-project identity, by bearer token) and your ACCOUNT
+(user-level; provisions agents, runs teams + schedules). Account/team/schedule
+commands authenticate the CLI in your browser automatically on first use.
+
+SETUP (per agent / project)
+  patchcord                                  Set up this project's agent (browser)
+  patchcord --token <t> [--server <url>]     Headless / self-hosted setup
+  patchcord --full                           Same + full statusline
+  patchcord --rename <name> [--agent-type <t>]   Rename this agent
+
+THIS AGENT — identity + messaging
+  patchcord whoami                           Who am I — this agent's identity + project
+  patchcord whoami --propose "<text>"        Set your self-description (two-shot confirm)
+  patchcord agents [name]                    List agents in your namespace (or show one)
+  patchcord subscribe [interval]             Start the realtime listener (Kimi: bg poll)
+  patchcord upload <file> [--mime <t>] [--as <name>]   Share a file as an attachment
+
+ACCOUNT — user-level (auto-auths the CLI in your browser on first use)
+  patchcord main                             Log in / re-authenticate the CLI
+  patchcord provision <agent> --tool <X> --role <Y> --namespace <ns> [--dir <sub/>]
+                                             Create a worker agent (identity + config)
+  patchcord provision revoke <agent> --namespace <ns>
+
+TEAM — the main agent's tools (run from the project root)
+  patchcord team init <project> [--namespace <ns>] [--tool <harness>]
+  patchcord team list [--namespace <ns>]     Provisioned agents (server view, deduped)
+  patchcord team status                      Reconcile folder ↔ identity ↔ tmux ↔ token
+  patchcord team launch                      Launch each worker in mux
+
+SCHEDULES — timed / recurring messages (user-level)
+  patchcord schedule create <name> --namespace <ns> --to <agent> --content "..." \\
+        (--at <ISO> | --cron "<expr>" | --every <sec>) \\
+        [--timezone <tz>] [--thread <slug>] [--max-runs N] [--expires <ISO>]
+  patchcord schedule list [--namespace <ns>]
+  patchcord schedule cancel|test|pause|resume <id>
+
+MISC
+  patchcord update                           Update to the latest version
+  patchcord --version                        Show installed version
+  patchcord --help                           Show this help
 
 First install: npx patchcord@latest`);
   process.exit(0);
@@ -797,7 +823,7 @@ if (cmd === "subscribe") {
 // (docs/main-agent.md). The "main" is the managing agent of a team; its main
 // token is a user-scoped provisioning credential stored at ~/.patchcord/main.json
 // (legacy: master.json) or $PATCHCORD_MAIN_TOKEN (legacy: $PATCHCORD_MASTER_TOKEN).
-if (cmd === "main" || cmd === "master" || cmd === "provision" || cmd === "team" || cmd === "schedule") {
+if (cmd === "main" || cmd === "provision" || cmd === "team" || cmd === "schedule") {
   const M = { cyan: "\x1b[36m", green: "\x1b[32m", dim: "\x1b[2m", rst: "\x1b[0m" };
   const MAIN_CONFIG = join(HOME, ".patchcord", "main.json");
   const LEGACY_CONFIG = join(HOME, ".patchcord", "master.json"); // pre-rename
@@ -821,11 +847,45 @@ if (cmd === "main" || cmd === "master" || cmd === "provision" || cmd === "team"
     if (i >= 0 && process.argv[i + 1] && !process.argv[i + 1].startsWith("-")) return process.argv[i + 1];
     return def;
   };
-  const requireMain = () => {
-    const m = readMain();
-    if (!m) { console.error("No main token. Run: patchcord main connect"); process.exit(1); }
-    return m;
+  // Browser auth flow → saves + returns the account token.
+  const connectMain = async () => {
+    const harness = flagVal("harness", flagVal("tool", ""));
+    const create = run(`curl -sf --max-time 10 -X POST "${DEFAULT_API}/api/main/session" -H "Content-Type: application/json" -d '{"harness":"${harness}"}'`);
+    let sessionId = "";
+    try { sessionId = (JSON.parse(create).session_id) || ""; } catch {}
+    if (!sessionId) { console.error("Could not start auth session."); process.exit(1); }
+    const url = `https://patchcord.dev/master?session=${sessionId}`;
+    console.log(`\n  Authenticate the patchcord CLI in your browser:\n  ${M.cyan}${url}${M.rst}\n`);
+    console.log(`  ${M.dim}Waiting...${M.rst}`);
+    const http = await import("http");
+    const https = await import("https");
+    const token = await new Promise((resolve) => {
+      const lib = DEFAULT_API.startsWith("https") ? https : http;
+      const req = lib.get(`${DEFAULT_API}/api/connect/session/${sessionId}/wait`, { headers: { Accept: "text/event-stream" } }, (res) => {
+        let buf = "";
+        res.on("data", (c) => {
+          buf += c.toString();
+          for (const line of buf.split("\n")) {
+            if (line.startsWith("data: ")) {
+              try { const d = JSON.parse(line.slice(6)); if (d.token) { resolve(d.token); try { req.destroy(); } catch {} return; } } catch {}
+            }
+          }
+        });
+        res.on("end", () => resolve(null));
+        res.on("error", () => resolve(null));
+      });
+      req.on("error", () => resolve(null));
+      setTimeout(() => { try { req.destroy(); } catch {}; resolve(null); }, 900000);
+    });
+    if (!token) { console.error("\n  Authentication timed out or failed."); process.exit(1); }
+    mkdirSync(dirname(MAIN_CONFIG), { recursive: true });
+    writeFileSync(MAIN_CONFIG, JSON.stringify({ token, baseUrl: DEFAULT_API }, null, 2) + "\n");
+    console.log(`  ${M.green}✓${M.rst} CLI authenticated ${M.dim}(${MAIN_CONFIG})${M.rst}\n`);
+    return { token, baseUrl: DEFAULT_API };
   };
+  // Auth on demand: any command needing the account token authenticates the
+  // CLI in the browser if it isn't logged in yet, then proceeds.
+  const requireMain = async () => readMain() || await connectMain();
   const writeWorkerConfig = (tool, dir, baseUrl, token, hostname) => {
     mkdirSync(dir, { recursive: true });
     const hdr = { Authorization: `Bearer ${token}`, "X-Patchcord-Machine": hostname };
@@ -865,56 +925,15 @@ if (cmd === "main" || cmd === "master" || cmd === "provision" || cmd === "team"
     });
   };
 
-  if (cmd === "main" || cmd === "master") {
-    const sub = process.argv[3];
-    if (sub === "connect") {
-      const harness = flagVal("harness", flagVal("tool", ""));
-      const create = run(`curl -sf --max-time 10 -X POST "${DEFAULT_API}/api/main/session" -H "Content-Type: application/json" -d '{"harness":"${harness}"}'`);
-      let sessionId = "";
-      try { sessionId = (JSON.parse(create).session_id) || ""; } catch {}
-      if (!sessionId) { console.error("Could not start main-auth session."); process.exit(1); }
-      const url = `https://patchcord.dev/master?session=${sessionId}`;
-      console.log(`\n  Authorize the main agent in your browser:\n  ${M.cyan}${url}${M.rst}\n`);
-      console.log(`  ${M.dim}Waiting for authorization...${M.rst}`);
-      const http = await import("http");
-      const https = await import("https");
-      const token = await new Promise((resolve) => {
-        const lib = DEFAULT_API.startsWith("https") ? https : http;
-        const req = lib.get(`${DEFAULT_API}/api/connect/session/${sessionId}/wait`, { headers: { Accept: "text/event-stream" } }, (res) => {
-          let buf = "";
-          res.on("data", (c) => {
-            buf += c.toString();
-            for (const line of buf.split("\n")) {
-              if (line.startsWith("data: ")) {
-                try { const d = JSON.parse(line.slice(6)); if (d.token) { resolve(d.token); try { req.destroy(); } catch {} return; } } catch {}
-              }
-            }
-          });
-          res.on("end", () => resolve(null));
-          res.on("error", () => resolve(null));
-        });
-        req.on("error", () => resolve(null));
-        setTimeout(() => { try { req.destroy(); } catch {}; resolve(null); }, 900000);
-      });
-      if (!token) { console.error("\n  Authorization timed out or failed."); process.exit(1); }
-      mkdirSync(dirname(MAIN_CONFIG), { recursive: true });
-      writeFileSync(MAIN_CONFIG, JSON.stringify({ token, baseUrl: DEFAULT_API }, null, 2) + "\n");
-      console.log(`\n  ${M.green}✓${M.rst} Main token saved: ${M.dim}${MAIN_CONFIG}${M.rst}`);
-      process.exit(0);
-    }
-    if (sub === "whoami") {
-      const m = requireMain();
-      const { status, json } = await _httpJSON("GET", `${m.baseUrl}/api/main/whoami`, m.token);
-      if (status !== "200" || !json) { console.error(`main whoami failed (HTTP ${status})`); process.exit(1); }
-      console.log(`main · user ${json.user_id} · ${json.agents}/${json.quota} agents`);
-      process.exit(0);
-    }
-    console.error("Usage: patchcord main <connect|whoami>");
-    process.exit(1);
+  if (cmd === "main") {
+    // Explicit (re)authentication. Other commands auth on demand via
+    // requireMain(), so this is only needed to log in ahead of time or switch.
+    await connectMain();
+    process.exit(0);
   }
 
   if (cmd === "provision") {
-    const m = requireMain();
+    const m = await requireMain();
     const arg = process.argv[3];
     if (!arg || arg.startsWith("-")) { console.error("Usage: patchcord provision <agent> --tool X --role Y --namespace ns [--dir sub/]"); process.exit(1); }
     if (arg === "revoke") {
@@ -968,20 +987,16 @@ if (cmd === "main" || cmd === "master" || cmd === "provision" || cmd === "team"
       // write its config at the project root, so the main — running here —
       // resolves to ns:main and SEES every worker it provisions into ns.
       // Without this the main has no identity and whoami grabs a stale global.
-      const m = readMain();
-      if (m) {
-        const hostname = run("hostname -s") || run("hostname") || "unknown";
-        const { status, json } = await _httpJSON("POST", `${m.baseUrl}/api/provision`, m.token, { namespace_id: ns, agent_id: "main", tool: mainTool, role: "main", label: "main:self" });
-        if (status === "200" && json?.token) {
-          const base = String(json.url || `${m.baseUrl}/mcp`).replace(/\/mcp$/, "");
-          writeWorkerConfig(mainTool, root, base, json.token, hostname);
-          manifest.main = { agent: "main", tool: mainTool };
-          console.log(`✓ main identity: ${M.green}${ns}:main${M.rst} [${mainTool}] — config written at ${root}`);
-        } else {
-          console.log(`⚠ could not provision main identity (HTTP ${status}: ${json?.error || ""}) — scaffolding only`);
-        }
+      const m = await requireMain();
+      const hostname = run("hostname -s") || run("hostname") || "unknown";
+      const { status, json } = await _httpJSON("POST", `${m.baseUrl}/api/provision`, m.token, { namespace_id: ns, agent_id: "main", tool: mainTool, role: "main", label: "main:self" });
+      if (status === "200" && json?.token) {
+        const base = String(json.url || `${m.baseUrl}/mcp`).replace(/\/mcp$/, "");
+        writeWorkerConfig(mainTool, root, base, json.token, hostname);
+        manifest.main = { agent: "main", tool: mainTool };
+        console.log(`✓ main identity: ${M.green}${ns}:main${M.rst} [${mainTool}] — config written at ${root}`);
       } else {
-        console.log(`⚠ no main token — run 'patchcord main connect' first, then re-run team init`);
+        console.log(`⚠ could not provision main identity (HTTP ${status}: ${json?.error || ""}) — scaffolding only`);
       }
       writeFileSync(join(root, ".patchcord", "team.json"), JSON.stringify(manifest, null, 2) + "\n");
       writeFileSync(join(root, "AGENTS.md"), `# ${project} — Patchcord team\n\nNamespace: ${ns}\nMain identity: ${ns}:main (you, when running patchcord from this folder)\nProvision workers: patchcord provision <agent> --tool X --role Y --namespace ${ns} --dir <agent>/\n`);
@@ -990,12 +1005,23 @@ if (cmd === "main" || cmd === "master" || cmd === "provision" || cmd === "team"
       process.exit(0);
     }
     if (sub === "list") {
-      const m = requireMain();
+      const m = await requireMain();
       const { status, json } = await _httpJSON("GET", `${m.baseUrl}/api/provision/list`, m.token);
       if (status !== "200") { console.error(`list failed (HTTP ${status})`); process.exit(1); }
-      const agents = json?.agents || [];
-      for (const a of agents) console.log(`  ${a.namespace_id}:${a.agent_id}  ${M.dim}${a.label || ""}${M.rst}`);
-      if (!agents.length) console.log("  (no agents)");
+      // Dedup by namespace:agent — the server returns one row per token, so a
+      // re-provisioned agent shows up many times. Optional --namespace filter.
+      const filterNs = flagVal("namespace");
+      const seen = new Set();
+      let n = 0;
+      for (const a of (json?.agents || [])) {
+        if (filterNs && a.namespace_id !== filterNs) continue;
+        const key = `${a.namespace_id}:${a.agent_id}`;
+        if (seen.has(key)) continue;
+        seen.add(key);
+        console.log(`  ${key}  ${M.dim}${a.label || ""}${M.rst}`);
+        n++;
+      }
+      if (!n) console.log("  (no agents)");
       process.exit(0);
     }
     if (sub === "status") {
@@ -1138,7 +1164,7 @@ if (cmd === "main" || cmd === "master" || cmd === "provision" || cmd === "team"
   if (cmd === "schedule") {
     // User-level scheduled / recurring messages (server Plan 041). Authed by
     // the main token — the user can manage schedules in any namespace they own.
-    const m = requireMain();
+    const m = await requireMain();
     const sub = process.argv[3];
     const BASE = `${m.baseUrl}/api/dashboard/scheduled`;
     const when = (s) => s.cron_expr ? `cron ${s.cron_expr}` : s.interval_sec ? `every ${s.interval_sec}s` : s.fire_at ? `once @ ${s.fire_at}` : s.schedule_kind;
@@ -2768,38 +2794,6 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd?.startsWith("--")) {
 }
 
 // ── channel: spawn the channel MCP server (used by .mcp.json) ──
-if (cmd === "channel") {
-  const channelScript = join(pluginRoot, "channel", "server.ts");
-  if (!existsSync(channelScript)) {
-    console.error("Channel server not found. Reinstall patchcord.");
-    process.exit(1);
-  }
-  // Prefer bun, fall back to node (tsx)
-  const hasBun = run("which bun");
-  if (hasBun) {
-    const { spawnSync } = await import("child_process");
-    // Install deps if needed
-    const channelDir = join(pluginRoot, "channel");
-    if (!existsSync(join(channelDir, "node_modules"))) {
-      spawnSync("bun", ["install", "--no-summary"], { cwd: channelDir, stdio: "inherit" });
-    }
-    const result = spawnSync("bun", ["run", channelScript], { stdio: "inherit", env: process.env });
-    process.exit(result.status ?? 1);
-  } else {
-    console.error("Channel plugin requires bun. Install from https://bun.sh");
-    process.exit(1);
-  }
-}
-
-// ── back-compat: init → install + agent ───────────────────────
-if (cmd === "init") {
-  console.log(`"patchcord init" is now two commands:
-
-  patchcord install    One-time global setup (once)
-  patchcord agent      Set up MCP for this project (per project)`);
-  process.exit(0);
-}
-
 // ── skill: custom skill from web console ─────────────────────
 if (cmd === "skill") {
   const sub = process.argv[3];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "patchcord",
-  "version": "0.5.105",
+  "version": "0.5.107",
   "description": "Cross-machine agent messaging for Claude Code and Codex",
   "author": "ppravdin",
   "license": "MIT",