@pushary/agent-hooks 0.89.13 → 0.90.1

package/dist/bin/pushary-upgrade.js

@@ -1,15 +1,15 @@
 #!/usr/bin/env node
 import {
   reapplyAllAgents
-} from "../chunk-MNTZKFZI.js";
-import "../chunk-5YEF55AX.js";
+} from "../chunk-BQBEH6TV.js";
+import "../chunk-H2QZRQR2.js";
 import {
   waitForMachineReadiness
-} from "../chunk-RAEPAUNJ.js";
-import "../chunk-MSTHT2M7.js";
-import "../chunk-JVLB5CAJ.js";
-import "../chunk-B2HND22S.js";
-import "../chunk-VF3RTVWY.js";
+} from "../chunk-7TPQEWUZ.js";
+import "../chunk-DZDI62LY.js";
+import "../chunk-GL3FFM7A.js";
+import "../chunk-2LAHXHBR.js";
+import "../chunk-EZIEXHYM.js";
 import {
   daemonHasRemoteProof,
   daemonServiceManagerAvailable,
@@ -20,7 +20,7 @@ import {
   replaceDaemonService,
   stopDaemonService,
   waitForDaemonRemoteProof
-} from "../chunk-7JZCADBR.js";
+} from "../chunk-F2ICEWZL.js";
 import {
   detectProviderLiveCapabilities,
   hasSpawnProvider,
@@ -34,32 +34,32 @@ import {
   npmErrorMessage,
   resolveGlobalBinary
 } from "../chunk-L4ZCFMWW.js";
-import "../chunk-JTBDBKHU.js";
+import "../chunk-54ELC7D7.js";
 import {
   claudeJson,
   codexConfigToml,
   cursorPluginDir,
   geminiSettings,
   vscodePluginDir
-} from "../chunk-3YGGEDJK.js";
+} from "../chunk-KUZWXPUS.js";
 import {
   exitOnHelpFlag
-} from "../chunk-WHDSJ6PD.js";
-import "../chunk-GMJDQDXU.js";
+} from "../chunk-BVBEURWJ.js";
+import "../chunk-43GMYSS4.js";
 import {
   isNewerVersion
 } from "../chunk-DINDL2CF.js";
 import {
   readControlMode
-} from "../chunk-NBDU3R3G.js";
+} from "../chunk-OSALSIUF.js";
 import "../chunk-BC3VCZ3E.js";
 import "../chunk-KZERVKTD.js";
-import "../chunk-ANMHIZZY.js";
+import "../chunk-JW4KO5AF.js";
 import "../chunk-4LL6LG5X.js";
 import {
   getApiKey
 } from "../chunk-2UMNXADU.js";
-import "../chunk-QINYXLA5.js";
+import "../chunk-VNMKIJZB.js";
 
 // bin/pushary-upgrade.ts
 import { existsSync } from "fs";

package/dist/bin/pushary-wait.js

@@ -4,8 +4,8 @@ import {
 } from "../chunk-IIENZE2J.js";
 import {
   exitOnFailedResponse
-} from "../chunk-YXT55PYF.js";
-import "../chunk-ZO43JTT3.js";
+} from "../chunk-DYP6SMOR.js";
+import "../chunk-AJYV3VGU.js";
 import {
   createIo
 } from "../chunk-5RUIFDTP.js";
@@ -14,8 +14,8 @@ import {
 } from "../chunk-GMXKITVA.js";
 import {
   exitOnHelpFlag
-} from "../chunk-WHDSJ6PD.js";
-import "../chunk-GMJDQDXU.js";
+} from "../chunk-BVBEURWJ.js";
+import "../chunk-43GMYSS4.js";
 import "../chunk-DINDL2CF.js";
 import "../chunk-SAF6HGAA.js";
 import {
@@ -28,7 +28,7 @@ import {
   getApiKey,
   getBaseUrl
 } from "../chunk-2UMNXADU.js";
-import "../chunk-QINYXLA5.js";
+import "../chunk-VNMKIJZB.js";
 
 // bin/pushary-wait.ts
 exitOnHelpFlag("wait");

package/dist/bin/pushary.js

@@ -3,7 +3,7 @@ import {
   COMMANDS,
   isCommandName,
   renderHelp
-} from "../chunk-GMJDQDXU.js";
+} from "../chunk-43GMYSS4.js";
 import {
   getPackageVersion
 } from "../chunk-DINDL2CF.js";

package/dist/{chunk-B2HND22S.js → chunk-2LAHXHBR.js}

@@ -1,6 +1,6 @@
 import {
   ASKED_IN_EVERY_MODE_TOOLS
-} from "./chunk-QINYXLA5.js";
+} from "./chunk-VNMKIJZB.js";
 
 // src/claude-tools.ts
 var PRETOOLUSE_GATED_TOOLS = [

package/dist/{chunk-GMJDQDXU.js → chunk-43GMYSS4.js}

@@ -149,6 +149,7 @@ var SETUP_OPTIONS = [
   ["--control auto|on|off", "Manage phone-start automatically (default), require it, or disable its background service"],
   ["--transcripts on|off", "Enable or disable encrypted transcript sync on this machine"],
   ["--skip-phone", "Skip the phone connect step"],
+  ["--take-over-hooks", "Replace hooks the Pushary Mac app owns with the CLI's. Without it the app's wiring is kept"],
   ["--verify roundtrip", "Send a real question and wait for you to answer it (default when a human is present)"],
   ["--verify push", "Only prove a notification was delivered. Automatic when nobody is at the terminal"],
   ["--verify none", "Skip the final check entirely"],

package/dist/{chunk-OX35BSPV.js → chunk-4LOPSGLP.js}

@@ -4,6 +4,7 @@ import {
   isDefaultSession,
   isPolicyConfig,
   listPendingQuestions,
+  listPendingQuestionsForToolUse,
   markPendingCommandDelivered,
   readPendingCommand,
   removePendingCommand,
@@ -12,9 +13,10 @@ import {
   savePendingCommand,
   sendNotification,
   waitForAnswer
-} from "./chunk-JHJHCMAF.js";
+} from "./chunk-F7OURW3C.js";
 import {
   AGENT_IDENTITIES,
+  compactionAction,
   deriveReceiptMeta,
   deriveToolTarget,
   describeToolCall,
@@ -22,20 +24,22 @@ import {
   parseApplyPatchFiles,
   parseApplyPatchOps,
   sessionEndAction,
+  sessionIdentityOf,
   sessionStartAction,
+  subagentStopSummary,
   summarizeStop,
   taskTitleFrom,
   toolResultErrorText
-} from "./chunk-N4QJ3CLX.js";
+} from "./chunk-L4E2BIJ2.js";
 import {
   getMachineId
-} from "./chunk-JTBDBKHU.js";
+} from "./chunk-54ELC7D7.js";
 import {
   withRetry
 } from "./chunk-BSZYIAZL.js";
 import {
   reportedInstallSource
-} from "./chunk-ANMHIZZY.js";
+} from "./chunk-JW4KO5AF.js";
 import {
   getApiKey,
   getBaseUrl
@@ -51,7 +55,7 @@ import {
   pendingCommandEvents,
   resolveAutoResolveOrigin,
   resolvePolicy
-} from "./chunk-QINYXLA5.js";
+} from "./chunk-VNMKIJZB.js";
 
 // src/policy.ts
 import { createHash } from "crypto";
@@ -505,6 +509,15 @@ var permissionTimeoutDecision = (timeoutAction) => {
 };
 var preToolUseTimeoutDecision = (timeoutAction, denyReason = "No response within timeout") => timeoutAction === "deny" ? codexDeny(denyReason) : codexPass();
 
+// src/driver.ts
+var DRIVER_ENV = "PUSHARY_DRIVER";
+var PHONE_DRIVER = "phone";
+var driverFromEnv = (env) => env[DRIVER_ENV] === PHONE_DRIVER ? PHONE_DRIVER : void 0;
+var phoneDrivenEnv = (base) => ({
+  ...base,
+  [DRIVER_ENV]: PHONE_DRIVER
+});
+
 // src/throttle.ts
 import { join as join4 } from "path";
 import { tmpdir as tmpdir3 } from "os";
@@ -552,10 +565,13 @@ var readLastPrompt = (sessionId) => {
     return void 0;
   }
 };
-var reconcilePendingQuestions = async (sessionId) => {
+var pendingQuestionsToSettle = (sessionId, toolUseId) => {
+  const settledElsewhere = toolUseId ? listPendingQuestionsForToolUse(sessionId, toolUseId) : [];
+  return [.../* @__PURE__ */ new Set([...settledElsewhere, ...listPendingQuestions(sessionId)])];
+};
+var reconcileQuestions = async (sessionId, files) => {
   const late = [];
   try {
-    const files = listPendingQuestions(sessionId);
     if (files.length === 0) return late;
     const apiKey = getApiKey();
     for (const correlationId of files) {
@@ -576,6 +592,7 @@ var reconcilePendingQuestions = async (sessionId) => {
   }
   return late;
 };
+var reconcilePendingQuestions = (sessionId, toolUseId) => reconcileQuestions(sessionId, pendingQuestionsToSettle(sessionId, toolUseId));
 var describeLateAnswer = (value) => {
   const v = (value ?? "").trim();
   if (v === "yes") return "approved it";
@@ -724,6 +741,7 @@ var reportEvent = async (event, options = {}) => {
         // Link-back for a phone-spawned session: forward the spawn id the daemon
         // set in the environment so the server can map spawnId -> sessionId.
         ...process.env.PUSHARY_SPAWN_ID ? { spawnId: process.env.PUSHARY_SPAWN_ID } : {},
+        ...driverFromEnv(process.env) ? { driver: driverFromEnv(process.env) } : {},
         canDrainCommand: clientCanDrain && !storedCommand,
         ackMode: clientCanDrain && !storedCommand,
         skipCommandDrain: storedCommand != null
@@ -780,6 +798,11 @@ var reportEvent = async (event, options = {}) => {
   }, { maxAttempts: options.maxAttempts ?? 2, baseDelayMs: 300 });
 };
 var NON_GATED_MIRROR_TOOLS = /* @__PURE__ */ new Set(["TodoWrite"]);
+var settleQuestionsForToolUse = async (sessionId, toolUseId) => {
+  if (!toolUseId) return;
+  const late = await reconcileQuestions(sessionId, listPendingQuestionsForToolUse(sessionId, toolUseId));
+  for (const answer of late) removePendingQuestion(sessionId, answer.correlationId);
+};
 var handlePostToolUse = async (input, agent = CLAUDE_CODE_AGENT) => {
   try {
     const projectName = basename2(input.cwd ?? process.cwd());
@@ -790,7 +813,7 @@ var handlePostToolUse = async (input, agent = CLAUDE_CODE_AGENT) => {
     const receiptsEnabled = process.env.PUSHARY_RECEIPTS !== "off";
     const sessionKey = input.session_id || DEFAULT_SESSION;
     const liveMode = await fetchModeState(getApiKey(), input.session_id, MODE_REUSE_MS);
-    const late = await reconcilePendingQuestions(sessionKey);
+    const late = await reconcilePendingQuestions(sessionKey, input.tool_use_id);
     let additionalContext;
     if (late.length > 0 && agent.type === CLAUDE_CODE_AGENT.type) {
       additionalContext = buildLateAnswerContext(late);
@@ -875,7 +898,7 @@ var handleStop = async (input, agent = CLAUDE_CODE_AGENT) => {
         agentType: agent.type,
         agentName: `${agent.label} - ${projectName}`,
         action: summarizeStop(input),
-        sessionId: input.session_id,
+        ...sessionIdentityOf(input),
         usage: deriveUsage(input.transcript_path, input.session_id)
       }, { maxAttempts: 1 })
     ];
@@ -897,16 +920,46 @@ var handleStop = async (input, agent = CLAUDE_CODE_AGENT) => {
     return void 0;
   }
 };
+var isSubagentStop = (input) => input.hook_event_name === "SubagentStop" || typeof input.agent_id === "string" && input.agent_id.length > 0;
+var SUBAGENT_STOP_REPORT_TIMEOUT_MS = 4e3;
+var handleSubagentStop = async (input, agent = CLAUDE_CODE_AGENT) => {
+  try {
+    const projectName = basename2(input.cwd ?? process.cwd());
+    await reportEvent({
+      event: "session_end",
+      agentType: agent.type,
+      agentName: `${agent.label} - ${projectName}`,
+      action: subagentStopSummary(input),
+      ...sessionIdentityOf(input)
+    }, { maxAttempts: 1, timeoutMs: SUBAGENT_STOP_REPORT_TIMEOUT_MS });
+  } catch {
+  }
+};
+var isCompactionEvent = (hookEventName) => hookEventName === "PreCompact" || hookEventName === "PostCompact";
+var COMPACTION_REPORT_TIMEOUT_MS = 4e3;
+var handleCompaction = async (input, agent = CLAUDE_CODE_AGENT) => {
+  try {
+    const projectName = basename2(input.cwd ?? process.cwd());
+    await reportEvent({
+      event: "compaction",
+      agentType: agent.type,
+      agentName: `${agent.label} - ${projectName}`,
+      action: compactionAction(input.hook_event_name, input.trigger),
+      sessionId: input.session_id
+    }, { maxAttempts: 1, timeoutMs: COMPACTION_REPORT_TIMEOUT_MS });
+  } catch {
+  }
+};
 var handleSessionStart = async (input, agent = CLAUDE_CODE_AGENT) => {
   try {
     const projectName = basename2(input.cwd ?? process.cwd());
-    const action = sessionStartAction(input.source);
+    const action = input.agent_id ? "Subagent started" : sessionStartAction(input.source);
     await reportEvent({
       event: "session_start",
       agentType: agent.type,
       agentName: `${agent.label} - ${projectName}`,
       action,
-      sessionId: input.session_id
+      ...sessionIdentityOf(input)
     }, { maxAttempts: 2, timeoutMs: 4e3 });
   } catch {
   }
@@ -1033,6 +1086,7 @@ export {
   getPolicy,
   fetchModeState,
   fetchModeOverride,
+  phoneDrivenEnv,
   repoKeyFor,
   throttlePass,
   readLastUserPrompt,
@@ -1048,9 +1102,14 @@ export {
   preToolUseTimeoutDecision,
   readLastPrompt,
   reportEvent,
+  settleQuestionsForToolUse,
   handlePostToolUse,
   handleUserPrompt,
   handleStop,
+  isSubagentStop,
+  handleSubagentStop,
+  isCompactionEvent,
+  handleCompaction,
   handleSessionStart,
   handleSessionEnd,
   handleNotification,

package/dist/{chunk-JTBDBKHU.js → chunk-54ELC7D7.js}

@@ -1,6 +1,6 @@
 import {
   pusharyDir
-} from "./chunk-3YGGEDJK.js";
+} from "./chunk-KUZWXPUS.js";
 import {
   writeFileAtomic
 } from "./chunk-4LL6LG5X.js";

package/dist/{chunk-C56VHSXU.js → chunk-5NAZ7SFS.js}

@@ -1,6 +1,6 @@
 import {
   readConfigFileKey
-} from "./chunk-NBDU3R3G.js";
+} from "./chunk-OSALSIUF.js";
 
 // src/bell/fleet.ts
 import { closeSync, constants, futimesSync, lstatSync, mkdirSync, openSync, readdirSync, unlinkSync } from "fs";

package/dist/{chunk-4IPSMEGT.js → chunk-7FE2KABY.js}

@@ -1,6 +1,6 @@
 import {
   redactSecrets
-} from "./chunk-QINYXLA5.js";
+} from "./chunk-VNMKIJZB.js";
 
 // src/crypto.ts
 import nacl from "tweetnacl";
@@ -98,7 +98,17 @@ var INTERNAL_TYPES = /* @__PURE__ */ new Set([
   "file-history-snapshot",
   "change",
   "queue-operation",
-  "summary"
+  "summary",
+  "last-prompt",
+  "mode",
+  "permission-mode",
+  "atis-latch",
+  "frame-link",
+  "cost-state",
+  "agent-name",
+  "bridge-session",
+  "artifact-autoreact-ledger",
+  "artifact-comment-monitor"
 ]);
 var redactDeep = (value) => {
   if (typeof value === "string") return redactSecrets(value);

package/dist/{chunk-RAEPAUNJ.js → chunk-7TPQEWUZ.js}

@@ -1,6 +1,6 @@
 import {
   getMachineId
-} from "./chunk-JTBDBKHU.js";
+} from "./chunk-54ELC7D7.js";
 import {
   getPackageVersion
 } from "./chunk-DINDL2CF.js";

package/dist/{chunk-ZO43JTT3.js → chunk-AJYV3VGU.js}

@@ -12,7 +12,7 @@ import {
 } from "./chunk-2UMNXADU.js";
 import {
   isValidApiKey
-} from "./chunk-QINYXLA5.js";
+} from "./chunk-VNMKIJZB.js";
 
 // src/session.ts
 var IDENTITY_PATH = "/api/v1/server/identity";

package/dist/{chunk-QFJZHVVL.js → chunk-AZPIQG4G.js}

@@ -232,9 +232,43 @@ var runHermesPythonScript = (python, script, ...args) => {
   }
 };
 
+// src/cli/dry-run.ts
+import { execSync } from "child_process";
+import { rmSync as rmSync2, writeFileSync as writeFileSync2 } from "fs";
+var createGuards = (isDryRun, note) => ({
+  write: (path, contents) => {
+    if (isDryRun()) return note("rewrite", path);
+    writeFileSync2(path, contents, "utf-8");
+  },
+  remove: (path, options = {}) => {
+    if (isDryRun()) return note("remove ", path);
+    rmSync2(path, { recursive: true, force: options.force ?? false });
+  },
+  exec: (command, options, describe) => {
+    if (isDryRun()) return note("run    ", describe);
+    execSync(command, options);
+  }
+});
+var describeService = (effects) => {
+  if (effects.controlMode === "off") return "skip     the phone-start background service (--control off)";
+  const where = effects.serviceDefinitionPath ?? "the phone-start service definition";
+  const condition = effects.controlMode === "on" ? "" : ", when a supported agent and a service manager are present";
+  return `write    ${where} and register it with the OS${condition}`;
+};
+var describeSetupSideEffects = (effects) => [
+  `run      npm install -g @pushary/agent-hooks@${effects.version} (the hooks run from the global copy; up to two minutes)`,
+  `write    ${effects.configFile} (the API key, mode 600)`,
+  effects.rcPath ? `edit     ${effects.rcPath} (export PUSHARY_API_KEY)` : "print    the export line for your shell, since no rc file was found",
+  describeService(effects),
+  "ask      Add Pushary instructions to this project's CLAUDE.md/AGENTS.md? (default no)",
+  "ask      Alias claude to pushary claude? (default no)"
+];
+
 export {
   isHermesConfigReceipt,
   HERMES_CONFIG_SCRIPT,
   resolveHermesPython,
-  runHermesPythonScript
+  runHermesPythonScript,
+  createGuards,
+  describeSetupSideEffects
 };

package/dist/{chunk-5MNTWAAJ.js → chunk-B6H2KAQC.js}

@@ -1,14 +1,14 @@
 import {
   PRETOOLUSE_HANDLED_TOOLS,
   PRETOOLUSE_PHONE_ANSWERED_TOOLS
-} from "./chunk-B2HND22S.js";
+} from "./chunk-2LAHXHBR.js";
 import {
   defersToNativeMode
-} from "./chunk-S4BLNILH.js";
+} from "./chunk-I463AEG3.js";
 import {
   isGatingMoment,
   recordKeylessMoment
-} from "./chunk-FOGW6O2Y.js";
+} from "./chunk-VHWCVD42.js";
 import {
   denyReasonFrom,
   isDeferAnswer
@@ -19,8 +19,9 @@ import {
   readLastPrompt,
   readLastUserPrompt,
   repoKeyFor,
+  settleQuestionsForToolUse,
   throttlePass
-} from "./chunk-OX35BSPV.js";
+} from "./chunk-4LOPSGLP.js";
 import {
   DEFAULT_SESSION,
   askUser,
@@ -28,7 +29,7 @@ import {
   pollForAnswer,
   savePendingQuestion,
   sendNotification
-} from "./chunk-JHJHCMAF.js";
+} from "./chunk-F7OURW3C.js";
 import {
   UNNAMED_ACTION,
   deriveAction,
@@ -37,10 +38,10 @@ import {
   deriveToolTarget,
   describeToolCall,
   scopePathFor
-} from "./chunk-N4QJ3CLX.js";
+} from "./chunk-L4E2BIJ2.js";
 import {
   getMachineId
-} from "./chunk-JTBDBKHU.js";
+} from "./chunk-54ELC7D7.js";
 import {
   getApiKey,
   getBaseUrl
@@ -52,10 +53,12 @@ import {
   effectiveWaitSeconds,
   hookWaitClamped,
   hookWaitDeadline,
+  isPusharyOwnTool,
   parseAgentQuestionAnswers,
   parseAgentQuestions,
-  resolveGate
-} from "./chunk-QINYXLA5.js";
+  resolveGate,
+  stoppedOutput
+} from "./chunk-VNMKIJZB.js";
 
 // src/decision-episode.ts
 var EPISODE_PATH = "/api/agent/decision-episode";
@@ -88,6 +91,7 @@ var allow = () => claudePreToolUseOutput("allow");
 var deny = (reason) => claudePreToolUseOutput("deny", reason);
 var allowWithInput = (updatedInput) => claudePreToolUseOutput("allow", void 0, updatedInput);
 var ask = (reason) => claudePreToolUseOutput("ask", reason);
+var halted = (reason) => stoppedOutput(deny(reason), reason);
 var storedWaitDeadline = (result, requestedDeadline) => {
   const stored = result.waitEndsAt ? Date.parse(result.waitEndsAt) : Number.NaN;
   return Number.isFinite(stored) ? Math.min(stored, requestedDeadline) : requestedDeadline;
@@ -148,7 +152,7 @@ var handlePushOnly = async (apiKey, description, projectName, timeoutSeconds, ti
     return answer.value === "yes" ? allow() : deny(denyReasonFrom(answer.value, answer.note));
   }
   if (timeoutAction === "wait" || clampCut) {
-    savePendingQuestion(sessionId || DEFAULT_SESSION, result.correlationId);
+    savePendingQuestion(sessionId || DEFAULT_SESSION, result.correlationId, decision.toolUseId);
     return ask(timeoutAction === "wait" ? "Still waiting on your phone. Answer here, or on your phone and it will be applied on the next step." : "This step cannot wait any longer. Answer here, or on your phone and it will be applied on the next step.");
   }
   switch (timeoutAction) {
@@ -157,7 +161,7 @@ var handlePushOnly = async (apiKey, description, projectName, timeoutSeconds, ti
     case "deny":
       return deny("No response within timeout");
     default:
-      savePendingQuestion(sessionId || DEFAULT_SESSION, result.correlationId);
+      savePendingQuestion(sessionId || DEFAULT_SESSION, result.correlationId, decision.toolUseId);
       return ask("No push response, asking in terminal");
   }
 };
@@ -201,7 +205,7 @@ var handlePushFirst = async (apiKey, description, projectName, pushFirstSeconds,
     signals.humanDecision = true;
     return answer.value === "yes" ? allow() : deny(denyReasonFrom(answer.value, answer.note));
   }
-  savePendingQuestion(sessionId || DEFAULT_SESSION, result.correlationId);
+  savePendingQuestion(sessionId || DEFAULT_SESSION, result.correlationId, decision.toolUseId);
   return ask("Sent as push notification. You can also approve here.");
 };
 var handleNotifyOnly = async (apiKey, description, projectName, sessionId, machineId) => {
@@ -359,7 +363,7 @@ var askAsOneCard = async (apiKey, input, parsed, projectName, deadline) => {
   const answer = returnedAnswer(result) ?? await pollForAnswer(apiKey, result.correlationId, storedWaitDeadline(result, deadline));
   const values = answer.answered && answer.value ? parseAgentQuestionAnswers(parsed, answer.value) : null;
   if (!values || isDeferAnswer(answer.value)) {
-    savePendingQuestion(input.session_id || DEFAULT_SESSION, result.correlationId);
+    savePendingQuestion(input.session_id || DEFAULT_SESSION, result.correlationId, input.tool_use_id);
     return void 0;
   }
   return values;
@@ -400,14 +404,15 @@ var askQuestionByQuestion = async (apiKey, input, parsed, projectName, deadline)
     })) : null;
     const value = values?.[question.question];
     if (!value || isDeferAnswer(answer.value)) {
-      savePendingQuestion(input.session_id || DEFAULT_SESSION, result.correlationId);
+      savePendingQuestion(input.session_id || DEFAULT_SESSION, result.correlationId, input.tool_use_id);
       return void 0;
     }
     answers[question.question] = value;
   }
   return answers;
 };
-var handleAskUserQuestion = async (apiKey, input) => {
+var handleAskUserQuestion = async (apiKey, input, modeState) => {
+  if (modeState.askHandoff) return void 0;
   const parsed = parseQuestions(input.tool_input ?? {});
   if (!parsed) return void 0;
   const projectName = basename(input.cwd ?? process.cwd());
@@ -452,7 +457,7 @@ var handleExitPlanMode = async (apiKey, input) => {
   const answer = returnedAnswer(result) ?? await pollForAnswer(apiKey, result.correlationId, storedWaitDeadline(result, deadline));
   const value = answer.answered ? (answer.value ?? "").trim() : "";
   if (!value || isDeferAnswer(answer.value)) {
-    savePendingQuestion(input.session_id || DEFAULT_SESSION, result.correlationId);
+    savePendingQuestion(input.session_id || DEFAULT_SESSION, result.correlationId, input.tool_use_id);
     return void 0;
   }
   if (value === PLAN_APPROVE) return allow();
@@ -487,7 +492,7 @@ var claudeGateInput = (modeState, config, input) => {
   };
 };
 var handlePreToolUse = async (input) => {
-  if (input.tool_name.startsWith("mcp__pushary__")) return void 0;
+  if (isPusharyOwnTool(input.tool_name)) return void 0;
   let apiKey;
   try {
     apiKey = getApiKey();
@@ -498,10 +503,10 @@ var handlePreToolUse = async (input) => {
     const modeState = await fetchModeState(apiKey, input.session_id);
     const policy = await getPolicy(apiKey, modeState.policyVersion, "claude_code", true, input.session_id);
     const verdict = resolveGate(claudeGateInput(modeState, policy, input));
-    if (verdict.kind === "kill") return deny(verdict.reason);
+    if (verdict.kind === "kill") return halted(verdict.reason);
     if (verdict.kind === "deny") return deny(verdict.reason);
     if (input.tool_name === "AskUserQuestion") {
-      return handleAskUserQuestion(apiKey, input);
+      return handleAskUserQuestion(apiKey, input, modeState);
     }
     if (input.tool_name === "ExitPlanMode") {
       return handleExitPlanMode(apiKey, input);
@@ -528,6 +533,7 @@ var handlePreToolUse = async (input) => {
 };
 var permReqAllow = (updatedInput) => claudePermissionRequestOutput("allow", void 0, updatedInput);
 var permReqDeny = (message) => claudePermissionRequestOutput("deny", message);
+var permReqHalted = (reason) => stoppedOutput(permReqDeny(reason), reason);
 var toPermissionRequestOutput = (hookOutput) => {
   if (!hookOutput) return void 0;
   const d = hookOutput.hookSpecificOutput;
@@ -540,7 +546,7 @@ var handlePermissionRequest = async (input) => {
     const reclaimDeferredExec = !PRETOOLUSE_PHONE_ANSWERED_TOOLS.includes(input.tool_name) && shouldDeferToNativeMode(input.permission_mode, input.tool_name);
     if (!reclaimDeferredExec) return void 0;
   }
-  if (input.tool_name.startsWith("mcp__pushary__")) return void 0;
+  if (isPusharyOwnTool(input.tool_name)) return void 0;
   let apiKey;
   try {
     apiKey = getApiKey();
@@ -553,7 +559,7 @@ var handlePermissionRequest = async (input) => {
     const verdict = resolveGate(claudeGateInput(modeState, policy, input));
     switch (verdict.kind) {
       case "kill":
-        return permReqDeny(verdict.reason);
+        return permReqHalted(verdict.reason);
       case "allow":
         return permReqAllow();
       case "deny":
@@ -577,7 +583,7 @@ var automodeRetryEnabled = () => {
   return flag === "1" || flag === "true";
 };
 var handlePermissionDenied = async (input) => {
-  if (input.tool_name.startsWith("mcp__pushary__")) return void 0;
+  if (isPusharyOwnTool(input.tool_name)) return void 0;
   let apiKey;
   try {
     apiKey = getApiKey();
@@ -587,6 +593,7 @@ var handlePermissionDenied = async (input) => {
   try {
     const projectName = basename(input.cwd ?? process.cwd());
     const sessionKey = input.session_id || DEFAULT_SESSION;
+    await settleQuestionsForToolUse(sessionKey, input.tool_use_id);
     if (!throttlePass(`permdenied:${sessionKey}:${input.tool_name}`, PERMISSION_DENIED_WINDOW_MS)) return void 0;
     const mode = await fetchModeState(apiKey, input.session_id).catch(() => null);
     if (mode?.kill || mode?.mode === "terminal_only") return void 0;

package/dist/{chunk-MNTZKFZI.js → chunk-BQBEH6TV.js}

@@ -1,11 +1,11 @@
 import {
   detectClaudeVersion
-} from "./chunk-5YEF55AX.js";
+} from "./chunk-H2QZRQR2.js";
 import {
   claudeWired,
   codexWired,
   geminiWired
-} from "./chunk-MSTHT2M7.js";
+} from "./chunk-DZDI62LY.js";
 import {
   GEMINI_HOOK_BINARY,
   addClaudeMcpServer,
@@ -14,10 +14,10 @@ import {
   addPusharyHooks,
   addPusharyToolPermissions,
   hasGeminiHooks
-} from "./chunk-JVLB5CAJ.js";
+} from "./chunk-GL3FFM7A.js";
 import {
   guardBinary
-} from "./chunk-VF3RTVWY.js";
+} from "./chunk-EZIEXHYM.js";
 import {
   resolveGlobalBinDir,
   resolveGlobalBinary
@@ -32,7 +32,7 @@ import {
   codexHooksJson,
   hasCodexHooks,
   vscodePluginMcp
-} from "./chunk-3YGGEDJK.js";
+} from "./chunk-KUZWXPUS.js";
 import {
   readJsonSafe
 } from "./chunk-4LL6LG5X.js";