@pushary/agent-hooks 1.9.66 → 1.9.68

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 1.9.68
+
+- fx: `pushary upgrade` switches a `pushary` server you added to `~/.fx/mcp.json` by hand as an HTTP server (`https://pushary.com/api/mcp/mcp`) to the local bridge that setup writes. fx's MCP-v2 engine (`FX_MCP_ENGINE=v2`) keeps that HTTP connection open between calls. Pushary's host closes a connection idle for about six minutes, and fx sends the next call on the closed connection. That call never reached Pushary, and fx reported "the server went away. The tool may have run." The bridge opens a new connection when it needs one, so the first call after an idle stretch arrives. Your other fx servers, your permission rules and your question settings stay as they are. Restart fx, or run `/mcp reload`, after the upgrade.
+- The daily update makes the same switch. Neither switches when no Pushary key is saved on the machine, or when the bridge is not installed globally, because fx would then lose Pushary altogether. `pushary upgrade` says which, and to run `npx pushary@latest setup --agents fx`.
+- Setup, upgrade and `pushary doctor` name any other fx server that reaches Pushary over HTTP, under a name other than `pushary`, and say to remove it, so fx does not see Pushary's tools twice.
+
+## 1.9.67
+
+- Hermes: setup installs the Pushary plugin as a folder in `~/.hermes/plugins/pushary`, where Hermes keeps your own plugins, instead of pip-installing it into Hermes's old virtualenv. Hermes v0.21.6 and later run from a Python they manage and rebuild on every `hermes update`, which left the pip copy behind and silently unloaded Pushary. The folder survives updates. Setup turns the plugin on with `hermes plugins enable pushary` and `hermes config set`, and never restarts Hermes for you.
+- `pushary upgrade` moves a Hermes setup from before this release over to the folder, removes the old pip copy Hermes would otherwise load, and tells you to run `hermes gateway restart`.
+- Setup no longer turns off Hermes's `clarify` tool. While the plugin is loaded it sends Hermes's questions to your phone through `pushary_ask`; without the plugin Hermes asks in its own prompt. Setups from before this release get `clarify` back.
+- `pushary doctor` reports Hermes as connected only when the running Hermes loaded the plugin, and says when Hermes needs a restart, runs an older copy, or has the plugin switched off. It no longer asks for the global package when Pushary for Mac saved the key.
+- Setup finds the `hermes` command in `~/.local/bin` and Homebrew when it is not on your PATH, and follows Hermes profiles (`HERMES_HOME` and `active_profile`).
+- `pushary clean` removes the plugin folder only if Pushary installed it, and leaves a Hermes that Pushary for Mac connected, and the key the app saved for it, to the app. Neither setup nor the Mac app writes an older plugin over a newer one.
+
 ## 1.9.66
 
 - In Claude Code, an approval stays answerable from your phone and from the terminal at the same time, and whichever answers first wins. Before, Pushary held the call for its window (60 seconds by default) while the terminal showed only a spinner, then withdrew the phone question and left only the terminal. Now Claude Code shows its own prompt straight away, Pushary sends the same question to your phone, and the phone keeps it for up to 10 minutes. Answer at the terminal and Pushary withdraws the phone question. This applies in an interactive Claude Code session in default or accept-edits mode, when only Pushary's defaults ask about the call. In bypass mode, and in `claude -p` and other headless runs, there is no prompt to answer, so Pushary still holds the call as before.

package/data/SKILL.md

@@ -272,7 +272,7 @@ brew install --cask pushary/tap/pushary
 
 They can also download it from https://pushary.com/download. It needs macOS 14 or later. It is not in the App Store.
 
-The command line works on macOS too. Offer it if the user prefers the terminal, or if the user runs Hermes, because Hermes needs a Python the app cannot install.
+The command line works on macOS too. Offer it if the user prefers the terminal. The app connects Hermes as well.
 
 ### Branch 3. `Linux` or `Windows_NT`
 

package/data/cursor-plugin/skills/pushary/SKILL.md

@@ -265,7 +265,7 @@ brew install --cask pushary/tap/pushary
 
 They can also download it from https://pushary.com/download. It needs macOS 14 or later. It is not in the App Store.
 
-The command line works on macOS too. Offer it if the user prefers the terminal, or if the user runs Hermes, because Hermes needs a Python the app cannot install.
+The command line works on macOS too. Offer it if the user prefers the terminal. The app connects Hermes as well.
 
 ### Branch 3. `Linux` or `Windows_NT`
 

package/data/vscode-plugin/skills/pushary/SKILL.md

@@ -265,7 +265,7 @@ brew install --cask pushary/tap/pushary
 
 They can also download it from https://pushary.com/download. It needs macOS 14 or later. It is not in the App Store.
 
-The command line works on macOS too. Offer it if the user prefers the terminal, or if the user runs Hermes, because Hermes needs a Python the app cannot install.
+The command line works on macOS too. Offer it if the user prefers the terminal. The app connects Hermes as well.
 
 ### Branch 3. `Linux` or `Windows_NT`
 

package/dist/{api-GDSVUTI2.js → api-6Q7XIB67.js}

@@ -17,23 +17,23 @@ import {
   waitForQuestion,
   waitsForThePhone,
   withdrawQuestion
-} from "./chunk-ZAZUDYSF.js";
+} from "./chunk-QYTOYNV2.js";
 import "./chunk-POFBE6ZY.js";
-import "./chunk-Q5RNYE2L.js";
-import "./chunk-QR2QWGQI.js";
-import "./chunk-GECU7V44.js";
-import "./chunk-IA5VWIHV.js";
+import "./chunk-PZZKXX6Q.js";
+import "./chunk-BSMHSN3Y.js";
+import "./chunk-MHC34X5A.js";
+import "./chunk-2VYQG2HG.js";
 import "./chunk-PPY5N2E6.js";
 import "./chunk-KZERVKTD.js";
-import "./chunk-GDLT32I4.js";
-import "./chunk-KS3O6O7E.js";
-import "./chunk-A47UKPC7.js";
-import "./chunk-GO7YKPT3.js";
+import "./chunk-LQAAOXYJ.js";
+import "./chunk-NAQCWM4U.js";
+import "./chunk-32OSSYGZ.js";
+import "./chunk-X2MTVD4W.js";
 import "./chunk-QTOLNRET.js";
 import {
   DECISION_STOP_REASON,
   UNVERIFIABLE_APPROVAL_REASON
-} from "./chunk-EJR5JXMV.js";
+} from "./chunk-RQOT6QL3.js";
 import "./chunk-MLKGABMK.js";
 export {
   ABANDONED_WAIT,

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

@@ -1,39 +1,39 @@
 #!/usr/bin/env node
 import {
   handleBell
-} from "../chunk-6RJZSBPD.js";
+} from "../chunk-LGCVAE52.js";
 import {
   readHookInput
-} from "../chunk-QN25WBXL.js";
-import "../chunk-SVKCYUYP.js";
-import "../chunk-DBUHSUL7.js";
-import "../chunk-3EZP5ZPS.js";
-import "../chunk-57NTMVMI.js";
-import "../chunk-YQDCTID4.js";
-import "../chunk-UTAARXYQ.js";
-import "../chunk-IQ3GKPFM.js";
+} from "../chunk-PGOPIIOQ.js";
+import "../chunk-Q6JXE3PD.js";
+import "../chunk-4TIN3T2A.js";
+import "../chunk-TVVJ6OYG.js";
+import "../chunk-EUU5PDUI.js";
+import "../chunk-73DHP3JX.js";
+import "../chunk-ZK5WYAMI.js";
+import "../chunk-77QP22FL.js";
 import "../chunk-NMUI3ZWG.js";
-import "../chunk-XEXF2OFZ.js";
-import "../chunk-XGFFNERF.js";
+import "../chunk-NWN6GGJL.js";
+import "../chunk-MUDUWF74.js";
 import "../chunk-XHKBHWLX.js";
-import "../chunk-CNJ7SI5V.js";
-import "../chunk-2BL6KWN7.js";
-import "../chunk-XXIJBYNW.js";
-import "../chunk-ZAZUDYSF.js";
+import "../chunk-PBEW5CJK.js";
+import "../chunk-6IFEYELN.js";
+import "../chunk-GMHQYX3D.js";
+import "../chunk-QYTOYNV2.js";
 import "../chunk-POFBE6ZY.js";
-import "../chunk-Q5RNYE2L.js";
-import "../chunk-QR2QWGQI.js";
-import "../chunk-GECU7V44.js";
-import "../chunk-IA5VWIHV.js";
+import "../chunk-PZZKXX6Q.js";
+import "../chunk-BSMHSN3Y.js";
+import "../chunk-MHC34X5A.js";
+import "../chunk-2VYQG2HG.js";
 import "../chunk-PPY5N2E6.js";
 import "../chunk-KZERVKTD.js";
-import "../chunk-XIJTXRWB.js";
-import "../chunk-GDLT32I4.js";
-import "../chunk-KS3O6O7E.js";
-import "../chunk-A47UKPC7.js";
-import "../chunk-GO7YKPT3.js";
+import "../chunk-METUT7V4.js";
+import "../chunk-LQAAOXYJ.js";
+import "../chunk-NAQCWM4U.js";
+import "../chunk-32OSSYGZ.js";
+import "../chunk-X2MTVD4W.js";
 import "../chunk-QTOLNRET.js";
-import "../chunk-EJR5JXMV.js";
+import "../chunk-RQOT6QL3.js";
 import "../chunk-MLKGABMK.js";
 
 // bin/pushary-bell-hook.ts

package/dist/bin/pushary-bell.js

@@ -5,40 +5,40 @@ import {
   liveAgentCount,
   ring,
   upgradeThreshold
-} from "../chunk-6RJZSBPD.js";
+} from "../chunk-LGCVAE52.js";
 import {
   createIo
 } from "../chunk-FO3MDD26.js";
 import {
   exitOnHelpFlag
-} from "../chunk-G6VJZ3RB.js";
+} from "../chunk-77L2TNJW.js";
 import {
   addBellHooks,
   bellInstalled,
   removeBellHooks
-} from "../chunk-IQ3GKPFM.js";
+} from "../chunk-77QP22FL.js";
 import {
   parseFlags
 } from "../chunk-NMUI3ZWG.js";
-import "../chunk-CNJ7SI5V.js";
+import "../chunk-PBEW5CJK.js";
 import "../chunk-PPY5N2E6.js";
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
-import "../chunk-XIJTXRWB.js";
+import "../chunk-METUT7V4.js";
 import {
   claudeSettings
-} from "../chunk-GDLT32I4.js";
+} from "../chunk-LQAAOXYJ.js";
 import {
   readJsonSafe,
   writeJsonAtomic
-} from "../chunk-KS3O6O7E.js";
-import "../chunk-A47UKPC7.js";
-import "../chunk-GO7YKPT3.js";
+} from "../chunk-NAQCWM4U.js";
+import "../chunk-32OSSYGZ.js";
+import "../chunk-X2MTVD4W.js";
 import "../chunk-QTOLNRET.js";
 import {
   isRecord
-} from "../chunk-EJR5JXMV.js";
+} from "../chunk-RQOT6QL3.js";
 import "../chunk-MLKGABMK.js";
 
 // bin/pushary-bell.ts

package/dist/bin/pushary-claude.js

@@ -2,43 +2,43 @@
 import {
   WRAPPER_ACTIVE_ENV,
   findClaudeBinary
-} from "../chunk-5J7OZBJ4.js";
+} from "../chunk-XQKB4LEK.js";
 import {
   SESSION_IDLE_TIMEOUT_MS,
   describeIdleWindow,
   startProcessOwnership,
   withSpawnProcessOwnership
-} from "../chunk-3ELJIG2R.js";
-import "../chunk-RJ6JEHCP.js";
+} from "../chunk-MCNHNIRC.js";
+import "../chunk-JAKWPQ2L.js";
 import {
   announceSubscriptionRequired,
   isDeferAnswer
-} from "../chunk-ZJV7SFIJ.js";
+} from "../chunk-2HMKZYF5.js";
 import {
   claudeTranscriptPath,
   loadSessionKey,
   registerTranscript,
   registeredTranscriptEnabled
-} from "../chunk-SVKCYUYP.js";
-import "../chunk-DBUHSUL7.js";
+} from "../chunk-Q6JXE3PD.js";
+import "../chunk-4TIN3T2A.js";
 import {
   ensureDaemonRunning
-} from "../chunk-57NTMVMI.js";
-import "../chunk-YQDCTID4.js";
-import "../chunk-UTAARXYQ.js";
-import "../chunk-IQ3GKPFM.js";
+} from "../chunk-EUU5PDUI.js";
+import "../chunk-73DHP3JX.js";
+import "../chunk-ZK5WYAMI.js";
+import "../chunk-77QP22FL.js";
 import "../chunk-NMUI3ZWG.js";
 import {
   encryptRecord
-} from "../chunk-XEXF2OFZ.js";
+} from "../chunk-NWN6GGJL.js";
 import {
   transcriptsEnabled
-} from "../chunk-XGFFNERF.js";
+} from "../chunk-MUDUWF74.js";
 import {
   needsShell,
   spawnClaude
 } from "../chunk-XHKBHWLX.js";
-import "../chunk-CNJ7SI5V.js";
+import "../chunk-PBEW5CJK.js";
 import {
   DEFAULT_SESSION,
   UNNAMED_ACTION,
@@ -55,10 +55,10 @@ import {
   reportEvent,
   savePendingCommand,
   scopePathFor
-} from "../chunk-2BL6KWN7.js";
+} from "../chunk-6IFEYELN.js";
 import {
   repoKeyFor
-} from "../chunk-XXIJBYNW.js";
+} from "../chunk-GMHQYX3D.js";
 import {
   askUser,
   cancelQuestion,
@@ -70,30 +70,30 @@ import {
   waitForAnswer,
   waitsForThePhone,
   withdrawQuestion
-} from "../chunk-ZAZUDYSF.js";
+} from "../chunk-QYTOYNV2.js";
 import "../chunk-POFBE6ZY.js";
 import {
   SubscriptionRequiredError
-} from "../chunk-Q5RNYE2L.js";
-import "../chunk-QR2QWGQI.js";
-import "../chunk-GECU7V44.js";
+} from "../chunk-PZZKXX6Q.js";
+import "../chunk-BSMHSN3Y.js";
+import "../chunk-MHC34X5A.js";
 import {
   getMachineId
-} from "../chunk-IA5VWIHV.js";
+} from "../chunk-2VYQG2HG.js";
 import "../chunk-PPY5N2E6.js";
 import "../chunk-KZERVKTD.js";
-import "../chunk-XIJTXRWB.js";
+import "../chunk-METUT7V4.js";
 import {
   claudeConfigDir
-} from "../chunk-GDLT32I4.js";
-import "../chunk-KS3O6O7E.js";
+} from "../chunk-LQAAOXYJ.js";
+import "../chunk-NAQCWM4U.js";
 import {
   getApiKey,
   getBaseUrl
-} from "../chunk-A47UKPC7.js";
+} from "../chunk-32OSSYGZ.js";
 import {
   NPX_LATEST_COMMAND
-} from "../chunk-GO7YKPT3.js";
+} from "../chunk-X2MTVD4W.js";
 import "../chunk-QTOLNRET.js";
 import {
   DECISION_STOP_REASON,
@@ -106,7 +106,7 @@ import {
   refusesWhenUnanswered,
   resolveGate,
   timeoutActionWithoutLocalPrompt
-} from "../chunk-EJR5JXMV.js";
+} from "../chunk-RQOT6QL3.js";
 import "../chunk-MLKGABMK.js";
 
 // src/wrapper/localPassthrough.ts

package/dist/bin/pushary-clean.js

@@ -15,51 +15,53 @@ import {
   storedMacAppState,
   storedPusharyKeychainServices,
   waitForMacAppExit
-} from "../chunk-DPU6H4JY.js";
+} from "../chunk-NLDEC4Y7.js";
 import {
   PUSHARY_SKILL_NAME,
   PUSHARY_SKILL_SOURCE,
   createGuards
 } from "../chunk-EUW7JL2K.js";
-import "../chunk-AVWECJSN.js";
+import "../chunk-ORHVVRVL.js";
 import "../chunk-XCEN33UP.js";
 import {
   describeCliKeyRevocation,
   planCliKeyRevocations,
   readCliHeldKeys,
   revokeCliKeys
-} from "../chunk-32ZT2ATY.js";
-import "../chunk-26W46E46.js";
+} from "../chunk-EOWHEZHD.js";
 import {
   isCursorPluginLeftover,
   releaseSoleGate,
   withoutPusharyCursorHooks
-} from "../chunk-IGO3AGZK.js";
+} from "../chunk-O655YCOG.js";
 import {
-  HERMES_PIP_PACKAGE,
-  readHermesStatus,
-  resolveHermesPython,
-  runHermesConfigScript,
   shortenHome,
   unregisterPluginLocation,
   vscodeSettingsTargets
-} from "../chunk-QBNICXMC.js";
+} from "../chunk-LF2NSOAQ.js";
 import {
+  configFileHoldsMacAppKey,
   macAppKeepsMcpEntry,
   mcpServerBearer,
   pusharyKey,
   readMacAppAgentKey,
   setupReceiptKey
-} from "../chunk-CN6JFM62.js";
+} from "../chunk-PEPRUUGM.js";
+import "../chunk-7V63A4AI.js";
+import {
+  HERMES_CONFIG_FILE,
+  defaultHermesHome,
+  hermesReceiptPaths,
+  removeHermesWiring
+} from "../chunk-D6W7QDQE.js";
 import "../chunk-QCGNGEGE.js";
-import "../chunk-YB3HMDKE.js";
 import {
   planClineRemoval,
   planFxRemoval,
   removeClineServer
-} from "../chunk-6ZXCWK27.js";
-import "../chunk-5FJDODOA.js";
-import "../chunk-HUGVJBDN.js";
+} from "../chunk-SL7CIZCL.js";
+import "../chunk-ODAAK2RZ.js";
+import "../chunk-53RH3ZIK.js";
 import {
   OPENCODE_ASKED_PERMISSIONS,
   OPENCODE_PLUGIN_SIBLING,
@@ -73,15 +75,15 @@ import {
   openCodePluginDir,
   openCodePluginFile,
   removeOpenCodeMcpServer
-} from "../chunk-7LK3Y6ET.js";
+} from "../chunk-CB4U6WRP.js";
 import {
   ansiPainter,
   useColor
 } from "../chunk-FO3MDD26.js";
 import {
   exitOnHelpFlag
-} from "../chunk-G6VJZ3RB.js";
-import "../chunk-RJ6JEHCP.js";
+} from "../chunk-77L2TNJW.js";
+import "../chunk-JAKWPQ2L.js";
 import {
   compatibleConfigFile,
   compatibleDocuments,
@@ -93,10 +95,10 @@ import {
   removeCompatibleHooks,
   removeCompatibleMcpServer,
   serializeConfigDocument
-} from "../chunk-3EZP5ZPS.js";
+} from "../chunk-TVVJ6OYG.js";
 import {
   disableDaemonService
-} from "../chunk-57NTMVMI.js";
+} from "../chunk-EUU5PDUI.js";
 import {
   hookOwnerOf,
   isHookTakeoverReceipt,
@@ -105,9 +107,9 @@ import {
   resolveBridgeStub,
   restoreHookTakeover,
   restoreMcpServer
-} from "../chunk-YQDCTID4.js";
-import "../chunk-UTAARXYQ.js";
-import "../chunk-IQ3GKPFM.js";
+} from "../chunk-73DHP3JX.js";
+import "../chunk-ZK5WYAMI.js";
+import "../chunk-77QP22FL.js";
 import {
   parseFlags
 } from "../chunk-NMUI3ZWG.js";
@@ -117,21 +119,21 @@ import {
   isDisabledExport,
   removeClaudeAlias,
   shellProfileCandidates
-} from "../chunk-CNJ7SI5V.js";
+} from "../chunk-PBEW5CJK.js";
 import "../chunk-E46NE7FB.js";
-import "../chunk-2BL6KWN7.js";
-import "../chunk-XXIJBYNW.js";
-import "../chunk-ZAZUDYSF.js";
+import "../chunk-6IFEYELN.js";
+import "../chunk-GMHQYX3D.js";
+import "../chunk-QYTOYNV2.js";
 import "../chunk-POFBE6ZY.js";
-import "../chunk-Q5RNYE2L.js";
-import "../chunk-QR2QWGQI.js";
-import "../chunk-GECU7V44.js";
-import "../chunk-IA5VWIHV.js";
+import "../chunk-PZZKXX6Q.js";
+import "../chunk-BSMHSN3Y.js";
+import "../chunk-MHC34X5A.js";
+import "../chunk-2VYQG2HG.js";
 import "../chunk-PPY5N2E6.js";
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
-import "../chunk-XIJTXRWB.js";
+import "../chunk-METUT7V4.js";
 import {
   claudeConfigDir,
   claudeJson,
@@ -158,10 +160,10 @@ import {
   fxSettings,
   geminiMd,
   geminiSettings,
-  hermesConfig,
-  hermesConfigReceipt,
+  hermesAppWiringRecord,
   hookTakeoverReceipt,
   isClaudeMcpSnapshot,
+  pusharyConfigFile,
   pusharyDir,
   readCodexMcpAuth,
   removeClaudeMcpServers,
@@ -174,20 +176,20 @@ import {
   restoreCodexHookTrust,
   vscodePluginDir,
   vscodePluginMcp
-} from "../chunk-GDLT32I4.js";
+} from "../chunk-LQAAOXYJ.js";
 import {
   cleanNpmEnv,
   globalPackageState,
   npmIsOnPath,
   readGlobalFolder,
   readGlobalPrefix
-} from "../chunk-KS3O6O7E.js";
+} from "../chunk-NAQCWM4U.js";
 import {
   getBaseUrl
-} from "../chunk-A47UKPC7.js";
+} from "../chunk-32OSSYGZ.js";
 import {
   NPX_LATEST_COMMAND
-} from "../chunk-GO7YKPT3.js";
+} from "../chunk-X2MTVD4W.js";
 import {
   CLI_PACKAGE_NAMES,
   globalPackageFolder,
@@ -201,12 +203,12 @@ import {
   SUPPORT_EMAIL,
   isValidApiKey,
   redactSecrets
-} from "../chunk-EJR5JXMV.js";
+} from "../chunk-RQOT6QL3.js";
 import "../chunk-MLKGABMK.js";
 
 // bin/pushary-clean.ts
 import { existsSync as existsSync5, readFileSync as readFileSync4, copyFileSync, readdirSync as readdirSync4 } from "fs";
-import { dirname as dirname2, join as join5 } from "path";
+import { basename, dirname as dirname2, join as join5 } from "path";
 import { homedir as homedir4, tmpdir } from "os";
 import { confirm } from "@inquirer/prompts";
 import { parse as parseTOML, stringify as stringifyTOML } from "smol-toml";
@@ -531,8 +533,6 @@ var CLAUDE_SETTINGS = claudeSettings();
 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();
@@ -571,6 +571,33 @@ var readJson = (path) => {
 };
 var dryRun = false;
 var did = (past) => dryRun ? `(would ${past === "cleaned" ? "clean" : past === "removed" ? "remove" : past === "uninstalled" ? "uninstall" : past})` : `(${past})`;
+var HERMES_REMOVAL_FAILURES = {
+  receipt_invalid: "setup receipt is unreadable; left unchanged",
+  home_unknown: "Hermes would not report its settings; left unchanged",
+  plugin: "could not remove the plugin; setup receipt kept for retry",
+  settings: "could not restore config.yaml; setup receipt kept for retry"
+};
+var reportHermesRemoval = (outcome) => {
+  switch (outcome.kind) {
+    case "not_found":
+      console.log(`  ${skip} Hermes ${dim("(not found)")}`);
+      return false;
+    case "kept_for_mac_app":
+      console.log(`  ${skip} Hermes ${dim("(kept: the Mac app connected it)")}`);
+      return false;
+    case "runtime_missing":
+      console.log(`  ${skip} Hermes ${dim("(hermes command not found; setup receipt kept for retry)")}`);
+      return true;
+    case "failed":
+      console.log(`  ${skip} Hermes ${dim(`(${HERMES_REMOVAL_FAILURES[outcome.step]})`)}`);
+      return true;
+    case "removed":
+      if (outcome.pluginRemoved) console.log(`  ${check} Hermes plugin ${dim(did("removed"))}`);
+      if (outcome.dryRun) wouldNote("rewrite", join5(defaultHermesHome(), HERMES_CONFIG_FILE));
+      console.log(`  ${check} Hermes config ${dim(outcome.dryRun ? "(would restore)" : "(restored)")} ${dim("(Pushary settings)")}`);
+      return false;
+  }
+};
 var wouldNote = (action, path) => {
   console.log(`  ${dim("would")} ${action} ${path}`);
 };
@@ -1149,37 +1176,8 @@ var main = async () => {
   removeFxConfiguration();
   removeFxInstructions();
   removeClineConfiguration();
-  const hermesPython = resolveHermesPython();
-  if (hermesPython) {
-    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 {
-      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 (existsSync5(HERMES_CONFIG_RECEIPT)) {
-    incompleteClean = true;
-    console.log(`  ${skip} Hermes ${dim("(runtime not found; setup receipt kept for retry)")}`);
-  } else {
-    console.log(`  ${skip} Hermes ${dim("(not found)")}`);
-  }
+  const hermesRemoval = removeHermesWiring({ dryRun, receipts: hermesReceiptPaths(), keepMacAppWiring: keepShared, macAppWiringRecord: hermesAppWiringRecord() });
+  if (reportHermesRemoval(hermesRemoval)) incompleteClean = true;
   for (const shellFile of SHELL_FILES) {
     try {
       const content = readFileSync4(shellFile, "utf-8");
@@ -1226,10 +1224,11 @@ var main = async () => {
   if (existsSync5(PUSHARY_DIR)) {
     let removed = 0;
     const kept = [];
+    const macAppsHermesKey = hermesRemoval.kind === "kept_for_mac_app" && configFileHoldsMacAppKey(pusharyConfigFile()) ? basename(pusharyConfigFile()) : null;
     for (const entry of readdirSync4(PUSHARY_DIR)) {
       const appCardsFolder = entry === CODEX_APP_CARDS_DIRECTORY ? codexAppCardsFolderInTheLastSweep(appCardsCleanUp) : "swept_with_the_rest";
       if (appCardsFolder === "left_to_the_switch") continue;
-      if (keepShared && isAppOwned(entry) || entry === "setup" && (keepShared || incompleteClean) || appCardsFolder === "kept") {
+      if (keepShared && isAppOwned(entry) || entry === "setup" && (keepShared || incompleteClean) || entry === macAppsHermesKey || appCardsFolder === "kept") {
         kept.push(entry);
         continue;
       }