@pushary/agent-hooks 1.7.0 → 1.7.1

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 1.7.1
+
+- **fx asks through Pushary.** Setup now adds `"ask_user_question": "deny"` as the last rule in `~/.fx/settings.json`, which removes fx's own terminal question tool from what its agent can call, so every question goes through `mcp_pushary_ask_user`: to the Mac notch at the Mac, to the phone away from it. fx cannot forward its own prompt, so a question asked there used to wait unseen once you walked away. A rule you already set for `ask_user_question` is kept, and setup names it. The instructions in `~/.fx/AGENTS.md` now tell fx's agent to load `mcp_pushary_ask_user` with `mcp_select_tool` by exact name and to ask there even while you are at the terminal, and to ask in its reply only when Pushary hands the question back or cannot be reached.
+- fx's full-access mode (`yolo`, `full-access` or `full access`, from settings, a workspace, or `FX_PERMISSION_MODE`) ignores permission rules, so the terminal question tool stays on there; setup and `pushary doctor` say so instead of claiming questions are routed, and the instructions still steer the agent to Pushary. fx workspaces with their own permission rules replace the global ones, and setup and doctor name how many keep the question tool on. Setup reads the rules the way fx does (globs, last match wins, per-target maps) and leaves a `settings.json` fx would reject, such as one with an unknown action or permission mode, untouched and says fx ignores it.
+- `pushary clean` removes the question rule only when setup recorded adding it and it is still `deny`, so a rule of your own survives.
+- `pushary clean` now removes Pushary entries from every event in `~/.cursor/hooks.json`, not only the events the permission gate uses. The Mac app registers its bridge on session, compaction and stop events too, and those eight entries were left behind under "Clean complete". Other tools' hooks are untouched.
+- `pushary clean` now removes the Pushary block from OpenCode's `~/.config/opencode/AGENTS.md`, as it already did for Codex and Gemini. Setup wrote it and clean left it.
+- `pushary clean` removes temp files that an interrupted config write left next to an agent's config (`.<file>.pushary-<id>` and `.<pid>-<time>.pushary-tmp`), only next to the agent configs clean rewrites (your home folder, Claude Code, Codex, Gemini, Cursor, OpenCode, fx and VS Code settings), never through a symlink, and only once they are over a minute old.
+- Setup's summary no longer says "(others completed successfully)" or "Other agents will continue" when the failed agent was the only one; it names the agents that were configured.
+- Setup's progress lines no longer leave the tail of the previous frame behind ("with Codexex", "tap the notificationon"): setup uses the shared spinner, which clears the line, keeps each frame to one terminal row, and does not animate into a log when colour is forced on.
+
 ## 1.7.0
 
 - **fx.** `npx @pushary/agent-hooks@latest setup --agents fx`, or ticking fx in the picker, connects Vercel Labs' fx coding agent. Setup adds a `pushary` server to `~/.fx/mcp.json` that runs the new `pushary-mcp` command, a local bridge that signs in with the key setup saved in `~/.pushary`. No key is written to fx's files, and a rotated key is used without running setup again. fx has no hooks other tools can register, so Pushary cannot answer fx's own approval prompts; fx's agent asks through Pushary's tools when it chooses to, guided by a managed block setup writes to `~/.fx/AGENTS.md`.

package/dist/bin/pushary-bell-hook.js

@@ -1,38 +1,38 @@
 #!/usr/bin/env node
 import {
   handleBell
-} from "../chunk-6ADZQFVW.js";
+} from "../chunk-55RO62FV.js";
 import {
   readHookInput
-} from "../chunk-UC65FJJT.js";
-import "../chunk-EAQMWJPG.js";
+} from "../chunk-7GI6QC3M.js";
+import "../chunk-7GYGVQBU.js";
 import "../chunk-SGZJ5LYH.js";
-import "../chunk-R2XCLT6I.js";
-import "../chunk-CVALVGA7.js";
-import "../chunk-5HLTWFJ6.js";
-import "../chunk-PQ4F64M2.js";
-import "../chunk-73T6MSU5.js";
-import "../chunk-ZQ7IDOKY.js";
-import "../chunk-VKVIAZQO.js";
-import "../chunk-BH2SKSSK.js";
-import "../chunk-KXMZMZD3.js";
-import "../chunk-B76WVEDX.js";
+import "../chunk-SVEMF2VO.js";
+import "../chunk-XMN37YJH.js";
+import "../chunk-MWVCDP64.js";
+import "../chunk-XDASEYRS.js";
+import "../chunk-AAGLDXH4.js";
+import "../chunk-WZWXBTRF.js";
+import "../chunk-XPMOCJHN.js";
+import "../chunk-O5JD7UI5.js";
+import "../chunk-OTZHT34O.js";
+import "../chunk-XPTCPU6V.js";
 import "../chunk-XHKBHWLX.js";
-import "../chunk-DZURML2D.js";
-import "../chunk-V6QRSU2G.js";
+import "../chunk-4C4NRDIC.js";
+import "../chunk-KSNAAMU5.js";
 import "../chunk-POFBE6ZY.js";
 import "../chunk-GMXKITVA.js";
-import "../chunk-UOAQ6QMP.js";
-import "../chunk-KW2RRR7D.js";
-import "../chunk-XNCMT7YY.js";
+import "../chunk-YZKS3ME3.js";
+import "../chunk-JTQDP4ZL.js";
+import "../chunk-P5CBNSYL.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
-import "../chunk-ROQK7IN3.js";
-import "../chunk-DNJUSFBL.js";
+import "../chunk-UPKP67TA.js";
+import "../chunk-454KMJHF.js";
 import "../chunk-T7E75EKA.js";
-import "../chunk-V4AQBAVG.js";
-import "../chunk-B3UXMSMW.js";
-import "../chunk-YROGUPOZ.js";
+import "../chunk-OAL44FM2.js";
+import "../chunk-EIZW73P5.js";
+import "../chunk-XFNVG3OV.js";
 
 // bin/pushary-bell-hook.ts
 var main = async () => {

package/dist/bin/pushary-bell.js

@@ -5,37 +5,37 @@ import {
   liveAgentCount,
   ring,
   upgradeThreshold
-} from "../chunk-6ADZQFVW.js";
+} from "../chunk-55RO62FV.js";
 import {
   addBellHooks,
   bellInstalled,
   removeBellHooks
-} from "../chunk-VKVIAZQO.js";
+} from "../chunk-XPMOCJHN.js";
 import {
   createIo
-} from "../chunk-5RUIFDTP.js";
+} from "../chunk-O5PRIYFZ.js";
 import {
   exitOnHelpFlag
-} from "../chunk-2PS6QWDW.js";
+} from "../chunk-6PV2JQ64.js";
 import {
   parseFlags
 } from "../chunk-GMXKITVA.js";
-import "../chunk-UOAQ6QMP.js";
+import "../chunk-YZKS3ME3.js";
 import "../chunk-7QLSKOSU.js";
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
-import "../chunk-ROQK7IN3.js";
+import "../chunk-UPKP67TA.js";
 import {
   claudeSettings
-} from "../chunk-DNJUSFBL.js";
+} from "../chunk-454KMJHF.js";
 import {
   readJsonSafe,
   writeJsonAtomic
 } from "../chunk-T7E75EKA.js";
-import "../chunk-V4AQBAVG.js";
-import "../chunk-B3UXMSMW.js";
-import "../chunk-YROGUPOZ.js";
+import "../chunk-OAL44FM2.js";
+import "../chunk-EIZW73P5.js";
+import "../chunk-XFNVG3OV.js";
 
 // bin/pushary-bell.ts
 exitOnHelpFlag("bell");

package/dist/bin/pushary-claude.js

@@ -8,7 +8,7 @@ import {
   describeIdleWindow,
   startProcessOwnership,
   withSpawnProcessOwnership
-} from "../chunk-LEZFOTMI.js";
+} from "../chunk-SNWNA3MQ.js";
 import {
   isDeferAnswer
 } from "../chunk-YHG74UFF.js";
@@ -17,24 +17,24 @@ import {
   loadSessionKey,
   registerTranscript,
   registeredTranscriptEnabled
-} from "../chunk-EAQMWJPG.js";
+} from "../chunk-7GYGVQBU.js";
 import "../chunk-SGZJ5LYH.js";
-import "../chunk-R2XCLT6I.js";
-import "../chunk-CVALVGA7.js";
-import "../chunk-5HLTWFJ6.js";
-import "../chunk-PQ4F64M2.js";
+import "../chunk-SVEMF2VO.js";
+import "../chunk-XMN37YJH.js";
+import "../chunk-MWVCDP64.js";
+import "../chunk-XDASEYRS.js";
 import {
   ensureDaemonRunning
-} from "../chunk-73T6MSU5.js";
-import "../chunk-ZQ7IDOKY.js";
-import "../chunk-VKVIAZQO.js";
+} from "../chunk-AAGLDXH4.js";
+import "../chunk-WZWXBTRF.js";
+import "../chunk-XPMOCJHN.js";
 import {
   encryptRecord
-} from "../chunk-BH2SKSSK.js";
-import "../chunk-KXMZMZD3.js";
+} from "../chunk-O5JD7UI5.js";
+import "../chunk-OTZHT34O.js";
 import {
   transcriptsEnabled
-} from "../chunk-B76WVEDX.js";
+} from "../chunk-XPTCPU6V.js";
 import {
   needsShell,
   spawnClaude
@@ -56,8 +56,8 @@ import {
   reportEvent,
   savePendingCommand,
   scopePathFor
-} from "../chunk-IJ6ECPA6.js";
-import "../chunk-DZURML2D.js";
+} from "../chunk-WM3U2RUK.js";
+import "../chunk-4C4NRDIC.js";
 import {
   DECISION_STOP_REASON,
   askUser,
@@ -67,33 +67,33 @@ import {
   nextLongPollMs,
   waitForAnswer,
   withdrawQuestion
-} from "../chunk-EGKXSQCY.js";
-import "../chunk-V6QRSU2G.js";
+} from "../chunk-ZIIYTQHC.js";
+import "../chunk-KSNAAMU5.js";
 import "../chunk-POFBE6ZY.js";
 import "../chunk-GMXKITVA.js";
-import "../chunk-UOAQ6QMP.js";
-import "../chunk-JNXVOU6Y.js";
-import "../chunk-KW2RRR7D.js";
+import "../chunk-YZKS3ME3.js";
+import "../chunk-NQFGVAT6.js";
+import "../chunk-JTQDP4ZL.js";
 import {
   getMachineId
-} from "../chunk-XNCMT7YY.js";
+} from "../chunk-P5CBNSYL.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
-import "../chunk-ROQK7IN3.js";
-import "../chunk-DNJUSFBL.js";
+import "../chunk-UPKP67TA.js";
+import "../chunk-454KMJHF.js";
 import "../chunk-T7E75EKA.js";
 import {
   getApiKey,
   getBaseUrl
-} from "../chunk-V4AQBAVG.js";
+} from "../chunk-OAL44FM2.js";
 import {
   NPX_LATEST_COMMAND
-} from "../chunk-B3UXMSMW.js";
+} from "../chunk-EIZW73P5.js";
 import {
   KILL_REASON,
   redactSecrets,
   resolveGate
-} from "../chunk-YROGUPOZ.js";
+} from "../chunk-XFNVG3OV.js";
 
 // src/wrapper/localPassthrough.ts
 var SIGNAL_NUMBERS = {

package/dist/bin/pushary-clean.js

@@ -6,14 +6,16 @@ import {
   PUSHARY_SKILL_SOURCE,
   createGuards,
   resolveHermesPython,
-  runHermesPythonScript
-} from "../chunk-DANOZVZK.js";
-import "../chunk-P32LPT2L.js";
+  runHermesPythonScript,
+  withoutPusharyCursorHooks
+} from "../chunk-JMBG47WV.js";
 import {
   FX_PROFILE_REFUSALS,
+  FX_QUESTION_TOOL,
   FX_SETTINGS_REFUSALS,
   fxProfileText,
   fxSettingsText,
+  isFxQuestionRuleReceipt,
   readFxFile,
   readFxProfile,
   readFxSettings,
@@ -22,19 +24,22 @@ import {
   unregisterPluginLocation,
   vscodeSettingsTargets,
   withoutFxPusharyServer,
-  withoutPusharyToolsAllowed
-} from "../chunk-L4H2Q2S4.js";
-import "../chunk-YYINL576.js";
+  withoutPusharyToolsAllowed,
+  withoutQuestionsRoutedToPushary
+} from "../chunk-NAAZCNKI.js";
+import "../chunk-2FU43B5Q.js";
 import {
   OPENCODE_PLUGIN_SIBLING,
   OPENCODE_PLUGIN_SIBLING_CONTENTS,
   hasForeignPlugins,
   isOpenCodePluginOurs,
+  openCodeConfigDir,
   openCodeConfigFile,
+  openCodeInstructionsFile,
   openCodePluginDir,
   openCodePluginFile,
   removeOpenCodeMcpServer
-} from "../chunk-B3YQANFN.js";
+} from "../chunk-NID4UZDN.js";
 import {
   compatibleConfigFile,
   compatibleInstructionsFile,
@@ -42,44 +47,42 @@ import {
   compatiblePermissionRuleFile,
   removeCompatibleHooks,
   removeCompatibleMcpServer
-} from "../chunk-WUNZAE7I.js";
+} from "../chunk-KBLIVEFJ.js";
 import {
   isClaudeMcpSnapshot,
   removeClaudeMcpServers,
   removePusharySettings,
   removePusharyToolPermissions,
   restoreClaudeMcpServer
-} from "../chunk-KYQXUGH7.js";
+} from "../chunk-WSC53O7I.js";
 import {
   hookOwnerOf,
   isHookTakeoverReceipt,
   restoreHookTakeover,
   restoreMcpServer
-} from "../chunk-R2XCLT6I.js";
-import "../chunk-CVALVGA7.js";
+} from "../chunk-SVEMF2VO.js";
+import "../chunk-XMN37YJH.js";
 import {
   liveBridgeProbe,
   resolveBridgeStub
-} from "../chunk-5HLTWFJ6.js";
-import {
-  pusharyHookExecutable
-} from "../chunk-PQ4F64M2.js";
+} from "../chunk-MWVCDP64.js";
+import "../chunk-XDASEYRS.js";
 import {
   disableDaemonService
-} from "../chunk-73T6MSU5.js";
+} from "../chunk-AAGLDXH4.js";
 import {
   removeGeminiSettings
-} from "../chunk-ZQ7IDOKY.js";
-import "../chunk-VKVIAZQO.js";
+} from "../chunk-WZWXBTRF.js";
+import "../chunk-XPMOCJHN.js";
 import "../chunk-XHKBHWLX.js";
-import "../chunk-IJ6ECPA6.js";
-import "../chunk-DZURML2D.js";
-import "../chunk-EGKXSQCY.js";
-import "../chunk-V6QRSU2G.js";
+import "../chunk-WM3U2RUK.js";
+import "../chunk-4C4NRDIC.js";
+import "../chunk-ZIIYTQHC.js";
+import "../chunk-KSNAAMU5.js";
 import "../chunk-POFBE6ZY.js";
 import {
   exitOnHelpFlag
-} from "../chunk-2PS6QWDW.js";
+} from "../chunk-6PV2JQ64.js";
 import {
   rejectUnknownFlags
 } from "../chunk-GMXKITVA.js";
@@ -87,15 +90,15 @@ import {
   CANDIDATE_RCS,
   isDisabledExport,
   removeClaudeAlias
-} from "../chunk-UOAQ6QMP.js";
-import "../chunk-JNXVOU6Y.js";
-import "../chunk-KW2RRR7D.js";
-import "../chunk-XNCMT7YY.js";
+} from "../chunk-YZKS3ME3.js";
+import "../chunk-NQFGVAT6.js";
+import "../chunk-JTQDP4ZL.js";
+import "../chunk-P5CBNSYL.js";
 import "../chunk-7QLSKOSU.js";
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
-import "../chunk-ROQK7IN3.js";
+import "../chunk-UPKP67TA.js";
 import {
   bridgeAgentKey,
   claudeJson,
@@ -113,13 +116,14 @@ import {
   cursorUserMcp,
   execNpm,
   fxAgentsMd,
+  fxConfigDir,
   fxMcpProfile,
+  fxQuestionRuleReceipt,
   fxSettings,
   geminiMd,
   geminiSettings,
   hermesConfigReceipt,
   hookTakeoverReceipt,
-  isProtectedByScope,
   pusharyDir,
   readCodexMcpAuth,
   removeCodexHookTrust,
@@ -127,23 +131,22 @@ import {
   restoreCodexHookTrust,
   vscodePluginDir,
   vscodePluginMcp
-} from "../chunk-DNJUSFBL.js";
+} from "../chunk-454KMJHF.js";
 import "../chunk-T7E75EKA.js";
-import "../chunk-V4AQBAVG.js";
-import "../chunk-B3UXMSMW.js";
+import "../chunk-OAL44FM2.js";
+import "../chunk-EIZW73P5.js";
 import {
-  CURSOR_GATE_EVENTS,
   HOOK_COMPATIBLE_PROFILES,
   HOOK_LOCATOR_BINARY,
   SUPPORT_DISCORD,
   SUPPORT_EMAIL,
   isValidApiKey,
   redactSecrets
-} from "../chunk-YROGUPOZ.js";
+} from "../chunk-XFNVG3OV.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";
@@ -425,6 +428,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
@@ -477,13 +500,13 @@ 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 +535,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 +556,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 +600,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]})`)}`);
+  }
+  guardedRemove(fxQuestionRuleReceipt(), { force: true });
+};
 var removeFxInstructions = () => {
   if (guardedInstructionBlockRemoval(fxAgentsMd())) {
     console.log(`  ${check} fx instructions ${dim(did("removed"))}`);
@@ -591,21 +633,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 +644,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 +669,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 +1059,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,8 +1086,16 @@ 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) {
@@ -1117,15 +1157,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 +1187,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 {
       }