@pushary/agent-hooks 1.9.37 → 1.9.38

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.9.38
+
+- Owned Codex child questions reach the long-wait bridge instead of being asked first by a short-lived native hook. The matching Mac helper hands these questions to the CLI; kill, deny and command-permission checks still apply.
+- Questions in the personal Codex child bridge keep waiting until answered or cancelled when Codex supplies no deadline. A short poll or temporary network failure no longer cancels the question.
+- A cancelled request or an explicit Codex deadline still stops the wait and rejects a late answer. Native permission hooks and recovery after closing Codex keep their existing limits.
+- With the updated Pushary server, ordinary MCP questions remain available after the cache clears and can receive one reminder after ten minutes. This saves the answer; it does not promise that a closed agent will restart.
+
 ## 1.9.37
 
 - Codex questions reach Pushary. When Codex asks you something with its question card (`request_user_input`), the question and its choices go to your phone or the Mac notch, and your answer goes back to Codex in place of the card. A question with no choices, one choice, more than four, or a secret stays in Codex, and so does one nobody answers or Pushary cannot reach. Setup and upgrade widen the Codex `PreToolUse` matcher to include both question tools.

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

@@ -1,41 +1,41 @@
 #!/usr/bin/env node
 import {
   handleBell
-} from "../chunk-UEIL72RN.js";
+} from "../chunk-Y3XF324T.js";
 import {
   readHookInput
-} from "../chunk-ZMR3DSMH.js";
-import "../chunk-V7Q7DQXL.js";
+} from "../chunk-WLQENMOW.js";
+import "../chunk-PA3OZGIA.js";
 import "../chunk-DWQYCOPI.js";
-import "../chunk-F3J6JFR2.js";
-import "../chunk-MAGB6VW6.js";
-import "../chunk-PYWLW7PC.js";
-import "../chunk-HQR6DYVG.js";
+import "../chunk-AJIH4JGB.js";
+import "../chunk-4D54LZGF.js";
+import "../chunk-WR3GKYKD.js";
+import "../chunk-QC7ZNZMZ.js";
 import "../chunk-XHKBHWLX.js";
-import "../chunk-KHLYOIPY.js";
-import "../chunk-Q3TCLMYC.js";
-import "../chunk-6SYU5LVK.js";
-import "../chunk-Q52PBCN7.js";
-import "../chunk-SNI4FGOV.js";
+import "../chunk-7GSOIBVM.js";
+import "../chunk-ZFJAZBBF.js";
+import "../chunk-GBNG6QEV.js";
+import "../chunk-FZEQWY7Q.js";
+import "../chunk-JVKY6ILU.js";
 import "../chunk-GMXKITVA.js";
 import "../chunk-6ICPEJY5.js";
-import "../chunk-N5WEEYV6.js";
-import "../chunk-W73URGML.js";
-import "../chunk-QUKATQ66.js";
-import "../chunk-HA22GGDG.js";
+import "../chunk-JWMCGL3P.js";
+import "../chunk-L5WOYQT7.js";
+import "../chunk-IBUAVM6X.js";
+import "../chunk-7O5U5TED.js";
 import "../chunk-POFBE6ZY.js";
-import "../chunk-Z5ORWTY3.js";
-import "../chunk-DYALNCS6.js";
-import "../chunk-NWSWP3KY.js";
-import "../chunk-VA36Q6BD.js";
+import "../chunk-ABDGTGBT.js";
+import "../chunk-OLS4DTFN.js";
+import "../chunk-BMHD2NEH.js";
+import "../chunk-3HUHP4A4.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
-import "../chunk-GUHM2UQO.js";
-import "../chunk-RFIHLLRH.js";
+import "../chunk-MIENLS7P.js";
+import "../chunk-4GEHVRV3.js";
 import "../chunk-AQFEP65J.js";
-import "../chunk-AZXPJLKC.js";
-import "../chunk-WXA3CFZR.js";
-import "../chunk-235LKHLW.js";
+import "../chunk-D322CKL2.js";
+import "../chunk-MXEDMQLC.js";
+import "../chunk-QOUW57RT.js";
 
 // bin/pushary-bell-hook.ts
 var main = async () => {

package/dist/bin/pushary-bell.js

@@ -5,39 +5,39 @@ import {
   liveAgentCount,
   ring,
   upgradeThreshold
-} from "../chunk-UEIL72RN.js";
+} from "../chunk-Y3XF324T.js";
 import {
   createIo
 } from "../chunk-FO3MDD26.js";
 import {
   exitOnHelpFlag
-} from "../chunk-JMLJHKJN.js";
+} from "../chunk-7P43CI6G.js";
 import {
   addBellHooks,
   bellInstalled,
   removeBellHooks
-} from "../chunk-SNI4FGOV.js";
+} from "../chunk-JVKY6ILU.js";
 import {
   parseFlags
 } from "../chunk-GMXKITVA.js";
-import "../chunk-N5WEEYV6.js";
+import "../chunk-JWMCGL3P.js";
 import "../chunk-7QLSKOSU.js";
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
-import "../chunk-GUHM2UQO.js";
+import "../chunk-MIENLS7P.js";
 import {
   claudeSettings
-} from "../chunk-RFIHLLRH.js";
+} from "../chunk-4GEHVRV3.js";
 import {
   readJsonSafe,
   writeJsonAtomic
 } from "../chunk-AQFEP65J.js";
-import "../chunk-AZXPJLKC.js";
-import "../chunk-WXA3CFZR.js";
+import "../chunk-D322CKL2.js";
+import "../chunk-MXEDMQLC.js";
 import {
   isRecord
-} from "../chunk-235LKHLW.js";
+} from "../chunk-QOUW57RT.js";
 
 // bin/pushary-bell.ts
 exitOnHelpFlag("bell");

package/dist/bin/pushary-claude.js

@@ -8,39 +8,39 @@ import {
   describeIdleWindow,
   startProcessOwnership,
   withSpawnProcessOwnership
-} from "../chunk-UKCGR5T2.js";
+} from "../chunk-DDRLK67P.js";
 import {
   announceSubscriptionRequired,
   isDeferAnswer
-} from "../chunk-6VUVVVVN.js";
+} from "../chunk-W2TXFM6O.js";
 import {
   claudeTranscriptPath,
   loadSessionKey,
   registerTranscript,
   registeredTranscriptEnabled
-} from "../chunk-V7Q7DQXL.js";
+} from "../chunk-PA3OZGIA.js";
 import "../chunk-DWQYCOPI.js";
 import {
   ensureDaemonRunning
-} from "../chunk-F3J6JFR2.js";
+} from "../chunk-AJIH4JGB.js";
 import {
   encryptRecord
-} from "../chunk-MAGB6VW6.js";
-import "../chunk-PYWLW7PC.js";
+} from "../chunk-4D54LZGF.js";
+import "../chunk-WR3GKYKD.js";
 import {
   transcriptsEnabled
-} from "../chunk-HQR6DYVG.js";
+} from "../chunk-QC7ZNZMZ.js";
 import {
   needsShell,
   spawnClaude
 } from "../chunk-XHKBHWLX.js";
-import "../chunk-Q3TCLMYC.js";
-import "../chunk-6SYU5LVK.js";
-import "../chunk-Q52PBCN7.js";
-import "../chunk-SNI4FGOV.js";
+import "../chunk-ZFJAZBBF.js";
+import "../chunk-GBNG6QEV.js";
+import "../chunk-FZEQWY7Q.js";
+import "../chunk-JVKY6ILU.js";
 import "../chunk-GMXKITVA.js";
 import "../chunk-6ICPEJY5.js";
-import "../chunk-N5WEEYV6.js";
+import "../chunk-JWMCGL3P.js";
 import {
   DEFAULT_SESSION,
   UNNAMED_ACTION,
@@ -58,8 +58,8 @@ import {
   reportEvent,
   savePendingCommand,
   scopePathFor
-} from "../chunk-W73URGML.js";
-import "../chunk-QUKATQ66.js";
+} from "../chunk-L5WOYQT7.js";
+import "../chunk-IBUAVM6X.js";
 import {
   askUser,
   cancelQuestion,
@@ -70,28 +70,28 @@ import {
   waitForAnswer,
   waitsForThePhone,
   withdrawQuestion
-} from "../chunk-HA22GGDG.js";
+} from "../chunk-7O5U5TED.js";
 import "../chunk-POFBE6ZY.js";
 import {
   SubscriptionRequiredError
-} from "../chunk-Z5ORWTY3.js";
-import "../chunk-DYALNCS6.js";
-import "../chunk-NWSWP3KY.js";
+} from "../chunk-ABDGTGBT.js";
+import "../chunk-OLS4DTFN.js";
+import "../chunk-BMHD2NEH.js";
 import {
   getMachineId
-} from "../chunk-VA36Q6BD.js";
+} from "../chunk-3HUHP4A4.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
-import "../chunk-GUHM2UQO.js";
-import "../chunk-RFIHLLRH.js";
+import "../chunk-MIENLS7P.js";
+import "../chunk-4GEHVRV3.js";
 import "../chunk-AQFEP65J.js";
 import {
   getApiKey,
   getBaseUrl
-} from "../chunk-AZXPJLKC.js";
+} from "../chunk-D322CKL2.js";
 import {
   NPX_LATEST_COMMAND
-} from "../chunk-WXA3CFZR.js";
+} from "../chunk-MXEDMQLC.js";
 import {
   DECISION_STOP_REASON,
   HAND_BACK_WITHOUT_A_PROMPT,
@@ -101,7 +101,7 @@ import {
   redactSecretsFromContent,
   resolveGate,
   timeoutActionWithoutLocalPrompt
-} from "../chunk-235LKHLW.js";
+} from "../chunk-QOUW57RT.js";
 
 // src/wrapper/localPassthrough.ts
 var SIGNAL_NUMBERS = {

package/dist/bin/pushary-clean.js

@@ -9,12 +9,12 @@ import {
   planCliKeyRevocations,
   readCliHeldKeys,
   revokeCliKeys
-} from "../chunk-NDQXKLGE.js";
+} from "../chunk-AI2YBW42.js";
 import {
   isCursorPluginLeftover,
   releaseSoleGate,
   withoutPusharyCursorHooks
-} from "../chunk-4OQHT5IJ.js";
+} from "../chunk-WASCAI2U.js";
 import {
   HERMES_PIP_PACKAGE,
   readHermesStatus,
@@ -23,25 +23,25 @@ import {
   shortenHome,
   unregisterPluginLocation,
   vscodeSettingsTargets
-} from "../chunk-NPE44CX4.js";
+} from "../chunk-3DXDJL4K.js";
 import {
   planFxRemoval,
   removeInstructionBlock
-} from "../chunk-JLQV3XLV.js";
-import "../chunk-UK3WY3LE.js";
+} from "../chunk-LZZ3EKKI.js";
+import "../chunk-VITJTFFT.js";
 import {
   disableDaemonService
-} from "../chunk-F3J6JFR2.js";
+} from "../chunk-AJIH4JGB.js";
 import "../chunk-XHKBHWLX.js";
-import "../chunk-EK6PRPCY.js";
+import "../chunk-K2CZJBUS.js";
 import {
   macAppKeepsMcpEntry,
   mcpServerBearer,
   pusharyKey,
   readMacAppAgentKey,
   setupReceiptKey
-} from "../chunk-GSP7CC52.js";
-import "../chunk-VMIDUNOT.js";
+} from "../chunk-5KVL4AP5.js";
+import "../chunk-D2G6HWEA.js";
 import {
   OPENCODE_PLUGIN_SIBLING,
   OPENCODE_PLUGIN_SIBLING_CONTENTS,
@@ -53,14 +53,14 @@ import {
   openCodePluginDir,
   openCodePluginFile,
   removeOpenCodeMcpServer
-} from "../chunk-HJF57K2U.js";
+} from "../chunk-J2APHNZL.js";
 import {
   ansiPainter,
   useColor
 } from "../chunk-FO3MDD26.js";
 import {
   exitOnHelpFlag
-} from "../chunk-JMLJHKJN.js";
+} from "../chunk-7P43CI6G.js";
 import {
   compatibleConfigFile,
   compatibleDocuments,
@@ -76,7 +76,7 @@ import {
   removePusharyToolPermissions,
   restoreClaudeMcpServer,
   serializeConfigDocument
-} from "../chunk-KHLYOIPY.js";
+} from "../chunk-7GSOIBVM.js";
 import {
   hookOwnerOf,
   isHookTakeoverReceipt,
@@ -84,12 +84,12 @@ import {
   resolveBridgeStub,
   restoreHookTakeover,
   restoreMcpServer
-} from "../chunk-Q3TCLMYC.js";
+} from "../chunk-ZFJAZBBF.js";
 import {
   removeGeminiSettings
-} from "../chunk-6SYU5LVK.js";
-import "../chunk-Q52PBCN7.js";
-import "../chunk-SNI4FGOV.js";
+} from "../chunk-GBNG6QEV.js";
+import "../chunk-FZEQWY7Q.js";
+import "../chunk-JVKY6ILU.js";
 import {
   rejectUnknownFlags
 } from "../chunk-GMXKITVA.js";
@@ -99,20 +99,20 @@ import {
   isDisabledExport,
   removeClaudeAlias,
   shellProfileCandidates
-} from "../chunk-N5WEEYV6.js";
-import "../chunk-W73URGML.js";
-import "../chunk-QUKATQ66.js";
-import "../chunk-HA22GGDG.js";
+} from "../chunk-JWMCGL3P.js";
+import "../chunk-L5WOYQT7.js";
+import "../chunk-IBUAVM6X.js";
+import "../chunk-7O5U5TED.js";
 import "../chunk-POFBE6ZY.js";
-import "../chunk-Z5ORWTY3.js";
-import "../chunk-DYALNCS6.js";
-import "../chunk-NWSWP3KY.js";
-import "../chunk-VA36Q6BD.js";
+import "../chunk-ABDGTGBT.js";
+import "../chunk-OLS4DTFN.js";
+import "../chunk-BMHD2NEH.js";
+import "../chunk-3HUHP4A4.js";
 import "../chunk-7QLSKOSU.js";
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
-import "../chunk-GUHM2UQO.js";
+import "../chunk-MIENLS7P.js";
 import {
   claudeJson,
   claudeMcpReceipt,
@@ -149,14 +149,14 @@ import {
   restoreCodexHookTrust,
   vscodePluginDir,
   vscodePluginMcp
-} from "../chunk-RFIHLLRH.js";
+} from "../chunk-4GEHVRV3.js";
 import "../chunk-AQFEP65J.js";
 import {
   getBaseUrl
-} from "../chunk-AZXPJLKC.js";
+} from "../chunk-D322CKL2.js";
 import {
   NPX_LATEST_COMMAND
-} from "../chunk-WXA3CFZR.js";
+} from "../chunk-MXEDMQLC.js";
 import {
   CLI_PACKAGE_NAMES,
   HOOK_COMPATIBLE_PROFILES,
@@ -168,7 +168,7 @@ import {
   globalRootFor,
   isValidApiKey,
   redactSecrets
-} from "../chunk-235LKHLW.js";
+} from "../chunk-QOUW57RT.js";
 
 // bin/pushary-clean.ts
 import { existsSync as existsSync6, readFileSync as readFileSync4, copyFileSync, readdirSync as readdirSync4 } from "fs";

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

@@ -5,10 +5,10 @@ import {
   postLiveSession,
   postLiveSessionUntilAccepted,
   startLiveSessionHeartbeat
-} from "../chunk-OSLC7G3D.js";
+} from "../chunk-5DC2PRVT.js";
 import {
   resolveProviderBinary
-} from "../chunk-YNJ372JU.js";
+} from "../chunk-MBTNHQCI.js";
 import "../chunk-RIVNNBEK.js";
 import {
   SESSION_IDLE_TIMEOUT_MS,
@@ -16,50 +16,51 @@ import {
   idleDeadlinePassed,
   startProcessOwnership,
   withSpawnProcessOwnership
-} from "../chunk-UKCGR5T2.js";
-import "../chunk-MAGB6VW6.js";
-import "../chunk-PYWLW7PC.js";
+} from "../chunk-DDRLK67P.js";
+import "../chunk-4D54LZGF.js";
+import "../chunk-WR3GKYKD.js";
 import {
   transcriptsEnabled
-} from "../chunk-HQR6DYVG.js";
+} from "../chunk-QC7ZNZMZ.js";
 import {
   spawnClaude
 } from "../chunk-XHKBHWLX.js";
 import "../chunk-6ICPEJY5.js";
-import "../chunk-N5WEEYV6.js";
+import "../chunk-JWMCGL3P.js";
 import {
   isAskUserResponse,
   isDecisionStopped,
   isWaitForAnswerResponse,
   withdrawQuestion,
   writeDegraded
-} from "../chunk-HA22GGDG.js";
+} from "../chunk-7O5U5TED.js";
 import "../chunk-POFBE6ZY.js";
 import {
-  callMcpTool
-} from "../chunk-Z5ORWTY3.js";
-import "../chunk-DYALNCS6.js";
-import "../chunk-NWSWP3KY.js";
+  callMcpTool,
+  isRetryable
+} from "../chunk-ABDGTGBT.js";
+import "../chunk-OLS4DTFN.js";
+import "../chunk-BMHD2NEH.js";
 import {
   getMachineId
-} from "../chunk-VA36Q6BD.js";
+} from "../chunk-3HUHP4A4.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
-import "../chunk-GUHM2UQO.js";
-import "../chunk-RFIHLLRH.js";
+import "../chunk-MIENLS7P.js";
+import "../chunk-4GEHVRV3.js";
 import "../chunk-AQFEP65J.js";
 import {
   getApiKey,
   getBaseUrl
-} from "../chunk-AZXPJLKC.js";
-import "../chunk-WXA3CFZR.js";
+} from "../chunk-D322CKL2.js";
+import "../chunk-MXEDMQLC.js";
 import {
   elicitationContent,
   parseAgentQuestion,
   parseAgentQuestionAnswers,
   planElicitationAsk,
   readElicitationFields
-} from "../chunk-235LKHLW.js";
+} from "../chunk-QOUW57RT.js";
 
 // bin/pushary-codex-bridge.ts
 import { existsSync } from "fs";
@@ -112,7 +113,7 @@ var JsonRpcClient = class {
   constructor(command, cwd, timeoutMs, bridgeOptions) {
     this.bridgeOptions = bridgeOptions;
     this.threadId = bridgeOptions.resumeThreadId ?? null;
-    const options = { cwd, env: process.env, stdio: ["pipe", "pipe", "pipe"] };
+    const options = { cwd, env: { ...process.env, PUSHARY_CODEX_BRIDGE: "1" }, stdio: ["pipe", "pipe", "pipe"] };
     this.child = process.platform === "win32" ? spawnClaude(command.command, command.args ?? [], options) : spawn(command.command, command.args ?? [], options);
     this.child.stdout?.setEncoding("utf8");
     this.child.stdout?.on("data", (chunk) => this.read(String(chunk)));
@@ -288,9 +289,11 @@ var rpcTurnId = (result) => {
 var answerCodexQuestions = async (options, params, signal, toolName = "request_user_input") => {
   if (!Array.isArray(params.questions) || !params.questions.length || params.questions.length > 3) throw new Error("Invalid questions");
   const answers = /* @__PURE__ */ Object.create(null);
-  const deadline = Date.now() + Math.min(12e4, typeof params.autoResolutionMs === "number" ? Math.max(0, params.autoResolutionMs) : 12e4);
+  const now = options.now ?? Date.now;
+  if (params.autoResolutionMs != null && (typeof params.autoResolutionMs !== "number" || !Number.isFinite(params.autoResolutionMs) || params.autoResolutionMs < 0)) throw new Error("Invalid question deadline");
+  const deadline = typeof params.autoResolutionMs === "number" ? now() + params.autoResolutionMs : null;
   for (const raw of params.questions) {
-    if (signal.aborted || Date.now() >= deadline) throw new Error("Question expired");
+    if (signal.aborted || deadline !== null && now() >= deadline) throw new Error("Question expired");
     const question = object(raw);
     const id = string(question?.id);
     const prompt = string(question?.question);
@@ -306,7 +309,7 @@ var answerCodexQuestions = async (options, params, signal, toolName = "request_u
     };
     try {
       signal.throwIfAborted();
-      if (Date.now() >= deadline) throw new Error("Question expired");
+      if (deadline !== null && now() >= deadline) throw new Error("Question expired");
       let result = await call("ask_user", {
         requestId: randomUUID(),
         question: prompt,
@@ -319,8 +322,9 @@ var answerCodexQuestions = async (options, params, signal, toolName = "request_u
         machineId: options.machineId,
         toolName,
         wait: false,
-        waitEndsAt: new Date(deadline).toISOString()
-      }, Math.min(1e4, deadline - Date.now()));
+        ...deadline === null ? {} : { waitEndsAt: new Date(deadline).toISOString() },
+        localSurfaceAvailable: false
+      }, deadline === null ? 1e4 : Math.min(1e4, deadline - now()));
       correlationId = string(object(result)?.correlationId);
       if (!isAskUserResponse(result)) throw new Error("Invalid ask_user response");
       while (!result.answered) {
@@ -337,13 +341,20 @@ var answerCodexQuestions = async (options, params, signal, toolName = "request_u
           }
           throw new Error(LOCAL_QUESTION_UNAVAILABLE);
         }
-        if (!correlationId || result.handoffAction === "stop" || result.noDevices || result.status && result.status !== "pending") throw new Error(QUESTION_UNAVAILABLE);
-        const remaining = deadline - Date.now();
+        if (signal.aborted) throw new Error("Question cancelled");
+        if (!correlationId || result.handoffAction === "stop" && result.status !== "unavailable" || result.noDevices || result.status && result.status !== "pending" && result.status !== "unavailable") throw new Error(QUESTION_UNAVAILABLE);
+        const remaining = deadline === null ? 27e3 : deadline - now();
         if (remaining <= 0) throw new Error("Question expired");
-        result = await call("wait_for_answer", { correlationId, timeoutMs: Math.min(25e3, remaining) }, Math.min(27e3, remaining));
-        if (!result.answered) await liveSessionSleep(100, signal);
+        try {
+          result = await call("wait_for_answer", { correlationId, timeoutMs: Math.min(25e3, remaining) }, Math.min(27e3, remaining));
+        } catch (error) {
+          if (signal.aborted || !isRetryable(error)) throw error;
+          await liveSessionSleep(2e3, signal);
+          continue;
+        }
+        if (!result.answered) await liveSessionSleep(result.status === "unavailable" ? 2e3 : 100, signal);
       }
-      if (signal.aborted || Date.now() >= deadline) throw new Error("Question expired");
+      if (signal.aborted || deadline !== null && now() >= deadline) throw new Error("Question expired");
       settled = true;
       const rawValue = string(result.value);
       const value = rawValue && structured ? (parseAgentQuestionAnswers([structured], rawValue) ?? parseAgentQuestionAnswers([structured], JSON.stringify({ [prompt]: rawValue })))?.[prompt] : rawValue;