@pushary/agent-hooks 0.95.2 → 0.95.5

package/dist/{chunk-UOTSWS5N.js → chunk-67YNQ3QA.js}

@@ -1,16 +1,17 @@
 import {
   defersToNativeMode
-} from "./chunk-A4R6BZCK.js";
+} from "./chunk-D62EONG3.js";
 import {
   isGatingMoment,
   recordKeylessMoment
-} from "./chunk-EUAQ4YAN.js";
+} from "./chunk-UCS65VVR.js";
 import {
   denyReasonFrom,
   isDeferAnswer
 } from "./chunk-YHG74UFF.js";
 import {
   CLAUDE_CODE_AGENT,
+  DEFAULT_SESSION,
   fetchModeState,
   getPolicy,
   readLastPrompt,
@@ -19,15 +20,15 @@ import {
   reportEvent,
   settleQuestionsForToolUse,
   throttlePass
-} from "./chunk-DNVDKHQD.js";
+} from "./chunk-HCMM3BOW.js";
 import {
-  DEFAULT_SESSION,
+  DECISION_STOP_REASON,
   askUser,
-  cancelQuestion,
-  pollForAnswer,
-  savePendingQuestion,
-  sendNotification
-} from "./chunk-RER3FRTD.js";
+  isDecisionStopped,
+  isLocalQuestionHandoff,
+  sendNotification,
+  waitForQuestion
+} from "./chunk-XS33QBJA.js";
 import {
   UNNAMED_ACTION,
   deriveAction,
@@ -37,14 +38,10 @@ import {
   describeToolCall,
   permissionDeniedAction,
   scopePathFor
-} from "./chunk-CKOLDI47.js";
-import {
-  PRETOOLUSE_HANDLED_TOOLS,
-  PRETOOLUSE_PHONE_ANSWERED_TOOLS
-} from "./chunk-V27AHID3.js";
+} from "./chunk-BDI2MXTT.js";
 import {
   getMachineId
-} from "./chunk-IAEXPTXA.js";
+} from "./chunk-N4VNLISN.js";
 import {
   getApiKey,
   getBaseUrl
@@ -56,12 +53,13 @@ import {
   effectiveWaitSeconds,
   hookWaitClamped,
   hookWaitDeadline,
+  isPermissionRequestOwnedByPreToolUse,
   isPusharyOwnTool,
   parseAgentQuestionAnswers,
   parseAgentQuestions,
   resolveGate,
   stoppedOutput
-} from "./chunk-6FAHPGCZ.js";
+} from "./chunk-WDKHZRAS.js";
 
 // src/decision-episode.ts
 var EPISODE_PATH = "/api/agent/decision-episode";
@@ -99,7 +97,6 @@ var storedWaitDeadline = (result, requestedDeadline) => {
   const stored = result.waitEndsAt ? Date.parse(result.waitEndsAt) : Number.NaN;
   return Number.isFinite(stored) ? Math.min(stored, requestedDeadline) : requestedDeadline;
 };
-var returnedAnswer = (result) => result.answered === true ? { answered: true, value: result.value, note: result.note } : null;
 var handlePushOnly = async (apiKey, description, projectName, timeoutSeconds, timeoutAction, sessionId, machineId, toolName, toolTarget, decision, signals) => {
   const effectiveWait = effectiveWaitSeconds(timeoutAction, timeoutSeconds, "claude");
   const now = Date.now();
@@ -120,43 +117,21 @@ var handlePushOnly = async (apiKey, description, projectName, timeoutSeconds, ti
       ...decision
     });
   } catch {
-    switch (timeoutAction) {
-      case "approve":
-        return allow();
-      case "deny":
-        return deny("Push notification failed, denying per policy");
-      default:
-        return void 0;
-    }
-  }
-  if (result.suppressed || result.status === "terminal") {
-    await cancelQuestion(apiKey, result.correlationId).catch(() => {
-    });
-    return ask(result.suppressed ? "You are at the keyboard, approve here." : "Delivery mode is Terminal, approve here.");
-  }
-  if (result.noDevices) {
-    await cancelQuestion(apiKey, result.correlationId).catch(() => {
-    });
-    switch (timeoutAction) {
-      case "approve":
-        return allow();
-      case "deny":
-        return deny("No device connected to approve on");
-      default:
-        return void 0;
-    }
+    return halted("Pushary could not create a verifiable approval. Retry the action.");
   }
+  if (isDecisionStopped(result)) return halted(DECISION_STOP_REASON);
   const deadline = storedWaitDeadline(result, requestedDeadline);
-  announceWait(effectiveWait, result.answerUrl, sessionId);
-  const answer = returnedAnswer(result) ?? await pollForAnswer(apiKey, result.correlationId, deadline);
+  if (!isLocalQuestionHandoff(result) && !result.answered) announceWait(effectiveWait, result.answerUrl, sessionId);
+  const answer = await waitForQuestion(apiKey, result, deadline);
+  if (isDecisionStopped(answer)) return halted(DECISION_STOP_REASON);
+  if (!answer.answered && isLocalQuestionHandoff(result)) return ask("Approve in the current client.");
   if (answer.answered) {
     if (isDeferAnswer(answer.value)) return ask("Handling on your machine");
     signals.humanDecision = true;
     return answer.value === "yes" ? allow() : deny(denyReasonFrom(answer.value, answer.note));
   }
-  if (timeoutAction === "wait" || clampCut) {
-    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.");
+  if (timeoutAction === "wait" || clampCut || deadline < requestedDeadline) {
+    return ask("The phone question was withdrawn. Approve in the current client.");
   }
   switch (timeoutAction) {
     case "approve":
@@ -164,7 +139,6 @@ var handlePushOnly = async (apiKey, description, projectName, timeoutSeconds, ti
     case "deny":
       return deny("No response within timeout");
     default:
-      savePendingQuestion(sessionId || DEFAULT_SESSION, result.correlationId, decision.toolUseId);
       return ask("No push response, asking in terminal");
   }
 };
@@ -188,28 +162,19 @@ var handlePushFirst = async (apiKey, description, projectName, pushFirstSeconds,
       ...decision
     });
   } catch {
-    return void 0;
-  }
-  if (result.suppressed) {
-    await cancelQuestion(apiKey, result.correlationId).catch(() => {
-    });
-    return ask("You are at the keyboard, approve here.");
+    return halted("Pushary could not create a verifiable approval. Retry the action.");
   }
-  if (result.noDevices) {
-    await cancelQuestion(apiKey, result.correlationId).catch(() => {
-    });
-    return void 0;
-  }
-  announceWait(pushFirstSeconds, result.answerUrl, sessionId);
+  if (isDecisionStopped(result)) return halted(DECISION_STOP_REASON);
+  if (!isLocalQuestionHandoff(result) && !result.answered) announceWait(pushFirstSeconds, result.answerUrl, sessionId);
   const deadline = storedWaitDeadline(result, requestedDeadline);
-  const answer = returnedAnswer(result) ?? await pollForAnswer(apiKey, result.correlationId, deadline, 1500);
+  const answer = await waitForQuestion(apiKey, result, deadline, 1500);
+  if (isDecisionStopped(answer)) return halted(DECISION_STOP_REASON);
   if (answer.answered) {
     if (isDeferAnswer(answer.value)) return ask("Handling on your machine");
     signals.humanDecision = true;
     return answer.value === "yes" ? allow() : deny(denyReasonFrom(answer.value, answer.note));
   }
-  savePendingQuestion(sessionId || DEFAULT_SESSION, result.correlationId, decision.toolUseId);
-  return ask("Sent as push notification. You can also approve here.");
+  return ask("The phone question was withdrawn. Approve in the current client.");
 };
 var handleNotifyOnly = async (apiKey, description, projectName, sessionId, machineId) => {
   try {
@@ -327,7 +292,6 @@ var keylessNoticeOnce = (sessionId) => {
   }
 };
 var shouldDeferToNativeMode = defersToNativeMode;
-var handedToTerminal = (result) => result.suppressed === true || result.noDevices === true || result.status === "terminal";
 var withLabels = (question) => ({
   ...question,
   labels: question.options.map((option) => option.label)
@@ -356,17 +320,13 @@ var askAsOneCard = async (apiKey, input, parsed, projectName, deadline) => {
       waitEndsAt: new Date(deadline).toISOString()
     });
   } catch {
-    return void 0;
-  }
-  if (handedToTerminal(result)) {
-    await cancelQuestion(apiKey, result.correlationId).catch(() => {
-    });
-    return void 0;
+    return null;
   }
-  const answer = returnedAnswer(result) ?? await pollForAnswer(apiKey, result.correlationId, storedWaitDeadline(result, deadline));
+  if (isDecisionStopped(result)) return null;
+  const answer = await waitForQuestion(apiKey, result, storedWaitDeadline(result, deadline));
+  if (isDecisionStopped(answer)) return null;
   const values = answer.answered && answer.value ? parseAgentQuestionAnswers(parsed, answer.value) : null;
   if (!values || isDeferAnswer(answer.value)) {
-    savePendingQuestion(input.session_id || DEFAULT_SESSION, result.correlationId, input.tool_use_id);
     return void 0;
   }
   return values;
@@ -393,21 +353,17 @@ var askQuestionByQuestion = async (apiKey, input, parsed, projectName, deadline)
         waitEndsAt: new Date(deadline).toISOString()
       });
     } catch {
-      return void 0;
+      return null;
     }
-    if (handedToTerminal(result)) {
-      await cancelQuestion(apiKey, result.correlationId).catch(() => {
-      });
-      return void 0;
-    }
-    const answer = returnedAnswer(result) ?? await pollForAnswer(apiKey, result.correlationId, storedWaitDeadline(result, deadline));
+    if (isDecisionStopped(result)) return null;
+    const answer = await waitForQuestion(apiKey, result, storedWaitDeadline(result, deadline));
+    if (isDecisionStopped(answer)) return null;
     const legacyValue = answer.answered ? answer.value?.trim() : void 0;
     const values = legacyValue ? parseAgentQuestionAnswers([question], legacyValue) ?? parseAgentQuestionAnswers([question], JSON.stringify({
       [question.question]: question.multiSelect ? JSON.stringify([legacyValue]) : legacyValue
     })) : null;
     const value = values?.[question.question];
     if (!value || isDeferAnswer(answer.value)) {
-      savePendingQuestion(input.session_id || DEFAULT_SESSION, result.correlationId, input.tool_use_id);
       return void 0;
     }
     answers[question.question] = value;
@@ -421,6 +377,7 @@ var handleAskUserQuestion = async (apiKey, input, modeState) => {
   const projectName = basename(input.cwd ?? process.cwd());
   const deadline = hookWaitDeadline(START_MS, effectiveWaitSeconds("wait", 0, "claude"), "claude", Date.now());
   const answers = parsed.length === 1 ? await askAsOneCard(apiKey, input, parsed, projectName, deadline) : await askQuestionByQuestion(apiKey, input, parsed, projectName, deadline);
+  if (answers === null) return halted(DECISION_STOP_REASON);
   if (!answers) return void 0;
   return allowWithInput({ ...input.tool_input ?? {}, answers });
 };
@@ -450,17 +407,13 @@ var handleExitPlanMode = async (apiKey, input) => {
       waitEndsAt: new Date(deadline).toISOString()
     });
   } catch {
-    return void 0;
-  }
-  if (handedToTerminal(result)) {
-    await cancelQuestion(apiKey, result.correlationId).catch(() => {
-    });
-    return void 0;
+    return halted(DECISION_STOP_REASON);
   }
-  const answer = returnedAnswer(result) ?? await pollForAnswer(apiKey, result.correlationId, storedWaitDeadline(result, deadline));
+  if (isDecisionStopped(result)) return halted(DECISION_STOP_REASON);
+  const answer = await waitForQuestion(apiKey, result, storedWaitDeadline(result, deadline));
+  if (isDecisionStopped(answer)) return halted(DECISION_STOP_REASON);
   const value = answer.answered ? (answer.value ?? "").trim() : "";
   if (!value || isDeferAnswer(answer.value)) {
-    savePendingQuestion(input.session_id || DEFAULT_SESSION, result.correlationId, input.tool_use_id);
     return void 0;
   }
   if (value === PLAN_APPROVE) return allow();
@@ -545,10 +498,7 @@ var toPermissionRequestOutput = (hookOutput) => {
   return void 0;
 };
 var handlePermissionRequest = async (input) => {
-  if (PRETOOLUSE_HANDLED_TOOLS.has(input.tool_name)) {
-    const reclaimDeferredExec = !PRETOOLUSE_PHONE_ANSWERED_TOOLS.includes(input.tool_name) && shouldDeferToNativeMode(input.permission_mode, input.tool_name);
-    if (!reclaimDeferredExec) return void 0;
-  }
+  if (isPermissionRequestOwnedByPreToolUse(input.tool_name, input.permission_mode, shouldDeferToNativeMode)) return void 0;
   if (isPusharyOwnTool(input.tool_name)) return void 0;
   let apiKey;
   try {
@@ -640,13 +590,8 @@ var handlePermissionDenied = async (input) => {
     } catch {
       return void 0;
     }
-    if (handedToTerminal(result)) {
-      await cancelQuestion(apiKey, result.correlationId).catch(() => {
-      });
-      return void 0;
-    }
     const deadline = hookWaitDeadline(START_MS, PERMISSION_DENIED_WAIT_SECONDS, "claude", Date.now());
-    const answer = await pollForAnswer(apiKey, result.correlationId, deadline);
+    const answer = await waitForQuestion(apiKey, result, deadline);
     if (answer.answered && answer.value === "yes") {
       return { hookSpecificOutput: { hookEventName: "PermissionDenied", retry: true } };
     }

package/dist/{chunk-G4TL4YWH.js → chunk-6AEM5RCS.js}

@@ -1,6 +1,6 @@
 import {
   parseVersion
-} from "./chunk-7LUFYRH4.js";
+} from "./chunk-2D7BAOMY.js";
 
 // src/setup/agent-probe.ts
 import { execSync } from "child_process";

package/dist/{chunk-G24SEVCI.js → chunk-6VANQN5Q.js}

@@ -1,9 +1,9 @@
 import {
   openCodeConfigDirFrom
-} from "./chunk-E3NF5CL2.js";
+} from "./chunk-HQIVR7MM.js";
 import {
   codexHomeFrom
-} from "./chunk-WB2C7VPF.js";
+} from "./chunk-OW6AZDY2.js";
 
 // src/vscode-config.ts
 import { homedir } from "os";
@@ -327,9 +327,6 @@ var hasInstructionBlock = (filePath) => {
   }
 };
 
-// src/hooks-spec.ts
-var CURSOR_GATE_SCRIPT = "pushary-gate.mjs";
-
 export {
   registerPluginLocation,
   unregisterPluginLocation,
@@ -346,6 +343,5 @@ export {
   renderProjectAgentInstructions,
   writeInstructionBlock,
   removeInstructionBlock,
-  hasInstructionBlock,
-  CURSOR_GATE_SCRIPT
+  hasInstructionBlock
 };

package/dist/{chunk-CKOLDI47.js → chunk-BDI2MXTT.js}

@@ -5,7 +5,7 @@ import {
   FILE_TARGET_TOOLS,
   redactSecrets,
   redactSecretsDeep
-} from "./chunk-6FAHPGCZ.js";
+} from "./chunk-WDKHZRAS.js";
 
 // ../hook-mapping/src/describe.ts
 import { isAbsolute, relative, resolve } from "path";
@@ -382,7 +382,7 @@ var permissionDeniedAction = (toolName) => {
   return tool ? `Auto-mode blocked ${tool}` : "Auto-mode blocked a tool call";
 };
 var sessionIdentityOf = (payload) => {
-  const sessionId = asString(payload.session_id);
+  const sessionId = asString(payload.session_id ?? payload.sessionId ?? payload.conversation_id);
   const agentId = asString(payload.agent_id);
   if (!agentId) return { sessionId };
   return { sessionId: agentId, parentSessionId: sessionId };

package/dist/{chunk-YKLCWWEI.js → chunk-BMANRGJQ.js}

@@ -1,6 +1,6 @@
 import {
   writeJsonAtomicDurable
-} from "./chunk-4LL6LG5X.js";
+} from "./chunk-KAVDAZ7A.js";
 
 // src/transcript-recipient-pin.ts
 import { existsSync, mkdirSync, readFileSync, rmSync } from "fs";

package/dist/{chunk-2XUPP4WM.js → chunk-CUEZMPLJ.js}

@@ -1,6 +1,6 @@
 import {
   HOOK_LOCATOR_BINARY
-} from "./chunk-6FAHPGCZ.js";
+} from "./chunk-WDKHZRAS.js";
 
 // src/diagnostics/bridge.ts
 import { execFileSync } from "child_process";

package/dist/{chunk-A4R6BZCK.js → chunk-D62EONG3.js}

@@ -1,6 +1,6 @@
 import {
   shouldDeferToNativeMode
-} from "./chunk-6FAHPGCZ.js";
+} from "./chunk-WDKHZRAS.js";
 
 // src/native-defer.ts
 var nativeDeferOptions = () => {

package/dist/{chunk-ZDAT5KMU.js → chunk-D6PRC3YQ.js}

@@ -60,7 +60,7 @@ var COMMAND_LIST = [
   { name: "doctor", module: "pushary-doctor", summary: "Verify your Pushary installation is working" },
   { name: "disconnect", module: "pushary-disconnect", summary: "Turn off one agent (claude|codex|gemini|cursor)" },
   { name: "clean", module: "pushary-clean", summary: "Remove all Pushary configuration (--yes for non-interactive)" },
-  { name: "mode", module: "pushary-mode", summary: "Switch approval mode (push_only, push_first, terminal_only)" },
+  { name: "mode", module: "pushary-mode", summary: "Choose where approval requests appear" },
   { name: "wait", module: "pushary-wait", summary: 'Show or set the "wait for your phone" ladder (pushary wait 45)' },
   { name: "stats", module: "pushary-stats", summary: "Show the approval moments your agents hit while not connected" },
   {

package/dist/{chunk-MOY5X6HJ.js → chunk-DLLAWCQB.js}

@@ -1,6 +1,6 @@
 import {
   renderCommandHelp
-} from "./chunk-ZDAT5KMU.js";
+} from "./chunk-D6PRC3YQ.js";
 import {
   getPackageVersion
 } from "./chunk-DINDL2CF.js";

package/dist/{chunk-DSTLA2TC.js → chunk-GOPIMNVC.js}

@@ -1,6 +1,6 @@
 import {
   guardBinary
-} from "./chunk-EZIEXHYM.js";
+} from "./chunk-3AJIK5AO.js";
 
 // src/bell/install.ts
 import { join } from "path";

package/dist/{chunk-CH6DTGQR.js → chunk-HBHEX3JQ.js}

@@ -2,15 +2,15 @@ import {
   CLAUDE_HOOK_EVENTS,
   GEMINI_HOOK_EVENTS,
   hasGeminiHooks
-} from "./chunk-7LUFYRH4.js";
+} from "./chunk-2D7BAOMY.js";
 import {
   CODEX_HOOK_EVENTS,
   hasCodexHooks
-} from "./chunk-WB2C7VPF.js";
+} from "./chunk-OW6AZDY2.js";
 import {
   CURSOR_GATE_EVENTS,
   HOOK_LOCATOR_BINARY
-} from "./chunk-6FAHPGCZ.js";
+} from "./chunk-WDKHZRAS.js";
 
 // src/diagnostics/wiring.ts
 var record = (value) => value && typeof value === "object" && !Array.isArray(value) ? value : null;