@pushary/agent-hooks 0.95.2 → 0.95.5

package/dist/bin/pushary-claude.js

@@ -8,7 +8,7 @@ import {
   describeIdleWindow,
   startProcessOwnership,
   withSpawnProcessOwnership
-} from "../chunk-M7WWEFG6.js";
+} from "../chunk-QQGNFHIK.js";
 import {
   isDeferAnswer
 } from "../chunk-YHG74UFF.js";
@@ -17,70 +17,73 @@ import {
   loadSessionKey,
   registerTranscript,
   registeredTranscriptEnabled
-} from "../chunk-UW4LWAWY.js";
-import "../chunk-YKLCWWEI.js";
-import "../chunk-WM5XMCID.js";
-import "../chunk-3ZUTNTZA.js";
-import "../chunk-2XUPP4WM.js";
-import "../chunk-CH6DTGQR.js";
+} from "../chunk-4RF52LSU.js";
+import "../chunk-BMANRGJQ.js";
+import "../chunk-VOSGZ6PH.js";
+import "../chunk-2ZTL3PGN.js";
+import "../chunk-CUEZMPLJ.js";
+import "../chunk-HBHEX3JQ.js";
 import {
   ensureDaemonRunning
-} from "../chunk-RVSEGFPD.js";
-import "../chunk-7LUFYRH4.js";
-import "../chunk-DSTLA2TC.js";
-import "../chunk-EZIEXHYM.js";
+} from "../chunk-XLOELLAS.js";
+import "../chunk-2D7BAOMY.js";
+import "../chunk-GOPIMNVC.js";
+import "../chunk-3AJIK5AO.js";
 import {
   encryptRecord
-} from "../chunk-IPHOUBTU.js";
+} from "../chunk-4PX4QK2Z.js";
 import "../chunk-EQRS3SGM.js";
 import {
   transcriptsEnabled
-} from "../chunk-QF4RI5CD.js";
+} from "../chunk-OI3DJA7N.js";
 import {
   needsShell,
   spawnClaude
 } from "../chunk-XHKBHWLX.js";
 import "../chunk-L4ZCFMWW.js";
 import {
+  DEFAULT_SESSION,
   fetchModeState,
   getPolicy,
-  phoneDrivenEnv,
-  repoKeyFor,
-  reportEvent
-} from "../chunk-DNVDKHQD.js";
-import {
-  DEFAULT_SESSION,
-  askUser,
-  cancelQuestion,
   markPendingCommandDelivered,
   markPendingCommandFailed,
+  phoneDrivenEnv,
   readPendingCommand,
   readPendingCommandById,
   removePendingCommand,
-  savePendingCommand,
-  waitForAnswer
-} from "../chunk-RER3FRTD.js";
+  repoKeyFor,
+  reportEvent,
+  savePendingCommand
+} from "../chunk-HCMM3BOW.js";
+import {
+  DECISION_STOP_REASON,
+  askUser,
+  cancelQuestion,
+  isDecisionStopped,
+  isLocalQuestionHandoff,
+  nextLongPollMs,
+  waitForAnswer,
+  withdrawQuestion
+} from "../chunk-XS33QBJA.js";
 import {
   UNNAMED_ACTION,
   deriveToolTarget,
   describeToolCall,
   scopePathFor
-} from "../chunk-CKOLDI47.js";
-import "../chunk-V27AHID3.js";
+} from "../chunk-BDI2MXTT.js";
+import "../chunk-IVQMNLSA.js";
 import {
   getMachineId
-} from "../chunk-IAEXPTXA.js";
-import "../chunk-WB2C7VPF.js";
+} from "../chunk-N4VNLISN.js";
+import "../chunk-OW6AZDY2.js";
 import "../chunk-GMXKITVA.js";
 import "../chunk-DINDL2CF.js";
-import "../chunk-GUVCYYDK.js";
-import "../chunk-BC3VCZ3E.js";
+import "../chunk-S5CMLR35.js";
 import "../chunk-EYRGBYZG.js";
 import "../chunk-SAF6HGAA.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
-import "../chunk-X7YWD6IS.js";
-import "../chunk-4LL6LG5X.js";
+import "../chunk-KAVDAZ7A.js";
 import {
   getApiKey,
   getBaseUrl
@@ -89,7 +92,7 @@ import {
   KILL_REASON,
   redactSecrets,
   resolveGate
-} from "../chunk-6FAHPGCZ.js";
+} from "../chunk-WDKHZRAS.js";
 
 // src/wrapper/localPassthrough.ts
 var SIGNAL_NUMBERS = {
@@ -448,7 +451,11 @@ var createRemoteApprover = (deps) => {
   const waitForPhone = async (entry, correlationId, windowMs) => {
     const deadline = now() + windowMs;
     while (now() < deadline && !entry.controller.signal.aborted) {
-      const remaining = Math.min(Math.max(deadline - now(), 1e3), 3e4);
+      const hold = nextLongPollMs(deadline, now());
+      if (hold === null) {
+        await sleep(Math.min(500, Math.max(0, deadline - now())));
+        continue;
+      }
       const abortPromise = new Promise((resolve) => {
         entry.controller.signal.addEventListener("abort", () => resolve({ answered: false, aborted: true }), {
           once: true
@@ -457,18 +464,15 @@ var createRemoteApprover = (deps) => {
       let outcome;
       try {
         outcome = await Promise.race([
-          waitForAnswer2(deps.apiKey, correlationId, remaining),
+          waitForAnswer2(deps.apiKey, correlationId, hold, AbortSignal.any([entry.controller.signal, AbortSignal.timeout(Math.max(1, deadline - now()))])),
           abortPromise
         ]);
       } catch {
-        if (now() + 1e3 >= deadline) break;
-        await sleep(1e3);
-        continue;
+        return { answered: false, status: "unavailable" };
       }
-      if ("aborted" in outcome) return { answered: false };
-      if (outcome.answered) return outcome;
-      if (now() + 500 >= deadline) break;
-      await sleep(500);
+      if ("aborted" in outcome) return { answered: false, status: "cancelled" };
+      if (isDecisionStopped(outcome) || outcome.answered) return outcome;
+      await sleep(Math.min(500, Math.max(0, deadline - now())));
     }
     return { answered: false };
   };
@@ -524,23 +528,31 @@ var createRemoteApprover = (deps) => {
           repoKey: repoKeyFor(deps.cwd)
         });
       } catch {
-        return applyTimeout(policy, input);
+        return deny("Pushary could not create a verifiable approval. Retry the action.");
       }
+      if (isDecisionStopped(question)) return deny(DECISION_STOP_REASON);
       entry.correlationId = question.correlationId;
-      if (question.noDevices) return applyTimeout(policy, input);
-      const answer = await waitForPhone(entry, question.correlationId, windowFor(policy));
+      const localHandoff = isLocalQuestionHandoff(question);
+      let answer = question.answered ? { ...question, answered: true } : localHandoff ? { answered: false } : await waitForPhone(entry, question.correlationId, windowFor(policy));
+      if (isDecisionStopped(answer) || entry.controller.signal.aborted) return deny(DECISION_STOP_REASON);
+      if (!answer.answered) {
+        answer = await withdrawQuestion(deps.apiKey, question.correlationId, { cancelQuestion: cancelQuestion2, waitForAnswer: waitForAnswer2 });
+        entry.correlationId = void 0;
+        if (isDecisionStopped(answer)) return deny(DECISION_STOP_REASON);
+      }
       answered = answer.answered;
       if (answer.answered) {
         if (isDeferAnswer(answer.value)) return deny("Deferred \u2014 handle it on the machine");
         return answer.value === "yes" ? allow(input) : deny("Denied from your phone");
       }
+      if (localHandoff) return deny("This remote session has no local approval UI. Continue in an interactive session or choose a mode that permits remote approval.");
       return applyTimeout(policy, input);
     } catch {
       return deny("Approval unavailable; denied by default");
     } finally {
       if (options?.signal) options.signal.removeEventListener("abort", outerAbort);
       if (entry.correlationId && !answered && !tornDown) {
-        void cancelQuestion2(deps.apiKey, entry.correlationId).catch(() => {
+        await cancelQuestion2(deps.apiKey, entry.correlationId).catch(() => {
         });
       }
       pending.delete(entry);

package/dist/bin/pushary-clean.js

@@ -6,12 +6,13 @@ import {
   resolveHermesPython,
   runHermesPythonScript
 } from "../chunk-N6FAXQDD.js";
+import "../chunk-KBITFQST.js";
 import {
   removeInstructionBlock,
   shortenHome,
   unregisterPluginLocation,
   vscodeSettingsTargets
-} from "../chunk-G24SEVCI.js";
+} from "../chunk-6VANQN5Q.js";
 import {
   OPENCODE_PLUGIN_SIBLING,
   OPENCODE_PLUGIN_SIBLING_CONTENTS,
@@ -21,39 +22,39 @@ import {
   openCodePluginDir,
   openCodePluginFile,
   removeOpenCodeMcpServer
-} from "../chunk-E3NF5CL2.js";
+} from "../chunk-HQIVR7MM.js";
 import {
   isClaudeMcpSnapshot,
   removeClaudeMcpServers,
   removePusharySettings,
   restoreClaudeMcpServer
-} from "../chunk-76XICHYT.js";
+} from "../chunk-HGUZOUB2.js";
 import {
   hookOwnerOf,
   isHookTakeoverReceipt,
   restoreHookTakeover,
   restoreMcpServer
-} from "../chunk-WM5XMCID.js";
-import "../chunk-3ZUTNTZA.js";
-import "../chunk-2XUPP4WM.js";
+} from "../chunk-VOSGZ6PH.js";
+import "../chunk-2ZTL3PGN.js";
+import "../chunk-CUEZMPLJ.js";
 import {
   pusharyHookExecutable
-} from "../chunk-CH6DTGQR.js";
+} from "../chunk-HBHEX3JQ.js";
 import {
   disableDaemonService
-} from "../chunk-RVSEGFPD.js";
+} from "../chunk-XLOELLAS.js";
 import {
   removeGeminiSettings
-} from "../chunk-7LUFYRH4.js";
-import "../chunk-DSTLA2TC.js";
-import "../chunk-EZIEXHYM.js";
+} from "../chunk-2D7BAOMY.js";
+import "../chunk-GOPIMNVC.js";
+import "../chunk-3AJIK5AO.js";
 import "../chunk-XHKBHWLX.js";
 import {
   execNpm
 } from "../chunk-L4ZCFMWW.js";
-import "../chunk-CKOLDI47.js";
-import "../chunk-V27AHID3.js";
-import "../chunk-IAEXPTXA.js";
+import "../chunk-BDI2MXTT.js";
+import "../chunk-IVQMNLSA.js";
+import "../chunk-N4VNLISN.js";
 import {
   claudeJson,
   claudeMcpReceipt,
@@ -79,28 +80,28 @@ import {
   restoreCodexHookTrust,
   vscodePluginDir,
   vscodePluginMcp
-} from "../chunk-WB2C7VPF.js";
+} from "../chunk-OW6AZDY2.js";
 import {
   exitOnHelpFlag
-} from "../chunk-MOY5X6HJ.js";
-import "../chunk-ZDAT5KMU.js";
+} from "../chunk-DLLAWCQB.js";
+import "../chunk-D6PRC3YQ.js";
 import {
   rejectUnknownFlags
 } from "../chunk-GMXKITVA.js";
 import "../chunk-DINDL2CF.js";
 import {
   removeClaudeAlias
-} from "../chunk-BC3VCZ3E.js";
+} from "../chunk-S5CMLR35.js";
 import "../chunk-7QLSKOSU.js";
 import {
   EXIT
 } from "../chunk-KZERVKTD.js";
-import "../chunk-4LL6LG5X.js";
+import "../chunk-KAVDAZ7A.js";
 import "../chunk-2UMNXADU.js";
 import {
   CURSOR_GATE_EVENTS,
   HOOK_LOCATOR_BINARY
-} from "../chunk-6FAHPGCZ.js";
+} from "../chunk-WDKHZRAS.js";
 
 // bin/pushary-clean.ts
 import { existsSync, readFileSync, copyFileSync, readdirSync } from "fs";

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

@@ -1,24 +1,24 @@
 #!/usr/bin/env node
-import "../chunk-3OXHYPZG.js";
+import "../chunk-IM2A5H33.js";
 import {
   LiveTranscriptRelay,
   liveSessionSleep,
   postLiveSession,
   postLiveSessionUntilAccepted,
   startLiveSessionHeartbeat
-} from "../chunk-4XXUHWIK.js";
+} from "../chunk-QHWXUNMN.js";
 import {
   SESSION_IDLE_TIMEOUT_MS,
   describeIdleWindow,
   idleDeadlinePassed,
   startProcessOwnership,
   withSpawnProcessOwnership
-} from "../chunk-M7WWEFG6.js";
-import "../chunk-IPHOUBTU.js";
+} from "../chunk-QQGNFHIK.js";
+import "../chunk-4PX4QK2Z.js";
 import "../chunk-EQRS3SGM.js";
 import {
   transcriptsEnabled
-} from "../chunk-QF4RI5CD.js";
+} from "../chunk-OI3DJA7N.js";
 import {
   spawnClaude
 } from "../chunk-XHKBHWLX.js";
@@ -27,40 +27,42 @@ import {
 } from "../chunk-L4ZCFMWW.js";
 import {
   getMachineId
-} from "../chunk-IAEXPTXA.js";
-import "../chunk-WB2C7VPF.js";
-import "../chunk-GUVCYYDK.js";
-import "../chunk-BC3VCZ3E.js";
-import "../chunk-X7YWD6IS.js";
-import "../chunk-4LL6LG5X.js";
+} from "../chunk-N4VNLISN.js";
+import "../chunk-OW6AZDY2.js";
+import "../chunk-S5CMLR35.js";
+import {
+  callMcpTool
+} from "../chunk-EYRGBYZG.js";
+import "../chunk-SAF6HGAA.js";
+import "../chunk-7QLSKOSU.js";
+import "../chunk-KZERVKTD.js";
+import "../chunk-KAVDAZ7A.js";
 import {
   getApiKey,
   getBaseUrl
 } from "../chunk-2UMNXADU.js";
-import "../chunk-6FAHPGCZ.js";
+import {
+  parseAgentQuestion,
+  parseAgentQuestionAnswers
+} from "../chunk-WDKHZRAS.js";
 
 // bin/pushary-codex-bridge.ts
 import { existsSync } from "fs";
 
 // src/codex-bridge.ts
+import { randomUUID } from "crypto";
 import { spawn } from "child_process";
 import { basename } from "path";
 var MAX_RPC_LINE = 1024 * 1024;
 var STDERR_TAIL_LIMIT = 2e3;
 var FAILURE_MESSAGE_MAX = 240;
 var MAX_PENDING_RPC = 8;
+var LOCAL_QUESTION_UNAVAILABLE = "Pushary handed this question to the current client, but this Codex bridge has no local question UI. Continue in an interactive Codex session, or choose a Pushary mode that permits remote questions.";
 var MAX_TRANSCRIPT_TEXT = 32 * 1024;
 var MAX_MESSAGE_BUFFERS = 16;
 var JsonRpcClient = class {
-  child;
-  pending = /* @__PURE__ */ new Map();
-  notifications = /* @__PURE__ */ new Set();
-  nextId = 1;
-  buffer = "";
-  closed = false;
-  stderrTail = "";
-  failure = null;
-  constructor(command, cwd, timeoutMs) {
+  constructor(command, cwd, timeoutMs, bridgeOptions) {
+    this.bridgeOptions = bridgeOptions;
     const options = { cwd, env: process.env, 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");
@@ -71,6 +73,15 @@ var JsonRpcClient = class {
     this.child.once("exit", (code, signal) => this.fail(new Error(this.exitMessage(code, signal))));
     this.timeoutMs = timeoutMs;
   }
+  child;
+  pending = /* @__PURE__ */ new Map();
+  notifications = /* @__PURE__ */ new Set();
+  serverRequests = /* @__PURE__ */ new Map();
+  nextId = 1;
+  buffer = "";
+  closed = false;
+  stderrTail = "";
+  failure = null;
   keepStderrTail(chunk) {
     this.stderrTail = (this.stderrTail + chunk).slice(-STDERR_TAIL_LIMIT);
   }
@@ -109,6 +120,8 @@ var JsonRpcClient = class {
   async close() {
     if (this.closed) return;
     this.closed = true;
+    for (const request of this.serverRequests.values()) request.abort();
+    this.serverRequests.clear();
     this.child.stdin?.end();
     if (this.child.exitCode != null) return;
     await Promise.race([
@@ -147,8 +160,28 @@ var JsonRpcClient = class {
     } catch {
       return;
     }
-    if (typeof message.id === "number" && message.method) {
-      const result = message.method === "item/commandExecution/requestApproval" || message.method === "item/fileChange/requestApproval" ? { decision: "decline" } : message.method === "applyPatchApproval" || message.method === "execCommandApproval" ? { decision: { denied: { rejection: "No interactive Codex client is attached" } } } : message.method === "item/tool/requestUserInput" ? { answers: {} } : null;
+    if (message.id !== void 0 && message.method === "item/tool/requestUserInput") {
+      const id = message.id;
+      if (this.serverRequests.has(id)) 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 signal = AbortSignal.any([controller.signal, this.bridgeOptions.signal]);
+      void answerCodexQuestions(this.bridgeOptions, message.params ?? {}, signal).then(
+        (result) => {
+          if (!signal.aborted && !this.closed) this.write({ id, result });
+        },
+        (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));
+      return;
+    }
+    if (message.id !== void 0 && message.method) {
+      const result = message.method === "item/commandExecution/requestApproval" || message.method === "item/fileChange/requestApproval" ? { decision: "decline" } : message.method === "applyPatchApproval" || message.method === "execCommandApproval" ? { decision: { denied: { rejection: "No interactive Codex client is attached" } } } : null;
       this.write(result ? { id: message.id, result } : { id: message.id, error: { code: -32601, message: "Unsupported server request" } });
       return;
     }
@@ -161,6 +194,10 @@ 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 listener of this.notifications) listener(message);
     }
@@ -169,6 +206,8 @@ var JsonRpcClient = class {
     if (this.closed) return;
     this.closed = true;
     this.failure = error;
+    for (const request of this.serverRequests.values()) request.abort();
+    this.serverRequests.clear();
     this.rejectPending(error);
     if (this.child.exitCode == null) this.child.kill();
   }
@@ -188,11 +227,67 @@ var rpcTurnId = (result) => {
   const response = object(result);
   return string(object(response?.turn)?.id) ?? string(response?.turnId);
 };
+var answerCodexQuestions = async (options, params, signal) => {
+  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);
+  for (const raw of params.questions) {
+    if (signal.aborted || Date.now() >= deadline) throw new Error("Question expired");
+    const question = object(raw);
+    const id = string(question?.id);
+    const prompt = string(question?.question);
+    if (!id || !prompt || id in answers || question?.isSecret === true) throw new Error("Unsupported question");
+    const labels = Array.isArray(question?.options) ? question.options.map((option) => string(object(option)?.label)).filter((label) => !!label) : [];
+    const structured = labels.length >= 2 ? parseAgentQuestion({ ...question, multiSelect: false, allowOther: question?.isOther === true }) : void 0;
+    let correlationId = null;
+    let settled = false;
+    const call = (name, args, timeoutMs, waitSignal = signal) => callMcpTool(options.apiKey, name, args, { baseUrl: options.baseUrl, signal: waitSignal, timeoutMs, maxRetries: 1 });
+    try {
+      signal.throwIfAborted();
+      if (Date.now() >= deadline) throw new Error("Question expired");
+      let result = await call("ask_user", {
+        requestId: randomUUID(),
+        question: prompt,
+        type: labels.length >= 2 ? "select" : "input",
+        ...labels.length >= 2 ? { options: labels } : {},
+        ...structured ? { questions: [structured] } : {},
+        context: string(question?.header),
+        agentName: `Codex - ${basename(options.cwd)}`,
+        sessionId: params.threadId,
+        machineId: options.machineId,
+        toolName: "request_user_input",
+        wait: false,
+        waitEndsAt: new Date(deadline).toISOString()
+      }, Math.min(1e4, deadline - Date.now()));
+      correlationId = string(result.correlationId);
+      while (!result.answered) {
+        if (result.status === "terminal" || result.status === "notified" || result.suppressed || result.mode === "terminal_only" || result.mode === "notify_only") 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 (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);
+      }
+      if (signal.aborted || Date.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;
+      if (!value || value === "defer" || labels.length && question?.isOther !== true && !labels.includes(value)) throw new Error("Invalid answer");
+      answers[id] = { answers: [value] };
+    } finally {
+      if (correlationId && !settled) {
+        await call("cancel_question", { correlationId }, 3e3, AbortSignal.timeout(3e3)).catch(() => {
+        });
+      }
+    }
+  }
+  return { answers };
+};
 var runCodexBridge = async (options) => {
   const timeoutMs = options.requestTimeoutMs ?? 1e4;
   const now = options.now ?? Date.now;
   const idleTimeoutMs = options.idleTimeoutMs ?? SESSION_IDLE_TIMEOUT_MS;
-  const rpc = new JsonRpcClient(options.appServer, options.cwd, timeoutMs);
+  const rpc = new JsonRpcClient(options.appServer, options.cwd, timeoutMs, options);
   let threadId = options.resumeThreadId ?? null;
   let activeTurnId = null;
   let lastCompletedTurnId = null;
@@ -249,7 +344,7 @@ var runCodexBridge = async (options) => {
   try {
     await rpc.request("initialize", {
       clientInfo: { name: "pushary", title: "Pushary", version: "1" },
-      capabilities: { experimentalApi: false, requestAttestation: false }
+      capabilities: { experimentalApi: true, requestAttestation: false }
     });
     rpc.notify("initialized");
     const thread = options.resumeThreadId ? await rpc.request("thread/resume", { threadId: options.resumeThreadId, cwd: options.cwd, excludeTurns: true }) : await rpc.request("thread/start", { cwd: options.cwd, model: options.model ?? null });