@pushary/agent-hooks 0.62.5 → 0.62.6

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## 0.62.6
+
+### `clean` rewrote your project's Cursor config and left your own alone
+
+`clean` built the Cursor MCP path without a home directory, so it resolved
+against whatever directory you ran it from. Inside a repo that has a
+`.cursor/mcp.json`, it rewrote that committed file, stripping the Pushary entry
+and reformatting the rest. Meanwhile your real `~/.cursor/mcp.json` was never
+touched, so the API key stayed in it.
+
+Check `git status` in any project you ran `clean` from, and check
+`~/.cursor/mcp.json` for a key you thought was gone.
+
+### Every file the CLI touches is now named in one place
+
+`setup`, `clean`, `doctor`, `logout` and `upgrade` each derived the same paths by
+hand, and they drifted. That drift caused this bug and the `CODEX_HOME` one
+before it. All twenty-three call sites now resolve through one module, and a test
+fails any command that starts spelling a path out again.
+
+No behaviour changed anywhere else: setup's output is byte-identical across every
+mode before and after.
+
+
 ## 0.62.5
 
 ### `clean --dry-run` changed things again

package/dist/bin/pushary-clean.js

@@ -10,12 +10,22 @@ import {
   removeGeminiSettings
 } from "../chunk-E2U35RLD.js";
 import {
+  claudeJson,
+  claudeSettings,
+  claudeSettingsLocal,
+  claudeSkillDir,
   codexAgentsMd,
   codexConfigToml,
   codexHooksJson,
   codexSkillDir,
+  cursorPluginDir,
+  cursorUserHooks,
+  cursorUserMcp,
+  geminiMd,
+  geminiSettings,
+  pusharyDir,
   removeCodexHooks
-} from "../chunk-ER657KRJ.js";
+} from "../chunk-RU3CIBXY.js";
 import {
   removeClaudeAlias
 } from "../chunk-BC3VCZ3E.js";
@@ -63,14 +73,14 @@ var green = (s) => `\x1B[32m${s}\x1B[0m`;
 var yellow = (s) => `\x1B[33m${s}\x1B[0m`;
 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 CURSOR_PLUGIN_DIR = join(homedir(), ".cursor", "plugins", "local", "pushary");
-var CURSOR_USER_HOOKS = join(homedir(), ".cursor", "hooks.json");
-var PUSHARY_DIR = join(homedir(), ".pushary");
+var CLAUDE_SETTINGS = claudeSettings();
+var CLAUDE_SETTINGS_LOCAL = claudeSettingsLocal();
+var CLAUDE_JSON = claudeJson();
+var SKILL_DIR = claudeSkillDir();
+var CURSOR_MCP = cursorUserMcp();
+var CURSOR_PLUGIN_DIR = cursorPluginDir();
+var CURSOR_USER_HOOKS = cursorUserHooks();
+var PUSHARY_DIR = pusharyDir();
 var SHELL_FILES = [".zshrc", ".zprofile", ".bashrc", ".bash_profile"].map((f) => join(homedir(), f));
 var resolveHermesPython = () => {
   try {
@@ -157,10 +167,10 @@ 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) {
-    if (removeClaudeMcpServers(claudeJson)) {
-      writeJson(CLAUDE_JSON, claudeJson);
+  const claudeJson2 = readJson(CLAUDE_JSON);
+  if (claudeJson2) {
+    if (removeClaudeMcpServers(claudeJson2)) {
+      writeJson(CLAUDE_JSON, claudeJson2);
       console.log(`  ${check} Claude Code MCP servers ${dim("(removed from ~/.claude.json)")}`);
     } else {
       console.log(`  ${skip} Claude Code MCP servers ${dim("(no pushary entries)")}`);
@@ -257,11 +267,11 @@ var main = async () => {
   } else {
     console.log(`  ${skip} Codex skill directory ${dim("(not found)")}`);
   }
-  const geminiSettingsPath = join(homedir(), ".gemini", "settings.json");
-  const geminiSettings = readJson(geminiSettingsPath);
-  if (geminiSettings) {
-    if (removeGeminiSettings(geminiSettings)) {
-      writeJson(geminiSettingsPath, geminiSettings);
+  const geminiSettingsPath = geminiSettings();
+  const geminiSettings2 = readJson(geminiSettingsPath);
+  if (geminiSettings2) {
+    if (removeGeminiSettings(geminiSettings2)) {
+      writeJson(geminiSettingsPath, geminiSettings2);
       console.log(`  ${check} Gemini CLI settings ${dim(did("cleaned"))}`);
     } else {
       console.log(`  ${skip} Gemini CLI settings ${dim("(no pushary entries)")}`);
@@ -269,8 +279,8 @@ var main = async () => {
   } else {
     console.log(`  ${skip} Gemini CLI settings ${dim("(not found)")}`);
   }
-  const geminiMd = join(homedir(), ".gemini", "GEMINI.md");
-  if (guardedInstructionBlockRemoval(geminiMd)) {
+  const geminiMd2 = geminiMd();
+  if (guardedInstructionBlockRemoval(geminiMd2)) {
     console.log(`  ${check} Gemini GEMINI.md ${dim("(removed Pushary block)")}`);
   } else {
     console.log(`  ${skip} Gemini GEMINI.md ${dim("(no pushary block)")}`);

package/dist/bin/pushary-doctor.js

@@ -4,7 +4,7 @@ import {
 } from "../chunk-IIENZE2J.js";
 import {
   detectAllAgents
-} from "../chunk-UXXRRXUS.js";
+} from "../chunk-6G2BC4ET.js";
 import {
   hasInstructionBlock
 } from "../chunk-N7XJ4L2W.js";
@@ -14,15 +14,22 @@ import {
   missingGeminiHookEvents
 } from "../chunk-E2U35RLD.js";
 import {
+  claudeJson,
+  claudeSettings,
+  claudeSkillDir,
   codexAgentsMd,
   codexConfigToml,
   codexHooksJson,
   codexSkillDir,
+  cursorPluginDir,
+  cursorUserHooks,
+  geminiMd,
+  geminiSettings,
   hasCodexHooks,
   missingCodexHookEvents,
   readCodexMcpAuth,
   untrustedCodexHookEvents
-} from "../chunk-ER657KRJ.js";
+} from "../chunk-RU3CIBXY.js";
 import {
   describeReach,
   fetchChannels,
@@ -159,8 +166,8 @@ var { bold, dim, green, yellow, red, cyan } = createIo();
 var pass = green("\u2713");
 var fail = red("\u2717");
 var warn = yellow("!");
-var CLAUDE_SETTINGS = join(homedir2(), ".claude", "settings.json");
-var SKILL_PATH = join(homedir2(), ".claude", "skills", "pushary", "SKILL.md");
+var CLAUDE_SETTINGS = claudeSettings();
+var SKILL_PATH = join(claudeSkillDir(), "SKILL.md");
 var SHELL_FILES = [".zshrc", ".zprofile", ".bashrc", ".bash_profile"].map((f) => join(homedir2(), f));
 var readJson = (path) => {
   try {
@@ -277,9 +284,9 @@ var main = async () => {
         break;
     }
   }
-  const CLAUDE_JSON = join(homedir2(), ".claude.json");
-  const claudeJson = readJson(CLAUDE_JSON);
-  const mcpServers = claudeJson?.mcpServers ?? {};
+  const CLAUDE_JSON = claudeJson();
+  const claudeJson2 = readJson(CLAUDE_JSON);
+  const mcpServers = claudeJson2?.mcpServers ?? {};
   const pusharyServer = mcpServers?.pushary;
   check(!!pusharyServer, "Claude Code: MCP server configured");
   if (pusharyServer) {
@@ -393,10 +400,10 @@ var main = async () => {
     const hasCodexInstructions = hasInstructionBlock(codexAgentsMd2);
     check(hasCodexInstructions, "Codex: proactive instructions (AGENTS.md)", hasCodexInstructions ? codexAgentsMd2 : "missing \u2014 re-run setup so Codex asks via push, not the terminal");
   }
-  const geminiSettingsPath = join(homedir2(), ".gemini", "settings.json");
-  const geminiSettings = readJson(geminiSettingsPath);
-  if (geminiSettings) {
-    const geminiServers = geminiSettings.mcpServers ?? {};
+  const geminiSettingsPath = geminiSettings();
+  const geminiSettings2 = readJson(geminiSettingsPath);
+  if (geminiSettings2) {
+    const geminiServers = geminiSettings2.mcpServers ?? {};
     const geminiPushary = geminiServers.pushary;
     check(!!geminiPushary, "Gemini CLI: MCP server configured");
     if (geminiPushary) {
@@ -413,11 +420,11 @@ var main = async () => {
         }
       }
     }
-    const geminiHooksInstalled = hasGeminiHooks(geminiSettings);
+    const geminiHooksInstalled = hasGeminiHooks(geminiSettings2);
     if (geminiHooksInstalled) {
-      const missingEvents = missingGeminiHookEvents(geminiSettings);
+      const missingEvents = missingGeminiHookEvents(geminiSettings2);
       check(missingEvents.length === 0, "Gemini CLI: native hooks installed", missingEvents.length === 0 ? "all 5 events" : `missing ${missingEvents.join(", ")}, re-run setup`);
-      const geminiHooks = geminiSettings.hooks;
+      const geminiHooks = geminiSettings2.hooks;
       const hookCommand = extractHookCommand(geminiHooks?.BeforeTool, GEMINI_HOOK_BINARY) ?? extractHookCommand(geminiHooks?.AfterTool, GEMINI_HOOK_BINARY) ?? extractHookCommand(geminiHooks?.SessionStart, GEMINI_HOOK_BINARY);
       if (hookCommand) {
         const resolves = commandResolves(hookCommand);
@@ -431,14 +438,14 @@ var main = async () => {
     } else {
       check(false, "Gemini CLI: native hooks installed", "no Pushary hooks in ~/.gemini/settings.json \u2014 re-run setup");
     }
-    const geminiMd = join(homedir2(), ".gemini", "GEMINI.md");
-    const hasGeminiInstructions = hasInstructionBlock(geminiMd);
-    check(hasGeminiInstructions, "Gemini CLI: proactive instructions (GEMINI.md)", hasGeminiInstructions ? geminiMd : "missing \u2014 re-run setup so Gemini asks via push, not the terminal");
+    const geminiMd2 = geminiMd();
+    const hasGeminiInstructions = hasInstructionBlock(geminiMd2);
+    check(hasGeminiInstructions, "Gemini CLI: proactive instructions (GEMINI.md)", hasGeminiInstructions ? geminiMd2 : "missing \u2014 re-run setup so Gemini asks via push, not the terminal");
   }
-  const cursorPluginDir = join(homedir2(), ".cursor", "plugins", "local", "pushary");
-  if (existsSync(cursorPluginDir)) {
-    const cursorUserHooks = join(homedir2(), ".cursor", "hooks.json");
-    const userHooks = readJson(cursorUserHooks);
+  const cursorPluginDir2 = cursorPluginDir();
+  if (existsSync(cursorPluginDir2)) {
+    const cursorUserHooks2 = cursorUserHooks();
+    const userHooks = readJson(cursorUserHooks2);
     const gateEntry = userHooks.hooks?.beforeShellExecution?.find(
       (h) => String(h.command ?? "").includes("pushary-gate")
     );
@@ -449,7 +456,7 @@ var main = async () => {
       const resolves = scriptPath ? existsSync(scriptPath) : false;
       check(resolves, "Cursor: permission gate registered", resolves ? `~/.cursor/hooks.json \u2192 ${scriptPath}` : `gate script not found: ${scriptPath || gateEntry.command} \u2014 re-run setup`);
     }
-    const cursorMcp = readJson(join(cursorPluginDir, "mcp.json"));
+    const cursorMcp = readJson(join(cursorPluginDir2, "mcp.json"));
     const cursorServers = cursorMcp?.mcpServers ?? {};
     const cursorAuth = cursorServers.pushary?.headers?.Authorization;
     if (!cursorAuth) {

package/dist/bin/pushary-logout.js

@@ -1,7 +1,10 @@
 #!/usr/bin/env node
 import {
-  codexConfigToml
-} from "../chunk-ER657KRJ.js";
+  claudeJson,
+  codexConfigToml,
+  cursorUserMcp,
+  geminiSettings
+} from "../chunk-RU3CIBXY.js";
 import {
   clearKey,
   readKeySource
@@ -31,8 +34,6 @@ import {
 
 // bin/pushary-logout.ts
 import { existsSync } from "fs";
-import { homedir } from "os";
-import { join } from "path";
 exitOnHelpFlag("logout");
 var parseLogoutOptions = (argv) => {
   const flags = parseFlags(argv, { bools: ["json", "revoke", "help", "h"], values: [] });
@@ -54,10 +55,10 @@ var say = options.json ? (line) => process.stderr.write(`${line}
 `) : (line) => process.stdout.write(`${line}
 `);
 var AGENT_CONFIGS = [
-  { label: "Claude Code", path: join(homedir(), ".claude.json") },
+  { label: "Claude Code", path: claudeJson() },
   { label: "Codex", path: codexConfigToml() },
-  { label: "Gemini CLI", path: join(homedir(), ".gemini", "settings.json") },
-  { label: "Cursor", path: join(homedir(), ".cursor", "mcp.json") }
+  { label: "Gemini CLI", path: geminiSettings() },
+  { label: "Cursor", path: cursorUserMcp() }
 ];
 var revokeRemotely = async (apiKey) => {
   try {

package/dist/bin/pushary-setup.js

@@ -11,7 +11,7 @@ import {
   describeDetection,
   detectAllAgents,
   isDetected
-} from "../chunk-UXXRRXUS.js";
+} from "../chunk-6G2BC4ET.js";
 import {
   renderAgentInstructions,
   renderProjectAgentInstructions,
@@ -26,9 +26,19 @@ import {
   addCodexHookTrust,
   addCodexHooks,
   addCodexMcpServer,
+  claudeJson,
+  claudeSettings,
+  claudeSkillDir,
+  codexAgentsMd2 as codexAgentsMd,
   codexConfigToml,
-  codexHome
-} from "../chunk-ER657KRJ.js";
+  codexHome,
+  codexSkillDir2 as codexSkillDir,
+  cursorPluginDir,
+  cursorUserHooks,
+  geminiMd,
+  geminiSettings,
+  pusharyConfigFile
+} from "../chunk-RU3CIBXY.js";
 import {
   confirmAppConnection,
   connectDevice,
@@ -259,17 +269,17 @@ var parseSetupOptions = (input2) => {
 };
 
 // bin/pushary-setup.ts
-var CLAUDE_SETTINGS = join(homedir(), ".claude", "settings.json");
-var CLAUDE_JSON = join(homedir(), ".claude.json");
-var CURSOR_PLUGIN_DIR = join(homedir(), ".cursor", "plugins", "local", "pushary");
-var CURSOR_USER_HOOKS = join(homedir(), ".cursor", "hooks.json");
-var CLAUDE_SKILL_DIR = join(homedir(), ".claude", "skills", "pushary");
+var CLAUDE_SETTINGS = claudeSettings();
+var CLAUDE_JSON = claudeJson();
+var CURSOR_PLUGIN_DIR = cursorPluginDir();
+var CURSOR_USER_HOOKS = cursorUserHooks();
+var CLAUDE_SKILL_DIR = claudeSkillDir();
 var CODEX_HOME = codexHome();
-var CODEX_SKILL_DIR = join(CODEX_HOME, "skills", "pushary");
-var CODEX_AGENTS_MD = join(CODEX_HOME, "AGENTS.md");
-var GEMINI_SETTINGS = join(homedir(), ".gemini", "settings.json");
-var GEMINI_MD = join(homedir(), ".gemini", "GEMINI.md");
-var PUSHARY_CONFIG_FILE = join(homedir(), ".pushary", "config.json");
+var CODEX_SKILL_DIR = codexSkillDir();
+var CODEX_AGENTS_MD = codexAgentsMd();
+var GEMINI_SETTINGS = geminiSettings();
+var GEMINI_MD = geminiMd();
+var PUSHARY_CONFIG_FILE = pusharyConfigFile();
 var manualSteps = [];
 var noteManual = (step) => {
   manualSteps.push(step);
@@ -433,10 +443,10 @@ var setupClaudeCode = async (apiKey) => {
   ${bold("Setting up Claude Code")}
 `);
   await installGlobally2();
-  const claudeJson = readAgentJson(CLAUDE_JSON);
+  const claudeJson2 = readAgentJson(CLAUDE_JSON);
   const settings = readAgentJson(CLAUDE_SETTINGS);
   await spinner("Adding MCP server (type: http)", async () => {
-    addClaudeMcpServer(claudeJson, apiKey);
+    addClaudeMcpServer(claudeJson2, apiKey);
   });
   await spinner("Auto-allowing Pushary tools", async () => {
     addPusharyToolPermissions(settings);
@@ -445,7 +455,7 @@ var setupClaudeCode = async (apiKey) => {
     addPusharyHooks(settings, resolveGlobalBinDir("pushary-hook"));
   });
   await spinner(`Writing ${CLAUDE_JSON}`, async () => {
-    writeJsonAtomic(CLAUDE_JSON, claudeJson, 384);
+    writeJsonAtomic(CLAUDE_JSON, claudeJson2, 384);
   });
   await spinner(`Writing ${CLAUDE_SETTINGS}`, async () => {
     writeJsonAtomic(CLAUDE_SETTINGS, settings);

package/dist/bin/pushary-upgrade.js

@@ -15,10 +15,13 @@ import {
   addCodexHookTrust,
   addCodexHooks,
   addCodexMcpServer,
+  claudeJson,
   codexConfigToml,
   codexHooksJson,
+  cursorPluginDir,
+  geminiSettings,
   hasCodexHooks
-} from "../chunk-ER657KRJ.js";
+} from "../chunk-RU3CIBXY.js";
 import {
   readJsonSafe
 } from "../chunk-6MTNS63X.js";
@@ -65,16 +68,16 @@ var writeJson = (filePath, data) => {
   writeFileSync(filePath, JSON.stringify(data, null, 2) + "\n", "utf-8");
 };
 var hasPusharyClaudeHooks = (settings) => JSON.stringify(settings.hooks ?? {}).includes("pushary-hook");
-var hasPusharyMcp = (claudeJson) => !!claudeJson.mcpServers?.pushary;
+var hasPusharyMcp = (claudeJson2) => !!claudeJson2.mcpServers?.pushary;
 var reapplyClaudeSettings = (apiKey, paths = {}) => {
   const settingsPath = paths.settingsPath ?? CLAUDE_SETTINGS;
   const claudeJsonPath = paths.claudeJsonPath ?? CLAUDE_JSON;
   const settings = readJson(settingsPath);
-  const claudeJson = readJson(claudeJsonPath);
-  const configured = settings != null && hasPusharyClaudeHooks(settings) || claudeJson != null && hasPusharyMcp(claudeJson);
+  const claudeJson2 = readJson(claudeJsonPath);
+  const configured = settings != null && hasPusharyClaudeHooks(settings) || claudeJson2 != null && hasPusharyMcp(claudeJson2);
   if (!configured) return { reapplied: false, hooks: false, mcp: false };
   const settingsWritable = settings != null;
-  const claudeJsonWritable = claudeJson != null;
+  const claudeJsonWritable = claudeJson2 != null;
   let hooks = false;
   let mcp = false;
   try {
@@ -89,7 +92,7 @@ var reapplyClaudeSettings = (apiKey, paths = {}) => {
   if (apiKey) {
     try {
       if (!claudeJsonWritable) throw new Error(".claude.json could not be parsed");
-      const cj = claudeJson;
+      const cj = claudeJson2;
       addClaudeMcpServer(cj, apiKey);
       writeJson(claudeJsonPath, cj);
       mcp = true;
@@ -197,7 +200,7 @@ var detectInstallModes = () => {
     {
       label: "Cursor plugin",
       upgrade: "updates itself through Cursor",
-      present: existsSync2(join2(homedir2(), ".cursor", "plugins", "local", "pushary"))
+      present: existsSync2(cursorPluginDir())
     },
     {
       label: "Codex config",
@@ -207,12 +210,12 @@ var detectInstallModes = () => {
     {
       label: "Claude Code config",
       upgrade: "npx @pushary/agent-hooks@latest setup --agents claude_code",
-      present: existsSync2(join2(homedir2(), ".claude.json"))
+      present: existsSync2(claudeJson())
     },
     {
       label: "Gemini config",
       upgrade: "npx @pushary/agent-hooks@latest setup --agents gemini_cli",
-      present: existsSync2(join2(homedir2(), ".gemini", "settings.json"))
+      present: existsSync2(geminiSettings())
     },
     {
       label: "Hermes plugin (pip)",

package/dist/{chunk-UXXRRXUS.js → chunk-6G2BC4ET.js}

@@ -1,6 +1,6 @@
 import {
   codexHomeFrom
-} from "./chunk-ER657KRJ.js";
+} from "./chunk-RU3CIBXY.js";
 
 // src/setup/detect.ts
 import { execSync } from "child_process";

package/dist/{chunk-ER657KRJ.js → chunk-RU3CIBXY.js}

@@ -149,6 +149,23 @@ var addCodexHookTrust = (config, hooksJsonPath, command) => {
   }
 };
 
+// src/setup/paths.ts
+import { homedir as homedir2 } from "os";
+import { join as join2 } from "path";
+var claudeSettings = () => join2(homedir2(), ".claude", "settings.json");
+var claudeJson = () => join2(homedir2(), ".claude.json");
+var claudeSkillDir = () => join2(homedir2(), ".claude", "skills", "pushary");
+var cursorPluginDir = () => join2(homedir2(), ".cursor", "plugins", "local", "pushary");
+var cursorUserHooks = () => join2(homedir2(), ".cursor", "hooks.json");
+var cursorUserMcp = () => join2(homedir2(), ".cursor", "mcp.json");
+var claudeSettingsLocal = () => join2(homedir2(), ".claude", "settings.local.json");
+var pusharyDir = () => join2(homedir2(), ".pushary");
+var codexSkillDir2 = () => join2(codexHome(), "skills", "pushary");
+var codexAgentsMd2 = () => join2(codexHome(), "AGENTS.md");
+var geminiSettings = () => join2(homedir2(), ".gemini", "settings.json");
+var geminiMd = () => join2(homedir2(), ".gemini", "GEMINI.md");
+var pusharyConfigFile = () => join2(homedir2(), ".pushary", "config.json");
+
 export {
   CODEX_HOOK_BINARY,
   codexHome,
@@ -164,5 +181,18 @@ export {
   hasCodexHooks,
   missingCodexHookEvents,
   untrustedCodexHookEvents,
-  addCodexHookTrust
+  addCodexHookTrust,
+  claudeSettings,
+  claudeJson,
+  claudeSkillDir,
+  cursorPluginDir,
+  cursorUserHooks,
+  cursorUserMcp,
+  claudeSettingsLocal,
+  pusharyDir,
+  codexSkillDir2,
+  codexAgentsMd2,
+  geminiSettings,
+  geminiMd,
+  pusharyConfigFile
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushary/agent-hooks",
-  "version": "0.62.5",
+  "version": "0.62.6",
   "description": "Permission hooks for AI coding agents: route tool approvals through Pushary push notifications",
   "keywords": [
     "pushary",