patchcord 0.6.24 → 0.6.26

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "patchcord",
   "description": "Cross-machine agent messaging. Messages from other agents land in the inbox and wake the agent to reply.",
-  "version": "0.6.24",
+  "version": "0.6.26",
   "author": {
     "name": "ppravdin"
   },

package/bin/patchcord.mjs

@@ -257,11 +257,14 @@ function _purgeLegacyKimiProjectConfig(dir) {
   } catch {}
 }
 
-// Cursor slash menu duplicates come from (a) stale combined/no-hyphen dirs under
-// skills-cursor and (b) Claude colon-named plugin skills bundled inside
-// cursor-agent's node_modules/patchcord. NEVER touch ~/.agents/skills — that tree
-// is Codex/Antigravity-owned (global + per-project); Cursor update must not
-// delete other harnesses' skills.
+// Cursor slash menu duplicates come from multiple trees Cursor CLI indexes:
+//   (a) stale no-hyphen / colon dirs under skills-cursor
+//   (b) cursor-agent's bundled node_modules/patchcord — both skills/ (Claude
+//       colon names → /patchcordinbox) AND per-project-skills/cursor (exact
+//       dupes of skills-cursor /patchcord-inbox)
+//   (c) ~/.agents/skills Codex copies (/patchcord) — Cursor indexes Agent Skills
+// NEVER delete ~/.agents/skills content (Codex owns that tree). We only strip
+// the cursor-agent-bundled copies Cursor should not show.
 function _purgeCursorSkillDuplicates() {
   const staleCursorOnly = [
     "patchcord",
@@ -278,8 +281,22 @@ function _purgeCursorSkillDuplicates() {
     if (!existsSync(d)) continue;
     try { rmSync(d, { recursive: true, force: true }); } catch {}
   }
-  // cursor-agent ships patchcord@* with Claude plugin skills/ — Cursor must not
-  // index those; only per-project skills-cursor copies are valid for Cursor CLI.
+  // Keep ONLY the three hyphenated Cursor skills under skills-cursor.
+  // Anything else named patchcord* there is leftover junk.
+  if (existsSync(cursorSkillsRoot)) {
+    const keep = new Set(["patchcord-inbox", "patchcord-wait", "patchcord-subscribe"]);
+    try {
+      for (const ent of readdirSync(cursorSkillsRoot, { withFileTypes: true })) {
+        if (!ent.isDirectory()) continue;
+        if (!/^patchcord/i.test(ent.name)) continue;
+        if (keep.has(ent.name)) continue;
+        try { rmSync(join(cursorSkillsRoot, ent.name), { recursive: true, force: true }); } catch {}
+      }
+    } catch {}
+  }
+  // cursor-agent ships the full npm package. Cursor indexes SKILL.md under it,
+  // so strip BOTH skills/ and per-project-skills/ from every bundled copy.
+  // Canonical Cursor skills live only in ~/.cursor/skills-cursor/.
   const cursorAgentRoot = join(HOME, ".local", "share", "cursor-agent");
   if (existsSync(cursorAgentRoot)) {
     const walk = (dir, depth = 0) => {
@@ -290,8 +307,8 @@ function _purgeCursorSkillDuplicates() {
         const p = join(dir, ent.name);
         if (ent.isDirectory()) {
           if (ent.name === "patchcord" && dir.endsWith("node_modules")) {
-            for (const pluginSkill of ["inbox", "wait", "subscribe"]) {
-              const sd = join(p, "skills", pluginSkill);
+            for (const sub of ["skills", "per-project-skills"]) {
+              const sd = join(p, sub);
               if (existsSync(sd)) {
                 try { rmSync(sd, { recursive: true, force: true }); } catch {}
               }
@@ -318,8 +335,10 @@ function _purgeCursorSkillDuplicates() {
   }
 }
 
-// Codex global skills live at ~/.agents/skills/ (not Cursor). Refresh on
-// update so a mistaken Cursor-only purge cannot leave Codex without @patchcord.
+// Codex global skills live at ~/.agents/skills/. Cursor CLI also indexes that
+// tree (no exclude setting — see cursor.com/docs/skills). Use ONE hyphenated
+// wait skill here so Cursor does not also show /patchcordwait (colon) +
+// /patchcord-wait (skills-cursor). Claude plugin skills keep colon names.
 function _restoreCodexGlobalSkills() {
   const codexConfig = join(HOME, ".codex", "config.toml");
   if (!existsSync(codexConfig)) return;
@@ -330,11 +349,20 @@ function _restoreCodexGlobalSkills() {
     writeFileSync(join(globalSkillDir, "SKILL.md"),
       readFileSync(join(pluginRoot, "per-project-skills", "codex", "SKILL.md"), "utf-8"));
     mkdirSync(globalWaitDir, { recursive: true });
+    // Shared hyphenated wait (same MCP wait_for_message flow as Cursor).
     writeFileSync(join(globalWaitDir, "SKILL.md"),
-      readFileSync(join(pluginRoot, "skills", "wait", "SKILL.md"), "utf-8"));
+      readFileSync(join(pluginRoot, "per-project-skills", "cursor", "wait", "SKILL.md"), "utf-8"));
   } catch {}
 }
 
+/** True when Codex is on this machine (agents skills would be indexed by Cursor). */
+function _hasCodexAgentsSkills() {
+  if (existsSync(join(HOME, ".codex", "config.toml"))) return true;
+  if (existsSync(join(HOME, ".agents", "skills", "patchcord"))) return true;
+  if (existsSync(join(HOME, ".agents", "skills", "patchcord-wait"))) return true;
+  return false;
+}
+
 // preserving the rest of the user's YAML. Block-style only (what Hermes writes).
 function upsertHermesConfig(existing, url, token) {
   const block = [
@@ -1949,16 +1977,28 @@ if (!cmd || cmd === "install" || cmd === "agent" || cmd?.startsWith("--")) {
     if (existsSync(staleCursorSkillDir)) {
       try { rmSync(staleCursorSkillDir, { recursive: true, force: true }); cursorChanged = true; } catch {}
     }
+    // Always install Cursor-specific inbox + subscribe (not in ~/.agents).
     mkdirSync(cursorInboxDir, { recursive: true });
     cpSync(join(pluginRoot, "per-project-skills", "cursor", "inbox", "SKILL.md"), join(cursorInboxDir, "SKILL.md"));
     cursorChanged = true;
-    mkdirSync(cursorWaitDir, { recursive: true });
-    cpSync(join(pluginRoot, "per-project-skills", "cursor", "wait", "SKILL.md"), join(cursorWaitDir, "SKILL.md"));
     mkdirSync(cursorSubscribeDir, { recursive: true });
     cpSync(
       join(pluginRoot, "per-project-skills", "cursor", "subscribe", "SKILL.md"),
       join(cursorSubscribeDir, "SKILL.md")
     );
+    // Wait is shared MCP flow. If Codex/agents already owns patchcord-wait,
+    // keep ONE copy under ~/.agents (Cursor indexes it) — do NOT also install
+    // skills-cursor/patchcord-wait (duplicate slash). Cursor-only machines
+    // still get wait under skills-cursor.
+    if (_hasCodexAgentsSkills()) {
+      _restoreCodexGlobalSkills();
+      if (existsSync(cursorWaitDir)) {
+        try { rmSync(cursorWaitDir, { recursive: true, force: true }); cursorChanged = true; } catch {}
+      }
+    } else {
+      mkdirSync(cursorWaitDir, { recursive: true });
+      cpSync(join(pluginRoot, "per-project-skills", "cursor", "wait", "SKILL.md"), join(cursorWaitDir, "SKILL.md"));
+    }
     if (cursorChanged) globalChanges.push("Cursor skills installed");
 
     if (hasCursorAgent) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "patchcord",
-  "version": "0.6.24",
+  "version": "0.6.26",
   "description": "Cross-machine agent messaging for Claude Code and Codex",
   "scripts": {
     "version": "node scripts/sync-plugin-version.mjs && git add .claude-plugin/plugin.json"