patchcord 0.5.111 → 0.5.113

package/bin/patchcord.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import { existsSync, mkdirSync, cpSync, readdirSync, readFileSync, writeFileSync, unlinkSync } from "fs";
+import { existsSync, mkdirSync, cpSync, readdirSync, readFileSync, writeFileSync, unlinkSync, rmSync } from "fs";
 import { join, dirname, basename } from "path";
 import { fileURLToPath } from "url";
 import { execSync } from "child_process";
@@ -1563,29 +1563,59 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd?.startsWith("--")) {
     if (windsurfChanged) globalChanges.push("Windsurf skills installed");
   }
 
-  // Gemini CLI
+  // Gemini CLI + Antigravity (they SHARE ~/.gemini/skills and ~/.gemini/commands).
+  // Seed the patchcord skill ONLY when patchcord MCP is actually configured for
+  // one of these surfaces. Otherwise a bare session (esp. Antigravity, which
+  // inherits this dir) reads a skill with no backing MCP tool and improvises
+  // destructively — scavenging other agents' bearer tokens off disk and curling
+  // the API. Invariant: skill present ⟺ patchcord MCP present under ~/.gemini.
   if (existsSync(join(HOME, ".gemini"))) {
+    // true = configured, false = file absent (definitely not), null = unparseable (unknown)
+    const hasPatchcordMcp = (p, keyPath) => {
+      if (!existsSync(p)) return false;
+      try { return !!keyPath.reduce((o, k) => o?.[k], JSON.parse(readFileSync(p, "utf-8"))); }
+      catch { return null; }
+    };
+    const checks = [
+      hasPatchcordMcp(join(HOME, ".gemini", "settings.json"), ["mcpServers", "patchcord"]),
+      hasPatchcordMcp(join(HOME, ".gemini", "antigravity", "mcp_config.json"), ["mcpServers", "patchcord"]),
+      hasPatchcordMcp(join(HOME, ".gemini", "antigravity-cli", "mcp_config.json"), ["mcpServers", "patchcord"]),
+    ];
+    const mcpConfigured = checks.some((c) => c === true);
+    const mcpUnknown = checks.some((c) => c === null);
     const geminiSkillDir = join(HOME, ".gemini", "skills", "patchcord");
     const geminiWaitDir = join(HOME, ".gemini", "skills", "patchcord-wait");
     const geminiCmdDir = join(HOME, ".gemini", "commands");
-    let geminiChanged = false;
-    if (!existsSync(geminiSkillDir)) {
-      mkdirSync(geminiSkillDir, { recursive: true });
-      cpSync(join(pluginRoot, "skills", "inbox", "SKILL.md"), join(geminiSkillDir, "SKILL.md"));
-      geminiChanged = true;
-    }
-    if (!existsSync(geminiWaitDir)) {
-      mkdirSync(geminiWaitDir, { recursive: true });
-      cpSync(join(pluginRoot, "skills", "wait", "SKILL.md"), join(geminiWaitDir, "SKILL.md"));
-      geminiChanged = true;
-    }
-    if (!existsSync(join(geminiCmdDir, "inbox.toml"))) {
-      mkdirSync(geminiCmdDir, { recursive: true });
-      cpSync(join(pluginRoot, "commands", "inbox.toml"), join(geminiCmdDir, "inbox.toml"));
-      cpSync(join(pluginRoot, "commands", "wait.toml"), join(geminiCmdDir, "wait.toml"));
-      geminiChanged = true;
-    }
-    if (geminiChanged) globalChanges.push("Gemini CLI skills + commands installed");
+    const geminiLegacyCmd = join(geminiCmdDir, "patchcord.toml"); // single-command file from older installs
+    if (mcpConfigured) {
+      let geminiChanged = false;
+      // Refresh to the CURRENT plugin version (overwrite, not create-if-absent)
+      // so skill/gate fixes reach machines that already have an older copy.
+      const seedFile = (dest, src) => {
+        mkdirSync(dirname(dest), { recursive: true });
+        const want = readFileSync(src, "utf-8");
+        let cur = ""; try { cur = readFileSync(dest, "utf-8"); } catch {}
+        if (cur !== want) { writeFileSync(dest, want); geminiChanged = true; }
+      };
+      seedFile(join(geminiSkillDir, "SKILL.md"), join(pluginRoot, "skills", "inbox", "SKILL.md"));
+      seedFile(join(geminiWaitDir, "SKILL.md"), join(pluginRoot, "skills", "wait", "SKILL.md"));
+      seedFile(join(geminiCmdDir, "inbox.toml"), join(pluginRoot, "commands", "inbox.toml"));
+      seedFile(join(geminiCmdDir, "wait.toml"), join(pluginRoot, "commands", "wait.toml"));
+      if (existsSync(geminiLegacyCmd)) { try { unlinkSync(geminiLegacyCmd); geminiChanged = true; } catch {} }
+      if (geminiChanged) globalChanges.push("Gemini/Antigravity patchcord skills + commands refreshed");
+    } else if (!mcpUnknown) {
+      // Definitively no patchcord MCP under ~/.gemini → remove any previously
+      // seeded skill/commands so a bare Gemini/Antigravity session has nothing
+      // to act on (incl. the legacy patchcord.toml command).
+      let removed = false;
+      for (const d of [geminiSkillDir, geminiWaitDir]) {
+        if (existsSync(d)) { try { rmSync(d, { recursive: true, force: true }); removed = true; } catch {} }
+      }
+      for (const f of [join(geminiCmdDir, "inbox.toml"), join(geminiCmdDir, "wait.toml"), geminiLegacyCmd]) {
+        if (existsSync(f)) { try { unlinkSync(f); removed = true; } catch {} }
+      }
+      if (removed) globalChanges.push("Removed stale Gemini/Antigravity patchcord skills (no patchcord MCP configured there)");
+    }
   }
 
   // Kimi CLI

package/package.json

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

package/skills/inbox/SKILL.md

@@ -10,6 +10,18 @@ description: >
 
 7 MCP tools: inbox, send_message, reply, wait_for_message, attachment, recall, unsend.
 
+## Applies ONLY when the patchcord MCP tools are loaded this session
+
+This skill governs those 7 MCP tools. It applies only if they are actually available in the current session.
+
+**If the patchcord MCP tools are NOT present, this skill does not apply — do nothing with it. Specifically:**
+- Do NOT call inbox() at session start or at any other time.
+- Do NOT run the `patchcord` CLI as a substitute for the missing tools.
+- Do NOT read a bearer token out of `.mcp.json`, `settings.json`, `mcp_config.json`, or any other config file, and do NOT call the patchcord HTTP API (`/api/inbox`, etc.) directly. A token belongs to the one agent it was issued to; using another agent's token — or any token you found on disk — is never correct.
+- Just proceed with the user's actual request.
+
+A missing tool means patchcord is not configured for this agent. That is a normal, silent state, not a problem to work around.
+
 ## Do the work, never just acknowledge
 
 When you receive a message from another agent:
@@ -117,7 +129,7 @@ Always send the storage path (not the file content) to the other agent.
 
 ## Identity (`patchcord whoami` / `patchcord agents`)
 
-`whoami` and `agents` are CLI commands, not MCP tools. They use the bearer token from the project's `.mcp.json` — same namespace scope, no extra setup. Cheap to call (input tokens only), don't bloat MCP.
+`whoami` and `agents` are CLI commands, not MCP tools. Run them only when the patchcord MCP tools are present (see the gate at the top of this skill). They read the bearer token from the **current project's own** `.mcp.json` automatically — same namespace scope, no extra setup. Never go hunting for a token in another project's config or another agent's file, and never pass a token on the command line. Cheap to call (input tokens only), don't bloat MCP.
 
 - **Run `patchcord whoami` once per session.** Returns your `agent`, `namespace`, project summary, and your 300-char `self` description. Use it on first turn after `/clear` or a fresh session to orient.
 - **Run `patchcord agents`** to see the full roster (every peer's whoami). One call, ~3KB, complete picture of the namespace.

package/skills/wait/SKILL.md

@@ -8,6 +8,8 @@ description: >
 ---
 # patchcord:wait
 
+Applies ONLY when the patchcord MCP tools are loaded this session. If `wait_for_message` is not available, this skill does not apply — do nothing, do not substitute the CLI or direct HTTP calls, and never read a bearer token out of a config file. Proceed with the user's request.
+
 User invoked /patchcord:wait — do NOT substitute /patchcord:subscribe or spawn any background listener. Use `wait_for_message()` only.
 
 Call `wait_for_message()` to block until a message arrives (up to 5 minutes).