@pushary/agent-hooks 0.4.3 → 0.4.5

package/dist/bin/pushary-clean.js

@@ -14,6 +14,7 @@ var check = green("\u2713");
 var skip = yellow("\u2013");
 var CLAUDE_SETTINGS = join(homedir(), ".claude", "settings.json");
 var CLAUDE_SETTINGS_LOCAL = join(homedir(), ".claude", "settings.local.json");
+var CLAUDE_JSON = join(homedir(), ".claude.json");
 var SKILL_DIR = join(homedir(), ".claude", "skills", "pushary");
 var CURSOR_MCP = join(".cursor", "mcp.json");
 var SHELL_FILES = [".zshrc", ".bashrc"].map((f) => join(homedir(), f));
@@ -97,6 +98,18 @@ var main = async () => {
   console.log();
   cleanSettingsFile(CLAUDE_SETTINGS, "Claude Code settings");
   cleanSettingsFile(CLAUDE_SETTINGS_LOCAL, "Claude Code settings.local");
+  const claudeJson = readJson(CLAUDE_JSON);
+  if (claudeJson) {
+    const mcpServers = claudeJson.mcpServers;
+    if (mcpServers?.pushary) {
+      delete mcpServers.pushary;
+      if (Object.keys(mcpServers).length === 0) delete claudeJson.mcpServers;
+      writeJson(CLAUDE_JSON, claudeJson);
+      console.log(`  ${check} Claude Code MCP server ${dim("(removed from ~/.claude.json)")}`);
+    } else {
+      console.log(`  ${skip} Claude Code MCP server ${dim("(not in ~/.claude.json)")}`);
+    }
+  }
   const cursorData = readJson(CURSOR_MCP);
   if (cursorData) {
     const mcpServers = cursorData.mcpServers;
@@ -119,8 +132,24 @@ var main = async () => {
   const codexConfig = join(homedir(), ".codex", "config.toml");
   try {
     let config = readFileSync(codexConfig, "utf-8");
-    if (config.includes("pushary-codex")) {
-      config = config.split("\n").filter((l) => !l.includes("pushary-codex")).join("\n");
+    const hadPushary = config.includes("pushary");
+    if (hadPushary) {
+      const lines = config.split("\n");
+      const cleaned = [];
+      let skipping = false;
+      for (const line of lines) {
+        if (line.trim() === "[mcp_servers.pushary]") {
+          skipping = true;
+          continue;
+        }
+        if (skipping && (line.startsWith("[") || line.trim() === "")) {
+          skipping = false;
+        }
+        if (skipping) continue;
+        if (line.includes("pushary-codex")) continue;
+        cleaned.push(line);
+      }
+      config = cleaned.join("\n").replace(/\n{3,}/g, "\n\n");
       writeFileSync(codexConfig, config, "utf-8");
       console.log(`  ${check} Codex config ${dim("(cleaned)")}`);
     } else {

package/dist/bin/pushary-doctor.js

@@ -38,14 +38,16 @@ var main = async () => {
   console.log(`  ${dim("Configuration")}`);
   const apiKey = process.env.PUSHARY_API_KEY;
   check(!!apiKey, "API key in environment", apiKey ? `pk_${apiKey.split(".")[0]?.slice(3, 7)}...` : "PUSHARY_API_KEY not set");
+  const CLAUDE_JSON = join(homedir(), ".claude.json");
+  const claudeJson = readJson(CLAUDE_JSON);
+  const mcpServers = claudeJson?.mcpServers ?? {};
+  const pusharyServer = mcpServers?.pushary;
+  check(!!pusharyServer, "Claude Code: MCP server configured");
+  if (pusharyServer) {
+    check(pusharyServer.type === "http", "Claude Code: MCP server type", pusharyServer.type ? String(pusharyServer.type) : 'missing \u2014 add type: "http"');
+  }
   const settings = readJson(CLAUDE_SETTINGS);
   if (settings) {
-    const mcpServers = settings.mcpServers;
-    const pusharyServer = mcpServers?.pushary;
-    check(!!pusharyServer, "Claude Code: MCP server configured");
-    if (pusharyServer) {
-      check(pusharyServer.type === "http", "Claude Code: MCP server type", pusharyServer.type ? String(pusharyServer.type) : 'missing \u2014 add type: "http"');
-    }
     const hooks = settings.hooks;
     const hasPreHook = JSON.stringify(hooks?.PreToolUse ?? []).includes("pushary-hook");
     const hasPostHook = JSON.stringify(hooks?.PostToolUse ?? []).includes("pushary-post-hook");
@@ -54,8 +56,8 @@ var main = async () => {
     check(hasPostHook, "Claude Code: PostToolUse hook");
     check(hasStopHook, "Claude Code: Stop hook");
     const permissions = settings.permissions;
-    const hasWildcard = permissions?.allow?.some((r) => r === "MCP(pushary:*)") ?? false;
-    check(hasWildcard, "Claude Code: Pushary tools auto-allowed", hasWildcard ? "MCP(pushary:*)" : "missing");
+    const hasWildcard = permissions?.allow?.some((r) => r === "mcp__pushary__*" || r === "MCP(pushary:*)") ?? false;
+    check(hasWildcard, "Claude Code: Pushary tools auto-allowed", hasWildcard ? "mcp__pushary__*" : "missing");
     const hasLegacyPerms = permissions?.allow?.some((r) => r.startsWith("mcp__pushary__")) ?? false;
     if (hasLegacyPerms) {
       console.log(`  ${warn} Legacy individual permissions detected ${dim("(run pushary clean, then setup again)")}`);

package/dist/bin/pushary-setup.js

@@ -8,6 +8,7 @@ import { execSync } from "child_process";
 import { checkbox, input, confirm } from "@inquirer/prompts";
 import { fileURLToPath } from "url";
 var CLAUDE_SETTINGS = join(homedir(), ".claude", "settings.json");
+var CLAUDE_JSON = join(homedir(), ".claude.json");
 var CURSOR_MCP = join(".cursor", "mcp.json");
 var SKILL_DIR = join(homedir(), ".claude", "skills", "pushary");
 var SHELL_FILES = [".zshrc", ".bashrc"].map((f) => join(homedir(), f));
@@ -75,14 +76,16 @@ var installGlobally = async () => {
     execSync("npm install -g @pushary/agent-hooks@latest", { stdio: "ignore" });
   });
 };
-var addMcpServer = (settings, apiKey) => {
-  const mcpServers = settings.mcpServers ?? {};
+var addMcpServer = (apiKey) => {
+  const data = readJson(CLAUDE_JSON);
+  const mcpServers = data.mcpServers ?? {};
   mcpServers.pushary = {
     type: "http",
     url: "https://pushary.com/api/mcp/mcp",
     headers: { Authorization: `Bearer ${apiKey}` }
   };
-  settings.mcpServers = mcpServers;
+  data.mcpServers = mcpServers;
+  writeJson(CLAUDE_JSON, data);
 };
 var addPermissionHooks = (settings) => {
   const hooks = settings.hooks ?? {};
@@ -127,7 +130,7 @@ var addToolPermissions = (settings) => {
   const permissions = settings.permissions ?? {};
   const allow = permissions.allow ?? [];
   const filtered = allow.filter((r) => !r.includes("pushary"));
-  const rule = "MCP(pushary:*)";
+  const rule = "mcp__pushary__*";
   if (!filtered.includes(rule)) filtered.push(rule);
   permissions.allow = filtered;
   settings.permissions = permissions;
@@ -149,7 +152,7 @@ var setupClaudeCode = async (apiKey) => {
 `);
   const settings = readJson(CLAUDE_SETTINGS);
   await spinner("Adding MCP server (type: http)", async () => {
-    addMcpServer(settings, apiKey);
+    addMcpServer(apiKey);
   });
   await spinner("Auto-allowing Pushary tools", async () => {
     addToolPermissions(settings);
@@ -173,17 +176,25 @@ var setupHermes = async (_apiKey) => {
   console.log(`
   ${bold("Setting up Hermes Agent")}
 `);
+  let pipInstalled = false;
   await spinner("Installing hermes-plugin-pushary", async () => {
-    try {
-      execSync("pip install hermes-plugin-pushary", { stdio: "ignore" });
-    } catch {
+    for (const pip of ["pip3", "pip"]) {
       try {
-        execSync("pip3 install hermes-plugin-pushary", { stdio: "ignore" });
-      } catch {
-        throw new Error("pip not found");
+        execSync(`${pip} install hermes-plugin-pushary`, { stdio: "pipe" });
+        pipInstalled = true;
+        return;
+      } catch (err) {
+        const msg = err instanceof Error ? err.stderr?.toString() ?? "" : "";
+        if (msg.includes("No matching distribution")) {
+          throw new Error("requires Python 3.10+ (your pip uses an older version)");
+        }
       }
     }
+    throw new Error("pip not found");
   });
+  if (!pipInstalled) {
+    console.log(`  ${dim("  Install Python 3.10+ and re-run setup to fix.")}`);
+  }
   await spinner("Enabling plugin", async () => {
     try {
       execSync("hermes plugins enable pushary", { stdio: "ignore" });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushary/agent-hooks",
-  "version": "0.4.3",
+  "version": "0.4.5",
   "description": "Permission hooks for AI coding agents: route tool approvals through Pushary push notifications",
   "author": "Pushary <business@pushary.com>",
   "homepage": "https://pushary.com",