patchcord 0.5.109 → 0.5.111

package/bin/patchcord.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import { existsSync, mkdirSync, cpSync, readdirSync, readFileSync, writeFileSync } from "fs";
+import { existsSync, mkdirSync, cpSync, readdirSync, readFileSync, writeFileSync, unlinkSync } from "fs";
 import { join, dirname, basename } from "path";
 import { fileURLToPath } from "url";
 import { execSync } from "child_process";
@@ -834,17 +834,26 @@ if (cmd === "login" || cmd === "teamlead" || cmd === "provision" || cmd === "tea
   const LEGACY_CONFIGS = [join(HOME, ".patchcord", "main.json"), join(HOME, ".patchcord", "master.json")];
   const DEFAULT_API = process.env.PATCHCORD_BASE_URL || "https://api.patchcord.dev";
 
+  // Account tokens are always `pcm-` prefixed. Anything else (e.g. a stale
+  // worker token `pct-...` or a legacy bearer in $PATCHCORD_TOKEN) is NOT an
+  // account credential — ignore it so auth-on-demand falls through to login
+  // instead of feeding junk to /api/* and hard-failing with 401.
+  const isAccountToken = (t) => typeof t === "string" && t.startsWith("pcm-");
   const readAuth = () => {
     const envTok = process.env.PATCHCORD_TOKEN || process.env.PATCHCORD_MAIN_TOKEN || process.env.PATCHCORD_MASTER_TOKEN;
-    if (envTok) return { token: envTok, baseUrl: DEFAULT_API };
+    if (envTok && isAccountToken(envTok)) return { token: envTok, baseUrl: DEFAULT_API };
     for (const p of [AUTH_CONFIG, ...LEGACY_CONFIGS]) {
       try {
         const m = JSON.parse(readFileSync(p, "utf-8"));
-        if (m && m.token) return { token: m.token, baseUrl: m.baseUrl || DEFAULT_API };
+        if (m && isAccountToken(m.token)) return { token: m.token, baseUrl: m.baseUrl || DEFAULT_API };
       } catch {}
     }
     return null;
   };
+  // Drop a stale stored account token so the next requireAuth re-logs-in.
+  const forgetAuth = () => {
+    for (const p of [AUTH_CONFIG, ...LEGACY_CONFIGS]) { try { unlinkSync(p); } catch {} }
+  };
   const flagVal = (name, def = "") => {
     const eq = process.argv.find((a) => a.startsWith(`--${name}=`));
     if (eq) return eq.split("=").slice(1).join("=");
@@ -890,6 +899,19 @@ if (cmd === "login" || cmd === "teamlead" || cmd === "provision" || cmd === "tea
   };
   // Auth on demand: any command needing the account logs in if not already.
   const requireAuth = async () => readAuth() || await doLogin();
+  // Account-authed request with stale-token recovery. If the server rejects the
+  // stored token (401/403), forget it, re-log-in once, and retry. Returns the
+  // _httpJSON result plus the auth used (for callers that need m.baseUrl).
+  const accountCall = async (method, path, body) => {
+    let m = await requireAuth();
+    let r = await _httpJSON(method, `${m.baseUrl}${path}`, m.token, body);
+    if (r.status === "401" || r.status === "403") {
+      forgetAuth();
+      m = await doLogin();
+      r = await _httpJSON(method, `${m.baseUrl}${path}`, m.token, body);
+    }
+    return { ...r, m };
+  };
   const writeWorkerConfig = (tool, dir, baseUrl, token, hostname) => {
     mkdirSync(dir, { recursive: true });
     const hdr = { Authorization: `Bearer ${token}`, "X-Patchcord-Machine": hostname };
@@ -922,10 +944,12 @@ if (cmd === "login" || cmd === "teamlead" || cmd === "provision" || cmd === "tea
         o.mcp.patchcord = { type: "remote", url: `${baseUrl}/mcp`, headers: hdr };
       });
     }
-    // default: claude_code
+    // default: claude_code. type:"http" is REQUIRED — without it Claude Code
+    // defaults to stdio transport and rejects the entry ("command: expected
+    // string, received undefined").
     return writeJson(join(dir, ".mcp.json"), (o) => {
       o.mcpServers = o.mcpServers || {};
-      o.mcpServers.patchcord = { url: `${baseUrl}/mcp`, headers: hdr };
+      o.mcpServers.patchcord = { type: "http", url: `${baseUrl}/mcp`, headers: hdr };
     });
   };
 
@@ -937,14 +961,13 @@ if (cmd === "login" || cmd === "teamlead" || cmd === "provision" || cmd === "tea
   }
 
   if (cmd === "provision") {
-    const m = await requireAuth();
     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") {
       const ra = process.argv[4];
       const ns = flagVal("namespace");
       if (!ra || !ns) { console.error("Usage: patchcord provision revoke <agent> --namespace ns"); process.exit(1); }
-      const { status, json } = await _httpJSON("POST", `${m.baseUrl}/api/provision/revoke`, m.token, { namespace_id: ns, agent_id: ra });
+      const { status, json } = await accountCall("POST", "/api/provision/revoke", { namespace_id: ns, agent_id: ra });
       if (status !== "200") { console.error(`revoke failed (HTTP ${status}): ${json?.error || ""}`); process.exit(1); }
       console.log(`✓ revoked ${ns}:${ra} (${json.count} token(s))`);
       process.exit(0);
@@ -954,7 +977,7 @@ if (cmd === "login" || cmd === "teamlead" || cmd === "provision" || cmd === "tea
     const ns = flagVal("namespace");
     const subdir = flagVal("dir", arg);
     if (!ns) { console.error("--namespace <project-namespace> required"); process.exit(1); }
-    const { status, json } = await _httpJSON("POST", `${m.baseUrl}/api/provision`, m.token, { namespace_id: ns, agent_id: arg, tool, role, label: `main:${tool}` });
+    const { status, json, m } = await accountCall("POST", "/api/provision", { namespace_id: ns, agent_id: arg, tool, role, label: `main:${tool}` });
     if (status !== "200" || !json?.token) { console.error(`provision failed (HTTP ${status}): ${json?.error || ""}`); process.exit(1); }
     const base = String(json.url || `${m.baseUrl}/mcp`).replace(/\/mcp$/, "");
     const dir = join(process.cwd(), subdir);
@@ -983,12 +1006,11 @@ if (cmd === "login" || cmd === "teamlead" || cmd === "provision" || cmd === "tea
     // 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.
-    const m = await requireAuth();
     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 } = await _httpJSON("POST", `${m.baseUrl}/api/provision`, m.token, { namespace_id: ns, agent_id: "teamlead", tool, role: "teamlead", label: "teamlead:self" });
+    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 base = String(json.url || `${m.baseUrl}/mcp`).replace(/\/mcp$/, "");
     writeWorkerConfig(tool, root, base, json.token, hostname);
@@ -1025,8 +1047,7 @@ you design the team, provision its agents, launch them, and manage them.
   if (cmd === "team") {
     const sub = process.argv[3];
     if (sub === "list") {
-      const m = await requireAuth();
-      const { status, json } = await _httpJSON("GET", `${m.baseUrl}/api/provision/list`, m.token);
+      const { status, json } = await accountCall("GET", "/api/provision/list");
       if (status !== "200") { console.error(`list failed (HTTP ${status})`); process.exit(1); }
       // Dedup by namespace:agent — the server returns one row per token, so a
       // re-provisioned agent shows up many times. Optional --namespace filter.
@@ -1184,16 +1205,15 @@ you design the team, provision its agents, launch them, and manage them.
   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 = await requireAuth();
     const sub = process.argv[3];
-    const BASE = `${m.baseUrl}/api/dashboard/scheduled`;
+    const BASE = `/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;
     const fmt = (s) => `${s.id}  ${M.green}${s.namespace_id}:${s.to_agent}${M.rst}  ${s.active ? "" : M.dim + "[paused] " + M.rst}${s.name}  ${M.dim}${when(s)}${s.next_fire_at ? ` → ${s.next_fire_at}` : ""}${M.rst}`;
 
     if (sub === "list") {
       const ns = flagVal("namespace");
       const url = ns ? `${BASE}?namespace=${encodeURIComponent(ns)}` : BASE;
-      const { status, json } = await _httpJSON("GET", url, m.token);
+      const { status, json } = await accountCall("GET", url);
       if (status !== "200") { console.error(`list failed (HTTP ${status}): ${json?.error || ""}`); process.exit(1); }
       const items = json?.schedules || [];
       for (const s of items) console.log("  " + fmt(s));
@@ -1215,7 +1235,7 @@ you design the team, provision its agents, launch them, and manage them.
       const thread = flagVal("thread"); if (thread) body.thread_slug = thread;
       const maxRuns = flagVal("max-runs"); if (maxRuns) body.max_runs = parseInt(maxRuns, 10);
       const expires = flagVal("expires"); if (expires) body.expires_at = expires;
-      const { status, json } = await _httpJSON("POST", BASE, m.token, body);
+      const { status, json } = await accountCall("POST", BASE, body);
       if (status !== "201" && status !== "200") { console.error(`create failed (HTTP ${status}): ${json?.error || ""}`); process.exit(1); }
       console.log(`✓ scheduled ${M.green}${ns}:${to}${M.rst} [${schedule_kind}] ${M.dim}${json?.schedule?.id || ""}${M.rst}`);
       process.exit(0);
@@ -1223,7 +1243,7 @@ you design the team, provision its agents, launch them, and manage them.
     if (sub === "cancel" || sub === "delete" || sub === "rm") {
       const id = process.argv[4];
       if (!id) { console.error("Usage: patchcord schedule cancel <id>"); process.exit(1); }
-      const { status, json } = await _httpJSON("DELETE", `${BASE}/${id}`, m.token);
+      const { status, json } = await accountCall("DELETE", `${BASE}/${id}`);
       if (status !== "200") { console.error(`cancel failed (HTTP ${status}): ${json?.error || ""}`); process.exit(1); }
       console.log(`✓ cancelled ${id}`);
       process.exit(0);
@@ -1231,7 +1251,7 @@ you design the team, provision its agents, launch them, and manage them.
     if (sub === "test" || sub === "fire") {
       const id = process.argv[4];
       if (!id) { console.error("Usage: patchcord schedule test <id>"); process.exit(1); }
-      const { status, json } = await _httpJSON("POST", `${BASE}/${id}/test`, m.token, {});
+      const { status, json } = await accountCall("POST", `${BASE}/${id}/test`, {});
       if (status !== "200") { console.error(`test failed (HTTP ${status}): ${json?.error || ""}`); process.exit(1); }
       console.log(`✓ fired ${id} once (does not consume max-runs)`);
       process.exit(0);
@@ -1239,7 +1259,7 @@ you design the team, provision its agents, launch them, and manage them.
     if (sub === "pause" || sub === "resume") {
       const id = process.argv[4];
       if (!id) { console.error(`Usage: patchcord schedule ${sub} <id>`); process.exit(1); }
-      const { status, json } = await _httpJSON("PATCH", `${BASE}/${id}`, m.token, { active: sub === "resume" });
+      const { status, json } = await accountCall("PATCH", `${BASE}/${id}`, { active: sub === "resume" });
       if (status !== "200") { console.error(`${sub} failed (HTTP ${status}): ${json?.error || ""}`); process.exit(1); }
       console.log(`✓ ${sub === "resume" ? "resumed" : "paused"} ${id}`);
       process.exit(0);
@@ -2897,5 +2917,5 @@ if (cmd === "skill") {
   process.exit(0);
 }
 
-console.error(`Unknown command: ${cmd}. Available: whoami, agents, upload, subscribe, update, --rename, --token, --agent-type, --version, --help`);
+console.error(`Unknown command: ${cmd}. Available: install, whoami, agents, upload, subscribe, update, login, provision, teamlead, team, schedule, --rename, --token, --agent-type, --version, --help`);
 process.exit(1);

package/package.json

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