patchcord 0.3.76 → 0.3.78

package/bin/patchcord.mjs

@@ -39,7 +39,7 @@ const PROJECT_MARKERS = [
   ".git", "package.json", "package-lock.json", "Cargo.toml", "go.mod", "go.sum",
   "pyproject.toml", "pom.xml", "build.gradle", "Makefile", "CMakeLists.txt",
   "Gemfile", "composer.json", "mix.exs", "requirements.txt", "setup.py",
-  ".claude", ".codex", ".cursor", ".vscode",
+  ".claude", ".codex", ".cursor", ".vscode", ".openclaw",
 ];
 
 function detectFolder(dir) {
@@ -258,7 +258,7 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd === "--token" || cmd ===
 
   const CLIENT_TYPE_MAP = {
     "claude_code": "1", "codex": "2", "cursor": "3", "windsurf": "4",
-    "gemini": "5", "vscode": "6", "zed": "7", "opencode": "8",
+    "gemini": "5", "vscode": "6", "zed": "7", "opencode": "8", "openclaw": "9",
   };
 
 
@@ -292,9 +292,10 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd === "--token" || cmd ===
     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.log(`  ${cyan}4.${r} Windsurf      ${cyan}8.${r} OpenCode`);
+    console.log(`                    ${cyan}9.${r} OpenClaw\n`);
+    choice = (await ask(`${dim}Choose (1-9):${r} `)).trim();
+    if (!["1","2","3","4","5","6","7","8","9"].includes(choice)) {
       console.error("Invalid choice.");
       rl.close();
       process.exit(1);
@@ -346,30 +347,75 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd === "--token" || cmd ===
         }
       } catch {}
     }
+    if (!existingToken) {
+      const openclawJsonPath = join(HOME, ".openclaw", "openclaw.json");
+      if (existsSync(openclawJsonPath)) {
+        try {
+          const oc = JSON.parse(readFileSync(openclawJsonPath, "utf-8"));
+          const pt = oc?.mcp?.servers?.patchcord;
+          if (pt?.headers?.Authorization) {
+            existingToken = pt.headers.Authorization.replace(/^Bearer\s+/i, "");
+            existingConfigFile = openclawJsonPath;
+          }
+        } catch {}
+      }
+    }
     if (existingToken) {
-      console.log(`\n  ${dim}Existing patchcord token found in ${existingConfigFile}${r}`);
+      // Figure out which tool is already configured
+      const existingToolName = existingConfigFile.includes(".codex") ? "Codex"
+        : existingConfigFile.includes("openclaw") ? "OpenClaw"
+        : existingConfigFile.includes(".cursor") ? "Cursor"
+        : existingConfigFile.includes(".vscode") ? "VS Code"
+        : "Claude Code";
+
+      // Validate the existing token to get identity
+      let existingIdentity = "";
+      const validateResp = run(`curl -sf --max-time 5 -H "Authorization: Bearer ${existingToken}" "${serverUrl}/api/inbox?limit=0&count_only=1"`);
+      if (validateResp) {
+        try {
+          const data = JSON.parse(validateResp);
+          existingIdentity = `${data.agent_id}@${data.namespace_id}`;
+        } catch {}
+      }
+
+      const identityStr = existingIdentity ? ` (${bold}${existingIdentity}${r}${dim})` : "";
+      console.log(`\n  ${dim}${existingToolName} agent is already configured in this project${identityStr}${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") {
+
+      const updateAnswer = (await askU(`  ${bold}Update ${existingToolName} agent? (Y/n):${r} `)).trim().toLowerCase();
+      if (updateAnswer !== "n" && updateAnswer !== "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) {
+        if (existingIdentity) {
+          identity = existingIdentity;
+          const vResp = validateResp ? JSON.parse(validateResp) : {};
+          clientType = vResp.client_type || "";
+          choice = CLIENT_TYPE_MAP[clientType] || "";
+          console.log(`  ${green}✓${r} ${bold}${identity}${r} — token valid`);
+        } else {
           console.log(`  ${yellow}⚠${r} Token expired or invalid. Starting fresh setup.`);
           token = "";
         }
+        rlU.close();
+      } else {
+        // Offer to add a different tool
+        const addAnswer = (await askU(`  ${bold}Add another agent to this project? (y/N):${r} `)).trim().toLowerCase();
+        rlU.close();
+        if (addAnswer === "y" || addAnswer === "yes") {
+          // Use existing token but let user pick a different tool
+          token = existingToken;
+          if (existingIdentity) {
+            identity = existingIdentity;
+            console.log(`  ${green}✓${r} ${bold}${identity}${r}`);
+          } else {
+            console.log(`  ${yellow}⚠${r} Token expired or invalid. Starting fresh setup.`);
+            token = "";
+          }
+          // Force tool picker by clearing choice — will be asked below
+          choice = "";
+        }
       }
     }
 
@@ -519,10 +565,11 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd === "--token" || cmd ===
         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();
+        console.log(`  ${cyan}4.${r} Windsurf      ${cyan}8.${r} OpenCode`);
+        console.log(`                    ${cyan}9.${r} OpenClaw\n`);
+        choice = (await ask3(`${dim}Choose (1-9):${r} `)).trim();
         rl3.close();
-        if (!["1","2","3","4","5","6","7","8"].includes(choice)) {
+        if (!["1","2","3","4","5","6","7","8","9"].includes(choice)) {
           console.error("Invalid choice.");
           process.exit(1);
         }
@@ -538,6 +585,7 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd === "--token" || cmd ===
   const isVSCode = choice === "6";
   const isZed = choice === "7";
   const isOpenCode = choice === "8";
+  const isOpenClaw = choice === "9";
 
   const hostname = run("hostname -s") || run("hostname") || "unknown";
 
@@ -549,7 +597,7 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd === "--token" || cmd ===
     const cursorConfig = {
       mcpServers: {
         patchcord: {
-          url: `${serverUrl}/mcp/bearer`,
+          url: `${serverUrl}/mcp`,
           headers: {
             Authorization: `Bearer ${token}`,
             "X-Patchcord-Machine": hostname,
@@ -578,7 +626,7 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd === "--token" || cmd ===
     const wsConfig = {
       mcpServers: {
         patchcord: {
-          url: `${serverUrl}/mcp/bearer`,
+          url: `${serverUrl}/mcp`,
           headers: {
             Authorization: `Bearer ${token}`,
             "X-Patchcord-Machine": hostname,
@@ -609,7 +657,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/bearer`,
+      httpUrl: `${serverUrl}/mcp`,
       headers: {
         Authorization: `Bearer ${token}`,
         "X-Patchcord-Machine": hostname,
@@ -632,7 +680,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/bearer`,
+      url: `${serverUrl}/mcp`,
       headers: {
         Authorization: `Bearer ${token}`,
         "X-Patchcord-Machine": hostname,
@@ -657,7 +705,7 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd === "--token" || cmd ===
     if (!ocConfig.mcp) ocConfig.mcp = {};
     ocConfig.mcp.patchcord = {
       type: "remote",
-      url: `${serverUrl}/mcp/bearer`,
+      url: `${serverUrl}/mcp`,
       headers: {
         Authorization: `Bearer ${token}`,
         "X-Patchcord-Machine": hostname,
@@ -665,6 +713,52 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd === "--token" || cmd ===
     };
     writeFileSync(ocPath, JSON.stringify(ocConfig, null, 2) + "\n");
     console.log(`\n  ${green}✓${r} OpenCode configured: ${dim}${ocPath}${r}`);
+  } else if (isOpenClaw) {
+    // OpenClaw: global ~/.openclaw/openclaw.json → mcp.servers
+    // Try CLI first, fall back to direct file write
+    const openclawServerEntry = JSON.stringify({
+      url: `${serverUrl}/mcp`,
+      transport: "streamable-http",
+      headers: {
+        Authorization: `Bearer ${token}`,
+        "X-Patchcord-Machine": hostname,
+      },
+      connectionTimeoutMs: 300000,
+    });
+    const cliResult = run(`openclaw mcp set patchcord '${openclawServerEntry.replace(/'/g, "'\\''")}'`);
+    if (cliResult !== null) {
+      console.log(`\n  ${green}✓${r} OpenClaw configured via CLI: ${dim}openclaw mcp set${r}`);
+    } else {
+      // CLI not available — write config directly
+      const openclawDir = join(HOME, ".openclaw");
+      const openclawPath = join(openclawDir, "openclaw.json");
+      let openclawConfig = {};
+      if (existsSync(openclawPath)) {
+        try {
+          openclawConfig = JSON.parse(readFileSync(openclawPath, "utf-8"));
+        } catch {}
+      }
+      if (!openclawConfig.mcp) openclawConfig.mcp = {};
+      if (!openclawConfig.mcp.servers) openclawConfig.mcp.servers = {};
+      openclawConfig.mcp.servers.patchcord = {
+        url: `${serverUrl}/mcp`,
+        transport: "streamable-http",
+        headers: {
+          Authorization: `Bearer ${token}`,
+          "X-Patchcord-Machine": hostname,
+        },
+        connectionTimeoutMs: 300000,
+      };
+      mkdirSync(openclawDir, { recursive: true });
+      writeFileSync(openclawPath, JSON.stringify(openclawConfig, null, 2) + "\n");
+      console.log(`\n  ${green}✓${r} OpenClaw configured: ${dim}${openclawPath}${r}`);
+    }
+    console.log(`  ${yellow}Global config — all OpenClaw channels share this agent.${r}`);
+    console.log(`  ${dim}Run: openclaw gateway restart${r}`);
+    // mcp-remote fallback note for older OpenClaw versions
+    console.log(`\n  ${dim}If tools don't appear after restart, your OpenClaw may be too old${r}`);
+    console.log(`  ${dim}for streamable-http. Update to v2026.3.31+ or use mcp-remote:${r}`);
+    console.log(`  ${dim}openclaw mcp set patchcord '{"command":"npx","args":["mcp-remote","${serverUrl}/mcp","--header","Authorization: Bearer ${token}"],"transport":"stdio"}'${r}`);
   } else if (isVSCode) {
     // VS Code: write .vscode/mcp.json (per-project)
     const vscodeDir = join(cwd, ".vscode");
@@ -674,7 +768,7 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd === "--token" || cmd ===
       servers: {
         patchcord: {
           type: "http",
-          url: `${serverUrl}/mcp/bearer`,
+          url: `${serverUrl}/mcp`,
           headers: {
             Authorization: `Bearer ${token}`,
             "X-Patchcord-Machine": hostname,
@@ -715,7 +809,7 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd === "--token" || cmd ===
     let existing = existsSync(configPath) ? readFileSync(configPath, "utf-8") : "";
     // Remove old patchcord config block if present
     existing = existing.replace(/\[mcp_servers\.patchcord[-\w]*\]\n(?:(?!\[)[^\n]*\n?)*/g, "").replace(/\n{3,}/g, "\n\n").trim();
-    existing = existing.trimEnd() + `\n\n[mcp_servers.patchcord-codex]\nurl = "${serverUrl}/mcp/bearer"\nhttp_headers = { "Authorization" = "Bearer ${token}", "X-Patchcord-Machine" = "${hostname}" }\ntool_timeout_sec = 300\n`;
+    existing = existing.trimEnd() + `\n\n[mcp_servers.patchcord-codex]\nurl = "${serverUrl}/mcp"\nhttp_headers = { "Authorization" = "Bearer ${token}", "X-Patchcord-Machine" = "${hostname}" }\ntool_timeout_sec = 300\n`;
     writeFileSync(configPath, existing);
     // Clean up any PATCHCORD_TOKEN we previously wrote to .env
     const envPath = join(cwd, ".env");
@@ -840,7 +934,7 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd === "--token" || cmd ===
   }
 
   // Warn about gitignore for per-project configs with tokens
-  if (!isWindsurf && !isGemini && !isZed) {
+  if (!isWindsurf && !isGemini && !isZed && !isOpenClaw) {
     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;
@@ -855,14 +949,18 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd === "--token" || cmd ===
     }
   }
 
-  const toolName = isOpenCode ? "OpenCode" : isZed ? "Zed" : isVSCode ? "VS Code" : isGemini ? "Gemini CLI" : isWindsurf ? "Windsurf" : isCursor ? "Cursor" : isCodex ? "Codex" : "Claude Code";
+  const toolName = isOpenClaw ? "OpenClaw" : isOpenCode ? "OpenCode" : isZed ? "Zed" : isVSCode ? "VS Code" : isGemini ? "Gemini CLI" : isWindsurf ? "Windsurf" : isCursor ? "Cursor" : isCodex ? "Codex" : "Claude Code";
 
-  if (!isWindsurf && !isGemini && !isZed) {
+  if (!isWindsurf && !isGemini && !isZed && !isOpenClaw) {
     console.log(`\n  ${dim}To connect a second agent:${r}`);
     console.log(`  ${dim}cd into another project and run${r} ${bold}npx patchcord@latest${r} ${dim}there.${r}`);
   }
 
-  console.log(`\n${dim}Restart your ${toolName} session, then say:${r} ${bold}check inbox${r}`);
+  if (isOpenClaw) {
+    console.log(`\n${dim}Run${r} ${bold}openclaw gateway restart${r}${dim}, then tools will be available in your channels.${r}`);
+  } else {
+    console.log(`\n${dim}Restart your ${toolName} session, then say:${r} ${bold}check inbox${r}`);
+  }
   process.exit(0);
 }
 

package/package.json

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

package/scripts/check-inbox.sh

@@ -2,14 +2,13 @@
 set -euo pipefail
 
 find_patchcord_mcp_json() {
+  # Only check CWD itself — don't walk up.
+  # Walking up leaks agent identity from parent dirs into unrelated projects.
   local dir="${1:-$PWD}"
-  while [ -n "$dir" ] && [ "$dir" != "/" ]; do
-    if [ -f "$dir/.mcp.json" ]; then
-      printf '%s\n' "$dir/.mcp.json"
-      return 0
-    fi
-    dir=$(dirname "$dir")
-  done
+  if [ -f "$dir/.mcp.json" ]; then
+    printf '%s\n' "$dir/.mcp.json"
+    return 0
+  fi
   return 1
 }
 

package/scripts/statusline.sh

@@ -13,14 +13,13 @@ for arg in "$@"; do
 done
 
 find_patchcord_mcp_json() {
+    # Only check CWD itself — don't walk up.
+    # Walking up leaks agent identity from parent dirs into unrelated projects.
     local dir="$1"
-    while [ -n "$dir" ] && [ "$dir" != "/" ]; do
-        if [ -f "$dir/.mcp.json" ]; then
-            printf '%s\n' "$dir/.mcp.json"
-            return 0
-        fi
-        dir=$(dirname "$dir")
-    done
+    if [ -f "$dir/.mcp.json" ]; then
+        printf '%s\n' "$dir/.mcp.json"
+        return 0
+    fi
     return 1
 }
 

package/skills/codex/SKILL.md

@@ -87,16 +87,18 @@ attachment(relay=true, path_or_url="https://example.com/file.md", filename="file
 ```
 Server fetches the URL and stores it. ~50 tokens instead of thousands for the file content.
 
-**Presigned upload (for local files):**
+**Presigned upload (preferred for local files):**
 ```
-attachment(upload=true, filename="report.md") -> returns presigned URL
+attachment(upload=true, filename="report.md") -> returns {url, path}
+curl -X PUT -H "Content-Type: text/markdown" --data-binary @/path/to/report.md "<url>"
 ```
-PUT the file to the returned URL.
+Then send the `path` to the other agent. No base64, no token waste.
 
-**Inline base64 upload (for generated content):**
+**Inline base64 (last resort — small generated content only):**
 ```
-attachment(upload=true, filename="report.md", file_data="<base64>")
+attachment(upload=true, filename="notes.txt", file_data="<base64>")
 ```
+Never use for files on disk — use presigned upload above instead.
 
 **Downloading:**
 ```

package/skills/inbox/SKILL.md

@@ -75,17 +75,18 @@ attachment(relay=true, path_or_url="https://example.com/file.md", filename="file
 ```
 Server fetches the URL and stores it. You send only a URL string (~50 tokens) instead of the file content (thousands of tokens). Always prefer relay when the file is at a public URL.
 
-**Presigned upload (for local files):**
+**Presigned upload (preferred for local files):**
 ```
-attachment(upload=true, filename="report.md") -> returns presigned URL
+attachment(upload=true, filename="report.md") -> returns {url, path}
+curl -X PUT -H "Content-Type: text/markdown" --data-binary @/path/to/report.md "<url>"
 ```
-PUT the file to the returned URL. Best for files already on disk.
+Then send the `path` to the other agent. No base64, no token waste.
 
-**Inline base64 upload (for generated content):**
+**Inline base64 (last resort — small generated content only):**
 ```
-attachment(upload=true, filename="report.md", file_data="<base64>")
+attachment(upload=true, filename="notes.txt", file_data="<base64>")
 ```
-Upload directly with content embedded. Base64 adds ~33% overhead - keep files reasonable.
+Base64 adds ~33% overhead and wastes context tokens. Never use this for files on disk — use presigned upload above instead.
 
 **Downloading:**
 ```