patchcord 0.6.20 → 0.6.22

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.20",
+  "version": "0.6.22",
   "author": {
     "name": "ppravdin"
   },

package/bin/patchcord.mjs

@@ -43,77 +43,6 @@ function isSafeId(s) {
   return /^[A-Za-z0-9_\-]+$/.test(s) && s.length < 100;
 }
 
-/** Claude Code marketplace plugin — call ONLY from the Claude provision branch. */
-function _installClaudeMarketplacePlugin(stablePluginDir) {
-  if (!run("which claude")) return;
-  const npmCachePatchcord = join(HOME, ".claude", "plugins", "npm-cache", "node_modules", "patchcord");
-  if (existsSync(npmCachePatchcord)) {
-    try { rmSync(npmCachePatchcord, { recursive: true, force: true }); } catch {}
-  }
-  run(`claude plugin marketplace remove patchcord-marketplace`);
-  run(`claude plugin marketplace add "${stablePluginDir}"`);
-  const hadPlugin = run(`claude plugin list`)?.includes("patchcord");
-  if (hadPlugin) {
-    run(`claude plugin update patchcord@patchcord-marketplace`);
-  } else {
-    run(`claude plugin install patchcord@patchcord-marketplace`);
-  }
-  return hadPlugin;
-}
-
-/** 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
@@ -779,8 +708,6 @@ 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;
@@ -1734,8 +1661,6 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd?.startsWith("--")) {
     return out.replace(/,(\s*[}\]])/g, "$1");
   }
 
-  // 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
   // unrelated MCP servers, settings, or hand-edits the user has in there.
@@ -1794,15 +1719,6 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd?.startsWith("--")) {
   const bold = "\x1b[1m";
   const r = "\x1b[0m";
 
-  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 ────────────────────────────
   // npx never auto-updates a cached package. Users with an old `npx patchcord`
   // entry get the stale binary indefinitely. On every install we sweep
@@ -1868,11 +1784,33 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd?.startsWith("--")) {
   let globalChanges = [];
   if (globalCliInstalled) globalChanges.push("Patchcord CLI installed globally");
 
-  // Claude Code — skip when install runs inside cursor-agent: Claude's plugin
-  // MCP registers as "plugin-patchcord-marketplace-patchcord", which cursor-agent
-  // tries instead of project .cursor/mcp.json → "MCP server not found".
+  // Claude Code
   const hasClaude = run("which claude");
   if (hasClaude) {
+    // Remove legacy npm-cache install (pre-marketplace era) — causes duplicate /patchcord commands.
+    const npmCachePatchcord = join(HOME, ".claude", "plugins", "npm-cache", "node_modules", "patchcord");
+    if (existsSync(npmCachePatchcord)) {
+      try { rmSync(npmCachePatchcord, { recursive: true, force: true }); } catch {}
+    }
+
+    // Always re-add marketplace (point at the STABLE mirror, not pluginRoot
+    // which is the npx ephemeral cache). Claude Code stores the literal
+    // path in its plugin manifest — pointing at npx cache breaks every
+    // future session as soon as that cache dir is swept.
+    // Remove any prior marketplace registration first so the path actually
+    // updates for users who got the buggy npx-cache path on an earlier install.
+    run(`claude plugin marketplace remove patchcord-marketplace`);
+    run(`claude plugin marketplace add "${stablePluginDir}"`);
+    const installed = run(`claude plugin list`)?.includes("patchcord");
+    wasPluginInstalled = !!installed;
+    if (installed) {
+      run(`claude plugin update patchcord@patchcord-marketplace`);
+      globalChanges.push("Claude Code plugin updated");
+    } else {
+      run(`claude plugin install patchcord@patchcord-marketplace`);
+      globalChanges.push("Claude Code plugin installed");
+    }
+
     const claudeSettings = join(HOME, ".claude", "settings.json");
     if (existsSync(claudeSettings)) {
       try {
@@ -1963,9 +1901,8 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd?.startsWith("--")) {
         globalChanges.push("Cursor MCP allowlist configured");
       }
 
-      // cursor-agent v2026.07+ also reads ~/.cursor/cli-config.json permissions.allow
-      // for MCP tool approval — permissions.json alone leaves patchcord at
-      // "not loaded (needs approval)" even with --yolo.
+      // cursor-agent v2026.07+ reads ~/.cursor/cli-config.json permissions.allow
+      // for MCP — permissions.json mcpAllowlist alone leaves patchcord unloaded.
       const cliConfigPath = join(HOME, ".cursor", "cli-config.json");
       let cliAllowChanged = false;
       const cliOk = updateJsonConfig(cliConfigPath, (obj) => {
@@ -2423,9 +2360,8 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd?.startsWith("--")) {
     }
     toolSlug = toolFlag;  // preserved as-is for the URL param
   }
-  // cursor-agent --yolo runs `npx patchcord` without --tool=cursor. Without
-  // this, browser connect defaults to Claude and writes .mcp.json instead of
-  // .cursor/mcp.json — MCP never loads in cursor-agent.
+  // cursor-agent --yolo runs npx patchcord without --tool=cursor; auto-select
+  // Cursor so provision writes .cursor/mcp.json for this harness.
   if (!choice && process.env.CURSOR_AGENT) {
     choice = CLIENT_TYPE_MAP.cursor;
     toolSlug = toolSlug || "cursor";
@@ -2834,7 +2770,6 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd?.startsWith("--")) {
       console.log(`\n  ${green}✓${r} Cursor configured: ${dim}${cursorPath}${r}`);
       console.log(`  ${dim}Per-project only — other projects won't see this agent.${r}`);
     }
-    // Project-layer CLI permissions (cursor-agent merges .cursor/cli.json from git root).
     const cursorCliPath = join(cursorDir, "cli.json");
     const cursorCliOk = updateJsonConfig(cursorCliPath, (obj) => {
       obj.permissions = obj.permissions || {};
@@ -3387,14 +3322,8 @@ 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}`);
 
-    if (run("which claude")) {
-      wasPluginInstalled = _installClaudeMarketplacePlugin(stablePluginDir);
-      console.log(`  ${green}✓${r} Claude Code plugin ${wasPluginInstalled ? "updated" : "installed"}`);
-    }
-
     // Statusline: ask whether to enable full mode (unless --full flag passed or already configured).
     const enableScript = join(pluginRoot, "scripts", "enable-statusline.sh");
     if (existsSync(enableScript)) {
@@ -3504,13 +3433,12 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd?.startsWith("--")) {
 
   if (isOpenClaw) {
     console.log(`\n${dim}Run${r} ${bold}openclaw gateway restart${r}${dim}, then tools will be available in your channels.${r}`);
+  } else if (isCursor && hasCursorAgent) {
+    console.log(`\n  ${green}→${r} ${bold}Exit and start a new ${cyan}cursor-agent${r}${bold} session${r} ${dim}(MCP loads at session start)${r}`);
   } else if (isKimiCode) {
     console.log(`\n  ${green}→${r} ${bold}Restart ${cyan}kimi${r}${bold} in this project (or run ${cyan}/reload${r}${bold}), then say: ${cyan}${bold}check inbox${r}`);
   } else if (isKimi) {
     console.log(`\n  ${green}→${r} ${bold}Restart your ${toolName} session with ${cyan}kimi-pc${r}${bold}, then say: ${cyan}${bold}check inbox${r}`);
-  } else if (isCursor && hasCursorAgent) {
-    console.log(`\n  ${green}→${r} ${bold}Exit and start a new ${cyan}cursor-agent${r}${bold} session${r} ${dim}(MCP loads at session start — not mid-session)${r}`);
-    console.log(`  ${dim}Then:${r} ${cyan}${bold}check inbox${r} ${dim}before${r} ${cyan}${bold}/patchcord-subscribe${r}`);
   } else {
     console.log(`\n  ${green}→${r} ${bold}Restart your ${toolName} session${r}, then say: ${cyan}${bold}check inbox${r}`);
   }

package/package.json

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