patchcord 0.3.6 → 0.3.7

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "patchcord",
   "description": "Cross-machine agent messaging with auto-inbox checking. Agents automatically respond to messages from other agents without human intervention.",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "author": {
     "name": "ppravdin"
   },

package/bin/patchcord.mjs

@@ -21,12 +21,10 @@ if (!cmd || cmd === "help" || cmd === "--help" || cmd === "-h") {
   console.log(`patchcord — agent messaging for Claude Code & Codex
 
 Commands:
-  patchcord install            Install/update plugin globally (Claude Code)
-  patchcord install --full     Install + enable full statusline (model, context%, git)
-  patchcord agent              Set up MCP config for an agent in this project
-  patchcord agent --codex      Set up Codex skill + MCP config in this project
-  patchcord skill apply        Fetch and apply custom skill from the web console
-  patchcord skill reinstall    Full rewrite: default skill + custom skill from server
+  patchcord install            One-time global setup (auto-detects Claude Code + Codex)
+  patchcord install --full     Same + enable full statusline (model, context%, git)
+  patchcord agent              Set up MCP config for this project (auto-detects tool)
+  patchcord skill apply        Fetch custom skill from web console
 
 Run "patchcord install" once. Run "patchcord agent" in each project.`);
   process.exit(0);
@@ -37,101 +35,107 @@ if (cmd === "plugin-path") {
   process.exit(0);
 }
 
-// ── install: global plugin + skills (idempotent) ──────────────
+// ── install: global setup for all detected tools (idempotent) ──
 if (cmd === "install") {
-  const hasClaude = run("which claude");
-  if (!hasClaude) {
-    console.log(`Claude Code CLI not found. Install it first:
-  https://claude.ai/code
-
-Then run: patchcord install`);
-    process.exit(1);
-  }
-
   const flags = process.argv.slice(3);
   const fullStatusline = flags.includes("--full");
+  const { readFileSync, writeFileSync } = await import("fs");
 
-  console.log("Installing patchcord plugin into Claude Code...");
+  let installedSomething = false;
 
-  // Register npm package as a local marketplace (idempotent)
-  const marketplaceExists = run(`claude plugin marketplace list`)?.includes("patchcord");
-  if (!marketplaceExists) {
-    const addResult = run(`claude plugin marketplace add "${pluginRoot}"`);
-    if (addResult === null) {
-      console.log(`✗ Could not add marketplace. Try manually:
-  claude plugin marketplace add "${pluginRoot}"
-  claude plugin install patchcord`);
-      process.exit(1);
+  // ── Claude Code ──
+  const hasClaude = run("which claude");
+  if (hasClaude) {
+    console.log("Found Claude Code. Installing patchcord plugin...");
+
+    // Register npm package as a local marketplace (idempotent)
+    const marketplaceExists = run(`claude plugin marketplace list`)?.includes("patchcord");
+    if (!marketplaceExists) {
+      run(`claude plugin marketplace add "${pluginRoot}"`);
     }
-  }
 
-  // Install or update the plugin from the marketplace
-  const installed = run(`claude plugin list`)?.includes("patchcord");
-  const result = installed
-    ? run(`claude plugin update patchcord`)
-    : run(`claude plugin install patchcord`);
-  if (result === null && !installed) {
-    console.log(`✗ Plugin install failed. Try manually:
-  claude plugin marketplace add "${pluginRoot}"
-  claude plugin install patchcord`);
-    process.exit(1);
+    // Install or update the plugin from the marketplace
+    const installed = run(`claude plugin list`)?.includes("patchcord");
+    installed ? run(`claude plugin update patchcord`) : run(`claude plugin install patchcord`);
+
+    // Block OAuth tool leakage from claude.ai web connector
+    const claudeSettings = join(process.env.HOME || "", ".claude", "settings.json");
+    if (existsSync(claudeSettings)) {
+      try {
+        const settings = JSON.parse(readFileSync(claudeSettings, "utf-8"));
+        const deny = settings.permissions?.deny || [];
+        if (!deny.includes("mcp__claude_ai_Patchcord__*")) {
+          if (!settings.permissions) settings.permissions = {};
+          if (!settings.permissions.deny) settings.permissions.deny = [];
+          settings.permissions.deny.push("mcp__claude_ai_Patchcord__*");
+          writeFileSync(claudeSettings, JSON.stringify(settings, null, 2) + "\n");
+          console.log("✓ Blocked OAuth tool leakage from claude.ai web connector.");
+        }
+      } catch {
+        // Non-fatal — settings.json might be malformed
+      }
+    }
+
+    // Enable statusline
+    const enableScript = join(pluginRoot, "scripts", "enable-statusline.sh");
+    if (existsSync(enableScript)) {
+      const slArg = fullStatusline ? " --full" : "";
+      run(`bash "${enableScript}"${slArg}`);
+    }
+
+    console.log(`✓ Claude Code plugin installed.${fullStatusline ? " Full statusline enabled." : ""}`);
+    installedSomething = true;
   }
 
-  // Disable patchcord as Codex ChatGPT app (prevents OAuth identity conflict)
+  // ── Codex CLI ──
   const codexConfig = join(process.env.HOME || "", ".codex", "config.toml");
   if (existsSync(codexConfig)) {
-    const { readFileSync, writeFileSync } = await import("fs");
+    console.log("Found Codex CLI config.");
+
+    // Disable patchcord as ChatGPT app (prevents OAuth identity conflict)
     const content = readFileSync(codexConfig, "utf-8");
     if (!content.includes("[apps.patchcord]")) {
       writeFileSync(codexConfig, content.trimEnd() + "\n\n[apps.patchcord]\nenabled = false\n");
       console.log("✓ Disabled patchcord ChatGPT app in Codex (prevents identity conflict).");
     }
-  }
-
-  // Enable statusline
-  const enableScript = join(pluginRoot, "scripts", "enable-statusline.sh");
-  if (existsSync(enableScript)) {
-    const slArg = fullStatusline ? " --full" : "";
-    const slResult = run(`bash "${enableScript}"${slArg}`);
-    if (slResult !== null) {
-      console.log(`✓ Plugin installed. Statusline${fullStatusline ? " (full)" : ""} enabled.
 
-${fullStatusline
-  ? "Statusline shows: model │ context% │ repo (branch) │ agent@namespace │ inbox"
-  : "Statusline shows: agent@namespace │ inbox\n  Tip: run \"patchcord install --full\" for model, context%, git info too."}
+    installedSomething = true;
+  }
 
-Run "patchcord agent" in each project to set up MCP.`);
-    } else {
-      console.log(`✓ Plugin installed. Statusline setup skipped (non-fatal).
+  if (!installedSomething) {
+    console.log(`No Claude Code or Codex CLI detected.
 
-Run "patchcord agent" in each project to set up MCP.`);
-    }
-  } else {
-    console.log(`✓ Plugin installed.
+Install one first:
+  Claude Code: https://claude.ai/code
+  Codex CLI:   npm install -g @openai/codex
 
-Run "patchcord agent" in each project to set up MCP.`);
+Then run: npx patchcord@latest install`);
+    process.exit(1);
   }
+
+  console.log(`\nRun "npx patchcord@latest agent" in each project to set up MCP.`);
   process.exit(0);
 }
 
-// ── agent: per-project MCP setup ──────────────────────────────
+// ── agent: per-project MCP setup (auto-detects tool) ──────────
 if (cmd === "agent") {
-  const flag = process.argv[3];
   const cwd = process.cwd();
 
-  if (flag === "--codex" || (!flag && existsSync(join(cwd, ".agents")))) {
-    // Codex: copy skill + print MCP config
+  // Auto-detect: Codex project has .agents folder or .codex folder
+  const isCodex = existsSync(join(cwd, ".agents")) || existsSync(join(cwd, ".codex"));
+
+  if (isCodex) {
+    // Codex: copy skill
     const dest = join(cwd, ".agents", "skills", "patchcord");
     mkdirSync(dest, { recursive: true });
     cpSync(join(pluginRoot, "codex", "SKILL.md"), join(dest, "SKILL.md"));
     console.log(`✓ Codex skill installed: ${dest}/SKILL.md
 
-Add to ~/.codex/config.toml:
+Add to .codex/config.toml in this project:
 
   [mcp_servers.patchcord]
-  url = "https://YOUR_SERVER/mcp"
-  bearer_token_env_var = "PATCHCORD_TOKEN"
-  http_headers = { "X-Patchcord-Client-Type" = "codex" }`);
+  url = "https://YOUR_SERVER/mcp/bearer"
+  http_headers = { "Authorization" = "Bearer YOUR_TOKEN", "X-Patchcord-Client-Type" = "codex" }`);
   } else {
     // Claude Code: print .mcp.json template
     console.log(`Add .mcp.json to this project:
@@ -142,8 +146,7 @@ Add to ~/.codex/config.toml:
         "type": "http",
         "url": "https://YOUR_SERVER/mcp",
         "headers": {
-          "Authorization": "Bearer YOUR_TOKEN",
-          "X-Patchcord-Client-Type": "claude_code"
+          "Authorization": "Bearer YOUR_TOKEN"
         }
       }
     }
@@ -153,8 +156,7 @@ Or use the CLI:
 
   claude mcp add patchcord "https://YOUR_SERVER/mcp" \\
     --transport http -s project \\
-    -H "Authorization: Bearer YOUR_TOKEN" \\
-    -H "X-Patchcord-Client-Type: claude_code"`);
+    -H "Authorization: Bearer YOUR_TOKEN"`);
   }
   process.exit(0);
 }
@@ -163,12 +165,12 @@ Or use the CLI:
 if (cmd === "init") {
   console.log(`"patchcord init" is now two commands:
 
-  patchcord install    Install/update plugin globally (once)
+  patchcord install    One-time global setup (once)
   patchcord agent      Set up MCP for this project (per project)`);
   process.exit(0);
 }
 
-// ── skill: custom skill management ───────────────────────────
+// ── skill: custom skill from web console ─────────────────────
 if (cmd === "skill") {
   const sub = process.argv[3];
   const cwd = process.cwd();
@@ -215,9 +217,6 @@ if (cmd === "skill") {
     process.exit(1);
   }
 
-  // Custom skill goes to .claude/skills/patchcord-custom/SKILL.md
-  // Claude Code auto-discovers project-level skills from this directory.
-  // Only the custom part — default patchcord skill is already loaded globally by the plugin.
   const skillDir = join(cwd, ".claude", "skills", "patchcord-custom");
   const skillFile = join(skillDir, "SKILL.md");
 
@@ -241,34 +240,10 @@ if (cmd === "skill") {
       console.error("Failed to parse skill response.");
       process.exit(1);
     }
-  } else if (sub === "reinstall") {
-    console.log(`Fetching custom skill for ${namespace}:${agentId}...`);
-    const resp = run(`curl -s -H "Authorization: Bearer ${token}" "${baseUrl}/api/skills/${namespace}/${agentId}"`);
-    try {
-      const data = JSON.parse(resp || "{}");
-      if (data.skill_text) {
-        mkdirSync(skillDir, { recursive: true });
-        writeFileSync(skillFile, data.skill_text.trim() + "\n");
-        console.log(`✓ Custom skill applied to ${skillFile}`);
-      } else {
-        // Remove custom skill if none set
-        if (existsSync(skillFile)) {
-          const { unlinkSync } = await import("fs");
-          unlinkSync(skillFile);
-          console.log("Custom skill removed (none set on server).");
-        } else {
-          console.log("No custom skill set for this agent.");
-        }
-      }
-    } catch {
-      console.log("No custom skill set or server unreachable.");
-    }
   } else {
-    console.log(`Unknown skill subcommand: ${sub}
-Usage:
-  patchcord skill apply      Fetch and apply custom skill from server
-  patchcord skill reinstall  Re-fetch custom skill from server`);
+    console.log(`Usage: patchcord skill apply`);
   }
+
   // Clean up old PATCHCORD.md if it exists
   const oldFile = join(cwd, "PATCHCORD.md");
   if (existsSync(oldFile)) {

package/package.json

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