patchcord 0.5.30 → 0.5.32

package/bin/patchcord.mjs

@@ -67,7 +67,7 @@ Usage:
   npx patchcord@latest --token <token>                    Self-hosted / CI setup
   npx patchcord@latest --token <token> --server <url>     Self-hosted with custom server
   npx patchcord@latest --full                             Same + full statusline
-  npx patchcord@latest --rename <new-name>                Rename this agent (paste from dashboard)
+  npx patchcord@latest --rename <new-name> [--tool <slug>] Rename this agent (paste from dashboard)
   npx patchcord@latest skill apply                        Fetch custom skill from web console`);
   process.exit(0);
 }
@@ -77,59 +77,130 @@ if (cmd === "plugin-path") {
   process.exit(0);
 }
 
-// ── --rename <new> [--expect-token <prefix>] ────────────────────
-// Renames the agent in cwd's .mcp.json. Dashboard generates the full
-// pasted command including --expect-token to prevent wrong-machine paste.
+// ── --rename <new> [--tool <slug>] [--expect-token <prefix>] ────
+// Renames the agent's bearer in its tool's per-project config. Supported
+// tools: claude_code, codex, cursor, vscode, opencode. Dashboard generates
+// the full pasted command including --tool (so we read the right file)
+// and --expect-token (sha256 prefix, prevents wrong-machine paste).
 {
   const renameIdx = process.argv.indexOf("--rename");
   if (renameIdx !== -1) {
     const newName = (process.argv[renameIdx + 1] || "").trim().toLowerCase();
     const expectIdx = process.argv.indexOf("--expect-token");
     const expectPrefix = expectIdx !== -1 ? (process.argv[expectIdx + 1] || "").trim() : "";
+    const toolIdx = process.argv.indexOf("--tool");
+    const tool = toolIdx !== -1 ? (process.argv[toolIdx + 1] || "").trim().toLowerCase() : "";
 
     if (!newName || !/^[a-z][a-z0-9-]{1,49}$/.test(newName)) {
-      console.error("Usage: npx patchcord@latest --rename <new-name> [--expect-token <prefix>]");
-      console.error("       <new-name> must be lowercase letters, digits, dashes; 2-50 chars");
+      console.error("Usage: npx patchcord@latest --rename <new-name> [--tool <slug>] [--expect-token <prefix>]");
+      console.error("       <new-name>: lowercase letters, digits, dashes; 2-50 chars");
+      console.error("       <slug>: claude_code | codex | cursor | vscode | opencode");
       process.exit(1);
     }
 
-    const cwd = process.cwd();
-    let mcpJson = null;
-    let dir = cwd;
-    while (dir && dir !== "/") {
-      const p = join(dir, ".mcp.json");
-      if (existsSync(p)) { mcpJson = p; break; }
-      dir = dirname(dir);
-    }
-    if (!mcpJson) {
-      console.error(`No .mcp.json found above ${cwd}. Run from your patchcord project folder.`);
+    const { readFileSync } = await import("fs");
+
+    // Per-tool token readers. Each returns {token, baseUrl, configFile} or null.
+    const readMcpJsonShape = (path, key = "mcpServers") => {
+      if (!existsSync(path)) return null;
+      try {
+        const obj = JSON.parse(readFileSync(path, "utf-8"));
+        const pt = obj?.[key]?.patchcord;
+        if (!pt?.headers?.Authorization || !pt?.url) return null;
+        return {
+          token: pt.headers.Authorization.replace(/^Bearer\s+/i, ""),
+          baseUrl: pt.url.replace(/\/mcp(\/bearer)?$/, ""),
+          configFile: path,
+        };
+      } catch { return null; }
+    };
+    const readOpenCodeShape = (path) => {
+      if (!existsSync(path)) return null;
+      try {
+        const obj = JSON.parse(readFileSync(path, "utf-8"));
+        const pt = obj?.mcp?.patchcord;
+        if (!pt?.headers?.Authorization || !pt?.url) return null;
+        return {
+          token: pt.headers.Authorization.replace(/^Bearer\s+/i, ""),
+          baseUrl: pt.url.replace(/\/mcp(\/bearer)?$/, ""),
+          configFile: path,
+        };
+      } catch { return null; }
+    };
+    const readCodexTomlShape = (path) => {
+      if (!existsSync(path)) return null;
+      try {
+        const content = readFileSync(path, "utf-8");
+        const block = content.match(/\[mcp_servers\.patchcord[-\w]*\]([\s\S]*?)(?=\n\[|$)/);
+        if (!block) return null;
+        const urlMatch = block[1].match(/url\s*=\s*"([^"]+)"/);
+        const tokenMatch = block[1].match(/Bearer\s+([^\s"]+)/);
+        if (!urlMatch || !tokenMatch) return null;
+        return {
+          token: tokenMatch[1],
+          baseUrl: urlMatch[1].replace(/\/mcp(\/bearer)?$/, ""),
+          configFile: path,
+        };
+      } catch { return null; }
+    };
+
+    const READERS = {
+      claude_code: (cwd) => readMcpJsonShape(join(cwd, ".mcp.json")),
+      cursor:      (cwd) => readMcpJsonShape(join(cwd, ".cursor", "mcp.json")),
+      vscode:      (cwd) => readMcpJsonShape(join(cwd, ".vscode", "mcp.json"), "servers"),
+      opencode:    (cwd) => readOpenCodeShape(join(cwd, "opencode.json")),
+      codex:       (cwd) => readCodexTomlShape(join(cwd, ".codex", "config.toml")),
+    };
+
+    if (tool && !READERS[tool]) {
+      console.error(`✗ Rename not supported for --tool=${tool}.`);
+      console.error(`  Supported: ${Object.keys(READERS).join(", ")}.`);
+      console.error(`  This usually means the tool stores its config in a global location`);
+      console.error(`  not yet wired up to --rename. Open an issue.`);
       process.exit(1);
     }
 
-    const { readFileSync } = await import("fs");
-    let config;
-    try {
-      config = JSON.parse(readFileSync(mcpJson, "utf-8"));
-    } catch (e) {
-      console.error(`Cannot parse ${mcpJson}: ${e.message}`);
+    // Walk up from cwd looking for any supported config. If --tool given,
+    // only check that tool; otherwise try all in priority order.
+    const cwd = process.cwd();
+    const tryReaders = tool ? [READERS[tool]] : Object.values(READERS);
+    let found = null;
+    let dir = cwd;
+    while (dir && dir !== "/" && !found) {
+      for (const r of tryReaders) {
+        const result = r(dir);
+        if (result) { found = result; break; }
+      }
+      if (!found) dir = dirname(dir);
+    }
+    if (!found) {
+      const whichFile = tool
+        ? `the ${tool} config file in or above ${cwd}`
+        : `any supported tool config (.mcp.json, .cursor/mcp.json, .vscode/mcp.json, opencode.json, .codex/config.toml) above ${cwd}`;
+      console.error(`No patchcord bearer found in ${whichFile}. Run from the agent's project folder.`);
       process.exit(1);
     }
-    const mcpUrl = config?.mcpServers?.patchcord?.url || "";
-    const auth = config?.mcpServers?.patchcord?.headers?.Authorization || "";
-    const baseUrl = mcpUrl.replace(/\/mcp(\/bearer)?$/, "");
-    const token = auth.replace(/^Bearer\s+/, "");
+    const { token, baseUrl, configFile: mcpJson } = found;
 
     if (!baseUrl || !token || !isSafeToken(token) || !isSafeUrl(baseUrl)) {
       console.error(`Cannot read patchcord URL/token from ${mcpJson}.`);
       process.exit(1);
     }
 
-    if (expectPrefix && !token.startsWith(expectPrefix)) {
-      console.error("✗ Token mismatch.");
-      console.error(`  The dashboard issued this rename for a different agent than what's`);
-      console.error(`  installed in ${dirname(mcpJson)}.`);
-      console.error(`  Maybe you clicked Rename while looking at a different machine?`);
-      process.exit(2);
+    if (expectPrefix) {
+      // Compare sha256(token) prefix, not raw token prefix. The dashboard
+      // never sees the plaintext token (we don't store it server-side
+      // anymore) — it has token_hash from the bearer_tokens row, slices
+      // the first N chars of that, and we hash locally to compare.
+      const { createHash } = await import("node:crypto");
+      const tokenHash = createHash("sha256").update(token).digest("hex");
+      if (!tokenHash.startsWith(expectPrefix)) {
+        console.error("✗ Token mismatch.");
+        console.error(`  The dashboard issued this rename for a different agent than what's`);
+        console.error(`  installed in ${dirname(mcpJson)}.`);
+        console.error(`  Maybe you clicked Rename while looking at a different machine?`);
+        process.exit(2);
+      }
     }
 
     // Call the server. Use curl + -w for status code so we can distinguish

package/package.json

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