patchcord 0.6.14 → 0.6.15

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "patchcord",
   "description": "Cross-machine agent messaging. Messages from other agents land in the inbox and wake the agent to reply.",
-  "version": "0.6.14",
+  "version": "0.6.15",
   "author": {
     "name": "ppravdin"
   },

package/bin/patchcord.mjs

@@ -43,6 +43,59 @@ function isSafeId(s) {
   return /^[A-Za-z0-9_\-]+$/.test(s) && s.length < 100;
 }
 
+/** Undo 0.6.14 mistake: Claude Code uses /mcp (not /mcp/bearer). */
+function revertClaudeMcpBearerUrl(mcpPath) {
+  if (!existsSync(mcpPath)) return false;
+  try {
+    const obj = JSON.parse(readFileSync(mcpPath, "utf-8"));
+    const pt = obj?.mcpServers?.patchcord;
+    const url = pt?.url;
+    if (!url || !url.endsWith("/mcp/bearer")) return false;
+    pt.url = url.replace(/\/mcp\/bearer$/, "/mcp");
+    writeFileSync(mcpPath, JSON.stringify(obj, null, 2) + "\n");
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+/** Patchcord uses project .mcp.json only — drop stale local-scope duplicates. */
+function dedupeClaudePatchcordMcp(cwd) {
+  if (run("which claude")) {
+    run("claude mcp remove patchcord -s local");
+  }
+  const claudeJson = join(HOME, ".claude.json");
+  if (!existsSync(claudeJson)) return false;
+  try {
+    const obj = JSON.parse(readFileSync(claudeJson, "utf-8"));
+    let changed = false;
+    if (obj.mcpServers?.patchcord) {
+      delete obj.mcpServers.patchcord;
+      if (Object.keys(obj.mcpServers).length === 0) delete obj.mcpServers;
+      changed = true;
+    }
+    const proj = obj.projects?.[cwd];
+    if (proj?.mcpServers?.patchcord) {
+      delete proj.mcpServers.patchcord;
+      if (Object.keys(proj.mcpServers).length === 0) delete proj.mcpServers;
+      changed = true;
+    }
+    if (changed) {
+      writeFileSync(claudeJson, JSON.stringify(obj, null, 2) + "\n");
+    }
+    return changed;
+  } catch {
+    return false;
+  }
+}
+
+function fixClaudePatchcordMcp(cwd) {
+  const mcpPath = join(cwd, ".mcp.json");
+  const reverted = revertClaudeMcpBearerUrl(mcpPath);
+  const deduped = dedupeClaudePatchcordMcp(cwd);
+  return { reverted, deduped };
+}
+
 // A trailing --help/-h on ANY subcommand must show help and exit — never run the
 // command. (patchcord orchestrator --help used to PROVISION an orchestrator;
 // patchcord login --help hung on the browser login. Side-effecting --help is a
@@ -708,6 +761,8 @@ if (cmd === "subscribe") {
   const forceKimi = args.includes("--kimi");
   const intervalArg = args.find((a) => a !== "--kimi") || "30";
 
+  fixClaudePatchcordMcp(process.cwd());
+
   // Kimi Code uses polling instead of WebSocket realtime.
   // Force Kimi mode with --kimi flag, or auto-detect from bearer config.
   let isKimi = forceKimi;
@@ -1172,13 +1227,9 @@ if (cmd === "login" || cmd === "orchestrator" || cmd === "teamlead" || cmd === "
     // default: claude_code. type:"http" is REQUIRED — without it Claude Code
     // defaults to stdio transport and rejects the entry ("command: expected
     // string, received undefined").
-    // Use /mcp/bearer (not /mcp): Claude Code v2.1.113+ follows RFC 9728 OAuth
-    // discovery on /mcp, drops the static bearer header, and stalls on "Needs
-    // authentication". /mcp/bearer serves bearer-only resource metadata — same
-    // path Cursor and Kimi Code already use.
     return writeJson(join(dir, ".mcp.json"), (o) => {
       o.mcpServers = o.mcpServers || {};
-      o.mcpServers.patchcord = { type: "http", url: `${baseUrl}/mcp/bearer`, headers: hdr };
+      o.mcpServers.patchcord = { type: "http", url: `${baseUrl}/mcp`, headers: hdr };
     });
   };
 
@@ -1665,22 +1716,7 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd?.startsWith("--")) {
     return out.replace(/,(\s*[}\]])/g, "$1");
   }
 
-  // Claude Code v2.1.113+ OAuth discovery on plain /mcp breaks bearer MCP.
-  // Rewrite legacy project configs to /mcp/bearer (Cursor/Kimi already use it).
-  function _migrateClaudeMcpBearerUrl(mcpPath) {
-    if (!existsSync(mcpPath)) return false;
-    try {
-      const obj = JSON.parse(readFileSync(mcpPath, "utf-8"));
-      const pt = obj?.mcpServers?.patchcord;
-      const url = pt?.url;
-      if (!url || !/\/mcp$/.test(url) || url.endsWith("/mcp/bearer")) return false;
-      pt.url = url.replace(/\/mcp$/, "/mcp/bearer");
-      writeFileSync(mcpPath, JSON.stringify(obj, null, 2) + "\n");
-      return true;
-    } catch {
-      return false;
-    }
-  }
+  // dedupeClaudePatchcordMcp + revertClaudeMcpBearerUrl live at module scope.
 
   // Read+merge+write a JSON config file. If the file exists but its contents
   // can't be parsed, REFUSE to write — silently overwriting would erase
@@ -1740,8 +1776,13 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd?.startsWith("--")) {
   const bold = "\x1b[1m";
   const r = "\x1b[0m";
 
-  if (_migrateClaudeMcpBearerUrl(join(process.cwd(), ".mcp.json"))) {
-    console.log(`  ${green}✓${r} Claude Code MCP URL migrated to /mcp/bearer`);
+  const _installCwd = process.cwd();
+  const _mcpFix = fixClaudePatchcordMcp(_installCwd);
+  if (_mcpFix.reverted) {
+    console.log(`  ${green}✓${r} Claude Code MCP URL reverted to /mcp (0.6.14 /mcp/bearer was wrong for CC)`);
+  }
+  if (_mcpFix.deduped) {
+    console.log(`  ${green}✓${r} Removed stale local-scope patchcord MCP (use project .mcp.json only)`);
   }
 
   // ── Purge stale npx cache entries ────────────────────────────
@@ -3276,7 +3317,7 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd?.startsWith("--")) {
       mcpServers: {
         patchcord: {
           type: "http",
-          url: `${serverUrl}/mcp/bearer`,
+          url: `${serverUrl}/mcp`,
           headers: {
             Authorization: `Bearer ${token}`,
             "X-Patchcord-Machine": hostname,
@@ -3295,6 +3336,7 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd?.startsWith("--")) {
       // their JSON and re-runs.
       process.exit(1);
     }
+    dedupeClaudePatchcordMcp(cwd);
     console.log(`\n  ${green}✓${r} Claude Code configured: ${dim}${mcpPath}${r}`);
 
     // Statusline: ask whether to enable full mode (unless --full flag passed or already configured).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "patchcord",
-  "version": "0.6.14",
+  "version": "0.6.15",
   "description": "Cross-machine agent messaging for Claude Code and Codex",
   "scripts": {
     "version": "node scripts/sync-plugin-version.mjs && git add .claude-plugin/plugin.json"