@pushary/agent-hooks 0.86.0 → 0.87.0

package/dist/bin/pushary-setup.js

@@ -1,25 +1,25 @@
 #!/usr/bin/env node
 import {
   detectClaudeVersion
-} from "../chunk-2255DZ74.js";
+} from "../chunk-HAUTLCMA.js";
 import {
   claudeWired,
   codexWired,
   geminiWired
-} from "../chunk-Q7N3XGWM.js";
+} from "../chunk-XW5CHAQX.js";
 import {
   runBrowserLogin
 } from "../chunk-Z3Z4VK5F.js";
 import {
   ensureDaemonRunning
-} from "../chunk-MTKR4YLW.js";
+} from "../chunk-SJVLFIYP.js";
 import {
   addClaudeMcpServer,
   addPusharyHooks,
   addPusharyToolPermissions,
   compareVersion,
   parseVersion
-} from "../chunk-GK4CED6Z.js";
+} from "../chunk-5646VKR4.js";
 import {
   describeDetection,
   detectAllAgents,
@@ -31,17 +31,17 @@ import {
   shortenHome,
   vscodeSettingsTargets,
   writeInstructionBlock
-} from "../chunk-QW27ZFA4.js";
+} from "../chunk-IWL5LWIE.js";
 import {
   GEMINI_HOOK_BINARY,
   addGeminiHooks,
   addGeminiMcpServer
-} from "../chunk-2C6B6V2U.js";
+} from "../chunk-ZZE6FN7T.js";
 import "../chunk-ATBKJNWS.js";
 import {
   guardBinary,
   guardNodeScript
-} from "../chunk-HSGEEBBL.js";
+} from "../chunk-M7RYIZX6.js";
 import "../chunk-XHKBHWLX.js";
 import {
   installGlobally,
@@ -59,6 +59,7 @@ import {
   codexAgentsMd2 as codexAgentsMd,
   codexConfigToml,
   codexHome,
+  codexHookPositions,
   codexSkillDir2 as codexSkillDir,
   cursorPluginDir,
   cursorUserHooks,
@@ -66,10 +67,11 @@ import {
   geminiSettings,
   pusharyConfigFile,
   vscodePluginDir
-} from "../chunk-VPJAAGD4.js";
+} from "../chunk-B3V2H6SA.js";
 import {
   reportEvent
-} from "../chunk-33T5OOKP.js";
+} from "../chunk-V2XPF77V.js";
+import "../chunk-J3YDT4HM.js";
 import "../chunk-RN3NOEJF.js";
 import {
   confirmAppConnection,
@@ -79,12 +81,12 @@ import {
   printConnectInstructions,
   setHumanStream,
   verifyRoundTrip
-} from "../chunk-PZR4XMFU.js";
+} from "../chunk-A3PFIWWN.js";
 import "../chunk-3EGEA4KH.js";
 import {
   checkApiKey,
   describeKeyCheck
-} from "../chunk-2TZCZ7CL.js";
+} from "../chunk-A4I5JGCW.js";
 import {
   useColor
 } from "../chunk-5RUIFDTP.js";
@@ -95,7 +97,7 @@ import {
   readConfigFileKey,
   readKeySource,
   writeKey
-} from "../chunk-7G5VO76N.js";
+} from "../chunk-OT4YD54Q.js";
 import {
   parseFlags
 } from "../chunk-GMXKITVA.js";
@@ -118,7 +120,7 @@ import {
 } from "../chunk-6MTNS63X.js";
 import "../chunk-BSZYIAZL.js";
 import "../chunk-SAF6HGAA.js";
-import "../chunk-7C5CJC3H.js";
+import "../chunk-Y3UTTFTZ.js";
 import {
   UsageError
 } from "../chunk-7QLSKOSU.js";
@@ -128,7 +130,7 @@ import {
 import "../chunk-2UMNXADU.js";
 import {
   isValidApiKey
-} from "../chunk-CY4TZK5O.js";
+} from "../chunk-7YJS2VTG.js";
 
 // bin/pushary-setup.ts
 import { existsSync, readFileSync, writeFileSync, mkdirSync, cpSync, rmSync, renameSync, realpathSync, readdirSync, statSync } from "fs";
@@ -941,10 +943,12 @@ var setupCodex = async (apiKey) => {
   let trusted = false;
   if (hooksSupported) {
     const hookCommand = guardBinary(resolveGlobalBinary("pushary-codex-hook") ?? "pushary-codex-hook");
+    let hookPositions = {};
     await spinner("Adding native hooks (~/.codex/hooks.json)", async () => {
       const hooksConfig = readAgentJson(CODEX_HOOKS_JSON);
       addCodexHooks(hooksConfig, hookCommand);
       writeJson(CODEX_HOOKS_JSON, hooksConfig);
+      hookPositions = codexHookPositions(hooksConfig);
     });
     if (trustAuto) {
       await spinner("Trusting the Pushary hook (skips the /hooks step)", async () => {
@@ -954,7 +958,7 @@ var setupCodex = async (apiKey) => {
         } catch {
         }
         const config = raw ? parseTOML(raw) : {};
-        addCodexHookTrust(config, CODEX_HOOKS_JSON, hookCommand);
+        addCodexHookTrust(config, CODEX_HOOKS_JSON, hookCommand, hookPositions);
         writeFileSync(codexConfig, stringifyTOML(config), "utf-8");
         trusted = true;
       }, { optional: true });

package/dist/bin/pushary-stats.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   readLedgerSummary
-} from "../chunk-MNQI6ZZU.js";
+} from "../chunk-7MBDFNUC.js";
 import {
   exitOnHelpFlag
 } from "../chunk-SQOFGPNX.js";
@@ -11,7 +11,7 @@ import "../chunk-KZERVKTD.js";
 import {
   getApiKey
 } from "../chunk-2UMNXADU.js";
-import "../chunk-CY4TZK5O.js";
+import "../chunk-7YJS2VTG.js";
 
 // bin/pushary-stats.ts
 exitOnHelpFlag("stats");

package/dist/bin/pushary-status.js

@@ -8,18 +8,18 @@ import {
   describeReach,
   fetchChannels,
   reachVerdict
-} from "../chunk-PZR4XMFU.js";
+} from "../chunk-A3PFIWWN.js";
 import "../chunk-3EGEA4KH.js";
 import {
   checkApiKey,
   describeKeyCheck
-} from "../chunk-2TZCZ7CL.js";
+} from "../chunk-A4I5JGCW.js";
 import {
   createIo
 } from "../chunk-5RUIFDTP.js";
 import {
   readKeySource
-} from "../chunk-7G5VO76N.js";
+} from "../chunk-OT4YD54Q.js";
 import {
   rejectUnknownFlags
 } from "../chunk-GMXKITVA.js";
@@ -32,7 +32,7 @@ import "../chunk-DINDL2CF.js";
 import "../chunk-6MTNS63X.js";
 import "../chunk-BSZYIAZL.js";
 import "../chunk-SAF6HGAA.js";
-import "../chunk-7C5CJC3H.js";
+import "../chunk-Y3UTTFTZ.js";
 import {
   UsageError
 } from "../chunk-7QLSKOSU.js";
@@ -40,7 +40,7 @@ import {
   EXIT
 } from "../chunk-KZERVKTD.js";
 import "../chunk-2UMNXADU.js";
-import "../chunk-CY4TZK5O.js";
+import "../chunk-7YJS2VTG.js";
 
 // src/status.ts
 var keySourceLine = (source) => {

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

@@ -4,15 +4,16 @@ import {
 } from "../chunk-6CUUA7HO.js";
 import {
   handleStop
-} from "../chunk-33T5OOKP.js";
+} from "../chunk-V2XPF77V.js";
+import "../chunk-J3YDT4HM.js";
 import "../chunk-RN3NOEJF.js";
 import "../chunk-BSZYIAZL.js";
 import "../chunk-SAF6HGAA.js";
-import "../chunk-7C5CJC3H.js";
+import "../chunk-Y3UTTFTZ.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
 import "../chunk-2UMNXADU.js";
-import "../chunk-CY4TZK5O.js";
+import "../chunk-7YJS2VTG.js";
 
 // bin/pushary-stop-hook.ts
 var main = async () => {

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

@@ -4,15 +4,16 @@ import {
 } from "../chunk-6CUUA7HO.js";
 import {
   handleStopFailure
-} from "../chunk-33T5OOKP.js";
+} from "../chunk-V2XPF77V.js";
+import "../chunk-J3YDT4HM.js";
 import "../chunk-RN3NOEJF.js";
 import "../chunk-BSZYIAZL.js";
 import "../chunk-SAF6HGAA.js";
-import "../chunk-7C5CJC3H.js";
+import "../chunk-Y3UTTFTZ.js";
 import "../chunk-7QLSKOSU.js";
 import "../chunk-KZERVKTD.js";
 import "../chunk-2UMNXADU.js";
-import "../chunk-CY4TZK5O.js";
+import "../chunk-7YJS2VTG.js";
 
 // bin/pushary-stopfailure-hook.ts
 var main = async () => {

package/dist/bin/pushary-upgrade.js

@@ -1,22 +1,22 @@
 #!/usr/bin/env node
 import {
   detectClaudeVersion
-} from "../chunk-2255DZ74.js";
+} from "../chunk-HAUTLCMA.js";
 import {
   addClaudeMcpServer,
   addPusharyHooks,
   addPusharyToolPermissions
-} from "../chunk-GK4CED6Z.js";
+} from "../chunk-5646VKR4.js";
 import {
   GEMINI_HOOK_BINARY,
   addGeminiHooks,
   addGeminiMcpServer,
   hasGeminiHooks
-} from "../chunk-2C6B6V2U.js";
+} from "../chunk-ZZE6FN7T.js";
 import "../chunk-ATBKJNWS.js";
 import {
   guardBinary
-} from "../chunk-HSGEEBBL.js";
+} from "../chunk-M7RYIZX6.js";
 import {
   execNpm,
   npmErrorMessage,
@@ -30,13 +30,14 @@ import {
   addCodexMcpServer,
   claudeJson,
   codexConfigToml,
+  codexHookPositions,
   codexHooksJson,
   cursorPluginDir,
   geminiSettings,
   hasCodexHooks,
   vscodePluginDir,
   vscodePluginMcp
-} from "../chunk-VPJAAGD4.js";
+} from "../chunk-B3V2H6SA.js";
 import {
   exitOnHelpFlag
 } from "../chunk-SQOFGPNX.js";
@@ -51,7 +52,7 @@ import "../chunk-KZERVKTD.js";
 import {
   getApiKey
 } from "../chunk-2UMNXADU.js";
-import "../chunk-CY4TZK5O.js";
+import "../chunk-7YJS2VTG.js";
 
 // bin/pushary-upgrade.ts
 import { existsSync as existsSync2 } from "fs";
@@ -138,7 +139,7 @@ var reapplyCodexSettings = (apiKey, paths = {}) => {
   }
   if (config != null) {
     try {
-      if (hooks) addCodexHookTrust(config, hooksPath, command);
+      if (hooks) addCodexHookTrust(config, hooksPath, command, codexHookPositions(hooksConfig ?? void 0));
       if (apiKey) {
         addCodexMcpServer(config, apiKey);
         mcp = true;

package/dist/bin/pushary-wait.js

@@ -4,8 +4,8 @@ import {
 } from "../chunk-IIENZE2J.js";
 import {
   exitOnFailedResponse
-} from "../chunk-N52CIK47.js";
-import "../chunk-2TZCZ7CL.js";
+} from "../chunk-JAICP7BA.js";
+import "../chunk-A4I5JGCW.js";
 import {
   createIo
 } from "../chunk-5RUIFDTP.js";
@@ -28,7 +28,7 @@ import {
   getApiKey,
   getBaseUrl
 } from "../chunk-2UMNXADU.js";
-import "../chunk-CY4TZK5O.js";
+import "../chunk-7YJS2VTG.js";
 
 // bin/pushary-wait.ts
 exitOnHelpFlag("wait");

package/dist/{chunk-5EUZYWID.js → chunk-2T3GX7WG.js}

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

package/dist/{chunk-GK4CED6Z.js → chunk-5646VKR4.js}

@@ -4,11 +4,11 @@ import {
 } from "./chunk-ATBKJNWS.js";
 import {
   guardBinary
-} from "./chunk-HSGEEBBL.js";
+} from "./chunk-M7RYIZX6.js";
 import {
   HOOK_BUDGETS,
   HOOK_LOCATOR_BINARY
-} from "./chunk-CY4TZK5O.js";
+} from "./chunk-7YJS2VTG.js";
 
 // src/claude-config.ts
 import { join } from "path";
@@ -48,7 +48,11 @@ var CLAUDE_HOOK_EVENTS = [
   { event: "SubagentStop", binary: "pushary-stop-hook", timeout: 10, delivery: "telemetry", since: OBSERVED },
   { event: "PreCompact", binary: "pushary-post-hook", matcher: "manual|auto", timeout: 10, delivery: "telemetry", since: OBSERVED },
   { event: "PostCompact", binary: "pushary-post-hook", matcher: "manual|auto", timeout: 10, delivery: "telemetry", since: OBSERVED },
-  { event: "TeammateIdle", binary: "pushary-notification-hook", timeout: 10, delivery: "telemetry", since: OBSERVED }
+  { event: "TeammateIdle", binary: "pushary-notification-hook", timeout: 10, delivery: "telemetry", since: OBSERVED },
+  // An MCP server asking the person for a value, answered from the phone rather
+  // than the terminal. No matcher: Claude Code matches this event on the MCP
+  // server's name, and we have no business preferring one server over another.
+  { event: "Elicitation", binary: "pushary-elicitation-hook", timeout: HOOK_BUDGETS.claude.budgetSeconds, delivery: "approval", since: OBSERVED, cliOnly: true }
 ];
 var supportedClaudeEvents = (version) => CLAUDE_HOOK_EVENTS.filter((hook) => version ? atLeast(version, hook.since) : hook.since === ESTABLISHED);
 

package/dist/{chunk-MNQI6ZZU.js → chunk-7MBDFNUC.js}

@@ -1,6 +1,6 @@
 import {
   isSafeReadOnlyCommand
-} from "./chunk-CY4TZK5O.js";
+} from "./chunk-7YJS2VTG.js";
 
 // src/ledger.ts
 import { appendFileSync, existsSync, mkdirSync, readFileSync, renameSync, rmSync, statSync } from "fs";

package/dist/{chunk-CY4TZK5O.js → chunk-7YJS2VTG.js}

@@ -53,7 +53,8 @@ var HOOK_BUDGETS = {
   gemini: { budgetSeconds: 180, guardSeconds: 10 },
   // The Cursor gate is a dependency-free .mjs that cannot import this module; it
   // mirrors these as MAX_BLOCK_MS (45s) inside its 60s failClosed budget.
-  cursor: { budgetSeconds: 60, guardSeconds: 15 }
+  cursor: { budgetSeconds: 60, guardSeconds: 15 },
+  vscode: { budgetSeconds: 60, guardSeconds: 15 }
 };
 var hookMaxWaitSeconds = (agent) => Math.max(HOOK_BUDGETS[agent].budgetSeconds - HOOK_BUDGETS[agent].guardSeconds, 1);
 var hookWaitDeadline = (startMs, policyWaitSeconds, agent, nowMs) => {
@@ -65,6 +66,18 @@ var hookWaitDeadline = (startMs, policyWaitSeconds, agent, nowMs) => {
 };
 var hookWaitClamped = (startMs, policyWaitSeconds, agent, nowMs) => startMs + hookMaxWaitSeconds(agent) * 1e3 < nowMs + Math.max(policyWaitSeconds, 0) * 1e3;
 var effectiveWaitSeconds = (timeoutAction, policySeconds, agent) => timeoutAction === "wait" ? hookMaxWaitSeconds(agent) : policySeconds;
+var AGENT_LABELS_BY_TYPE = {
+  claude_code: "Claude Code",
+  claude_cowork: "Claude Cowork",
+  codex: "Codex",
+  chatgpt: "ChatGPT",
+  gemini_cli: "Gemini CLI",
+  hermes: "Hermes",
+  cursor: "Cursor",
+  vscode: "VS Code",
+  windsurf: "Windsurf",
+  unknown: "Agent"
+};
 var HOOK_LOCATOR_BINARY = "pushary-bridge";
 var HOOK_BATCH_MAX_BYTES = 4 * 1024 * 1024;
 var REPO_KEY_MAX_LENGTH = 200;
@@ -948,6 +961,7 @@ var resolvePolicy = (config, toolName, modeOverride, toolInput, cwd, repoKey, se
     pushFirstSeconds: config.defaultPushFirstSeconds ?? 20
   };
   const governedBySpecificRule = match?.rank === "exact" || match?.rank === "prefix";
+  const governingMode = base.mode;
   if (!governedBySpecificRule && toolName === "Bash" && typeof arg === "string" && isSafeReadOnlyCommand(arg)) {
     base = autoApprove(base.tool);
   }
@@ -957,7 +971,7 @@ var resolvePolicy = (config, toolName, modeOverride, toolInput, cwd, repoKey, se
       tool: base.tool,
       timeoutSeconds: config.defaultTimeoutSeconds,
       timeoutAction: "wait",
-      mode: "push_first",
+      mode: governingMode,
       pushFirstSeconds: config.defaultPushFirstSeconds ?? 20
     };
   }
@@ -1054,7 +1068,7 @@ var claudePermissionRequestOutput = (decision, reason, updatedInput) => ({
 });
 var gateOutputFor = (source, event, decision, reason) => {
   let output;
-  if (source === "claude") {
+  if (source === "claude" || source === "vscode") {
     if (event === "PreToolUse") {
       output = claudePreToolUseOutput(decision, reason);
     } else if (event === "PermissionRequest" && decision !== "ask") {
@@ -1088,6 +1102,17 @@ var gateOutputFor = (source, event, decision, reason) => {
   }
   return output;
 };
+var ELICITATION_EVENTS = ["Elicitation", "ElicitationResult"];
+var claudeElicitationOutput = (event, action, content) => ({
+  hookSpecificOutput: {
+    hookEventName: event,
+    action,
+    // Only ever alongside an accept. A declined elicitation has nothing to carry,
+    // and content beside a decline reads as an answer the person did not give.
+    ...action === "accept" && content ? { content } : {}
+  }
+});
+var renderElicitationOutput = (event, action, content) => ELICITATION_EVENTS.includes(event) ? JSON.stringify(claudeElicitationOutput(event, action, content)) : void 0;
 
 export {
   parseAgentQuestionAnswers,
@@ -1096,6 +1121,7 @@ export {
   hookWaitDeadline,
   hookWaitClamped,
   effectiveWaitSeconds,
+  AGENT_LABELS_BY_TYPE,
   HOOK_LOCATOR_BINARY,
   normalizeRepoRemote,
   localRepoKey,
@@ -1115,5 +1141,6 @@ export {
   modeStateFromResponse,
   claudePreToolUseOutput,
   claudePermissionRequestOutput,
-  gateOutputFor
+  gateOutputFor,
+  renderElicitationOutput
 };

package/dist/{chunk-PZR4XMFU.js → chunk-A3PFIWWN.js}

@@ -11,7 +11,7 @@ import {
 } from "./chunk-BSZYIAZL.js";
 import {
   reportedInstallSource
-} from "./chunk-7C5CJC3H.js";
+} from "./chunk-Y3UTTFTZ.js";
 
 // src/reach.ts
 var reachVerdict = (channels) => {

package/dist/{chunk-2TZCZ7CL.js → chunk-A4I5JGCW.js}

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

package/dist/{chunk-VPJAAGD4.js → chunk-B3V2H6SA.js}

@@ -1,7 +1,7 @@
 import {
   HOOK_BUDGETS,
   HOOK_LOCATOR_BINARY
-} from "./chunk-CY4TZK5O.js";
+} from "./chunk-7YJS2VTG.js";
 
 // src/codex-config.ts
 import { createHash } from "crypto";
@@ -61,13 +61,13 @@ var readCodexMcpAuth = (config) => {
   if (typeof pushary.bearer_token === "string") return { method: "legacy-bearer" };
   return void 0;
 };
+var isPusharyCommand = (hook) => {
+  const command = String(asRecord(hook)?.command ?? "");
+  return command.includes(CODEX_HOOK_BINARY) || command.includes(HOOK_LOCATOR_BINARY);
+};
 var isPusharyCodexHook = (entry) => {
   const hooks = asRecord(entry)?.hooks;
-  if (!Array.isArray(hooks)) return false;
-  return hooks.some((hook) => {
-    const command = String(asRecord(hook)?.command ?? "");
-    return command.includes(CODEX_HOOK_BINARY) || command.includes(HOOK_LOCATOR_BINARY);
-  });
+  return Array.isArray(hooks) && hooks.some(isPusharyCommand);
 };
 var addCodexHooks = (config, command) => {
   const hooks = ensureRecord(config, "hooks");
@@ -134,13 +134,28 @@ var codexHookTrustHash = (definition, command) => {
   if (definition.matcher) identity.matcher = definition.matcher;
   return "sha256:" + createHash("sha256").update(canonicalJson(identity), "utf8").digest("hex");
 };
-var codexHookStateKey = (hooksJsonPath, event) => `${hooksJsonPath}:${CODEX_EVENT_KEY[event]}:0:0`;
-var untrustedCodexHookEvents = (config, hooksJsonPath, command) => {
+var codexHookPositions = (hooksConfig) => {
+  const hooks = asRecord(hooksConfig?.hooks);
+  const positions = {};
+  for (const definition of CODEX_HOOK_EVENTS) {
+    const entries = hooks?.[definition.event];
+    if (!Array.isArray(entries)) continue;
+    const entryIndex = entries.findIndex(isPusharyCodexHook);
+    if (entryIndex < 0) continue;
+    const inner = asRecord(entries[entryIndex])?.hooks;
+    const hookIndex = Array.isArray(inner) ? inner.findIndex(isPusharyCommand) : -1;
+    positions[definition.event] = [entryIndex, Math.max(hookIndex, 0)];
+  }
+  return positions;
+};
+var codexHookStateKey = (hooksJsonPath, event, position) => `${hooksJsonPath}:${CODEX_EVENT_KEY[event]}:${position[0]}:${position[1]}`;
+var untrustedCodexHookEvents = (config, hooksJsonPath, command, positions) => {
   const state = asRecord(asRecord(config.hooks)?.state);
   return CODEX_HOOK_EVENTS.filter((definition) => {
-    const entry = asRecord(state?.[codexHookStateKey(hooksJsonPath, definition.event)]);
-    const stored = entry?.trusted_hash;
-    return stored !== codexHookTrustHash(definition, command);
+    const position = positions[definition.event];
+    if (!position) return false;
+    const entry = asRecord(state?.[codexHookStateKey(hooksJsonPath, definition.event, position)]);
+    return entry?.trusted_hash !== codexHookTrustHash(definition, command);
   }).map((definition) => definition.event);
 };
 var removeCodexMcpServer = (config) => {
@@ -150,12 +165,14 @@ var removeCodexMcpServer = (config) => {
   if (Object.keys(servers).length === 0) delete config.mcp_servers;
   return true;
 };
-var removeCodexHookTrust = (config, hooksJsonPath) => {
+var removeCodexHookTrust = (config, hooksJsonPath, positions) => {
   const state = asRecord(asRecord(config.hooks)?.state);
   if (!state) return false;
   let changed = false;
   for (const definition of CODEX_HOOK_EVENTS) {
-    const key = codexHookStateKey(hooksJsonPath, definition.event);
+    const position = positions[definition.event];
+    if (!position) continue;
+    const key = codexHookStateKey(hooksJsonPath, definition.event, position);
     if (key in state) {
       delete state[key];
       changed = true;
@@ -170,16 +187,18 @@ var removeCodexHookTrust = (config, hooksJsonPath) => {
   }
   return changed;
 };
-var removeCodexSettings = (config, hooksJsonPath) => {
+var removeCodexSettings = (config, hooksJsonPath, positions) => {
   const mcp = removeCodexMcpServer(config);
-  const trust = removeCodexHookTrust(config, hooksJsonPath);
+  const trust = removeCodexHookTrust(config, hooksJsonPath, positions);
   return mcp || trust;
 };
-var addCodexHookTrust = (config, hooksJsonPath, command) => {
+var addCodexHookTrust = (config, hooksJsonPath, command, positions) => {
   const hooks = ensureRecord(config, "hooks");
   const state = ensureRecord(hooks, "state");
   for (const definition of CODEX_HOOK_EVENTS) {
-    const key = codexHookStateKey(hooksJsonPath, definition.event);
+    const position = positions[definition.event];
+    if (!position) continue;
+    const key = codexHookStateKey(hooksJsonPath, definition.event, position);
     const existing = asRecord(state[key]) ?? {};
     state[key] = { ...existing, trusted_hash: codexHookTrustHash(definition, command) };
   }
@@ -218,6 +237,7 @@ export {
   removeCodexHooks,
   hasCodexHooks,
   missingCodexHookEvents,
+  codexHookPositions,
   untrustedCodexHookEvents,
   removeCodexSettings,
   addCodexHookTrust,

package/dist/{chunk-XPAGN3SC.js → chunk-ECEUMWBH.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-2UMNXADU.js";
 import {
   redactSecrets
-} from "./chunk-CY4TZK5O.js";
+} from "./chunk-7YJS2VTG.js";
 
 // src/crypto.ts
 import nacl from "tweetnacl";

package/dist/{chunk-2255DZ74.js → chunk-HAUTLCMA.js}

@@ -1,6 +1,6 @@
 import {
   parseVersion
-} from "./chunk-GK4CED6Z.js";
+} from "./chunk-5646VKR4.js";
 
 // src/setup/agent-probe.ts
 import { execSync } from "child_process";

package/dist/{chunk-S3UD7O35.js → chunk-HJ44HIUW.js}

@@ -5,15 +5,12 @@ import {
 import {
   isGatingMoment,
   recordKeylessMoment
-} from "./chunk-MNQI6ZZU.js";
+} from "./chunk-7MBDFNUC.js";
 import {
   denyReasonFrom,
   isDeferAnswer
 } from "./chunk-YHG74UFF.js";
 import {
-  DEFAULT_SESSION,
-  askUser,
-  cancelQuestion,
   deriveAction,
   deriveActionBody,
   deriveBlocker,
@@ -24,12 +21,17 @@ import {
   readLastPrompt,
   readLastUserPrompt,
   repoKeyFor,
-  savePendingQuestion,
   scopePathFor,
-  sendNotification,
-  throttlePass,
-  waitForAnswer
-} from "./chunk-33T5OOKP.js";
+  throttlePass
+} from "./chunk-V2XPF77V.js";
+import {
+  DEFAULT_SESSION,
+  askUser,
+  cancelQuestion,
+  pollForAnswer,
+  savePendingQuestion,
+  sendNotification
+} from "./chunk-J3YDT4HM.js";
 import {
   getMachineId
 } from "./chunk-RN3NOEJF.js";
@@ -46,7 +48,7 @@ import {
   hookWaitDeadline,
   parseAgentQuestionAnswers,
   resolveGate
-} from "./chunk-CY4TZK5O.js";
+} from "./chunk-7YJS2VTG.js";
 
 // src/decision-episode.ts
 var EPISODE_PATH = "/api/agent/decision-episode";
@@ -74,29 +76,11 @@ var reportDecisionEpisode = async (apiKey, input) => {
 import { basename, join } from "path";
 import { tmpdir } from "os";
 import { existsSync, writeFileSync } from "fs";
-var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 var START_MS = Date.now();
 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 pollForAnswer = async (apiKey, correlationId, deadlineMs, pollInterval = 2e3) => {
-  while (Date.now() < deadlineMs) {
-    const remaining = Math.min(Math.max(deadlineMs - Date.now(), 1e3), 3e4);
-    let answer;
-    try {
-      answer = await waitForAnswer(apiKey, correlationId, remaining);
-    } catch {
-      if (Date.now() + pollInterval >= deadlineMs) break;
-      await sleep(pollInterval);
-      continue;
-    }
-    if (answer.answered) return answer;
-    if (Date.now() + pollInterval >= deadlineMs) break;
-    await sleep(pollInterval);
-  }
-  return { answered: false };
-};
 var handlePushOnly = async (apiKey, description, projectName, timeoutSeconds, timeoutAction, sessionId, machineId, toolName, toolTarget, decision, signals) => {
   let result;
   try {