patchcord 0.3.44 → 0.3.47

package/bin/patchcord.mjs

@@ -20,6 +20,22 @@ function run(cmd) {
   }
 }
 
+function isSafeToken(t) {
+  return /^[A-Za-z0-9_\-=+/.]+$/.test(t) && t.length < 200;
+}
+
+function isSafeUrl(u) {
+  try {
+    const parsed = new URL(u);
+    return parsed.protocol === "https:" || parsed.protocol === "http:";
+  } catch { return false; }
+}
+
+function isSafeId(s) {
+  return /^[A-Za-z0-9_\-]+$/.test(s) && s.length < 100;
+}
+
+
 if (cmd === "help" || cmd === "--help" || cmd === "-h") {
   console.log(`patchcord — agent messaging for AI coding agents
 
@@ -43,6 +59,16 @@ if (!cmd || cmd === "install" || cmd === "agent") {
   const fullStatusline = flags.includes("--full");
   const { readFileSync, writeFileSync } = await import("fs");
 
+  function safeReadJson(filePath) {
+    try {
+      let content = readFileSync(filePath, "utf-8");
+      // Strip JSONC comments (Zed, Gemini use JSONC)
+      content = content.replace(/\/\/.*$/gm, "").replace(/\/\*[\s\S]*?\*\//g, "");
+      content = content.replace(/,\s*([}\]])/g, "$1");
+      return JSON.parse(content);
+    } catch { return null; }
+  }
+
   console.log(`
   ___  ____ ___ ____ _  _ ____ ____ ____ ___
   |__] |__|  |  |    |__| |    |  | |__/ |  \\
@@ -337,7 +363,7 @@ if (!cmd || cmd === "install" || cmd === "agent") {
     const geminiPath = join(HOME, ".gemini", "settings.json");
     if (existsSync(geminiPath)) {
       try {
-        const existing = JSON.parse(readFileSync(geminiPath, "utf-8"));
+        const existing = safeReadJson(geminiPath) || {};
         if (existing.mcpServers?.patchcord) {
           console.log(`\n  ${yellow}⚠ Gemini CLI already configured${r}`);
           console.log(`  ${dim}${geminiPath}${r}`);
@@ -373,7 +399,7 @@ if (!cmd || cmd === "install" || cmd === "agent") {
       : join(HOME, ".config", "zed", "settings.json");
     if (existsSync(zedPath)) {
       try {
-        const existing = JSON.parse(readFileSync(zedPath, "utf-8"));
+        const existing = safeReadJson(zedPath) || {};
         if (existing.context_servers?.patchcord) {
           console.log(`\n  ${yellow}⚠ Zed already configured${r}`);
           console.log(`  ${dim}${zedPath}${r}`);
@@ -414,7 +440,7 @@ if (!cmd || cmd === "install" || cmd === "agent") {
         console.log(`  ${yellow}This overrides per-project config and causes conflicts.${r}`);
         const cleanGlobal = (await ask(`  ${dim}Remove patchcord from global config? (Y/n):${r} `)).trim().toLowerCase();
         if (cleanGlobal !== "n" && cleanGlobal !== "no") {
-          const cleaned = globalContent.replace(/\[mcp_servers\.patchcord\][^\[]*/s, "").replace(/\n{3,}/g, "\n\n").trim();
+          const cleaned = globalContent.replace(/\[mcp_servers\.patchcord\]\n(?:(?!\[)[^\n]*\n?)*/g, "").replace(/\n{3,}/g, "\n\n").trim();
           writeFileSync(globalCodexConfig, cleaned + "\n");
           console.log(`  ${green}✓${r} Removed from global config`);
         }
@@ -452,6 +478,12 @@ if (!cmd || cmd === "install" || cmd === "agent") {
       process.exit(1);
     }
 
+    if (!isSafeToken(token)) {
+      console.log(`  ${red}✗${r} Invalid token format`);
+      rl.close();
+      process.exit(1);
+    }
+
     console.log("Validating...");
     const validateResp = run(`curl -sf --max-time 5 -H "Authorization: Bearer ${token}" "${serverUrl}/api/inbox?limit=0"`);
     if (validateResp) {
@@ -474,19 +506,13 @@ if (!cmd || cmd === "install" || cmd === "agent") {
   const customUrl = (await ask(`\n${dim}Custom server URL? (y/N):${r} `)).trim().toLowerCase();
   if (customUrl === "y" || customUrl === "yes") {
     const url = (await ask("Server URL: ")).trim();
-    if (url) serverUrl = url;
-
-    // Re-validate against custom server if identity wasn't found
-    if (!identity) {
-      console.log("Validating token...");
-      const resp2 = run(`curl -sf --max-time 5 -H "Authorization: Bearer ${token}" "${serverUrl}/api/inbox?limit=0"`);
-      if (resp2) {
-        try {
-          const data = JSON.parse(resp2);
-          identity = `${data.agent_id}@${data.namespace_id}`;
-          console.log(`  ${green}✓${r} ${bold}${identity}${r}`);
-        } catch {}
+    if (url) {
+      if (!isSafeUrl(url)) {
+        console.error("Invalid URL. Must start with https:// or http://");
+        rl.close();
+        process.exit(1);
       }
+      serverUrl = url;
     }
   }
 
@@ -505,7 +531,7 @@ if (!cmd || cmd === "install" || cmd === "agent") {
           command: "npx",
           args: [
             "-y", "mcp-remote",
-            serverUrl,
+            `${serverUrl}/mcp`,
             "--header",
             `Authorization: Bearer ${token}`,
             "--header",
@@ -538,7 +564,7 @@ if (!cmd || cmd === "install" || cmd === "agent") {
           command: "npx",
           args: [
             "-y", "mcp-remote",
-            serverUrl,
+            `${serverUrl}/mcp`,
             "--header",
             `Authorization: Bearer ${token}`,
             "--header",
@@ -562,23 +588,12 @@ if (!cmd || cmd === "install" || cmd === "agent") {
       mkdirSync(join(HOME, ".codeium", "windsurf"), { recursive: true });
       writeFileSync(wsPath, JSON.stringify(wsConfig, null, 2) + "\n");
     }
-    // Install workflows as slash commands (.windsurf/workflows/) — per-project
-    const wsWorkflowDir = join(cwd, ".windsurf", "workflows");
-    mkdirSync(wsWorkflowDir, { recursive: true });
-    cpSync(join(pluginRoot, "skills", "inbox", "SKILL.md"), join(wsWorkflowDir, "patchcord.md"));
-    cpSync(join(pluginRoot, "skills", "wait", "SKILL.md"), join(wsWorkflowDir, "patchcord-wait.md"));
     console.log(`\n  ${green}✓${r} Windsurf configured: ${dim}${wsPath}${r}`);
-    console.log(`  ${green}✓${r} Workflows installed: ${dim}/patchcord${r}, ${dim}/patchcord-wait${r}`);
-    console.log(`  ${yellow}MCP config is global — all Windsurf projects share this agent.${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");
-    let geminiSettings = {};
-    if (existsSync(geminiPath)) {
-      try {
-        geminiSettings = JSON.parse(readFileSync(geminiPath, "utf-8"));
-      } catch {}
-    }
+    let geminiSettings = (existsSync(geminiPath) && safeReadJson(geminiPath)) || {};
     if (!geminiSettings.mcpServers) geminiSettings.mcpServers = {};
     geminiSettings.mcpServers.patchcord = {
       httpUrl: `${serverUrl}/mcp`,
@@ -601,12 +616,7 @@ if (!cmd || cmd === "install" || cmd === "agent") {
     const zedPath = process.platform === "darwin"
       ? join(HOME, "Library", "Application Support", "Zed", "settings.json")
       : join(HOME, ".config", "zed", "settings.json");
-    let zedSettings = {};
-    if (existsSync(zedPath)) {
-      try {
-        zedSettings = JSON.parse(readFileSync(zedPath, "utf-8"));
-      } catch {}
-    }
+    let zedSettings = (existsSync(zedPath) && safeReadJson(zedPath)) || {};
     if (!zedSettings.context_servers) zedSettings.context_servers = {};
     zedSettings.context_servers.patchcord = {
       url: `${serverUrl}/mcp`,
@@ -685,20 +695,19 @@ if (!cmd || cmd === "install" || cmd === "agent") {
     const configPath = join(codexDir, "config.toml");
     let existing = existsSync(configPath) ? readFileSync(configPath, "utf-8") : "";
     // Remove old patchcord config block if present
-    existing = existing.replace(/\[mcp_servers\.patchcord\][^\[]*/s, "").replace(/\n{3,}/g, "\n\n").trim();
-    // Codex requires bearer_token via env var — http_headers not supported for auth
-    const envName = "PATCHCORD_TOKEN";
+    existing = existing.replace(/\[mcp_servers\.patchcord\]\n(?:(?!\[)[^\n]*\n?)*/g, "").replace(/\n{3,}/g, "\n\n").trim();
+    existing = existing.trimEnd() + `\n\n[mcp_servers.patchcord]\nurl = "${serverUrl}/mcp/bearer"\nhttp_headers = { "Authorization" = "Bearer ${token}", "X-Patchcord-Machine" = "${hostname}" }\n`;
+    writeFileSync(configPath, existing);
+    // Clean up any PATCHCORD_TOKEN we previously wrote to .env
     const envPath = join(cwd, ".env");
-    let envContent = existsSync(envPath) ? readFileSync(envPath, "utf-8") : "";
-    // Replace or add token in .env
-    if (envContent.includes(envName)) {
-      envContent = envContent.replace(new RegExp(`${envName}=.*`), `${envName}=${token}`);
-    } else {
-      envContent = envContent.trimEnd() + `\n${envName}=${token}\n`;
+    if (existsSync(envPath)) {
+      const envContent = readFileSync(envPath, "utf-8");
+      if (envContent.includes("PATCHCORD_TOKEN=")) {
+        const cleaned = envContent.replace(/^PATCHCORD_TOKEN=.*\n?/gm, "").replace(/\n{3,}/g, "\n\n").trim();
+        writeFileSync(envPath, cleaned ? cleaned + "\n" : "");
+        console.log(`  ${green}✓${r} Cleaned PATCHCORD_TOKEN from .env`);
+      }
     }
-    writeFileSync(envPath, envContent);
-    existing = existing.trimEnd() + `\n\n[mcp_servers.patchcord]\nurl = "${serverUrl}/mcp/bearer"\nbearer_token_env_var = "${envName}"\n`;
-    writeFileSync(configPath, existing);
     // Slash commands (.codex/prompts/)
     const codexPromptsDir = join(codexDir, "prompts");
     mkdirSync(codexPromptsDir, { recursive: true });
@@ -737,6 +746,22 @@ if (!cmd || cmd === "install" || cmd === "agent") {
     console.log(`\n  ${green}✓${r} Claude Code configured: ${dim}${mcpPath}${r}`);
   }
 
+  // Warn about gitignore for per-project configs with tokens
+  if (!isWindsurf && !isGemini && !isZed) {
+    const gitignorePath = join(cwd, ".gitignore");
+    const configFile = isCodex ? ".codex/config.toml" : isCursor ? ".cursor/mcp.json" : isVSCode ? ".vscode/mcp.json" : isOpenCode ? "opencode.json" : ".mcp.json";
+    let needsWarning = true;
+    if (existsSync(gitignorePath)) {
+      const gi = readFileSync(gitignorePath, "utf-8");
+      if (gi.includes(configFile) || gi.includes(".mcp.json") || gi.includes(".codex/") || gi.includes(".cursor/")) {
+        needsWarning = false;
+      }
+    }
+    if (needsWarning) {
+      console.log(`\n  ${yellow}⚠ Add ${configFile} to .gitignore — it contains your token${r}`);
+    }
+  }
+
   const toolName = isOpenCode ? "OpenCode" : isZed ? "Zed" : isVSCode ? "VS Code" : isGemini ? "Gemini CLI" : isWindsurf ? "Windsurf" : isCursor ? "Cursor" : isCodex ? "Codex" : "Claude Code";
   console.log(`\n${dim}Restart your ${toolName} session, then run:${r} ${bold}inbox()${r}`);
   process.exit(0);
@@ -777,7 +802,7 @@ if (cmd === "skill") {
   const baseUrl = mcpUrl.replace(/\/mcp(\/bearer)?$/, "");
   const token = auth.replace(/^Bearer\s+/, "");
 
-  if (!baseUrl || !token) {
+  if (!baseUrl || !token || !isSafeToken(token)) {
     console.error("Cannot read patchcord URL/token from .mcp.json");
     process.exit(1);
   }
@@ -793,7 +818,7 @@ if (cmd === "skill") {
     }
   } catch {}
 
-  if (!namespace || !agentId) {
+  if (!namespace || !agentId || !isSafeId(namespace) || !isSafeId(agentId)) {
     console.error("Cannot determine agent identity. Check your token.");
     process.exit(1);
   }

package/package.json

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