patchcord 0.5.68 → 0.5.70

package/bin/patchcord.mjs

@@ -709,13 +709,56 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd?.startsWith("--")) {
   let wasPluginInstalled = false;
   const { readFileSync, writeFileSync, unlinkSync, rmSync, chmodSync, copyFileSync } = await import("fs");
 
+  // JSONC-safe comment stripper that preserves content inside string literals.
+  // Prevents corrupting URLs like "https://..." which contain "//".
+  function _stripJsoncOutsideStrings(str) {
+    let out = "";
+    let i = 0;
+    let inStr = false;
+    let strCh = "";
+    let prev = "";
+    while (i < str.length) {
+      const c = str[i];
+      if (inStr) {
+        out += c;
+        if (c === strCh && prev !== "\\") inStr = false;
+        prev = c;
+        i++;
+        continue;
+      }
+      if (c === '"' || c === "'") {
+        inStr = true;
+        strCh = c;
+        out += c;
+        prev = c;
+        i++;
+        continue;
+      }
+      if (c === "/" && str[i + 1] === "/") {
+        while (i < str.length && str[i] !== "\n") i++;
+        continue;
+      }
+      if (c === "/" && str[i + 1] === "*") {
+        i += 2;
+        while (i < str.length && !(str[i] === "*" && str[i + 1] === "/")) i++;
+        i += 2;
+        continue;
+      }
+      out += c;
+      prev = c;
+      i++;
+    }
+    return out.replace(/,(\s*[}\]])/g, "$1");
+  }
+
   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);
+      const raw = readFileSync(filePath, "utf-8");
+      // Try strict JSON first (avoids corrupting URLs with //)
+      try { return JSON.parse(raw); } catch {}
+      // Fall back to JSONC stripping for Zed/Gemini-style configs
+      const cleaned = _stripJsoncOutsideStrings(raw);
+      return cleaned.trim() ? JSON.parse(cleaned) : {};
     } catch { return null; }
   }
 
@@ -729,24 +772,28 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd?.startsWith("--")) {
     if (existsSync(filePath)) {
       const raw = readFileSync(filePath, "utf-8");
       try {
-        // JSONC-tolerant: Zed/Gemini settings allow //, /* */, trailing commas.
-        const cleaned = raw
-          .replace(/\/\/.*$/gm, "")
-          .replace(/\/\*[\s\S]*?\*\//g, "")
-          .replace(/,\s*([}\]])/g, "$1");
-        const result = cleaned.trim() ? JSON.parse(cleaned) : {};
-        // null / arrays / primitives aren't config objects we can merge into;
-        // refuse rather than blow them away.
-        if (result === null || typeof result !== "object" || Array.isArray(result)) {
-          console.log(`\n  ${yellow}⚠${r}  Skipped ${filePath} — existing file is not a JSON object.`);
-          console.log(`     Replace it with a valid object ({...}) or remove it, then re-run.`);
+        // Try strict JSON first (most configs are plain JSON). This avoids
+        // corrupting URLs like "https://..." which contain "//".
+        parsed = JSON.parse(raw);
+      } catch {
+        // Fall back to JSONC stripping for Zed/Gemini-style configs.
+        // _stripJsoncOutsideStrings preserves content inside string literals
+        // so URLs like "https://..." survive.
+        try {
+          const cleaned = _stripJsoncOutsideStrings(raw);
+          parsed = cleaned.trim() ? JSON.parse(cleaned) : {};
+        } catch {
+          console.log(`\n  ${yellow}⚠${r}  Skipped ${filePath} — could not parse existing JSON.`);
+          console.log(`     Fix the file by hand and re-run the installer. We will not`);
+          console.log(`     overwrite it: that would erase your other servers/settings.`);
           return false;
         }
-        parsed = result;
-      } catch {
-        console.log(`\n  ${yellow}⚠${r}  Skipped ${filePath} — could not parse existing JSON.`);
-        console.log(`     Fix the file by hand and re-run the installer. We will not`);
-        console.log(`     overwrite it: that would erase your other servers/settings.`);
+      }
+      // null / arrays / primitives aren't config objects we can merge into;
+      // refuse rather than blow them away.
+      if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
+        console.log(`\n  ${yellow}⚠${r}  Skipped ${filePath} — existing file is not a JSON object.`);
+        console.log(`     Replace it with a valid object ({...}) or remove it, then re-run.`);
         return false;
       }
     }
@@ -1358,7 +1405,8 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd?.startsWith("--")) {
       // page skips its type picker (the user already chose on the
       // dashboard tile).
       const toolParam = toolSlug ? `&tool=${encodeURIComponent(toolSlug)}` : "";
-      const connectUrl = `https://patchcord.dev/connect?session=${sessionId}${toolParam}`;
+      const cwdParam = `&cwd=${encodeURIComponent(process.cwd())}`;
+      const connectUrl = `https://patchcord.dev/connect?session=${sessionId}${toolParam}${cwdParam}`;
 
       if (canOpenBrowser()) {
         const opened = openBrowser(connectUrl);
@@ -1746,12 +1794,14 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd?.startsWith("--")) {
     // Install alias for per-project --mcp-config-file
     const aliasLine = `alias kimi-pc='kimi --mcp-config-file .kimi/mcp.json'`;
     const aliasComment = "# Patchcord Kimi alias — loads per-project .kimi/mcp.json";
-    const shellRcFiles = [
-      join(HOME, ".bashrc"),
-      join(HOME, ".zshrc"),
-    ];
+    const isZsh = (process.env.SHELL || "").includes("zsh");
+    const shellRcCandidates = isZsh
+      ? [join(HOME, ".zshrc"), join(HOME, ".bashrc")]
+      : [join(HOME, ".bashrc"), join(HOME, ".zshrc")];
+    const primaryRc = shellRcCandidates[0];
+    const primaryName = basename(primaryRc);
     let aliasInstalled = false;
-    for (const rcFile of shellRcFiles) {
+    for (const rcFile of shellRcCandidates) {
       if (!existsSync(rcFile)) continue;
       const rcContent = readFileSync(rcFile, "utf-8");
       if (rcContent.includes("alias kimi-pc=")) continue; // already present
@@ -1762,12 +1812,12 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd?.startsWith("--")) {
       aliasInstalled = true;
     }
     if (aliasInstalled) {
-      console.log(`\n  ${green}✓${r} Alias installed in shell config`);
+      console.log(`\n  ${green}✓${r} Alias installed in ${primaryName}`);
       console.log(`  ${dim}Run ${bold}kimi-pc${r}${dim} instead of ${bold}kimi${r}${dim} in project directories.${r}`);
-      console.log(`  ${dim}Reload your shell or run ${cyan}source ~/.bashrc${r}${dim} (or ~/.zshrc) to use it now.${r}`);
+      console.log(`  ${dim}Reload your shell or run ${cyan}source ~/${primaryName}${r}${dim} to use it now.${r}`);
     } else {
       console.log(`\n  ${yellow}⚠${r} Could not auto-install alias.`);
-      console.log(`  ${dim}Add this to your ~/.bashrc or ~/.zshrc manually:${r}`);
+      console.log(`  ${dim}Add this to your ~/${primaryName} manually:${r}`);
       console.log(`  ${cyan}${aliasLine}${r}`);
     }
   } else if (isVSCode) {

package/package.json

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