patchcord 0.3.57 → 0.3.59

package/bin/patchcord.mjs

@@ -77,8 +77,8 @@ if (cmd === "plugin-path") {
 }
 
 // ── main flow: global setup + project setup (or just install/agent for back-compat) ──
-if (!cmd || cmd === "install" || cmd === "agent") {
-  const flags = process.argv.slice(3);
+if (!cmd || cmd === "install" || cmd === "agent" || cmd === "--token" || cmd === "--no-browser") {
+  const flags = cmd?.startsWith("--") ? process.argv.slice(2) : process.argv.slice(3);
   const fullStatusline = flags.includes("--full");
   const { readFileSync, writeFileSync } = await import("fs");
 
@@ -252,231 +252,16 @@ if (!cmd || cmd === "install" || cmd === "agent") {
   const rl = createInterface({ input: process.stdin, output: process.stdout });
   const ask = (q) => new Promise((resolve) => rl.question(q, resolve));
 
-  console.log(`\n${bold}Which tool are you setting up?${r}\n`);
-  console.log(`  ${cyan}1.${r} Claude Code`);
-  console.log(`  ${cyan}2.${r} Codex CLI`);
-  console.log(`  ${cyan}3.${r} Cursor`);
-  console.log(`  ${cyan}4.${r} Windsurf`);
-  console.log(`  ${cyan}5.${r} Gemini CLI`);
-  console.log(`  ${cyan}6.${r} VS Code (Copilot)`);
-  console.log(`  ${cyan}7.${r} Zed`);
-  console.log(`  ${cyan}8.${r} OpenCode\n`);
-
-  const choice = (await ask(`${dim}Choose (1-8):${r} `)).trim();
-  const isCodex = choice === "2";
-  const isCursor = choice === "3";
-  const isWindsurf = choice === "4";
-  const isGemini = choice === "5";
-  const isVSCode = choice === "6";
-  const isZed = choice === "7";
-  const isOpenCode = choice === "8";
+  // Tool picker only shown for --token bypass. Browser flow gets tool from web.
+  let choice = "";
 
-  if (!["1", "2", "3", "4", "5", "6", "7", "8"].includes(choice)) {
-    console.error("Invalid choice.");
-    rl.close();
-    process.exit(1);
-  }
-
-  if (isWindsurf || isGemini || isZed) {
-    const toolLabel = isZed ? "Zed" : isWindsurf ? "Windsurf" : "Gemini CLI";
-    console.log(`\n  ${yellow}Note: ${toolLabel} uses global config — applies to all projects.${r}`);
-  } else {
-    const folderType = detectFolder(cwd);
-    const folderName = cwd.split("/").pop() || cwd.split("\\").pop() || cwd;
-
-    if (folderType === "HOME") {
-      console.log(`\n  ${red}✗ You're in your home folder.${r}`);
-      console.log(`  ${yellow}Patchcord must be installed inside a project folder —${r}`);
-      console.log(`  ${yellow}the folder where your agent actually runs.${r}`);
-      console.log(`  ${dim}cd into your project first, then run this again.${r}`);
-      rl.close();
-      process.exit(0);
-    } else if (folderType === "CONTAINER") {
-      console.log(`\n  ${yellow}⚠ This looks like a projects container, not a project.${r}`);
-      console.log(`  ${dim}${cwd}${r}`);
-      console.log(`  ${dim}Patchcord should be installed inside a project, not the folder above it.${r}`);
-      const proceed = (await ask(`  ${dim}Set up here anyway? (y/N):${r} `)).trim().toLowerCase();
-      if (proceed !== "y" && proceed !== "yes") {
-        console.log(`  ${dim}cd into your project and run this again.${r}`);
-        rl.close();
-        process.exit(0);
-      }
-    }
+  const CLIENT_TYPE_MAP = {
+    "claude_code": "1", "codex": "2", "cursor": "3", "windsurf": "4",
+    "gemini": "5", "vscode": "6", "zed": "7", "opencode": "8",
+  };
 
-    console.log(`\n  ${dim}Agent identity:${r} ${bold}${folderName}${r}`);
-    console.log(`  ${dim}Folder:${r} ${cwd}`);
-  }
 
 
-  // Check if already configured
-  if (choice === "1") {
-    const mcpPath = join(cwd, ".mcp.json");
-    if (existsSync(mcpPath)) {
-      try {
-        const existing = JSON.parse(readFileSync(mcpPath, "utf-8"));
-        if (existing.mcpServers?.patchcord) {
-          console.log(`\n  ${yellow}⚠ Claude Code already configured in this project${r}`);
-          console.log(`  ${dim}${mcpPath}${r}`);
-          const replace = (await ask(`  ${dim}Replace? (y/N):${r} `)).trim().toLowerCase();
-          if (replace !== "y" && replace !== "yes") {
-            console.log("Keeping existing config.");
-            rl.close();
-            process.exit(0);
-          }
-        }
-      } catch {}
-    }
-  } else if (isCursor) {
-    const cursorPath = join(cwd, ".cursor", "mcp.json");
-    if (existsSync(cursorPath)) {
-      try {
-        const existing = JSON.parse(readFileSync(cursorPath, "utf-8"));
-        if (existing.mcpServers?.patchcord) {
-          console.log(`\n  ${yellow}⚠ Cursor already configured in this project${r}`);
-          console.log(`  ${dim}${cursorPath}${r}`);
-          const replace = (await ask(`  ${dim}Replace? (y/N):${r} `)).trim().toLowerCase();
-          if (replace !== "y" && replace !== "yes") {
-            console.log("Keeping existing config.");
-            rl.close();
-            process.exit(0);
-          }
-        }
-      } catch {}
-    }
-    // Warn about global config conflict
-    const globalCursor = join(HOME, ".cursor", "mcp.json");
-    if (existsSync(globalCursor)) {
-      try {
-        const global = JSON.parse(readFileSync(globalCursor, "utf-8"));
-        if (global.mcpServers?.patchcord) {
-          console.log(`\n  ${yellow}⚠ Patchcord is also configured globally in Cursor${r}`);
-          console.log(`  ${dim}${globalCursor}${r}`);
-          console.log(`  ${yellow}Having both global AND per-project will cause duplicate tool calls.${r}`);
-          console.log(`  ${dim}Remove patchcord from global config: Cursor Settings → MCP → remove patchcord${r}`);
-        }
-      } catch {}
-    }
-  } else if (isWindsurf) {
-    const wsPath = join(HOME, ".codeium", "windsurf", "mcp_config.json");
-    if (existsSync(wsPath)) {
-      try {
-        const content = readFileSync(wsPath, "utf-8").trim();
-        const existing = content ? JSON.parse(content) : {};
-        if (existing.mcpServers?.patchcord) {
-          console.log(`\n  ${yellow}⚠ Windsurf already configured${r}`);
-          console.log(`  ${dim}${wsPath}${r}`);
-          const replace = (await ask(`  ${dim}Replace? (y/N):${r} `)).trim().toLowerCase();
-          if (replace !== "y" && replace !== "yes") {
-            console.log("Keeping existing config.");
-            rl.close();
-            process.exit(0);
-          }
-        }
-      } catch {}
-    }
-  } else if (isGemini) {
-    const geminiPath = join(HOME, ".gemini", "settings.json");
-    if (existsSync(geminiPath)) {
-      try {
-        const existing = safeReadJson(geminiPath) || {};
-        if (existing.mcpServers?.patchcord) {
-          console.log(`\n  ${yellow}⚠ Gemini CLI already configured${r}`);
-          console.log(`  ${dim}${geminiPath}${r}`);
-          const replace = (await ask(`  ${dim}Replace? (y/N):${r} `)).trim().toLowerCase();
-          if (replace !== "y" && replace !== "yes") {
-            console.log("Keeping existing config.");
-            rl.close();
-            process.exit(0);
-          }
-        }
-      } catch {}
-    }
-  } else if (isVSCode) {
-    const vscodePath = join(cwd, ".vscode", "mcp.json");
-    if (existsSync(vscodePath)) {
-      try {
-        const existing = JSON.parse(readFileSync(vscodePath, "utf-8"));
-        if (existing.servers?.patchcord) {
-          console.log(`\n  ${yellow}⚠ VS Code already configured in this project${r}`);
-          console.log(`  ${dim}${vscodePath}${r}`);
-          const replace = (await ask(`  ${dim}Replace? (y/N):${r} `)).trim().toLowerCase();
-          if (replace !== "y" && replace !== "yes") {
-            console.log("Keeping existing config.");
-            rl.close();
-            process.exit(0);
-          }
-        }
-      } catch {}
-    }
-  } else if (isZed) {
-    const zedPath = process.platform === "darwin"
-      ? join(HOME, "Library", "Application Support", "Zed", "settings.json")
-      : join(HOME, ".config", "zed", "settings.json");
-    if (existsSync(zedPath)) {
-      try {
-        const existing = safeReadJson(zedPath) || {};
-        if (existing.context_servers?.patchcord) {
-          console.log(`\n  ${yellow}⚠ Zed already configured${r}`);
-          console.log(`  ${dim}${zedPath}${r}`);
-          const replace = (await ask(`  ${dim}Replace? (y/N):${r} `)).trim().toLowerCase();
-          if (replace !== "y" && replace !== "yes") {
-            console.log("Keeping existing config.");
-            rl.close();
-            process.exit(0);
-          }
-        }
-      } catch {}
-    }
-  } else if (isOpenCode) {
-    const ocPath = join(cwd, "opencode.json");
-    if (existsSync(ocPath)) {
-      try {
-        const existing = JSON.parse(readFileSync(ocPath, "utf-8"));
-        if (existing.mcp?.patchcord) {
-          console.log(`\n  ${yellow}⚠ OpenCode already configured in this project${r}`);
-          console.log(`  ${dim}${ocPath}${r}`);
-          const replace = (await ask(`  ${dim}Replace? (y/N):${r} `)).trim().toLowerCase();
-          if (replace !== "y" && replace !== "yes") {
-            console.log("Keeping existing config.");
-            rl.close();
-            process.exit(0);
-          }
-        }
-      } catch {}
-    }
-  } else if (isCodex) {
-    // Check global config for stale patchcord MCP — user may have run installer in ~ by mistake
-    const globalCodexConfig = join(HOME, ".codex", "config.toml");
-    if (existsSync(globalCodexConfig)) {
-      const globalContent = readFileSync(globalCodexConfig, "utf-8");
-      if (globalContent.includes("[mcp_servers.patchcord-codex]")) {
-        console.log(`\n  ${red}⚠ Patchcord is in your GLOBAL Codex config!${r}`);
-        console.log(`  ${dim}${globalCodexConfig}${r}`);
-        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\]\n(?:(?!\[)[^\n]*\n?)*/g, "").replace(/\n{3,}/g, "\n\n").trim();
-          writeFileSync(globalCodexConfig, cleaned + "\n");
-          console.log(`  ${green}✓${r} Removed from global config`);
-        }
-      }
-    }
-    const configPath = join(cwd, ".codex", "config.toml");
-    if (existsSync(configPath)) {
-      const content = readFileSync(configPath, "utf-8");
-      if (content.includes("[mcp_servers.patchcord-codex]")) {
-        console.log(`\n  ${yellow}⚠ Codex CLI already configured in this project${r}`);
-        console.log(`  ${dim}${configPath}${r}`);
-        const replace = (await ask(`  ${dim}Replace? (y/N):${r} `)).trim().toLowerCase();
-        if (replace !== "y" && replace !== "yes") {
-          console.log("Keeping existing config.");
-          rl.close();
-          process.exit(0);
-        }
-      }
-    }
-  }
-
   let token = "";
   let identity = "";
   let serverUrl = "https://mcp.patchcord.dev";
@@ -488,6 +273,18 @@ if (!cmd || cmd === "install" || cmd === "agent") {
     || (flags.includes("--token") ? flags[flags.indexOf("--token") + 1] : "");
 
   if (tokenFlag) {
+    // --token bypass: need tool picker in terminal
+    console.log(`\n${bold}Which tool are you setting up?${r}\n`);
+    console.log(`  ${cyan}1.${r} Claude Code   ${cyan}5.${r} Gemini CLI`);
+    console.log(`  ${cyan}2.${r} Codex CLI     ${cyan}6.${r} VS Code`);
+    console.log(`  ${cyan}3.${r} Cursor        ${cyan}7.${r} Zed`);
+    console.log(`  ${cyan}4.${r} Windsurf      ${cyan}8.${r} OpenCode\n`);
+    choice = (await ask(`${dim}Choose (1-8):${r} `)).trim();
+    if (!["1","2","3","4","5","6","7","8"].includes(choice)) {
+      console.error("Invalid choice.");
+      rl.close();
+      process.exit(1);
+    }
     token = tokenFlag.trim();
     if (!isSafeToken(token)) {
       console.error("Invalid token format.");
@@ -642,11 +439,38 @@ if (!cmd || cmd === "install" || cmd === "agent") {
 
       token = sseResult.token;
       identity = `${sseResult.agent_id}@${sseResult.namespace_id}`;
-      clientType = sseResult.client_type || "";
+      clientType = sseResult.client_type || sseResult.tool || "";
+      choice = CLIENT_TYPE_MAP[clientType] || "";
       console.log(`  ${green}✓${r} ${bold}${identity}${r} connected.`);
+
+      if (!choice) {
+        // Backend didn't send tool type — ask in terminal
+        const { createInterface: createRL3 } = await import("readline");
+        const rl3 = createRL3({ input: process.stdin, output: process.stdout });
+        const ask3 = (q) => new Promise((resolve) => rl3.question(q, resolve));
+        console.log(`\n${bold}Which tool are you setting up?${r}\n`);
+        console.log(`  ${cyan}1.${r} Claude Code   ${cyan}5.${r} Gemini CLI`);
+        console.log(`  ${cyan}2.${r} Codex CLI     ${cyan}6.${r} VS Code`);
+        console.log(`  ${cyan}3.${r} Cursor        ${cyan}7.${r} Zed`);
+        console.log(`  ${cyan}4.${r} Windsurf      ${cyan}8.${r} OpenCode\n`);
+        choice = (await ask3(`${dim}Choose (1-8):${r} `)).trim();
+        rl3.close();
+        if (!["1","2","3","4","5","6","7","8"].includes(choice)) {
+          console.error("Invalid choice.");
+          process.exit(1);
+        }
+      }
     }
   }
 
+  const isCodex = choice === "2";
+  const isCursor = choice === "3";
+  const isWindsurf = choice === "4";
+  const isGemini = choice === "5";
+  const isVSCode = choice === "6";
+  const isZed = choice === "7";
+  const isOpenCode = choice === "8";
+
   const hostname = run("hostname -s") || run("hostname") || "unknown";
 
   if (isCursor) {

package/package.json

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