patchcord 0.6.31 → 0.6.33

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

package/bin/patchcord.mjs

@@ -2865,7 +2865,12 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd?.startsWith("--")) {
 
   const CLIENT_TYPE_MAP = {
     "claude_code": "1", "codex": "2", "cursor": "3", "grok": "14", "grok_cli": "14", "grok_build": "14", "windsurf": "4",
-    "gemini": "5", "vscode": "6", "zed": "7", "opencode": "8", "openclaw": "9", "antigravity": "10",
+    // "gemini" is deliberately ABSENT: Gemini CLI is retired as an install
+    // target (Antigravity covers Google's agent). Slot "5" is left unassigned
+    // rather than reused, so an old connect page sending client_type=gemini
+    // falls through to no choice instead of silently configuring a DIFFERENT
+    // harness and writing someone's token to the wrong file.
+    "vscode": "6", "zed": "7", "opencode": "8", "openclaw": "9", "antigravity": "10",
     "cline": "11", "kimi": "12", "hermes": "13",
   };
 
@@ -3242,7 +3247,11 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd?.startsWith("--")) {
   const isCursor = choice === "3";
   const isGrok = choice === "14";
   const isWindsurf = choice === "4";
-  const isGemini = choice === "5";
+  // Gemini CLI retired as an install target. Kept as a permanent false so the
+  // guards below still read as "this harness gets no project-local config"
+  // for anything that reaches them, and so removing the slot cannot flip a
+  // condition that used to exclude it into one that now includes it.
+  const isGemini = false;
   const isVSCode = choice === "6";
   const isZed = choice === "7";
   const isOpenCode = choice === "8";
@@ -3371,28 +3380,6 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd?.startsWith("--")) {
       console.log(`\n  ${green}✓${r} Windsurf configured: ${dim}${wsPath}${r}`);
       console.log(`  ${yellow}Global config — all Windsurf projects share this agent.${r}`);
     }
-  } else if (isGemini) {
-    // Gemini CLI: global only (~/.gemini/settings.json)
-    const geminiPath = join(HOME, ".gemini", "settings.json");
-    const geminiOk = updateJsonConfig(geminiPath, (obj) => {
-      obj.mcpServers = obj.mcpServers || {};
-      obj.mcpServers.patchcord = {
-        httpUrl: `${serverUrl}/mcp`,
-        headers: {
-          Authorization: `Bearer ${token}`,
-          "X-Patchcord-Machine": hostname,
-        },
-      };
-      // Clean up deprecated tools.allowed if present (removed in Gemini CLI 1.0)
-      if (obj.tools?.allowed) {
-        obj.tools.allowed = obj.tools.allowed.filter(t => !t.startsWith("mcp_patchcord_"));
-        if (obj.tools.allowed.length === 0) delete obj.tools;
-      }
-    });
-    if (geminiOk) {
-      console.log(`\n  ${green}✓${r} Gemini CLI configured: ${dim}${geminiPath}${r}`);
-      console.log(`  ${yellow}Global config — all Gemini CLI projects share this agent.${r}`);
-    }
   } else if (isZed) {
     // Zed: global settings.json → context_servers
     const zedPath = process.platform === "darwin"

package/package.json

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

package/scripts/lib/claude-local-mcp.mjs

@@ -116,14 +116,18 @@ export function detectClaudeLocalMcpOverride({
       claude_config: claudeConfig,
       local_bearer_fp: localFp,
       disk_bearer_fp: diskFp,
+      // Kept SHORT and ending on the action that actually heals it. The old
+      // copy ran seven clauses and finished with "restart Claude Code", which
+      // is both heavier than needed and incomplete: clearing the entry does
+      // nothing until the MCP client reloads, and `/mcp` -> reconnect does that
+      // in place. A human who follows the old text to the letter clears the
+      // file, sees the tools still 401, and concludes the diagnosis was wrong.
       tell_human:
-        "Claude Code cached an old MCP token in ~/.claude.json that overrides this "
-        + "project's .mcp.json, and the cached copy wins. " + detail + " "
-        + `Clear projects["${projectDir}"].mcpServers (or just its "${serverKey}" entry) `
-        + "in ~/.claude.json, then restart Claude Code. "
-        + "Your Patchcord identity and token are fine — only Claude's MCP client is "
-        + "using the stale copy, which is why the CLI works while the MCP tools 401. "
-        + "Patchcord will not edit ~/.claude.json for you.",
+        `Claude Code cached an old MCP token in ~/.claude.json that overrides this project's .mcp.json. ${detail} `
+        + `Remove projects["${projectDir}"].mcpServers["${serverKey}"], then run /mcp and reconnect patchcord — `
+        + "clearing it alone will not fix it, the MCP client has to reload. "
+        + "Your token is fine; only Claude's MCP client holds the stale copy, "
+        + "which is why the CLI works while the MCP tools 401.",
     };
   } catch {
     return null;

package/skills/subscribe/SKILL.md

@@ -69,7 +69,19 @@ patchcord whoami --json
 
 If `warnings` contains `claude_local_mcp_cache_override`, **relay its `tell_human` text to the user verbatim.** They have no reason to know this command exists — all they saw was a tool failing.
 
-**Do NOT edit `~/.claude.json` yourself,** and do not ask another agent to. That file holds far more than MCP config, writing it races the running Claude Code process, and clearing an override is the user's call about their own editor. Patchcord diagnoses; the human acts.
+Then **offer to clear it**: *"Want me to remove the stale entry?"* Ask first — `~/.claude.json` is the user's global editor config, holds far more than MCP servers, and writing it races the running Claude Code process. But do not stop at diagnosing. Most users do not want to hand-edit JSON, and an accurate report they cannot act on leaves them exactly as stuck as no report.
+
+If they say yes:
+
+1. **Back it up first** — `cp ~/.claude.json ~/.claude.json.bak.$(date +%s)`.
+2. **Remove only** `projects["<dir>"].mcpServers["patchcord"]`. Not the whole `mcpServers` object, not the project entry, not the file. Parse, delete the one key, write atomically.
+3. **Then tell them to run `/mcp` and reconnect patchcord.**
+
+**Step 3 is the one that actually heals it, and it is the one that gets forgotten.** Clearing the entry changes a file the running MCP client already read; until it reloads, the tools keep 401-ing with the stale token and it looks like the fix failed. `/mcp` → reconnect reloads in place. Never tell them to restart Claude Code — if they are talking to you, they have already restarted, and it would not have helped anyway.
+
+You cannot run `/mcp` yourself; it is an interactive command in the user's client. Say the words and let them press it.
+
+Do not ask another agent to edit the file for you.
 
 ## If `whoami` is clean and the MCP tools STILL 401