patchcord 0.3.70 → 0.3.72

package/bin/patchcord.mjs

@@ -321,8 +321,61 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd === "--token" || cmd ===
     }
     rl.close();
   } else {
+    // Check if patchcord is already configured — offer to update URL without re-auth
+    let existingToken = "";
+    let existingConfigFile = "";
+    const mcpJsonPath = join(cwd, ".mcp.json");
+    const codexTomlPath = join(cwd, ".codex", "config.toml");
+    if (existsSync(mcpJsonPath)) {
+      try {
+        const existing = JSON.parse(readFileSync(mcpJsonPath, "utf-8"));
+        const pt = existing?.mcpServers?.patchcord;
+        if (pt?.headers?.Authorization) {
+          existingToken = pt.headers.Authorization.replace(/^Bearer\s+/i, "");
+          existingConfigFile = mcpJsonPath;
+        }
+      } catch {}
+    }
+    if (!existingToken && existsSync(codexTomlPath)) {
+      try {
+        const content = readFileSync(codexTomlPath, "utf-8");
+        const match = content.match(/Bearer\s+([^\s"]+)/);
+        if (match) {
+          existingToken = match[1];
+          existingConfigFile = codexTomlPath;
+        }
+      } catch {}
+    }
+    if (existingToken) {
+      console.log(`\n  ${dim}Existing patchcord token found in ${existingConfigFile}${r}`);
+      const { createInterface: createRLU } = await import("readline");
+      const rlU = createRLU({ input: process.stdin, output: process.stdout });
+      const askU = (q) => new Promise((resolve) => rlU.question(q, resolve));
+      const answer = (await askU(`  ${bold}Update config and keep existing token? (Y/n):${r} `)).trim().toLowerCase();
+      rlU.close();
+      if (answer !== "n" && answer !== "no") {
+        token = existingToken;
+        // Validate existing token
+        const validateResp = run(`curl -sf --max-time 5 -H "Authorization: Bearer ${token}" "${serverUrl}/api/inbox?limit=0&count_only=1"`);
+        if (validateResp) {
+          try {
+            const data = JSON.parse(validateResp);
+            identity = `${data.agent_id}@${data.namespace_id}`;
+            clientType = data.client_type || "";
+            choice = CLIENT_TYPE_MAP[clientType] || "";
+            console.log(`  ${green}✓${r} ${bold}${identity}${r} — token valid`);
+          } catch {}
+        }
+        if (!identity) {
+          console.log(`  ${yellow}⚠${r} Token expired or invalid. Starting fresh setup.`);
+          token = "";
+        }
+      }
+    }
+
+    if (!token) {
     // Browser connect flow
-    rl.close();
+    if (rl) rl.close();
 
     function canOpenBrowser() {
       if (process.env.SSH_CLIENT || process.env.SSH_TTY) return false;
@@ -475,7 +528,8 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd === "--token" || cmd ===
         }
       }
     }
-  }
+  } // end connect flow
+  } // end if (!token)
 
   const isCodex = choice === "2";
   const isCursor = choice === "3";
@@ -555,7 +609,7 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd === "--token" || cmd ===
     let geminiSettings = (existsSync(geminiPath) && safeReadJson(geminiPath)) || {};
     if (!geminiSettings.mcpServers) geminiSettings.mcpServers = {};
     geminiSettings.mcpServers.patchcord = {
-      httpUrl: `${serverUrl}/mcp`,
+      httpUrl: `${serverUrl}/mcp/bearer`,
       headers: {
         Authorization: `Bearer ${token}`,
         "X-Patchcord-Machine": hostname,
@@ -578,7 +632,7 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd === "--token" || cmd ===
     let zedSettings = (existsSync(zedPath) && safeReadJson(zedPath)) || {};
     if (!zedSettings.context_servers) zedSettings.context_servers = {};
     zedSettings.context_servers.patchcord = {
-      url: `${serverUrl}/mcp`,
+      url: `${serverUrl}/mcp/bearer`,
       headers: {
         Authorization: `Bearer ${token}`,
         "X-Patchcord-Machine": hostname,
@@ -603,7 +657,7 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd === "--token" || cmd ===
     if (!ocConfig.mcp) ocConfig.mcp = {};
     ocConfig.mcp.patchcord = {
       type: "remote",
-      url: `${serverUrl}/mcp`,
+      url: `${serverUrl}/mcp/bearer`,
       headers: {
         Authorization: `Bearer ${token}`,
         "X-Patchcord-Machine": hostname,
@@ -620,7 +674,7 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd === "--token" || cmd ===
       servers: {
         patchcord: {
           type: "http",
-          url: `${serverUrl}/mcp`,
+          url: `${serverUrl}/mcp/bearer`,
           headers: {
             Authorization: `Bearer ${token}`,
             "X-Patchcord-Machine": hostname,
@@ -746,13 +800,13 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd === "--token" || cmd ===
     console.log(`\n  ${green}✓${r} Codex configured: ${dim}${configPath}${r}`);
     console.log(`  ${green}✓${r} Plugin installed: ${dim}@patchcord${r}, ${dim}@patchcord-wait${r}`);
   } else {
-    // Claude Code: write .mcp.json (MCP server only — channel plugin disabled)
+    // Claude Code: write .mcp.json (use /mcp/bearer to avoid OAuth discovery override)
     const mcpPath = join(cwd, ".mcp.json");
     const mcpConfig = {
       mcpServers: {
         patchcord: {
           type: "http",
-          url: `${serverUrl}/mcp`,
+          url: `${serverUrl}/mcp/bearer`,
           headers: {
             Authorization: `Bearer ${token}`,
             "X-Patchcord-Machine": hostname,

package/package.json

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