patchcord 0.5.98 → 0.5.99

package/bin/patchcord.mjs

@@ -273,7 +273,7 @@ async function _resolveBearer(options = {}) {
   while (dir && dir !== "/") {
     for (const r of projectReaders) {
       const found = r(dir);
-      if (found) return found;
+      if (found) { found.scope = "project"; return found; }
     }
     dir = dirname(dir);
   }
@@ -323,7 +323,7 @@ async function _resolveBearer(options = {}) {
     : [...defaultGlobalCandidates, kimiGlobalReader, kimiCodeGlobalReader];
   for (const r of globalCandidates) {
     const found = r();
-    if (found) return found;
+    if (found) { found.scope = "global"; return found; }
   }
 
   return null;
@@ -353,6 +353,12 @@ if (cmd === "whoami") {
     console.error("No patchcord config found in current directory or any parent. Run `npx patchcord@latest` from a project directory first.");
     process.exit(1);
   }
+  if (found.scope === "global") {
+    console.error(`\x1b[33m⚠ No project patchcord config in ${process.cwd()} or any parent.`);
+    console.error(`  Falling back to a GLOBAL config: ${found.configFile} (tool: ${found.tool}).`);
+    console.error(`  If this isn't the agent you expected, you're in a directory without its own .mcp.json —`);
+    console.error(`  the identity below belongs to that global config, NOT to whatever harness launched this.\x1b[0m`);
+  }
   const { token, baseUrl } = found;
   if (!isSafeToken(token) || !isSafeUrl(baseUrl)) {
     console.error(`Invalid patchcord URL or token in config.`);
@@ -931,6 +937,16 @@ if (cmd === "master" || cmd === "provision" || cmd === "team") {
     if (role) {
       try { writeFileSync(join(dir, "AGENTS.md"), `# ${arg} — role: ${role}\n\nYou are \`${arg}\` in the \`${ns}\` Patchcord team. Role: ${role}.\nCoordinate with teammates over Patchcord (inbox / send_message / reply).\n`); } catch {}
     }
+    // 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, role, dir: subdir, namespace: ns });
+        writeFileSync(tj, JSON.stringify(man, null, 2) + "\n");
+      }
+    } catch {}
     console.log(`✓ provisioned ${M.green}${ns}:${arg}${M.rst} [${tool}${role ? "/" + role : ""}] → ${dir}`);
     process.exit(0);
   }
@@ -939,13 +955,35 @@ if (cmd === "master" || cmd === "provision" || cmd === "team") {
     const sub = process.argv[3];
     if (sub === "init") {
       const project = process.argv[4];
-      if (!project) { console.error("Usage: patchcord team init <project> [--namespace ns]"); process.exit(1); }
+      if (!project) { console.error("Usage: patchcord team init <project> [--namespace ns] [--tool <master-harness>]"); process.exit(1); }
       const ns = flagVal("namespace", project.replace(/[^a-z0-9-]/gi, "-").toLowerCase());
+      const masterTool = flagVal("tool", "claude_code");
       const root = join(process.cwd(), project);
       mkdirSync(join(root, ".patchcord"), { recursive: true });
-      writeFileSync(join(root, ".patchcord", "team.json"), JSON.stringify({ project, namespace: ns, pattern: "architect-workers-reviewer", agents: [] }, null, 2) + "\n");
-      writeFileSync(join(root, "AGENTS.md"), `# ${project} — Patchcord team\n\nNamespace: ${ns}\nProvision: patchcord provision <agent> --tool X --role Y --namespace ${ns} --dir <agent>/\n`);
+      const manifest = { project, namespace: ns, pattern: "architect-workers-reviewer", master: null, agents: [] };
+      // Provision the master's OWN messaging identity IN the team namespace and
+      // write its config at the project root, so the master — running here —
+      // resolves to ns:master and SEES every worker it provisions into ns.
+      // Without this the master has no identity and whoami grabs a stale global.
+      const m = readMaster();
+      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: "master", tool: masterTool, role: "master", label: "master:self" });
+        if (status === "200" && json?.token) {
+          const base = String(json.url || `${m.baseUrl}/mcp`).replace(/\/mcp$/, "");
+          writeWorkerConfig(masterTool, root, base, json.token, hostname);
+          manifest.master = { agent: "master", tool: masterTool };
+          console.log(`✓ master identity: ${M.green}${ns}:master${M.rst} [${masterTool}] — config written at ${root}`);
+        } else {
+          console.log(`⚠ could not provision master identity (HTTP ${status}: ${json?.error || ""}) — scaffolding only`);
+        }
+      } else {
+        console.log(`⚠ no master token — run 'patchcord master connect' first, then re-run team init`);
+      }
+      writeFileSync(join(root, ".patchcord", "team.json"), JSON.stringify(manifest, null, 2) + "\n");
+      writeFileSync(join(root, "AGENTS.md"), `# ${project} — Patchcord team\n\nNamespace: ${ns}\nMaster identity: ${ns}:master (you, when running patchcord from this folder)\nProvision workers: patchcord provision <agent> --tool X --role Y --namespace ${ns} --dir <agent>/\n`);
       console.log(`✓ team scaffolded: ${root} (namespace ${ns})`);
+      console.log(`  ${M.dim}cd ${project} — your identity there is ${ns}:master; you'll see every worker you provision into ${ns}.${M.rst}`);
       process.exit(0);
     }
     if (sub === "list") {

package/package.json

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