@pushary/agent-hooks 1.7.1 → 1.7.3

package/dist/bin/pushary-clean.js

@@ -1,33 +1,33 @@
 #!/usr/bin/env node
 import {
-  HERMES_CONFIG_SCRIPT,
-  HERMES_PIP_PACKAGE,
   PUSHARY_SKILL_NAME,
   PUSHARY_SKILL_SOURCE,
   createGuards,
-  resolveHermesPython,
-  runHermesPythonScript,
   withoutPusharyCursorHooks
-} from "../chunk-JMBG47WV.js";
+} from "../chunk-6JQFIHZC.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,
   withoutQuestionsRoutedToPushary
-} from "../chunk-NAAZCNKI.js";
-import "../chunk-2FU43B5Q.js";
+} from "../chunk-O3JDWNLU.js";
+import "../chunk-7OA34PNW.js";
 import {
   OPENCODE_PLUGIN_SIBLING,
   OPENCODE_PLUGIN_SIBLING_CONTENTS,
@@ -39,7 +39,7 @@ import {
   openCodePluginDir,
   openCodePluginFile,
   removeOpenCodeMcpServer
-} from "../chunk-NID4UZDN.js";
+} from "../chunk-KEL5MXRL.js";
 import {
   compatibleConfigFile,
   compatibleInstructionsFile,
@@ -47,42 +47,47 @@ import {
   compatiblePermissionRuleFile,
   removeCompatibleHooks,
   removeCompatibleMcpServer
-} from "../chunk-KBLIVEFJ.js";
+} from "../chunk-UOQRM7JQ.js";
 import {
   isClaudeMcpSnapshot,
   removeClaudeMcpServers,
   removePusharySettings,
   removePusharyToolPermissions,
   restoreClaudeMcpServer
-} from "../chunk-WSC53O7I.js";
+} from "../chunk-G3OMOTJ4.js";
 import {
   hookOwnerOf,
   isHookTakeoverReceipt,
   restoreHookTakeover,
   restoreMcpServer
-} from "../chunk-SVEMF2VO.js";
-import "../chunk-XMN37YJH.js";
+} from "../chunk-TCVMK6GI.js";
+import "../chunk-BGBLLHZ4.js";
 import {
   liveBridgeProbe,
   resolveBridgeStub
-} from "../chunk-MWVCDP64.js";
-import "../chunk-XDASEYRS.js";
+} from "../chunk-3EUBQARL.js";
+import "../chunk-WTJM7PSL.js";
 import {
   disableDaemonService
-} from "../chunk-AAGLDXH4.js";
+} from "../chunk-ZKJ34T2F.js";
 import {
   removeGeminiSettings
-} from "../chunk-WZWXBTRF.js";
-import "../chunk-XPMOCJHN.js";
+} from "../chunk-MIXWMA73.js";
+import "../chunk-NOI3XTCY.js";
 import "../chunk-XHKBHWLX.js";
-import "../chunk-WM3U2RUK.js";
-import "../chunk-4C4NRDIC.js";
-import "../chunk-ZIIYTQHC.js";
-import "../chunk-KSNAAMU5.js";
+import "../chunk-U6RVDUJ5.js";
+import "../chunk-N6IOSZOE.js";
+import "../chunk-EUGNVLMG.js";
+import "../chunk-YC27PROF.js";
+import "../chunk-N5MZH5A6.js";
 import "../chunk-POFBE6ZY.js";
+import {
+  ansiPainter,
+  useColor
+} from "../chunk-U4TMAANR.js";
 import {
   exitOnHelpFlag
-} from "../chunk-6PV2JQ64.js";
+} from "../chunk-5S2VBSJI.js";
 import {
   rejectUnknownFlags
 } from "../chunk-GMXKITVA.js";
@@ -90,16 +95,18 @@ import {
   CANDIDATE_RCS,
   isDisabledExport,
   removeClaudeAlias
-} from "../chunk-YZKS3ME3.js";
-import "../chunk-NQFGVAT6.js";
-import "../chunk-JTQDP4ZL.js";
-import "../chunk-P5CBNSYL.js";
+} from "../chunk-D6OODZCM.js";
+import "../chunk-VE7TXLR4.js";
+import "../chunk-EEEJ2JIL.js";
+import "../chunk-DUQO4C4I.js";
+import "../chunk-OVC5QXN5.js";
 import "../chunk-7QLSKOSU.js";
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
-import "../chunk-UPKP67TA.js";
+import "../chunk-62CVUUNU.js";
 import {
+  AGENT_HOOKS_PACKAGE,
   bridgeAgentKey,
   claudeJson,
   claudeMcpReceipt,
@@ -122,8 +129,11 @@ import {
   fxSettings,
   geminiMd,
   geminiSettings,
+  globalPackageState,
+  hermesConfig,
   hermesConfigReceipt,
   hookTakeoverReceipt,
+  npmIsOnPath,
   pusharyDir,
   readCodexMcpAuth,
   removeCodexHookTrust,
@@ -131,10 +141,10 @@ import {
   restoreCodexHookTrust,
   vscodePluginDir,
   vscodePluginMcp
-} from "../chunk-454KMJHF.js";
+} from "../chunk-MZBRL5H5.js";
 import "../chunk-T7E75EKA.js";
-import "../chunk-OAL44FM2.js";
-import "../chunk-EIZW73P5.js";
+import "../chunk-R6OYCUNK.js";
+import "../chunk-YYCTF4Q5.js";
 import {
   HOOK_COMPATIBLE_PROFILES,
   HOOK_LOCATOR_BINARY,
@@ -142,7 +152,7 @@ import {
   SUPPORT_EMAIL,
   isValidApiKey,
   redactSecrets
-} from "../chunk-XFNVG3OV.js";
+} from "../chunk-G4GLCLKK.js";
 
 // bin/pushary-clean.ts
 import { existsSync as existsSync6, readFileSync as readFileSync4, copyFileSync, readdirSync as readdirSync4 } from "fs";
@@ -169,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 [];
   }
@@ -211,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"),
@@ -284,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;
@@ -294,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",
@@ -308,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++;
@@ -479,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");
@@ -494,6 +527,7 @@ 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();
@@ -617,7 +651,7 @@ var removeFxQuestionRule = () => {
     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 });
+  if (existsSync6(fxQuestionRuleReceipt())) guardedRemove(fxQuestionRuleReceipt(), { force: true });
 };
 var removeFxInstructions = () => {
   if (guardedInstructionBlockRemoval(fxAgentsMd())) {
@@ -1099,18 +1133,27 @@ var main = async () => {
   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)) {
@@ -1209,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-Q7QRR6YL.js";
+import "../chunk-Y4ZH64UK.js";
 import {
   LiveTranscriptRelay,
   liveSessionSleep,
   postLiveSession,
   postLiveSessionUntilAccepted,
   startLiveSessionHeartbeat
-} from "../chunk-VCMFKZON.js";
+} from "../chunk-BIH2Y2HP.js";
 import {
   SESSION_IDLE_TIMEOUT_MS,
   describeIdleWindow,
   idleDeadlinePassed,
   startProcessOwnership,
   withSpawnProcessOwnership
-} from "../chunk-SNWNA3MQ.js";
-import "../chunk-O5JD7UI5.js";
-import "../chunk-OTZHT34O.js";
+} from "../chunk-LHC45YUC.js";
+import "../chunk-P2VIBGXA.js";
+import "../chunk-WPX67AKT.js";
 import {
   transcriptsEnabled
-} from "../chunk-XPTCPU6V.js";
+} from "../chunk-LPNJLKBQ.js";
 import {
   spawnClaude
 } from "../chunk-XHKBHWLX.js";
@@ -27,38 +27,39 @@ import {
   isDecisionStopped,
   isWaitForAnswerResponse,
   withdrawQuestion
-} from "../chunk-ZIIYTQHC.js";
+} from "../chunk-YC27PROF.js";
 import {
   writeDegraded
-} from "../chunk-KSNAAMU5.js";
+} from "../chunk-N5MZH5A6.js";
 import "../chunk-POFBE6ZY.js";
-import "../chunk-YZKS3ME3.js";
+import "../chunk-D6OODZCM.js";
 import {
   callMcpTool
-} from "../chunk-NQFGVAT6.js";
-import "../chunk-JTQDP4ZL.js";
+} from "../chunk-VE7TXLR4.js";
+import "../chunk-EEEJ2JIL.js";
+import "../chunk-DUQO4C4I.js";
 import {
   getMachineId
-} from "../chunk-P5CBNSYL.js";
+} from "../chunk-OVC5QXN5.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
-import "../chunk-UPKP67TA.js";
+import "../chunk-62CVUUNU.js";
 import {
   resolveBinary
-} from "../chunk-454KMJHF.js";
+} from "../chunk-MZBRL5H5.js";
 import "../chunk-T7E75EKA.js";
 import {
   getApiKey,
   getBaseUrl
-} from "../chunk-OAL44FM2.js";
-import "../chunk-EIZW73P5.js";
+} from "../chunk-R6OYCUNK.js";
+import "../chunk-YYCTF4Q5.js";
 import {
   elicitationContent,
   parseAgentQuestion,
   parseAgentQuestionAnswers,
   planElicitationAsk,
   readElicitationFields
-} from "../chunk-XFNVG3OV.js";
+} from "../chunk-G4GLCLKK.js";
 
 // bin/pushary-codex-bridge.ts
 import { existsSync } from "fs";

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

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   takeHookHoldBudget
-} from "../chunk-IGBDOZUO.js";
+} from "../chunk-VKVSRCBO.js";
 import {
   blockedActionFingerprint,
   codexCallKey,
@@ -13,37 +13,37 @@ import {
   recordCodexCallDecision,
   reportMachineDenial,
   userScope
-} from "../chunk-3QORH5EJ.js";
+} from "../chunk-5GB22QYL.js";
 import {
   triggerAutoUpdate
-} from "../chunk-BYVB3RX3.js";
+} from "../chunk-KJXUIPS4.js";
 import {
   isGatingMoment,
   recordKeylessMoment
-} from "../chunk-MCNS4725.js";
+} from "../chunk-IRZG3HEU.js";
 import {
   readHookInput
-} from "../chunk-7GI6QC3M.js";
+} from "../chunk-7RUJKCR4.js";
 import {
+  announceSubscriptionRequired,
   denyReasonFrom,
   isDeferAnswer
-} from "../chunk-YHG74UFF.js";
-import "../chunk-7GYGVQBU.js";
+} from "../chunk-5OP5MQI7.js";
+import "../chunk-OTNOANMX.js";
 import "../chunk-SGZJ5LYH.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-TCVMK6GI.js";
+import "../chunk-BGBLLHZ4.js";
+import "../chunk-3EUBQARL.js";
+import "../chunk-WTJM7PSL.js";
+import "../chunk-ZKJ34T2F.js";
+import "../chunk-MIXWMA73.js";
+import "../chunk-NOI3XTCY.js";
+import "../chunk-P2VIBGXA.js";
+import "../chunk-WPX67AKT.js";
+import "../chunk-LPNJLKBQ.js";
 import "../chunk-XHKBHWLX.js";
 import {
   CODEX_AGENT,
-  DEFAULT_SESSION,
   UNNAMED_ACTION,
   codexAllow,
   codexDeny,
@@ -76,10 +76,14 @@ import {
   toCodexWire,
   toPolicyLookup,
   toPolicyLookups
-} from "../chunk-WM3U2RUK.js";
-import "../chunk-4C4NRDIC.js";
+} from "../chunk-U6RVDUJ5.js";
+import {
+  DEFAULT_SESSION
+} from "../chunk-N6IOSZOE.js";
+import "../chunk-EUGNVLMG.js";
 import {
   DECISION_STOP_REASON,
+  UNVERIFIABLE_APPROVAL_REASON,
   askUser,
   cancelQuestion,
   claimBlockedAction,
@@ -88,34 +92,38 @@ import {
   pollForAnswer,
   requestGate,
   sendNotification,
+  unavailableQuestionUnlessSubscriptionRequired,
   waitForQuestion
-} from "../chunk-ZIIYTQHC.js";
+} from "../chunk-YC27PROF.js";
 import {
   exitAfterClientReports
-} from "../chunk-KSNAAMU5.js";
+} from "../chunk-N5MZH5A6.js";
 import "../chunk-POFBE6ZY.js";
 import "../chunk-GMXKITVA.js";
-import "../chunk-YZKS3ME3.js";
-import "../chunk-NQFGVAT6.js";
-import "../chunk-JTQDP4ZL.js";
+import "../chunk-D6OODZCM.js";
+import {
+  SubscriptionRequiredError
+} from "../chunk-VE7TXLR4.js";
+import "../chunk-EEEJ2JIL.js";
+import "../chunk-DUQO4C4I.js";
 import {
   getMachineId
-} from "../chunk-P5CBNSYL.js";
+} from "../chunk-OVC5QXN5.js";
 import "../chunk-7QLSKOSU.js";
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
-import "../chunk-UPKP67TA.js";
+import "../chunk-62CVUUNU.js";
 import {
   canonicalJson
-} from "../chunk-454KMJHF.js";
+} from "../chunk-MZBRL5H5.js";
 import {
   writeFileAtomic
 } from "../chunk-T7E75EKA.js";
 import {
   getApiKey
-} from "../chunk-OAL44FM2.js";
-import "../chunk-EIZW73P5.js";
+} from "../chunk-R6OYCUNK.js";
+import "../chunk-YYCTF4Q5.js";
 import {
   CODEX_RESCUE_TOOL_NAME,
   DECISION_LINE_MAX,
@@ -129,7 +137,7 @@ import {
   hookWaitClamped,
   hookWaitDeadline,
   resolveGate
-} from "../chunk-XFNVG3OV.js";
+} from "../chunk-G4GLCLKK.js";
 
 // bin/pushary-codex-hook.ts
 import { basename } from "path";
@@ -573,13 +581,18 @@ var pushQuestion = async (apiKey, input, lookup, waitSeconds, mode) => {
     // key on locally. Passing it through lets the server collapse a retried create
     // the same way, instead of putting the same approval on the phone twice.
     toolUseId: input.tool_use_id
-  }).catch(() => ({ correlationId: "", status: "unavailable" }));
+  }).catch(unavailableQuestionUnlessSubscriptionRequired);
   const now = Date.now();
   const deadline = hookWaitDeadline(START_MS2, waitSeconds, "codex", now);
   const clampCut = hookWaitClamped(START_MS2, waitSeconds, "codex", now);
   const answer = await waitForQuestion(apiKey, result, deadline);
   return { answer, localHandoff: !answer.answered && isLocalQuestionHandoff(result), clampCut };
 };
+var codexStepsAside = (error, input) => {
+  announceSubscriptionRequired(error.upgradeUrl, input.session_id);
+  return codexPass();
+};
+var passAfterFailure = (error, input) => error instanceof SubscriptionRequiredError ? codexStepsAside(error, input) : codexPass();
 var notifyApprovalNeeded = async (apiKey, input, lookup) => {
   try {
     await sendNotification(apiKey, {
@@ -650,8 +663,8 @@ var decidePermissionRequest = async (input) => {
     if (toolPolicy.mode === "push_first") return codexPass();
     if (clampCut) return codexPass();
     return permissionTimeoutDecision(toolPolicy.timeoutAction);
-  } catch {
-    return codexPass();
+  } catch (error) {
+    return passAfterFailure(error, input);
   }
 };
 var recordPreToolUse = (key, outcome) => {
@@ -670,8 +683,8 @@ var decidePushFirstBeforeTheTool = async (apiKey, input, lookup, pushFirstSecond
   let pushed;
   try {
     pushed = await pushQuestion(apiKey, input, lookup, pushFirstSeconds, "push_first");
-  } catch {
-    return recordPreToolUse(callKey, codexPass());
+  } catch (error) {
+    return recordPreToolUse(callKey, passAfterFailure(error, input));
   }
   const { answer, localHandoff } = pushed;
   if (isDecisionStopped(answer)) return codexDeny(DECISION_STOP_REASON);
@@ -721,8 +734,9 @@ var decidePreToolUse = async (input) => {
       let pushed;
       try {
         pushed = await pushQuestion(apiKey, input, lookup, effectiveWaitSeconds(toolPolicy.timeoutAction, toolPolicy.timeoutSeconds, "codex"), "push_only");
-      } catch {
-        return recordPreToolUse(callKey, codexDeny("Pushary could not create a verifiable approval. Retry the action."));
+      } catch (error) {
+        if (error instanceof SubscriptionRequiredError) return recordPreToolUse(callKey, codexStepsAside(error, input));
+        return recordPreToolUse(callKey, codexDeny(UNVERIFIABLE_APPROVAL_REASON));
       }
       const { answer, localHandoff, clampCut } = pushed;
       if (isDecisionStopped(answer)) return codexDeny(DECISION_STOP_REASON);
@@ -750,7 +764,7 @@ var decidePreToolUse = async (input) => {
 };
 var repairCodexHoldsQuietly = async () => {
   try {
-    const { repairCodexHolds } = await import("../reapply-66GQIBXN.js");
+    const { repairCodexHolds } = await import("../reapply-PH5T4BGR.js");
     repairCodexHolds();
   } catch {
     return;

package/dist/bin/pushary-codex.js

@@ -1,32 +1,34 @@
 #!/usr/bin/env node
 import {
   reportEvent
-} from "../chunk-WM3U2RUK.js";
-import "../chunk-4C4NRDIC.js";
+} from "../chunk-U6RVDUJ5.js";
+import "../chunk-N6IOSZOE.js";
+import "../chunk-EUGNVLMG.js";
 import {
   askUser,
   isDecisionStopped,
   waitForAnswer
-} from "../chunk-ZIIYTQHC.js";
-import "../chunk-KSNAAMU5.js";
+} from "../chunk-YC27PROF.js";
+import "../chunk-N5MZH5A6.js";
 import "../chunk-POFBE6ZY.js";
-import "../chunk-NQFGVAT6.js";
-import "../chunk-JTQDP4ZL.js";
+import "../chunk-VE7TXLR4.js";
+import "../chunk-EEEJ2JIL.js";
+import "../chunk-DUQO4C4I.js";
 import {
   getMachineId
-} from "../chunk-P5CBNSYL.js";
+} from "../chunk-OVC5QXN5.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
-import "../chunk-UPKP67TA.js";
-import "../chunk-454KMJHF.js";
+import "../chunk-62CVUUNU.js";
+import "../chunk-MZBRL5H5.js";
 import "../chunk-T7E75EKA.js";
 import {
   getApiKey
-} from "../chunk-OAL44FM2.js";
+} from "../chunk-R6OYCUNK.js";
 import {
   NPX_LATEST_COMMAND
-} from "../chunk-EIZW73P5.js";
-import "../chunk-XFNVG3OV.js";
+} from "../chunk-YYCTF4Q5.js";
+import "../chunk-G4GLCLKK.js";
 
 // bin/pushary-codex.ts
 import { basename } from "path";