@pushary/agent-hooks 1.7.0 → 1.7.2

package/dist/bin/pushary-clean.js

@@ -1,40 +1,45 @@
 #!/usr/bin/env node
 import {
-  HERMES_CONFIG_SCRIPT,
-  HERMES_PIP_PACKAGE,
   PUSHARY_SKILL_NAME,
   PUSHARY_SKILL_SOURCE,
   createGuards,
-  resolveHermesPython,
-  runHermesPythonScript
-} from "../chunk-DANOZVZK.js";
-import "../chunk-P32LPT2L.js";
+  withoutPusharyCursorHooks
+} from "../chunk-MY3UZO5U.js";
 import {
   FX_PROFILE_REFUSALS,
+  FX_QUESTION_TOOL,
   FX_SETTINGS_REFUSALS,
+  HERMES_PIP_PACKAGE,
   fxProfileText,
   fxSettingsText,
+  isFxQuestionRuleReceipt,
   readFxFile,
   readFxProfile,
   readFxSettings,
+  readHermesStatus,
   removeInstructionBlock,
+  resolveHermesPython,
+  runHermesConfigScript,
   shortenHome,
   unregisterPluginLocation,
   vscodeSettingsTargets,
   withoutFxPusharyServer,
-  withoutPusharyToolsAllowed
-} from "../chunk-L4H2Q2S4.js";
-import "../chunk-YYINL576.js";
+  withoutPusharyToolsAllowed,
+  withoutQuestionsRoutedToPushary
+} from "../chunk-SKMWPXGV.js";
+import "../chunk-TVJYGZXB.js";
 import {
   OPENCODE_PLUGIN_SIBLING,
   OPENCODE_PLUGIN_SIBLING_CONTENTS,
   hasForeignPlugins,
   isOpenCodePluginOurs,
+  openCodeConfigDir,
   openCodeConfigFile,
+  openCodeInstructionsFile,
   openCodePluginDir,
   openCodePluginFile,
   removeOpenCodeMcpServer
-} from "../chunk-B3YQANFN.js";
+} from "../chunk-SKEW3TQX.js";
 import {
   compatibleConfigFile,
   compatibleInstructionsFile,
@@ -42,44 +47,47 @@ import {
   compatiblePermissionRuleFile,
   removeCompatibleHooks,
   removeCompatibleMcpServer
-} from "../chunk-WUNZAE7I.js";
+} from "../chunk-T3PRPFDY.js";
 import {
   isClaudeMcpSnapshot,
   removeClaudeMcpServers,
   removePusharySettings,
   removePusharyToolPermissions,
   restoreClaudeMcpServer
-} from "../chunk-KYQXUGH7.js";
+} from "../chunk-KAJT6HPI.js";
 import {
   hookOwnerOf,
   isHookTakeoverReceipt,
   restoreHookTakeover,
   restoreMcpServer
-} from "../chunk-R2XCLT6I.js";
-import "../chunk-CVALVGA7.js";
+} from "../chunk-E3PLF7YB.js";
+import "../chunk-I7B2DNVU.js";
 import {
   liveBridgeProbe,
   resolveBridgeStub
-} from "../chunk-5HLTWFJ6.js";
-import {
-  pusharyHookExecutable
-} from "../chunk-PQ4F64M2.js";
+} from "../chunk-JMSB6CJT.js";
+import "../chunk-L6IF4JOF.js";
 import {
   disableDaemonService
-} from "../chunk-73T6MSU5.js";
+} from "../chunk-4S7CCOXB.js";
 import {
   removeGeminiSettings
-} from "../chunk-ZQ7IDOKY.js";
-import "../chunk-VKVIAZQO.js";
+} from "../chunk-A6WQF7FQ.js";
+import "../chunk-KLXYMPTM.js";
 import "../chunk-XHKBHWLX.js";
-import "../chunk-IJ6ECPA6.js";
-import "../chunk-DZURML2D.js";
-import "../chunk-EGKXSQCY.js";
-import "../chunk-V6QRSU2G.js";
+import "../chunk-2B4XCMH6.js";
+import "../chunk-N6IOSZOE.js";
+import "../chunk-RLRDPZG4.js";
+import "../chunk-2XOHXZRC.js";
+import "../chunk-6QZK4O36.js";
 import "../chunk-POFBE6ZY.js";
+import {
+  ansiPainter,
+  useColor
+} from "../chunk-U4TMAANR.js";
 import {
   exitOnHelpFlag
-} from "../chunk-2PS6QWDW.js";
+} from "../chunk-6NHXKTQU.js";
 import {
   rejectUnknownFlags
 } from "../chunk-GMXKITVA.js";
@@ -87,16 +95,18 @@ import {
   CANDIDATE_RCS,
   isDisabledExport,
   removeClaudeAlias
-} from "../chunk-UOAQ6QMP.js";
-import "../chunk-JNXVOU6Y.js";
-import "../chunk-KW2RRR7D.js";
-import "../chunk-XNCMT7YY.js";
+} from "../chunk-VSGKQ3HI.js";
+import "../chunk-D4OGEWLH.js";
+import "../chunk-VQDJ6KB3.js";
+import "../chunk-UFNBKYWT.js";
+import "../chunk-HOIGXMI7.js";
 import "../chunk-7QLSKOSU.js";
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
-import "../chunk-ROQK7IN3.js";
+import "../chunk-LI3C2IQY.js";
 import {
+  AGENT_HOOKS_PACKAGE,
   bridgeAgentKey,
   claudeJson,
   claudeMcpReceipt,
@@ -113,13 +123,17 @@ import {
   cursorUserMcp,
   execNpm,
   fxAgentsMd,
+  fxConfigDir,
   fxMcpProfile,
+  fxQuestionRuleReceipt,
   fxSettings,
   geminiMd,
   geminiSettings,
+  globalPackageState,
+  hermesConfig,
   hermesConfigReceipt,
   hookTakeoverReceipt,
-  isProtectedByScope,
+  npmIsOnPath,
   pusharyDir,
   readCodexMcpAuth,
   removeCodexHookTrust,
@@ -127,23 +141,22 @@ import {
   restoreCodexHookTrust,
   vscodePluginDir,
   vscodePluginMcp
-} from "../chunk-DNJUSFBL.js";
+} from "../chunk-NYBZJ44G.js";
 import "../chunk-T7E75EKA.js";
-import "../chunk-V4AQBAVG.js";
-import "../chunk-B3UXMSMW.js";
+import "../chunk-SJN64NJX.js";
+import "../chunk-65RN6ZCO.js";
 import {
-  CURSOR_GATE_EVENTS,
   HOOK_COMPATIBLE_PROFILES,
   HOOK_LOCATOR_BINARY,
   SUPPORT_DISCORD,
   SUPPORT_EMAIL,
   isValidApiKey,
   redactSecrets
-} from "../chunk-YROGUPOZ.js";
+} from "../chunk-WWTLAZQA.js";
 
 // bin/pushary-clean.ts
-import { existsSync as existsSync6, readFileSync as readFileSync4, copyFileSync, readdirSync as readdirSync3 } from "fs";
-import { dirname, join as join5 } from "path";
+import { existsSync as existsSync6, readFileSync as readFileSync4, copyFileSync, readdirSync as readdirSync4 } from "fs";
+import { dirname, join as join6 } from "path";
 import { homedir as homedir5, tmpdir } from "os";
 import { confirm } from "@inquirer/prompts";
 import { parse as parseTOML, stringify as stringifyTOML } from "smol-toml";
@@ -166,7 +179,7 @@ var TEST_DEFAULTS_PREFIXES = [
 var isTestDefaultsDomain = (domain) => TEST_DEFAULTS_PREFIXES.some((prefix) => domain.startsWith(prefix));
 var leakedTestDefaultsDomains = () => {
   try {
-    return execSync("defaults domains", { encoding: "utf-8", timeout: 2e4 }).split(",").map((entry) => entry.trim()).filter(isTestDefaultsDomain);
+    return execSync("defaults domains", { encoding: "utf-8", timeout: 2e4 }).split(",").map((entry) => entry.trim()).filter(isTestDefaultsDomain).filter(liveMacStatePresence.defaultsDomain);
   } catch {
     return [];
   }
@@ -208,6 +221,28 @@ var MAC_KEYCHAIN_ACCOUNTS = [
   "cachedEnvironment"
 ];
 var MAC_DEFAULTS_DOMAINS = ["com.pushary.app", "pushary-bridge", "pushary.render"];
+var PRESENCE_PROBE_TIMEOUT_MS = 1e4;
+var commandSucceeds = (file, args) => {
+  try {
+    execFileSync(file, args, { stdio: "ignore", timeout: PRESENCE_PROBE_TIMEOUT_MS });
+    return true;
+  } catch {
+    return false;
+  }
+};
+var KEYCHAIN_ITEM_NOT_FOUND = 44;
+var keychainItemMayExist = (service, account) => {
+  try {
+    execFileSync("security", ["find-generic-password", "-s", service, "-a", account], { stdio: "ignore" });
+    return true;
+  } catch (error) {
+    return !(error instanceof Error && "status" in error && error.status === KEYCHAIN_ITEM_NOT_FOUND);
+  }
+};
+var liveMacStatePresence = {
+  keychainItem: keychainItemMayExist,
+  defaultsDomain: (domain) => commandSucceeds("defaults", ["read", domain])
+};
 var macLibraryState = (home = homedir()) => [
   join(home, "Library", "Application Support", "Pushary"),
   join(home, "Library", "Caches", "com.pushary.app"),
@@ -281,7 +316,7 @@ var removeDeveloperLeftovers = (guards2, domains, bundles) => {
   }
   return removed;
 };
-var removeMacAppState = (guards2, readServices, home) => {
+var removeMacAppState = (guards2, readServices, home, present) => {
   let removed = 0;
   let failed = 0;
   let services;
@@ -291,7 +326,7 @@ var removeMacAppState = (guards2, readServices, home) => {
     return { removed, failed: 1 };
   }
   for (const service of services) {
-    for (const account of MAC_KEYCHAIN_ACCOUNTS) {
+    for (const account of MAC_KEYCHAIN_ACCOUNTS.filter((account2) => present.keychainItem(service, account2))) {
       try {
         guards2.execFile(
           "security",
@@ -305,7 +340,7 @@ var removeMacAppState = (guards2, readServices, home) => {
       }
     }
   }
-  for (const domain of MAC_DEFAULTS_DOMAINS) {
+  for (const domain of MAC_DEFAULTS_DOMAINS.filter(present.defaultsDomain)) {
     try {
       guards2.execFile("defaults", ["delete", domain], { stdio: "ignore", timeout: 1e4 }, `delete preferences ${domain}`);
       removed++;
@@ -425,6 +460,26 @@ var claudeBackupRewrites = (receipt, home = homedir4()) => claudeJsonBackups(hom
 ` }] : [];
 });
 
+// src/cli/config-temp-leftovers.ts
+import { lstatSync, readdirSync as readdirSync3 } from "fs";
+import { join as join5 } from "path";
+var MAC_APP_WRITE_TEMP = /^\..+\.pushary-[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}$/;
+var PID_STAMPED_WRITE_TEMP = /^\.\d+-[^/]+\.pushary-tmp$/;
+var CONFIG_TEMP_MIN_AGE_MS = 6e4;
+var isLeakedConfigTempName = (name) => MAC_APP_WRITE_TEMP.test(name) || PID_STAMPED_WRITE_TEMP.test(name);
+var leakedConfigTemps = (entries, nowMs) => entries.filter((entry) => entry.isFile && isLeakedConfigTempName(entry.name) && nowMs - entry.modifiedAtMs >= CONFIG_TEMP_MIN_AGE_MS).map((entry) => entry.name);
+var directoryEntries = (directory) => {
+  try {
+    return readdirSync3(directory).flatMap((name) => {
+      const stats = lstatSync(join5(directory, name), { throwIfNoEntry: false });
+      return stats ? [{ name, isFile: stats.isFile(), modifiedAtMs: stats.mtimeMs }] : [];
+    });
+  } catch {
+    return [];
+  }
+};
+var configTempLeftovers = (directories, nowMs) => [...new Set(directories)].flatMap((directory) => leakedConfigTemps(directoryEntries(directory), nowMs).map((name) => join5(directory, name)));
+
 // src/app-owned-paths.ts
 var APP_OWNED_ENTRIES = [
   // PusharyPaths.bin: bridgeStub, bridgeCache
@@ -456,11 +511,12 @@ var macAppKeepsMcpEntry = (entryKey, keys) => {
 
 // bin/pushary-clean.ts
 exitOnHelpFlag("clean");
-var dim = (s) => `\x1B[2m${s}\x1B[0m`;
-var bold = (s) => `\x1B[1m${s}\x1B[0m`;
-var green = (s) => `\x1B[32m${s}\x1B[0m`;
-var yellow = (s) => `\x1B[33m${s}\x1B[0m`;
-var red = (s) => `\x1B[31m${s}\x1B[0m`;
+var paint = ansiPainter(() => useColor());
+var dim = paint("\x1B[2m");
+var bold = paint("\x1B[1m");
+var green = paint("\x1B[32m");
+var yellow = paint("\x1B[33m");
+var red = paint("\x1B[31m");
 var check = green("\u2713");
 var skip = yellow("\u2013");
 var cross = red("\u2717");
@@ -471,19 +527,20 @@ var CLAUDE_SETTINGS_LOCAL = claudeSettingsLocal();
 var CLAUDE_JSON = claudeJson();
 var CLAUDE_MCP_RECEIPT = claudeMcpReceipt();
 var HERMES_CONFIG_RECEIPT = hermesConfigReceipt();
+var HERMES_CONFIG_FILE = hermesConfig();
 var SKILL_DIR = claudeSkillDir();
 var CURSOR_MCP = cursorUserMcp();
 var CURSOR_PLUGIN_DIR = cursorPluginDir();
 var CURSOR_USER_HOOKS = cursorUserHooks();
 var VSCODE_PLUGIN_DIR = vscodePluginDir();
 var PUSHARY_DIR = pusharyDir();
-var SHELL_FILES = [".zshrc", ".zprofile", ".bashrc", ".bash_profile"].map((f) => join5(homedir5(), f));
+var SHELL_FILES = [".zshrc", ".zprofile", ".bashrc", ".bash_profile"].map((f) => join6(homedir5(), f));
 var PRESENCE_BY_RESOLUTION = {
   bundle: "present",
   missing: "gone",
   "no-stub": "absent"
 };
-var macAppPresence = () => PRESENCE_BY_RESOLUTION[resolveBridgeStub(join5(PUSHARY_DIR, "bin", HOOK_LOCATOR_BINARY), liveBridgeProbe()).kind];
+var macAppPresence = () => PRESENCE_BY_RESOLUTION[resolveBridgeStub(join6(PUSHARY_DIR, "bin", HOOK_LOCATOR_BINARY), liveBridgeProbe()).kind];
 var removalScope = (keepMcpServer, keepAppWiring) => ({
   keepAppWiring,
   keepMcpServer
@@ -512,7 +569,7 @@ var cursorPluginLeftovers = () => {
   const parent = dirname(CURSOR_PLUGIN_DIR);
   const backupPrefix = `${CURSOR_PLUGIN_DIR.split("/").pop()}.pushary-backup-`;
   try {
-    return readdirSync3(parent).filter((name) => name.startsWith(backupPrefix) || name.startsWith(CURSOR_PLUGIN_STAGING)).map((name) => join5(parent, name));
+    return readdirSync4(parent).filter((name) => name.startsWith(backupPrefix) || name.startsWith(CURSOR_PLUGIN_STAGING)).map((name) => join6(parent, name));
   } catch {
     return [];
   }
@@ -533,7 +590,7 @@ var guardedInstructionBlockRemoval = (path) => {
 };
 var guardedAliasRemoval = () => {
   if (!dryRun) return removeClaudeAlias();
-  const shells = CANDIDATE_RCS.map((name) => join5(homedir5(), name)).filter((path) => existsSync6(path) && readFileSync4(path, "utf-8").includes("pushary claude"));
+  const shells = CANDIDATE_RCS.map((name) => join6(homedir5(), name)).filter((path) => existsSync6(path) && readFileSync4(path, "utf-8").includes("pushary claude"));
   for (const path of shells) wouldNote("rewrite", path);
   return shells;
 };
@@ -577,6 +634,25 @@ var removeFxToolsRule = () => {
   const { settings, removed } = withoutPusharyToolsAllowed(read.settings);
   if (removed) writeFxText(path, fxSettingsText(settings), "fx auto-allowed Pushary tools");
 };
+var FX_QUESTION_RULE_KEPT = {
+  "not-ours": "no setup record says Pushary added it, so it may be yours; left as it is",
+  "changed-after-setup": "changed after setup; left as it is"
+};
+var readFxQuestionRuleReceipt = () => {
+  const receipt = readJson(fxQuestionRuleReceipt());
+  return isFxQuestionRuleReceipt(receipt) ? receipt : null;
+};
+var removeFxQuestionRule = () => {
+  const path = fxSettings();
+  const read = readFxFile(path, readFxSettings);
+  if (read.kind === "refused" || read.kind === "unreadable") return;
+  if (read.kind === "settings") {
+    const { settings, outcome } = withoutQuestionsRoutedToPushary(read.settings, readFxQuestionRuleReceipt());
+    if (outcome === "removed") writeFxText(path, fxSettingsText(settings), "fx question rule");
+    else if (outcome !== "absent") console.log(`  ${skip} fx question rule ${dim(`(${FX_QUESTION_TOOL} in ${path}: ${FX_QUESTION_RULE_KEPT[outcome]})`)}`);
+  }
+  if (existsSync6(fxQuestionRuleReceipt())) guardedRemove(fxQuestionRuleReceipt(), { force: true });
+};
 var removeFxInstructions = () => {
   if (guardedInstructionBlockRemoval(fxAgentsMd())) {
     console.log(`  ${check} fx instructions ${dim(did("removed"))}`);
@@ -591,21 +667,9 @@ var removeCursorUserHook = (scope) => {
     return "failed";
   }
   if (!parsed2 || typeof parsed2 !== "object") return "failed";
-  const hooks = parsed2.hooks ?? {};
-  let removedAny = false;
-  for (const event of CURSOR_GATE_EVENTS) {
-    const existing = Array.isArray(hooks[event]) ? hooks[event] : [];
-    const others = existing.filter((h) => {
-      const command = String(h.command ?? "");
-      return pusharyHookExecutable(command) === null || isProtectedByScope(command, scope);
-    });
-    if (others.length === existing.length) continue;
-    removedAny = true;
-    if (others.length === 0) delete hooks[event];
-    else hooks[event] = others;
-  }
-  if (!removedAny) return "absent";
-  parsed2.hooks = hooks;
+  const removal = withoutPusharyCursorHooks(parsed2.hooks ?? {}, scope);
+  if (removal.removed === 0) return "absent";
+  parsed2.hooks = removal.hooks;
   try {
     writeJson(CURSOR_USER_HOOKS, parsed2);
   } catch {
@@ -614,15 +678,7 @@ var removeCursorUserHook = (scope) => {
   if (dryRun) return "removed";
   try {
     const after = JSON.parse(readFileSync4(CURSOR_USER_HOOKS, "utf-8"));
-    const afterHooks = after?.hooks ?? {};
-    const stillThere = CURSOR_GATE_EVENTS.some((event) => {
-      const entries = afterHooks[event];
-      return Array.isArray(entries) && entries.some((h) => {
-        const command = String(h?.command ?? "");
-        return pusharyHookExecutable(command) !== null && !isProtectedByScope(command, scope);
-      });
-    });
-    if (stillThere) return "failed";
+    if (withoutPusharyCursorHooks(after?.hooks ?? {}, scope).removed > 0) return "failed";
   } catch {
     return "failed";
   }
@@ -647,13 +703,23 @@ var cleanSettingsFile = (path, label, scope) => {
     `  ${skip} ${label} ${dim(wouldHaveChanged ? "(kept: written by the Mac app)" : "(no pushary entries)")}`
   );
 };
+var agentConfigDirectories = () => [
+  homedir5(),
+  dirname(CLAUDE_SETTINGS),
+  dirname(codexConfigToml()),
+  dirname(geminiSettings()),
+  dirname(CURSOR_USER_HOOKS),
+  openCodeConfigDir(),
+  fxConfigDir(),
+  ...vscodeSettingsTargets(existsSync6).map((settings) => dirname(settings))
+];
 var restoreTakeoverReceipts = () => {
   const targets = [
     ["claude_code", CLAUDE_SETTINGS, CLAUDE_JSON, "mcpServers", "json"],
     ["codex", codexHooksJson(), codexConfigToml(), "mcp_servers", "toml"],
     ["gemini_cli", geminiSettings(), geminiSettings(), "mcpServers", "json"],
     ["cursor", CURSOR_USER_HOOKS, null, null, null],
-    ["vscode", join5(VSCODE_PLUGIN_DIR, "hooks", "hooks.json"), vscodePluginMcp(), "mcpServers", "json"]
+    ["vscode", join6(VSCODE_PLUGIN_DIR, "hooks", "hooks.json"), vscodePluginMcp(), "mcpServers", "json"]
   ];
   for (const [agent, hookFile, mcpFile, mcpKey, mcpFormat] of targets) {
     const receiptPath = hookTakeoverReceipt(agent);
@@ -1027,10 +1093,10 @@ var main = async () => {
   } else {
     guardedRemove(openCodePlugin, { force: true });
     console.log(`  ${check} OpenCode plugin ${dim(did("removed"))}`);
-    const sibling = join5(openCodePluginDir(), OPENCODE_PLUGIN_SIBLING);
+    const sibling = join6(openCodePluginDir(), OPENCODE_PLUGIN_SIBLING);
     const remaining = (() => {
       try {
-        return readdirSync3(openCodePluginDir()).filter((name) => name !== OPENCODE_PLUGIN_SIBLING);
+        return readdirSync4(openCodePluginDir()).filter((name) => name !== OPENCODE_PLUGIN_SIBLING);
       } catch {
         return [];
       }
@@ -1054,23 +1120,40 @@ var main = async () => {
   } else {
     console.log(`  ${skip} OpenCode MCP ${dim("(not found)")}`);
   }
+  if (keepShared) {
+    console.log(`  ${skip} OpenCode AGENTS.md ${dim("(kept: the Mac app uses it)")}`);
+  } else if (guardedInstructionBlockRemoval(openCodeInstructionsFile())) {
+    console.log(`  ${check} OpenCode AGENTS.md ${dim("(removed Pushary block)")}`);
+  } else {
+    console.log(`  ${skip} OpenCode AGENTS.md ${dim("(no pushary block)")}`);
+  }
   removeFxMcpServer();
   removeFxToolsRule();
+  removeFxQuestionRule();
   removeFxInstructions();
   const hermesPython = resolveHermesPython();
   if (hermesPython) {
-    const configUpdated = dryRun ? (wouldNote("run    ", "hermes plugin config restore"), true) : runHermesPythonScript(hermesPython, HERMES_CONFIG_SCRIPT, "clean", HERMES_CONFIG_RECEIPT);
-    if (!configUpdated) {
+    const configRun = runHermesConfigScript(hermesPython, dryRun ? "clean-preview" : "clean", HERMES_CONFIG_RECEIPT);
+    if (configRun === "failed") {
       incompleteClean = true;
       console.log(`  ${skip} Hermes config ${dim("(could not update config.yaml)")}`);
     } else {
-      console.log(`  ${check} Hermes config ${dim("(setup-owned changes restored)")}`);
-      try {
-        guards.execFile(hermesPython, ["-m", "pip", "uninstall", "-y", HERMES_PIP_PACKAGE], { stdio: "pipe", timeout: 6e4 }, `pip uninstall ${HERMES_PIP_PACKAGE}`);
-        console.log(`  ${check} Hermes plugin ${dim("(pip uninstalled)")}`);
-      } catch {
-        incompleteClean = true;
-        console.log(`  ${skip} Hermes plugin ${dim("(could not uninstall; setup receipt kept for retry)")}`);
+      if (configRun === "changed") {
+        if (dryRun) wouldNote("rewrite", HERMES_CONFIG_FILE);
+        console.log(`  ${check} Hermes config ${dim(did("removed"))} ${dim("(Pushary settings)")}`);
+      } else {
+        console.log(`  ${skip} Hermes config ${dim("(no Pushary settings)")}`);
+      }
+      if (readHermesStatus(hermesPython)?.pluginInstalled === false) {
+        console.log(`  ${skip} Hermes plugin ${dim("(not installed)")}`);
+      } else {
+        try {
+          guards.execFile(hermesPython, ["-m", "pip", "uninstall", "-y", HERMES_PIP_PACKAGE], { stdio: "pipe", timeout: 6e4 }, `pip uninstall ${HERMES_PIP_PACKAGE}`);
+          console.log(`  ${check} Hermes plugin ${dim(did("uninstalled"))}`);
+        } catch {
+          incompleteClean = true;
+          console.log(`  ${skip} Hermes plugin ${dim("(could not uninstall; setup receipt kept for retry)")}`);
+        }
       }
     }
   } else if (existsSync6(HERMES_CONFIG_RECEIPT)) {
@@ -1117,15 +1200,20 @@ var main = async () => {
   } else {
     console.log(`  ${skip} claude alias ${dim("(not set)")}`);
   }
+  const leakedTemps = configTempLeftovers(agentConfigDirectories(), Date.now());
+  for (const temp of leakedTemps) guardedRemove(temp, { force: true });
+  if (leakedTemps.length > 0) {
+    console.log(`  ${check} Leftover temp files ${dim(`(${dryRun ? "would remove" : "removed"} ${leakedTemps.length} left by an interrupted config write)`)}`);
+  }
   if (existsSync6(PUSHARY_DIR)) {
     let removed = 0;
     const kept = [];
-    for (const entry of readdirSync3(PUSHARY_DIR)) {
+    for (const entry of readdirSync4(PUSHARY_DIR)) {
       if (keepShared && isAppOwned(entry) || entry === "setup" && (keepShared || incompleteClean)) {
         kept.push(entry);
         continue;
       }
-      guardedRemove(join5(PUSHARY_DIR, entry), { force: true });
+      guardedRemove(join6(PUSHARY_DIR, entry), { force: true });
       removed++;
     }
     if (removed > 0) {
@@ -1142,10 +1230,10 @@ var main = async () => {
   }
   try {
     let swept = 0;
-    for (const f of readdirSync3(tmpdir())) {
+    for (const f of readdirSync4(tmpdir())) {
       if (!f.startsWith("pushary-")) continue;
       try {
-        guardedRemove(join5(tmpdir(), f), { force: true });
+        guardedRemove(join6(tmpdir(), f), { force: true });
         swept++;
       } catch {
       }
@@ -1164,26 +1252,30 @@ var main = async () => {
     if (leftovers > 0) {
       console.log(`  ${check} Developer leftovers ${dim(did("removed"))} ${dim(`(${leftovers} leaked test preferences and stale app registrations)`)}`);
     }
-    const { removed, failed } = process.platform === "darwin" ? removeMacAppState(guards, storedPusharyKeychainServices, homedir5()) : { removed: 0, failed: 0 };
+    const { removed, failed } = process.platform === "darwin" ? removeMacAppState(guards, storedPusharyKeychainServices, homedir5(), liveMacStatePresence) : { removed: 0, failed: 0 };
     if (failed > 0) {
       incompleteClean = true;
       console.log(`  ${cross} Mac keychain ${dim(`(${failed} operations failed; unlock your keychain and re-run)`)}`);
     }
     if (removed > 0) {
-      console.log(`  ${check} Mac app state ${dim(did("removed"))} ${dim(`(${removed} keychain items, preferences and caches)`)}`);
+      console.log(`  ${check} Mac app state ${dim(did("removed"))} ${dim(`(${removed} across the keychain, preferences and caches)`)}`);
     } else if (failed === 0) {
       console.log(`  ${skip} Mac app state ${dim("(nothing of ours in the keychain, preferences or caches)")}`);
     }
   }
-  try {
-    if (dryRun) {
-      wouldNote("run    ", "npm uninstall -g @pushary/agent-hooks");
-    } else {
-      execNpm("uninstall -g --no-workspaces @pushary/agent-hooks", { stdio: "ignore", timeout: 3e4 });
-    }
-    console.log(`  ${check} Global package ${dim(did("uninstalled"))}`);
-  } catch {
+  if (!npmIsOnPath()) {
+    console.log(`  ${skip} Global package ${dim(`(npm not found; remove ${AGENT_HOOKS_PACKAGE} with the tool that installed it)`)}`);
+  } else if (globalPackageState(AGENT_HOOKS_PACKAGE) === "absent") {
     console.log(`  ${skip} Global package ${dim("(not installed)")}`);
+  } else {
+    try {
+      if (dryRun) wouldNote("run    ", `npm uninstall -g ${AGENT_HOOKS_PACKAGE}`);
+      else execNpm(`uninstall -g --no-workspaces ${AGENT_HOOKS_PACKAGE}`, { stdio: "ignore", timeout: 3e4 });
+      console.log(`  ${check} Global package ${dim(did("uninstalled"))}`);
+    } catch {
+      incompleteClean = true;
+      console.log(`  ${cross} Global package ${dim(`(npm uninstall failed; run npm uninstall -g ${AGENT_HOOKS_PACKAGE})`)}`);
+    }
   }
   console.log();
   if (incompleteClean) {

package/dist/bin/pushary-codex-bridge.js

@@ -1,24 +1,24 @@
 #!/usr/bin/env node
-import "../chunk-JXUAXO74.js";
+import "../chunk-YNJ2H2FD.js";
 import {
   LiveTranscriptRelay,
   liveSessionSleep,
   postLiveSession,
   postLiveSessionUntilAccepted,
   startLiveSessionHeartbeat
-} from "../chunk-SQRWHALT.js";
+} from "../chunk-WXIVUIXA.js";
 import {
   SESSION_IDLE_TIMEOUT_MS,
   describeIdleWindow,
   idleDeadlinePassed,
   startProcessOwnership,
   withSpawnProcessOwnership
-} from "../chunk-LEZFOTMI.js";
-import "../chunk-BH2SKSSK.js";
-import "../chunk-KXMZMZD3.js";
+} from "../chunk-PWNQGITG.js";
+import "../chunk-R7ZETVNR.js";
+import "../chunk-QSZ37ROP.js";
 import {
   transcriptsEnabled
-} from "../chunk-B76WVEDX.js";
+} from "../chunk-Q7CDBJXU.js";
 import {
   spawnClaude
 } from "../chunk-XHKBHWLX.js";
@@ -27,38 +27,39 @@ import {
   isDecisionStopped,
   isWaitForAnswerResponse,
   withdrawQuestion
-} from "../chunk-EGKXSQCY.js";
+} from "../chunk-2XOHXZRC.js";
 import {
   writeDegraded
-} from "../chunk-V6QRSU2G.js";
+} from "../chunk-6QZK4O36.js";
 import "../chunk-POFBE6ZY.js";
-import "../chunk-UOAQ6QMP.js";
+import "../chunk-VSGKQ3HI.js";
 import {
   callMcpTool
-} from "../chunk-JNXVOU6Y.js";
-import "../chunk-KW2RRR7D.js";
+} from "../chunk-D4OGEWLH.js";
+import "../chunk-VQDJ6KB3.js";
+import "../chunk-UFNBKYWT.js";
 import {
   getMachineId
-} from "../chunk-XNCMT7YY.js";
+} from "../chunk-HOIGXMI7.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
-import "../chunk-ROQK7IN3.js";
+import "../chunk-LI3C2IQY.js";
 import {
   resolveBinary
-} from "../chunk-DNJUSFBL.js";
+} from "../chunk-NYBZJ44G.js";
 import "../chunk-T7E75EKA.js";
 import {
   getApiKey,
   getBaseUrl
-} from "../chunk-V4AQBAVG.js";
-import "../chunk-B3UXMSMW.js";
+} from "../chunk-SJN64NJX.js";
+import "../chunk-65RN6ZCO.js";
 import {
   elicitationContent,
   parseAgentQuestion,
   parseAgentQuestionAnswers,
   planElicitationAsk,
   readElicitationFields
-} from "../chunk-YROGUPOZ.js";
+} from "../chunk-WWTLAZQA.js";
 
 // bin/pushary-codex-bridge.ts
 import { existsSync } from "fs";