patchcord 0.5.115 → 0.5.117

package/bin/patchcord.mjs

@@ -89,14 +89,17 @@ THIS AGENT — identity + messaging
 ACCOUNT — log in to the CLI (commands below log in on demand)
   patchcord login                            Authenticate the CLI (your account)
 
-TEAMLEAD — set up the team-lead agent (the shepherd) in this folder
-  patchcord teamlead [--namespace <ns>] [--tool <harness>]
-                                             Provision the teamlead here; launch it
+ORCHESTRATOR — set up the orchestrator agent (the shepherd) in this folder
+  patchcord orchestrator [--namespace <ns>] [--tool <harness>]
+                                             Provision the orchestrator here; launch it
                                              to adopt this project or build a new team
 
-TEAM — the teamlead's tools (run from the project root)
+TEAM — the orchestrator's tools (run from the project root)
   patchcord provision <agent> --tool <X> --role <Y> --namespace <ns> [--dir <sub/>]
                                              Create a worker agent (identity + config)
+  patchcord pull <agent> --tool <X> --namespace <ns> [--dir <sub/>]
+                                             Place an EXISTING agent into a folder
+                                             (same identity, new token; nothing overwritten)
   patchcord provision revoke <agent> --namespace <ns>
   patchcord team list [--namespace <ns>]     Provisioned agents (server view, deduped)
   patchcord team status                      Reconcile folder ↔ identity ↔ tmux ↔ token
@@ -824,12 +827,12 @@ if (cmd === "subscribe") {
 // works the same as the space-form (--token foo). The internal flag parsing below
 // supports both. Non-flag commands (channel, init, skill, help, plugin-path) have
 // their own branches above and below.
-// ── CLI account auth + teamlead/team/provisioning/schedule ─────────────────
+// ── CLI account auth + orchestrator/team/provisioning/schedule ─────────────
 // These commands act on the user's ACCOUNT, so they require CLI login. The
 // account token (user-level, tied to NO agent) lives at ~/.patchcord/auth.json
 // (legacy: main.json / master.json) or $PATCHCORD_TOKEN (legacy: *_MAIN/MASTER).
 // `patchcord login` authenticates; everything else logs in on demand.
-if (cmd === "login" || cmd === "teamlead" || cmd === "provision" || cmd === "team" || cmd === "schedule") {
+if (cmd === "login" || cmd === "orchestrator" || cmd === "teamlead" || cmd === "provision" || cmd === "pull" || cmd === "team" || cmd === "schedule") {
   const M = { cyan: "\x1b[36m", green: "\x1b[32m", dim: "\x1b[2m", rst: "\x1b[0m" };
   const AUTH_CONFIG = join(HOME, ".patchcord", "auth.json");
   const LEGACY_CONFIGS = [join(HOME, ".patchcord", "main.json"), join(HOME, ".patchcord", "master.json")];
@@ -1010,27 +1013,67 @@ if (cmd === "login" || cmd === "teamlead" || cmd === "provision" || cmd === "tea
     process.exit(0);
   }
 
-  if (cmd === "teamlead") {
-    // Set up the TEAMLEAD agent in THIS folder. The teamlead is a distinct kind
-    // of agent — it shepherds a team: provisions, connects, and manages the
-    // other agents. It is NOT a normal agent: it gets its own identity, its own
-    // onboarding instruction, and on launch either ADOPTS this existing project
-    // or CREATES a new team by interviewing the user.
+  if (cmd === "pull") {
+    // Inverse of provision: place an EXISTING agent identity into a folder.
+    // Mints another token bound to the same agent_id@namespace (its original
+    // token is hashed server-side and unrecoverable, so we can't return the
+    // literal one — but the identity is the same). Nothing is overwritten; the
+    // agent can now run from this folder too.
+    const arg = process.argv[3];
+    if (!arg || arg.startsWith("-")) { console.error("Usage: patchcord pull <agent> --namespace ns --tool X [--dir sub/]"); process.exit(1); }
+    const tool = flagVal("tool", "claude_code");
+    const ns = flagVal("namespace");
+    const subdir = flagVal("dir", arg);
+    if (!ns) { console.error("--namespace <project-namespace> required"); process.exit(1); }
+    const { status, json, m } = await accountCall("POST", "/api/provision", { namespace_id: ns, agent_id: arg, tool, require_existing: true, label: `pull:${tool}` });
+    if (status === "404") { console.error(`no agent ${M.green}${ns}:${arg}${M.rst} to pull — create it with: patchcord provision ${arg} --tool ${tool} --namespace ${ns}`); process.exit(1); }
+    if (status !== "200" || !json?.token) { console.error(`pull failed (HTTP ${status}): ${json?.error || ""}`); process.exit(1); }
+    const base = String(json.url || `${m.baseUrl}/mcp`).replace(/\/mcp$/, "");
+    const dir = join(process.cwd(), subdir);
+    const hostname = run("hostname -s") || run("hostname") || "unknown";
+    writeWorkerConfig(tool, dir, base, json.token, hostname);
+    // Record in the local team manifest so `team launch` / `team status` see it.
+    try {
+      const tj = join(process.cwd(), ".patchcord", "team.json");
+      if (existsSync(tj)) {
+        const man = JSON.parse(readFileSync(tj, "utf-8"));
+        man.agents = (man.agents || []).filter((a) => a.agent !== arg);
+        man.agents.push({ agent: arg, tool, dir: subdir, namespace: ns });
+        writeFileSync(tj, JSON.stringify(man, null, 2) + "\n");
+      }
+    } catch {}
+    console.log(`✓ pulled ${M.green}${ns}:${arg}${M.rst} [${tool}] → ${dir}`);
+    process.exit(0);
+  }
+
+  if (cmd === "orchestrator" || cmd === "teamlead") {
+    // Set up the ORCHESTRATOR agent in THIS folder. The orchestrator is a
+    // distinct kind of agent — it shepherds a team: provisions, connects, and
+    // manages the other agents. It is NOT a normal agent: it gets its own
+    // identity, its own onboarding instruction, and on launch either ADOPTS
+    // this existing project or CREATES a new team by interviewing the user.
+    // (`teamlead` is kept as a back-compat alias for the command name.)
     const root = process.cwd();
     const ns = (flagVal("namespace", basename(root)) || "team").replace(/[^a-z0-9-]/gi, "-").toLowerCase();
     const tool = flagVal("tool", "claude_code");
     const hostname = run("hostname -s") || run("hostname") || "unknown";
-    const { status, json, m } = await accountCall("POST", "/api/provision", { namespace_id: ns, agent_id: "teamlead", tool, role: "teamlead", label: "teamlead:self" });
-    if (status !== "200" || !json?.token) { console.error(`could not set up teamlead (HTTP ${status}): ${json?.error || ""}`); process.exit(1); }
+    const { status, json, m } = await accountCall("POST", "/api/provision", { namespace_id: ns, agent_id: "orchestrator", tool, role: "orchestrator", label: "orchestrator:self" });
+    if (status !== "200" || !json?.token) { console.error(`could not set up orchestrator (HTTP ${status}): ${json?.error || ""}`); process.exit(1); }
     const base = String(json.url || `${m.baseUrl}/mcp`).replace(/\/mcp$/, "");
     writeWorkerConfig(tool, root, base, json.token, hostname);
     mkdirSync(join(root, ".patchcord"), { recursive: true });
     const tj = join(root, ".patchcord", "team.json");
-    let manifest = { project: basename(root), namespace: ns, teamlead: { agent: "teamlead", tool }, agents: [] };
-    try { if (existsSync(tj)) manifest = { ...JSON.parse(readFileSync(tj, "utf-8")), namespace: ns, teamlead: { agent: "teamlead", tool } }; } catch {}
+    let manifest = { project: basename(root), namespace: ns, orchestrator: { agent: "orchestrator", tool }, agents: [] };
+    try {
+      if (existsSync(tj)) {
+        const prev = JSON.parse(readFileSync(tj, "utf-8"));
+        delete prev.teamlead; delete prev.main; delete prev.master; // drop pre-rename keys
+        manifest = { ...prev, namespace: ns, orchestrator: { agent: "orchestrator", tool } };
+      }
+    } catch {}
     writeFileSync(tj, JSON.stringify(manifest, null, 2) + "\n");
-    // The teamlead's onboarding instruction (read on launch).
-    writeFileSync(join(root, "TEAMLEAD.md"), `# You are the TEAMLEAD (${ns}:teamlead)
+    // The orchestrator's onboarding instruction (read on launch).
+    writeFileSync(join(root, "ORCHESTRATOR.md"), `# You are the ORCHESTRATOR (${ns}:orchestrator)
 
 You shepherd a team of patchcord agents in this folder. You are NOT a worker —
 you design the team, provision its agents, launch them, and manage them.
@@ -1043,14 +1086,16 @@ you design the team, provision its agents, launch them, and manage them.
    which roles/harnesses, how many — confirm the plan, then build it.
 
 ## Build / run
-- Provision each worker: \`patchcord provision <agent> --tool <claude_code|codex|opencode|kimi> --role <role> --namespace ${ns} --dir <agent>/\`
+- Provision each worker: \`patchcord provision <agent> --tool <claude_code|codex|opencode|kimi|agy> --role <role> --namespace ${ns} --dir <agent>/\`
+- Pull an existing agent into a folder: \`patchcord pull <agent> --tool <X> --namespace ${ns} --dir <agent>/\`
 - Launch: \`patchcord team launch\` (mux), verify with \`patchcord team status\`.
 - Coordinate over patchcord (inbox / send_message); manage at the meta level.
-- Your own identity here is ${ns}:teamlead — \`patchcord whoami\` confirms it.
+- Your own identity here is ${ns}:orchestrator — \`patchcord whoami\` confirms it.
 `);
-    console.log(`\n  ${M.green}✓${M.rst} Teamlead ready: ${M.green}${ns}:teamlead${M.rst} [${tool}] in ${root}`);
+    try { if (existsSync(join(root, "TEAMLEAD.md"))) unlinkSync(join(root, "TEAMLEAD.md")); } catch {} // remove pre-rename onboarding file
+    console.log(`\n  ${M.green}✓${M.rst} Orchestrator ready: ${M.green}${ns}:orchestrator${M.rst} [${tool}] in ${root}`);
     console.log(`  ${M.dim}Launch it here — it adopts this project or creates a new team, asking you:${M.rst}`);
-    console.log(`    mux new ${tool === "claude_code" ? "claude" : (tool === "kimi-code" ? "kimi" : tool)} --dir .`);
+    console.log(`    mux new ${tool === "claude_code" ? "claude" : (tool === "kimi-code" ? "kimi" : (tool === "antigravity" || tool === "agy") ? "agy" : tool)} --dir .`);
     process.exit(0);
   }
 
@@ -1124,10 +1169,10 @@ you design the team, provision its agents, launch them, and manage them.
         panes.push({ session, window, path: real(path), cmd, claimed: false });
       }
 
-      // Build the roster: teamlead first, then workers.
+      // Build the roster: orchestrator first, then workers.
       const roster = [];
-      const leadEntry = manifest.teamlead || manifest.main || manifest.master; // pre-rename names
-      if (leadEntry) roster.push({ ...leadEntry, role: "teamlead", dir: ".", _lead: true });
+      const leadEntry = manifest.orchestrator || manifest.teamlead || manifest.main || manifest.master; // pre-rename names
+      if (leadEntry) roster.push({ ...leadEntry, role: "orchestrator", dir: ".", _lead: true });
       for (const a of (manifest.agents || [])) roster.push(a);
 
       const rows = [];
@@ -2977,5 +3022,5 @@ if (cmd === "skill") {
   process.exit(0);
 }
 
-console.error(`Unknown command: ${cmd}. Available: install, whoami, agents, upload, subscribe, update, login, provision, teamlead, team, schedule, --rename, --token, --agent-type, --version, --help`);
+console.error(`Unknown command: ${cmd}. Available: install, whoami, agents, upload, subscribe, update, login, provision, pull, orchestrator, team, schedule, --rename, --token, --agent-type, --version, --help`);
 process.exit(1);

package/package.json

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