pushary 1.9.38 → 1.9.40

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 1.9.40
+
+- Personal Codex question replies bind to the original connection and request. A saved answer is claimed once; missing delivery confirmation never triggers automatic replay.
+- With the matching server, blocked-action answers and their short-lived grants commit together, and a Stop prevents later claims. Question answer time remains separate from this grant window.
+- Phone, Mac and browser inboxes read every authorized question page. Saved answers and unconfirmed delivery have separate messages; neither claims an action ran.
+
+## 1.9.39
+
+- When away recognizes destructive Codex commands behind Git options and command wrappers, and recursive PowerShell deletions.
+- Malformed Codex question choices stay in Codex instead of appearing in Pushary with choices silently removed.
+
 ## 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.

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

@@ -1,41 +1,41 @@
 #!/usr/bin/env node
 import {
   handleBell
-} from "../chunk-Y3XF324T.js";
+} from "../chunk-54JZ6GLW.js";
 import {
   readHookInput
-} from "../chunk-WLQENMOW.js";
-import "../chunk-PA3OZGIA.js";
+} from "../chunk-3E2P45GK.js";
+import "../chunk-N2JDDOQS.js";
 import "../chunk-DWQYCOPI.js";
-import "../chunk-AJIH4JGB.js";
-import "../chunk-4D54LZGF.js";
-import "../chunk-WR3GKYKD.js";
-import "../chunk-QC7ZNZMZ.js";
+import "../chunk-HPZMNWDI.js";
+import "../chunk-BXPIKJPY.js";
+import "../chunk-ESJY5UYZ.js";
+import "../chunk-2UG5Y6EC.js";
 import "../chunk-XHKBHWLX.js";
-import "../chunk-7GSOIBVM.js";
-import "../chunk-ZFJAZBBF.js";
-import "../chunk-GBNG6QEV.js";
-import "../chunk-FZEQWY7Q.js";
-import "../chunk-JVKY6ILU.js";
+import "../chunk-CCAYCIW4.js";
+import "../chunk-QLV5S2KS.js";
+import "../chunk-22SNRAZS.js";
+import "../chunk-E6QJMEQJ.js";
+import "../chunk-KPDV6RQL.js";
 import "../chunk-GMXKITVA.js";
 import "../chunk-6ICPEJY5.js";
-import "../chunk-JWMCGL3P.js";
-import "../chunk-L5WOYQT7.js";
-import "../chunk-IBUAVM6X.js";
-import "../chunk-7O5U5TED.js";
+import "../chunk-2UKEITTN.js";
+import "../chunk-ADWW7Y6X.js";
+import "../chunk-VMIR56HZ.js";
+import "../chunk-W6PSSMTV.js";
 import "../chunk-POFBE6ZY.js";
-import "../chunk-ABDGTGBT.js";
-import "../chunk-OLS4DTFN.js";
-import "../chunk-BMHD2NEH.js";
-import "../chunk-3HUHP4A4.js";
+import "../chunk-CQ56WBBP.js";
+import "../chunk-QDC2VGFO.js";
+import "../chunk-AYU4S7RQ.js";
+import "../chunk-QWWJWPUV.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
-import "../chunk-MIENLS7P.js";
-import "../chunk-4GEHVRV3.js";
+import "../chunk-MAMQK4I2.js";
+import "../chunk-UOMFOMJM.js";
 import "../chunk-AQFEP65J.js";
-import "../chunk-D322CKL2.js";
-import "../chunk-MXEDMQLC.js";
-import "../chunk-QOUW57RT.js";
+import "../chunk-XJD5H72U.js";
+import "../chunk-CPGW7MMA.js";
+import "../chunk-EPFB6LGF.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-Y3XF324T.js";
+} from "../chunk-54JZ6GLW.js";
 import {
   createIo
 } from "../chunk-FO3MDD26.js";
 import {
   exitOnHelpFlag
-} from "../chunk-7P43CI6G.js";
+} from "../chunk-KH57L2HF.js";
 import {
   addBellHooks,
   bellInstalled,
   removeBellHooks
-} from "../chunk-JVKY6ILU.js";
+} from "../chunk-KPDV6RQL.js";
 import {
   parseFlags
 } from "../chunk-GMXKITVA.js";
-import "../chunk-JWMCGL3P.js";
+import "../chunk-2UKEITTN.js";
 import "../chunk-7QLSKOSU.js";
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
-import "../chunk-MIENLS7P.js";
+import "../chunk-MAMQK4I2.js";
 import {
   claudeSettings
-} from "../chunk-4GEHVRV3.js";
+} from "../chunk-UOMFOMJM.js";
 import {
   readJsonSafe,
   writeJsonAtomic
 } from "../chunk-AQFEP65J.js";
-import "../chunk-D322CKL2.js";
-import "../chunk-MXEDMQLC.js";
+import "../chunk-XJD5H72U.js";
+import "../chunk-CPGW7MMA.js";
 import {
   isRecord
-} from "../chunk-QOUW57RT.js";
+} from "../chunk-EPFB6LGF.js";
 
 // bin/pushary-bell.ts
 exitOnHelpFlag("bell");

package/dist/bin/pushary-claude.js

@@ -8,39 +8,39 @@ import {
   describeIdleWindow,
   startProcessOwnership,
   withSpawnProcessOwnership
-} from "../chunk-DDRLK67P.js";
+} from "../chunk-FZ5FYVR3.js";
 import {
   announceSubscriptionRequired,
   isDeferAnswer
-} from "../chunk-W2TXFM6O.js";
+} from "../chunk-C7P5VIU6.js";
 import {
   claudeTranscriptPath,
   loadSessionKey,
   registerTranscript,
   registeredTranscriptEnabled
-} from "../chunk-PA3OZGIA.js";
+} from "../chunk-N2JDDOQS.js";
 import "../chunk-DWQYCOPI.js";
 import {
   ensureDaemonRunning
-} from "../chunk-AJIH4JGB.js";
+} from "../chunk-HPZMNWDI.js";
 import {
   encryptRecord
-} from "../chunk-4D54LZGF.js";
-import "../chunk-WR3GKYKD.js";
+} from "../chunk-BXPIKJPY.js";
+import "../chunk-ESJY5UYZ.js";
 import {
   transcriptsEnabled
-} from "../chunk-QC7ZNZMZ.js";
+} from "../chunk-2UG5Y6EC.js";
 import {
   needsShell,
   spawnClaude
 } from "../chunk-XHKBHWLX.js";
-import "../chunk-ZFJAZBBF.js";
-import "../chunk-GBNG6QEV.js";
-import "../chunk-FZEQWY7Q.js";
-import "../chunk-JVKY6ILU.js";
+import "../chunk-QLV5S2KS.js";
+import "../chunk-22SNRAZS.js";
+import "../chunk-E6QJMEQJ.js";
+import "../chunk-KPDV6RQL.js";
 import "../chunk-GMXKITVA.js";
 import "../chunk-6ICPEJY5.js";
-import "../chunk-JWMCGL3P.js";
+import "../chunk-2UKEITTN.js";
 import {
   DEFAULT_SESSION,
   UNNAMED_ACTION,
@@ -58,8 +58,8 @@ import {
   reportEvent,
   savePendingCommand,
   scopePathFor
-} from "../chunk-L5WOYQT7.js";
-import "../chunk-IBUAVM6X.js";
+} from "../chunk-ADWW7Y6X.js";
+import "../chunk-VMIR56HZ.js";
 import {
   askUser,
   cancelQuestion,
@@ -70,28 +70,28 @@ import {
   waitForAnswer,
   waitsForThePhone,
   withdrawQuestion
-} from "../chunk-7O5U5TED.js";
+} from "../chunk-W6PSSMTV.js";
 import "../chunk-POFBE6ZY.js";
 import {
   SubscriptionRequiredError
-} from "../chunk-ABDGTGBT.js";
-import "../chunk-OLS4DTFN.js";
-import "../chunk-BMHD2NEH.js";
+} from "../chunk-CQ56WBBP.js";
+import "../chunk-QDC2VGFO.js";
+import "../chunk-AYU4S7RQ.js";
 import {
   getMachineId
-} from "../chunk-3HUHP4A4.js";
+} from "../chunk-QWWJWPUV.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
-import "../chunk-MIENLS7P.js";
-import "../chunk-4GEHVRV3.js";
+import "../chunk-MAMQK4I2.js";
+import "../chunk-UOMFOMJM.js";
 import "../chunk-AQFEP65J.js";
 import {
   getApiKey,
   getBaseUrl
-} from "../chunk-D322CKL2.js";
+} from "../chunk-XJD5H72U.js";
 import {
   NPX_LATEST_COMMAND
-} from "../chunk-MXEDMQLC.js";
+} from "../chunk-CPGW7MMA.js";
 import {
   DECISION_STOP_REASON,
   HAND_BACK_WITHOUT_A_PROMPT,
@@ -101,7 +101,7 @@ import {
   redactSecretsFromContent,
   resolveGate,
   timeoutActionWithoutLocalPrompt
-} from "../chunk-QOUW57RT.js";
+} from "../chunk-EPFB6LGF.js";
 
 // src/wrapper/localPassthrough.ts
 var SIGNAL_NUMBERS = {

package/dist/bin/pushary-clean.js

@@ -9,12 +9,12 @@ import {
   planCliKeyRevocations,
   readCliHeldKeys,
   revokeCliKeys
-} from "../chunk-AI2YBW42.js";
+} from "../chunk-DKJFRVVN.js";
 import {
   isCursorPluginLeftover,
   releaseSoleGate,
   withoutPusharyCursorHooks
-} from "../chunk-WASCAI2U.js";
+} from "../chunk-MFGPTJJ3.js";
 import {
   HERMES_PIP_PACKAGE,
   readHermesStatus,
@@ -23,25 +23,25 @@ import {
   shortenHome,
   unregisterPluginLocation,
   vscodeSettingsTargets
-} from "../chunk-3DXDJL4K.js";
+} from "../chunk-P2PWALZL.js";
 import {
   planFxRemoval,
   removeInstructionBlock
-} from "../chunk-LZZ3EKKI.js";
-import "../chunk-VITJTFFT.js";
+} from "../chunk-V2TZVYXI.js";
+import "../chunk-7TV7BXIH.js";
 import {
   disableDaemonService
-} from "../chunk-AJIH4JGB.js";
+} from "../chunk-HPZMNWDI.js";
 import "../chunk-XHKBHWLX.js";
-import "../chunk-K2CZJBUS.js";
+import "../chunk-IKBQRXPQ.js";
 import {
   macAppKeepsMcpEntry,
   mcpServerBearer,
   pusharyKey,
   readMacAppAgentKey,
   setupReceiptKey
-} from "../chunk-5KVL4AP5.js";
-import "../chunk-D2G6HWEA.js";
+} from "../chunk-P2IT4Y5Q.js";
+import "../chunk-PZTLBH6Z.js";
 import {
   OPENCODE_PLUGIN_SIBLING,
   OPENCODE_PLUGIN_SIBLING_CONTENTS,
@@ -53,14 +53,14 @@ import {
   openCodePluginDir,
   openCodePluginFile,
   removeOpenCodeMcpServer
-} from "../chunk-J2APHNZL.js";
+} from "../chunk-ABSVJ3WV.js";
 import {
   ansiPainter,
   useColor
 } from "../chunk-FO3MDD26.js";
 import {
   exitOnHelpFlag
-} from "../chunk-7P43CI6G.js";
+} from "../chunk-KH57L2HF.js";
 import {
   compatibleConfigFile,
   compatibleDocuments,
@@ -76,7 +76,7 @@ import {
   removePusharyToolPermissions,
   restoreClaudeMcpServer,
   serializeConfigDocument
-} from "../chunk-7GSOIBVM.js";
+} from "../chunk-CCAYCIW4.js";
 import {
   hookOwnerOf,
   isHookTakeoverReceipt,
@@ -84,12 +84,12 @@ import {
   resolveBridgeStub,
   restoreHookTakeover,
   restoreMcpServer
-} from "../chunk-ZFJAZBBF.js";
+} from "../chunk-QLV5S2KS.js";
 import {
   removeGeminiSettings
-} from "../chunk-GBNG6QEV.js";
-import "../chunk-FZEQWY7Q.js";
-import "../chunk-JVKY6ILU.js";
+} from "../chunk-22SNRAZS.js";
+import "../chunk-E6QJMEQJ.js";
+import "../chunk-KPDV6RQL.js";
 import {
   rejectUnknownFlags
 } from "../chunk-GMXKITVA.js";
@@ -99,20 +99,20 @@ import {
   isDisabledExport,
   removeClaudeAlias,
   shellProfileCandidates
-} from "../chunk-JWMCGL3P.js";
-import "../chunk-L5WOYQT7.js";
-import "../chunk-IBUAVM6X.js";
-import "../chunk-7O5U5TED.js";
+} from "../chunk-2UKEITTN.js";
+import "../chunk-ADWW7Y6X.js";
+import "../chunk-VMIR56HZ.js";
+import "../chunk-W6PSSMTV.js";
 import "../chunk-POFBE6ZY.js";
-import "../chunk-ABDGTGBT.js";
-import "../chunk-OLS4DTFN.js";
-import "../chunk-BMHD2NEH.js";
-import "../chunk-3HUHP4A4.js";
+import "../chunk-CQ56WBBP.js";
+import "../chunk-QDC2VGFO.js";
+import "../chunk-AYU4S7RQ.js";
+import "../chunk-QWWJWPUV.js";
 import "../chunk-7QLSKOSU.js";
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
-import "../chunk-MIENLS7P.js";
+import "../chunk-MAMQK4I2.js";
 import {
   claudeJson,
   claudeMcpReceipt,
@@ -149,14 +149,14 @@ import {
   restoreCodexHookTrust,
   vscodePluginDir,
   vscodePluginMcp
-} from "../chunk-4GEHVRV3.js";
+} from "../chunk-UOMFOMJM.js";
 import "../chunk-AQFEP65J.js";
 import {
   getBaseUrl
-} from "../chunk-D322CKL2.js";
+} from "../chunk-XJD5H72U.js";
 import {
   NPX_LATEST_COMMAND
-} from "../chunk-MXEDMQLC.js";
+} from "../chunk-CPGW7MMA.js";
 import {
   CLI_PACKAGE_NAMES,
   HOOK_COMPATIBLE_PROFILES,
@@ -168,7 +168,7 @@ import {
   globalRootFor,
   isValidApiKey,
   redactSecrets
-} from "../chunk-QOUW57RT.js";
+} from "../chunk-EPFB6LGF.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-5DC2PRVT.js";
+} from "../chunk-N7MBQPIF.js";
 import {
   resolveProviderBinary
-} from "../chunk-MBTNHQCI.js";
+} from "../chunk-SGOQGCKJ.js";
 import "../chunk-RIVNNBEK.js";
 import {
   SESSION_IDLE_TIMEOUT_MS,
@@ -16,55 +16,116 @@ import {
   idleDeadlinePassed,
   startProcessOwnership,
   withSpawnProcessOwnership
-} from "../chunk-DDRLK67P.js";
-import "../chunk-4D54LZGF.js";
-import "../chunk-WR3GKYKD.js";
+} from "../chunk-FZ5FYVR3.js";
+import "../chunk-BXPIKJPY.js";
+import "../chunk-ESJY5UYZ.js";
 import {
   transcriptsEnabled
-} from "../chunk-QC7ZNZMZ.js";
+} from "../chunk-2UG5Y6EC.js";
 import {
   spawnClaude
 } from "../chunk-XHKBHWLX.js";
 import "../chunk-6ICPEJY5.js";
-import "../chunk-JWMCGL3P.js";
+import "../chunk-2UKEITTN.js";
 import {
   isAskUserResponse,
   isDecisionStopped,
   isWaitForAnswerResponse,
   withdrawQuestion,
   writeDegraded
-} from "../chunk-7O5U5TED.js";
+} from "../chunk-W6PSSMTV.js";
 import "../chunk-POFBE6ZY.js";
 import {
   callMcpTool,
   isRetryable
-} from "../chunk-ABDGTGBT.js";
-import "../chunk-OLS4DTFN.js";
-import "../chunk-BMHD2NEH.js";
+} from "../chunk-CQ56WBBP.js";
+import "../chunk-QDC2VGFO.js";
+import "../chunk-AYU4S7RQ.js";
 import {
   getMachineId
-} from "../chunk-3HUHP4A4.js";
+} from "../chunk-QWWJWPUV.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
-import "../chunk-MIENLS7P.js";
-import "../chunk-4GEHVRV3.js";
+import "../chunk-MAMQK4I2.js";
+import "../chunk-UOMFOMJM.js";
 import "../chunk-AQFEP65J.js";
 import {
   getApiKey,
   getBaseUrl
-} from "../chunk-D322CKL2.js";
-import "../chunk-MXEDMQLC.js";
+} from "../chunk-XJD5H72U.js";
+import "../chunk-CPGW7MMA.js";
 import {
+  PERSONAL_QUESTION_CAPABILITY,
+  canonicalJsonText,
   elicitationContent,
+  isQuestionOwner,
   parseAgentQuestion,
   parseAgentQuestionAnswers,
   planElicitationAsk,
   readElicitationFields
-} from "../chunk-QOUW57RT.js";
+} from "../chunk-EPFB6LGF.js";
 
 // bin/pushary-codex-bridge.ts
 import { existsSync } from "fs";
 
+// src/codex-question-owner.ts
+import { createHash } from "crypto";
+var codexQuestionOwner = (params, requestId, runtime) => {
+  if (params.threadId !== runtime.threadId || typeof params.isBlocking !== "boolean") return null;
+  const owner = {
+    capability: PERSONAL_QUESTION_CAPABILITY,
+    machineId: runtime.machineId,
+    generation: runtime.generation,
+    threadId: params.threadId,
+    turnId: params.turnId,
+    itemId: params.itemId,
+    requestId,
+    method: "item/tool/requestUserInput",
+    subjectHash: createHash("sha256").update(canonicalJsonText(params)).digest("hex")
+  };
+  return isQuestionOwner(owner) ? owner : null;
+};
+var closesOwnedQuestion = (owner, method, params) => {
+  if (method === "serverRequest/resolved") return params.requestId === owner.requestId;
+  if (params.threadId !== owner.threadId) return false;
+  if (method === "thread/closed" || method === "thread/archived") return true;
+  if (method === "turn/completed") {
+    const turn = params.turn;
+    return turn !== null && typeof turn === "object" && "id" in turn && turn.id === owner.turnId;
+  }
+  if (method === "item/completed" && params.turnId === owner.turnId) {
+    const item = params.item;
+    return item !== null && typeof item === "object" && "id" in item && item.id === owner.itemId;
+  }
+  return false;
+};
+
+// src/question-dispatch.ts
+var claimOwnedQuestion = async (options, dispatch) => {
+  const response = await postLiveSession(options, "/api/agent/question/dispatch", {
+    owner: dispatch.owner,
+    correlationIds: dispatch.correlationIds,
+    operation: "claim"
+  });
+  const body = await response.json();
+  if (!response.ok || body === null || typeof body !== "object" || !("claimId" in body) || typeof body.claimId !== "string" || !body.claimId) throw new Error("Question delivery could not be claimed");
+  dispatch.claimId = body.claimId;
+};
+var reportOwnedQuestion = async (options, dispatch, operation) => {
+  if (dispatch.correlationIds.length === 0) return;
+  try {
+    const response = await postLiveSession({ ...options, signal: AbortSignal.timeout(3e3), requestTimeoutMs: 3e3 }, "/api/agent/question/dispatch", {
+      owner: dispatch.owner,
+      correlationIds: dispatch.correlationIds,
+      claimId: dispatch.claimId,
+      operation
+    });
+    if (!response.ok) throw new Error("Receipt refused");
+  } catch {
+    writeDegraded("questions", { reason: "question_receipt_unconfirmed", fallback: "no automatic replay", event: operation });
+  }
+};
+
 // src/codex-bridge.ts
 import { randomUUID } from "crypto";
 
@@ -126,6 +187,7 @@ var JsonRpcClient = class {
   child;
   pending = /* @__PURE__ */ new Map();
   notifications = /* @__PURE__ */ new Set();
+  generation = randomUUID();
   serverRequests = /* @__PURE__ */ new Map();
   threadId = null;
   nextId = 1;
@@ -174,7 +236,10 @@ var JsonRpcClient = class {
   async close() {
     if (this.closed) return;
     this.closed = true;
-    for (const request of this.serverRequests.values()) request.abort();
+    for (const request of this.serverRequests.values()) {
+      request.controller.abort();
+      if (request.dispatch) void reportOwnedQuestion(this.bridgeOptions, request.dispatch, "unavailable");
+    }
     this.serverRequests.clear();
     this.child.stdin?.end();
     if (this.child.exitCode != null) return;
@@ -218,23 +283,50 @@ var JsonRpcClient = class {
     }
     if (message.id !== void 0 && (message.method === "item/tool/requestUserInput" || message.method === "mcpServer/elicitation/request")) {
       const id = message.id;
-      if (this.serverRequests.has(id)) return;
+      const owner = message.method === "item/tool/requestUserInput" ? codexQuestionOwner(message.params ?? {}, id, { machineId: this.bridgeOptions.machineId, generation: this.generation, threadId: this.threadId }) : null;
+      if (message.method === "item/tool/requestUserInput" && !owner) {
+        this.write({ id, error: { code: -32e3, message: "Unsupported question ownership" } });
+        return;
+      }
+      const existing = this.serverRequests.get(id);
+      if (existing) {
+        if (existing.dispatch && existing.dispatch.owner.subjectHash !== owner?.subjectHash) existing.controller.abort();
+        return;
+      }
       if (this.serverRequests.size >= MAX_PENDING_RPC) {
         this.write({ id, error: { code: -32e3, message: "Too many pending user questions" } });
         return;
       }
       const controller = new AbortController();
-      this.serverRequests.set(id, controller);
+      const now = this.bridgeOptions.now ?? Date.now;
+      const duration = message.params?.autoResolutionMs;
+      if (duration != null && (typeof duration !== "number" || !Number.isFinite(duration) || duration < 0)) {
+        this.write({ id, error: { code: -32e3, message: "Invalid question deadline" } });
+        return;
+      }
+      const deadline = typeof duration === "number" ? now() + duration : null;
+      const dispatch = owner ? { owner, correlationIds: [], deadline } : void 0;
+      this.serverRequests.set(id, { controller, dispatch });
       const signal = AbortSignal.any([controller.signal, this.bridgeOptions.signal]);
-      const answer = message.method === "mcpServer/elicitation/request" ? answerCodexElicitation(this.bridgeOptions, message.params ?? {}, this.threadId, signal) : answerCodexQuestions(this.bridgeOptions, message.params ?? {}, signal);
+      const answer = message.method === "mcpServer/elicitation/request" ? answerCodexElicitation(this.bridgeOptions, message.params ?? {}, this.threadId, signal) : answerCodexQuestions(this.bridgeOptions, message.params ?? {}, signal, "request_user_input", dispatch);
       void answer.then(
-        (result) => {
-          if (!signal.aborted && !this.closed) this.write({ id, result });
+        async (result) => {
+          if (signal.aborted || this.closed) return;
+          if (dispatch) await claimOwnedQuestion(this.bridgeOptions, dispatch);
+          if (signal.aborted || this.closed || this.serverRequests.get(id)?.controller !== controller) return;
+          if (deadline !== null && now() >= deadline) throw new Error("Question expired");
+          this.write({ id, result });
+          if (dispatch) await reportOwnedQuestion(this.bridgeOptions, dispatch, "reply_queued");
         },
         (error) => {
           if (!signal.aborted && !this.closed) this.write({ id, error: { code: -32e3, message: error instanceof Error && error.message === LOCAL_QUESTION_UNAVAILABLE ? LOCAL_QUESTION_UNAVAILABLE : "No user answer was received through Pushary" } });
         }
-      ).finally(() => this.serverRequests.delete(id));
+      ).catch(() => {
+        if (!signal.aborted && !this.closed) this.write({ id, error: { code: -32e3, message: "Question delivery is unconfirmed; no automatic retry" } });
+      }).finally(async () => {
+        if (dispatch && (signal.aborted || !dispatch.claimId)) await reportOwnedQuestion(this.bridgeOptions, dispatch, "unavailable");
+        if (!dispatch?.claimId || signal.aborted) this.serverRequests.delete(id);
+      });
       return;
     }
     if (message.id !== void 0 && message.method) {
@@ -251,9 +343,17 @@ var JsonRpcClient = class {
       else pending.resolve(message.result);
       return;
     }
-    if (message.method === "serverRequest/resolved") {
-      const id = message.params?.requestId;
-      if (typeof id === "number" || typeof id === "string") this.serverRequests.get(id)?.abort();
+    if (message.method) {
+      for (const request of this.serverRequests.values()) {
+        if (request.dispatch && closesOwnedQuestion(request.dispatch.owner, message.method, message.params ?? {})) {
+          request.controller.abort();
+          void reportOwnedQuestion(this.bridgeOptions, request.dispatch, request.dispatch.claimId ? "request_closed" : "unavailable");
+          this.serverRequests.delete(request.dispatch.owner.requestId);
+        } else if (!request.dispatch && message.method === "serverRequest/resolved") {
+          const id = message.params?.requestId;
+          if ((typeof id === "string" || typeof id === "number") && this.serverRequests.get(id) === request) request.controller.abort();
+        }
+      }
     }
     if (message.method) {
       for (const listener of this.notifications) listener(message);
@@ -263,7 +363,10 @@ var JsonRpcClient = class {
     if (this.closed) return;
     this.closed = true;
     this.failure = error;
-    for (const request of this.serverRequests.values()) request.abort();
+    for (const request of this.serverRequests.values()) {
+      request.controller.abort();
+      if (request.dispatch) void reportOwnedQuestion(this.bridgeOptions, request.dispatch, "unavailable");
+    }
     this.serverRequests.clear();
     this.rejectPending(error);
     if (this.child.exitCode == null) this.child.kill();
@@ -286,12 +389,12 @@ var rpcTurnId = (result) => {
   const response = object(result);
   return string(object(response?.turn)?.id) ?? string(response?.turnId);
 };
-var answerCodexQuestions = async (options, params, signal, toolName = "request_user_input") => {
+var answerCodexQuestions = async (options, params, signal, toolName = "request_user_input", dispatch) => {
   if (!Array.isArray(params.questions) || !params.questions.length || params.questions.length > 3) throw new Error("Invalid questions");
   const answers = /* @__PURE__ */ Object.create(null);
   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;
+  const deadline = dispatch ? dispatch.deadline : typeof params.autoResolutionMs === "number" ? now() + params.autoResolutionMs : null;
   for (const raw of params.questions) {
     if (signal.aborted || deadline !== null && now() >= deadline) throw new Error("Question expired");
     const question = object(raw);
@@ -311,6 +414,7 @@ var answerCodexQuestions = async (options, params, signal, toolName = "request_u
       signal.throwIfAborted();
       if (deadline !== null && now() >= deadline) throw new Error("Question expired");
       let result = await call("ask_user", {
+        ...dispatch ? { questionOwner: dispatch.owner } : {},
         requestId: randomUUID(),
         question: prompt,
         type: labels.length >= 2 ? "select" : "input",
@@ -327,6 +431,7 @@ var answerCodexQuestions = async (options, params, signal, toolName = "request_u
       }, deadline === null ? 1e4 : Math.min(1e4, deadline - now()));
       correlationId = string(object(result)?.correlationId);
       if (!isAskUserResponse(result)) throw new Error("Invalid ask_user response");
+      if (correlationId && dispatch) dispatch.correlationIds.push(correlationId);
       while (!result.answered) {
         if (result.status === "terminal" || result.status === "notified" || result.suppressed || result.mode === "terminal_only" || result.mode === "notify_only") {
           if (correlationId) {