patchcord 0.6.22 → 0.6.24

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

package/bin/patchcord.mjs

@@ -4,6 +4,7 @@ import { existsSync, mkdirSync, cpSync, readdirSync, readFileSync, writeFileSync
 import { join, dirname, basename } from "path";
 import { fileURLToPath } from "url";
 import { execSync } from "child_process";
+import { createHash } from "crypto";
 import { homedir } from "os";
 
 const HOME = homedir();
@@ -28,6 +29,85 @@ function run(cmd) {
   }
 }
 
+/**
+ * Cursor CLI gates project MCP behind per-project approval
+ * (`mcp list` → "not loaded (needs approval)"). permissions.json mcpAllowlist
+ * only covers IDE auto-run AFTER the server is loaded — it does not clear that
+ * gate. Approve via `cursor-agent mcp enable` (+ CLI allowlist + approvals file).
+ */
+function _approveCursorProjectMcp(projectDir) {
+  if (!projectDir || !existsSync(join(projectDir, ".cursor", "mcp.json"))) return false;
+  let changed = false;
+
+  // CLI tool allow — official format in cli-config.json (separate from permissions.json).
+  const cliConfigPath = join(HOME, ".cursor", "cli-config.json");
+  try {
+    mkdirSync(dirname(cliConfigPath), { recursive: true });
+    let obj = {};
+    if (existsSync(cliConfigPath)) {
+      try { obj = JSON.parse(readFileSync(cliConfigPath, "utf-8")); } catch { obj = {}; }
+    }
+    obj.permissions = obj.permissions || {};
+    if (!Array.isArray(obj.permissions.allow)) obj.permissions.allow = [];
+    const pat = "Mcp(patchcord:*)";
+    if (!obj.permissions.allow.includes(pat)) {
+      obj.permissions.allow.push(pat);
+      writeFileSync(cliConfigPath, JSON.stringify(obj, null, 2) + "\n");
+      changed = true;
+    }
+  } catch {}
+
+  // Official CLI API: records approval under ~/.cursor/projects/<slug>/mcp-approvals.json
+  if (run("which cursor-agent")) {
+    try {
+      execSync("cursor-agent mcp enable patchcord", {
+        cwd: projectDir,
+        stdio: "pipe",
+        encoding: "utf-8",
+        timeout: 20000,
+      });
+      changed = true;
+    } catch {
+      // Fall through to writing mcp-approvals.json directly.
+    }
+  }
+
+  // Fallback: write the same approval key cursor-agent expects (URL MCP servers).
+  try {
+    const mcpPath = join(projectDir, ".cursor", "mcp.json");
+    const cfg = JSON.parse(readFileSync(mcpPath, "utf-8"));
+    const server = cfg?.mcpServers?.patchcord;
+    const url = server?.url;
+    if (url) {
+      const slug = projectDir.replace(/[^A-Za-z0-9]+/g, "-").replace(/^-|-$/g, "");
+      const approvalsDir = join(HOME, ".cursor", "projects", slug);
+      mkdirSync(approvalsDir, { recursive: true });
+      const approvalsPath = join(approvalsDir, "mcp-approvals.json");
+      let approvals = [];
+      if (existsSync(approvalsPath)) {
+        try {
+          const raw = JSON.parse(readFileSync(approvalsPath, "utf-8"));
+          if (Array.isArray(raw)) approvals = raw;
+        } catch {}
+      }
+      // Cursor hashes { path, server: { url } } and sometimes the full server object.
+      const keys = [
+        `patchcord-${createHash("sha256").update(JSON.stringify({ path: projectDir, server: { url } })).digest("hex").slice(0, 16)}`,
+        `patchcord-${createHash("sha256").update(JSON.stringify({ path: projectDir, server })).digest("hex").slice(0, 16)}`,
+      ];
+      for (const key of keys) {
+        if (!approvals.includes(key)) {
+          approvals.push(key);
+          changed = true;
+        }
+      }
+      writeFileSync(approvalsPath, JSON.stringify(approvals, null, 2) + "\n");
+    }
+  } catch {}
+
+  return changed;
+}
+
 function isSafeToken(t) {
   return /^[A-Za-z0-9_\-=+/.]+$/.test(t) && t.length < 200;
 }
@@ -1901,27 +1981,9 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd?.startsWith("--")) {
         globalChanges.push("Cursor MCP allowlist configured");
       }
 
-      // 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) => {
-        obj.permissions = obj.permissions || {};
-        if (!obj.permissions.allow) obj.permissions.allow = [];
-        if (!Array.isArray(obj.permissions.allow)) {
-          console.log(`\n  ${yellow}⚠${r} Skipped Cursor CLI MCP allow — ${cliConfigPath} permissions.allow is not an array.`);
-          return;
-        }
-        const pat = "Mcp(patchcord:*)";
-        if (!obj.permissions.allow.includes(pat)) {
-          obj.permissions.allow.push(pat);
-          cliAllowChanged = true;
-        }
-      });
-      if (!cliOk) {
-        globalChanges.push("✗ Cursor CLI permissions error");
-      } else if (cliAllowChanged) {
-        globalChanges.push("Cursor CLI MCP allowlist configured");
+      // Existing projects: clear "not loaded (needs approval)" on update.
+      if (_approveCursorProjectMcp(process.cwd())) {
+        globalChanges.push("Cursor MCP approved for this project");
       }
     }
   }
@@ -2360,12 +2422,6 @@ 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; 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";
-  }
 
   // --token bypass for power users / CI / self-hosters
   const tokenFlag = flags.find(f => f.startsWith("--token="))?.split("=")[1]
@@ -2416,14 +2472,12 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd?.startsWith("--")) {
     let existingToken = "";
     let existingConfigFile = "";
     const mcpJsonPath = join(cwd, ".mcp.json");
-    const cursorMcpPath = join(cwd, ".cursor", "mcp.json");
     const codexTomlPath = join(cwd, ".codex", "config.toml");
     const grokTomlPath = join(cwd, ".grok", "config.toml");
     const kimiJsonPath = join(cwd, ".kimi", "mcp.json");
 
-    const slugForCheck = toolSlug ? toolSlug.replace(/-/g, "_") : (process.env.CURSOR_AGENT ? "cursor" : "");
+    const slugForCheck = toolSlug ? toolSlug.replace(/-/g, "_") : "";
     const checkMcpJson = !slugForCheck || slugForCheck === "claude_code";
-    const checkCursorJson = !slugForCheck || slugForCheck === "cursor";
     const checkCodexToml = !slugForCheck || slugForCheck === "codex";
     const checkGrokToml = !slugForCheck || ["grok", "grok_cli", "grok_build"].includes(slugForCheck);
     const checkKimiJson = !slugForCheck || slugForCheck === "kimi";
@@ -2438,16 +2492,6 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd?.startsWith("--")) {
         }
       } catch {}
     }
-    if (!existingToken && checkCursorJson && existsSync(cursorMcpPath)) {
-      try {
-        const existing = JSON.parse(readFileSync(cursorMcpPath, "utf-8"));
-        const pt = existing?.mcpServers?.patchcord;
-        if (pt?.headers?.Authorization) {
-          existingToken = pt.headers.Authorization.replace(/^Bearer\s+/i, "");
-          existingConfigFile = cursorMcpPath;
-        }
-      } catch {}
-    }
     if (!existingToken && checkCodexToml && existsSync(codexTomlPath)) {
       try {
         const content = readFileSync(codexTomlPath, "utf-8");
@@ -2770,16 +2814,8 @@ 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}`);
     }
-    const cursorCliPath = join(cursorDir, "cli.json");
-    const cursorCliOk = updateJsonConfig(cursorCliPath, (obj) => {
-      obj.permissions = obj.permissions || {};
-      if (!obj.permissions.allow) obj.permissions.allow = [];
-      if (!Array.isArray(obj.permissions.allow)) return;
-      const pat = "Mcp(patchcord:*)";
-      if (!obj.permissions.allow.includes(pat)) obj.permissions.allow.push(pat);
-    });
-    if (cursorCliOk) {
-      console.log(`  ${green}✓${r} Cursor CLI permissions: ${dim}${cursorCliPath}${r}`);
+    if (_approveCursorProjectMcp(cwd)) {
+      console.log(`  ${green}✓${r} Cursor MCP approved (cursor-agent mcp enable)`);
     }
   } else if (isGrok) {
     // Grok CLI: project-scoped .grok/config.toml. Grok loads this file from
@@ -3433,8 +3469,6 @@ 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) {

package/package.json

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