@pushary/agent-hooks 0.92.1 → 0.93.1

package/dist/{chunk-QZCFVWA7.js → chunk-EQRS3SGM.js}

@@ -38,16 +38,18 @@ var uploadTranscriptRecords = async (apiKey, params, baseUrl = getBaseUrl()) =>
     const body = await res.json().catch(() => null);
     const keyRegistered = body?.keyRegistered === true;
     const keyConflict = body?.keyConflict === true;
+    const keyUnavailable = res.status === 503;
     const ids = (value) => Array.isArray(value) ? value.filter((v) => typeof v === "string") : [];
     return {
       ok: res.ok && !keyConflict && (params.dataEncryptionKey === void 0 || keyRegistered),
       keyRegistered,
       keyConflict,
+      keyUnavailable,
       settledIds: Array.isArray(body?.settledIds) ? ids(body.settledIds) : null,
       rejectedIds: ids(body?.rejectedIds)
     };
   } catch {
-    return { ok: false, keyRegistered: false, keyConflict: false, settledIds: null, rejectedIds: [] };
+    return { ok: false, keyRegistered: false, keyConflict: false, keyUnavailable: false, settledIds: null, rejectedIds: [] };
   }
 };
 

package/dist/{chunk-BSZYIAZL.js → chunk-EYRGBYZG.js}

@@ -57,6 +57,7 @@ var parseMcpResponse = (body, contentType) => {
 };
 var sendMcpRequest = async (apiKey, message, options = {}) => {
   return withRetry(async () => {
+    options.signal?.throwIfAborted();
     const baseUrl = options.baseUrl ?? getBaseUrl();
     const fetchFn = options.fetchFn ?? fetch;
     const headers = {
@@ -71,7 +72,7 @@ var sendMcpRequest = async (apiKey, message, options = {}) => {
       method: "POST",
       headers,
       body: JSON.stringify(message),
-      signal: options.timeoutMs ? AbortSignal.timeout(options.timeoutMs) : void 0
+      signal: options.timeoutMs ? AbortSignal.any([AbortSignal.timeout(options.timeoutMs), ...options.signal ? [options.signal] : []]) : options.signal
     });
     const body = await response.text();
     const contentType = response.headers.get("content-type");

package/dist/{chunk-QCXKQJTG.js → chunk-FYOIW5RV.js}

@@ -1,9 +1,9 @@
 import {
   isBridgeLocator
-} from "./chunk-3HS4YGHB.js";
+} from "./chunk-YANV5TGK.js";
 import {
   pusharyHookExecutable
-} from "./chunk-ZMKKK6DC.js";
+} from "./chunk-HSAVPZ46.js";
 import {
   BELL_HOOK_BINARY
 } from "./chunk-DSTLA2TC.js";
@@ -18,7 +18,7 @@ import {
 } from "./chunk-7QLSKOSU.js";
 import {
   isValidApiKey
-} from "./chunk-VNMKIJZB.js";
+} from "./chunk-Z6CP5ZZD.js";
 
 // src/hermes-config.ts
 import { execFileSync } from "child_process";

package/dist/{chunk-ZMKKK6DC.js → chunk-HSAVPZ46.js}

@@ -2,15 +2,15 @@ import {
   CLAUDE_HOOK_EVENTS,
   GEMINI_HOOK_EVENTS,
   hasGeminiHooks
-} from "./chunk-I7W3UTDK.js";
+} from "./chunk-RX75MRGC.js";
 import {
   CODEX_HOOK_EVENTS,
   hasCodexHooks
-} from "./chunk-CV2YD2JR.js";
+} from "./chunk-Y6XXFXVB.js";
 import {
   CURSOR_GATE_EVENTS,
   HOOK_LOCATOR_BINARY
-} from "./chunk-VNMKIJZB.js";
+} from "./chunk-Z6CP5ZZD.js";
 
 // src/diagnostics/wiring.ts
 var record = (value) => value && typeof value === "object" && !Array.isArray(value) ? value : null;

package/dist/{chunk-2ACC5M7F.js → chunk-NVPYRDCT.js}

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

package/dist/{chunk-CNPAT3HL.js → chunk-OB4RF2TF.js}

@@ -3,11 +3,11 @@ import {
   decodePublicKey,
   generateSessionKey,
   wrapSessionKey
-} from "./chunk-7FE2KABY.js";
+} from "./chunk-46P3VES5.js";
 import {
   fetchTranscriptRecipients,
   uploadTranscriptRecords
-} from "./chunk-QZCFVWA7.js";
+} from "./chunk-EQRS3SGM.js";
 
 // src/live-session.ts
 var MAX_TRANSCRIPT_QUEUE = 100;

package/dist/{chunk-JW4KO5AF.js → chunk-ODL52O5V.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-2UMNXADU.js";
 import {
   normalizeInstallSource
-} from "./chunk-VNMKIJZB.js";
+} from "./chunk-Z6CP5ZZD.js";
 
 // src/install-source.ts
 import { readFileSync } from "fs";

package/dist/{chunk-I463AEG3.js → chunk-OYNPLEXP.js}

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

package/dist/{chunk-2XQSN66Q.js → chunk-QGA2ZB4I.js}

@@ -1,6 +1,6 @@
 import {
   getMachineId
-} from "./chunk-2ACC5M7F.js";
+} from "./chunk-NVPYRDCT.js";
 import {
   getPackageVersion
 } from "./chunk-DINDL2CF.js";

package/dist/{chunk-RQPQSJJH.js → chunk-QKNLW7H6.js}

@@ -1,27 +1,25 @@
-import {
-  PRETOOLUSE_HANDLED_TOOLS,
-  PRETOOLUSE_PHONE_ANSWERED_TOOLS
-} from "./chunk-2LAHXHBR.js";
 import {
   defersToNativeMode
-} from "./chunk-I463AEG3.js";
+} from "./chunk-OYNPLEXP.js";
 import {
   isGatingMoment,
   recordKeylessMoment
-} from "./chunk-VHWCVD42.js";
+} from "./chunk-2ORRI66J.js";
 import {
   denyReasonFrom,
   isDeferAnswer
 } from "./chunk-YHG74UFF.js";
 import {
+  CLAUDE_CODE_AGENT,
   fetchModeState,
   getPolicy,
   readLastPrompt,
   readLastUserPrompt,
   repoKeyFor,
+  reportEvent,
   settleQuestionsForToolUse,
   throttlePass
-} from "./chunk-YXDYKECP.js";
+} from "./chunk-5HGLZGI4.js";
 import {
   DEFAULT_SESSION,
   askUser,
@@ -29,7 +27,7 @@ import {
   pollForAnswer,
   savePendingQuestion,
   sendNotification
-} from "./chunk-F7OURW3C.js";
+} from "./chunk-RER3FRTD.js";
 import {
   UNNAMED_ACTION,
   deriveAction,
@@ -37,11 +35,16 @@ import {
   deriveBlocker,
   deriveToolTarget,
   describeToolCall,
+  permissionDeniedAction,
   scopePathFor
-} from "./chunk-L4E2BIJ2.js";
+} from "./chunk-4PE2SQVM.js";
+import {
+  PRETOOLUSE_HANDLED_TOOLS,
+  PRETOOLUSE_PHONE_ANSWERED_TOOLS
+} from "./chunk-Y3UGCQQC.js";
 import {
   getMachineId
-} from "./chunk-2ACC5M7F.js";
+} from "./chunk-NVPYRDCT.js";
 import {
   getApiKey,
   getBaseUrl
@@ -58,7 +61,7 @@ import {
   parseAgentQuestions,
   resolveGate,
   stoppedOutput
-} from "./chunk-VNMKIJZB.js";
+} from "./chunk-Z6CP5ZZD.js";
 
 // src/decision-episode.ts
 var EPISODE_PATH = "/api/agent/decision-episode";
@@ -582,7 +585,19 @@ var automodeRetryEnabled = () => {
   const flag = process.env.PUSHARY_AUTOMODE_RETRY;
   return flag === "1" || flag === "true";
 };
+var reportPermissionDenied = (input) => reportEvent({
+  event: "permission_denied",
+  agentType: CLAUDE_CODE_AGENT.type,
+  agentName: `${CLAUDE_CODE_AGENT.label} - ${basename(input.cwd ?? process.cwd())}`,
+  action: permissionDeniedAction(input.tool_name),
+  sessionId: input.session_id
+  // Side report, not a command carrier. Without timeoutMs this takes the phone's
+  // queued instruction and acknowledges it delivered, and this hook can print
+  // only {retry}. 4s rather than the Notification path's 2.5s because
+  // PermissionDenied is given a 60s budget, not 10s.
+}, { timeoutMs: 4e3 }).catch(() => void 0);
 var handlePermissionDenied = async (input) => {
+  await reportPermissionDenied(input);
   if (isPusharyOwnTool(input.tool_name)) return void 0;
   let apiKey;
   try {

package/dist/{chunk-F7OURW3C.js → chunk-RER3FRTD.js}

@@ -1,6 +1,6 @@
 import {
   callMcpTool
-} from "./chunk-BSZYIAZL.js";
+} from "./chunk-EYRGBYZG.js";
 import {
   installProxyDispatcher
 } from "./chunk-SAF6HGAA.js";
@@ -33,11 +33,11 @@ var askUser = async (apiKey, params, timeoutMs = 15e3) => {
   if (!isAskUserResponse(result)) throw new Error("Invalid ask_user response");
   return result;
 };
-var waitForAnswer = async (apiKey, correlationId, timeoutMs = 3e4) => {
+var waitForAnswer = async (apiKey, correlationId, timeoutMs = 3e4, signal) => {
   const result = await callMcpTool(apiKey, "wait_for_answer", {
     correlationId,
     timeoutMs
-  }, { timeoutMs: timeoutMs + 1e4 });
+  }, { timeoutMs: timeoutMs + 1e4, signal });
   if (!isWaitForAnswerResponse(result)) throw new Error("Invalid wait_for_answer response");
   return result;
 };
@@ -59,11 +59,11 @@ var pollForAnswer = async (apiKey, correlationId, deadlineMs, pollInterval = 2e3
   }
   return { answered: false };
 };
-var cancelQuestion = async (apiKey, correlationId) => {
-  await callMcpTool(apiKey, "cancel_question", { correlationId });
+var cancelQuestion = async (apiKey, correlationId, signal) => {
+  await callMcpTool(apiKey, "cancel_question", { correlationId }, { signal });
 };
-var sendNotification = async (apiKey, params, timeoutMs = 15e3) => {
-  await callMcpTool(apiKey, "send_notification", { ...params }, { maxRetries: 3, timeoutMs });
+var sendNotification = async (apiKey, params, timeoutMs = 15e3, signal) => {
+  await callMcpTool(apiKey, "send_notification", { ...params }, { maxRetries: signal ? 1 : 3, timeoutMs, signal });
 };
 
 // src/pending.ts

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

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

package/dist/{chunk-PYA4FLKI.js → chunk-ROHFVGXM.js}

@@ -12,10 +12,10 @@ import {
 } from "./chunk-5RUIFDTP.js";
 import {
   callMcpTool
-} from "./chunk-BSZYIAZL.js";
+} from "./chunk-EYRGBYZG.js";
 import {
   reportedInstallSource
-} from "./chunk-JW4KO5AF.js";
+} from "./chunk-ODL52O5V.js";
 
 // src/reach.ts
 var reachVerdict = (channels) => {

package/dist/{chunk-I7W3UTDK.js → chunk-RX75MRGC.js}

@@ -1,17 +1,19 @@
-import {
-  PRETOOLUSE_GATED_TOOLS,
-  PRETOOLUSE_PHONE_ANSWERED_TOOLS
-} from "./chunk-2LAHXHBR.js";
 import {
   guardBinary
 } from "./chunk-EZIEXHYM.js";
+import {
+  NOTIFICATION_MATCHED_TYPES,
+  POSTTOOLUSE_MIRRORED_TOOLS,
+  PRETOOLUSE_GATED_TOOLS,
+  PRETOOLUSE_PHONE_ANSWERED_TOOLS
+} from "./chunk-Y3UGCQQC.js";
 import {
   isProtectedByScope
-} from "./chunk-CV2YD2JR.js";
+} from "./chunk-Y6XXFXVB.js";
 import {
   HOOK_BUDGETS,
   HOOK_LOCATOR_BINARY
-} from "./chunk-VNMKIJZB.js";
+} from "./chunk-Z6CP5ZZD.js";
 
 // src/claude-config.ts
 import { join } from "path";
@@ -32,7 +34,7 @@ var formatVersion = (version) => version.join(".");
 
 // src/claude-events.ts
 var GATED_TOOLS = [...PRETOOLUSE_GATED_TOOLS, ...PRETOOLUSE_PHONE_ANSWERED_TOOLS].join("|");
-var MIRRORED_TOOLS = [...PRETOOLUSE_GATED_TOOLS, "TodoWrite"].join("|");
+var MIRRORED_TOOLS = POSTTOOLUSE_MIRRORED_TOOLS.join("|");
 var ESTABLISHED = [1, 0, 0];
 var OBSERVED = [2, 0, 0];
 var CLAUDE_HOOK_EVENTS = [
@@ -40,7 +42,7 @@ var CLAUDE_HOOK_EVENTS = [
   { event: "PostToolUse", binary: "pushary-post-hook", matcher: MIRRORED_TOOLS, timeout: 10, delivery: "telemetry", since: ESTABLISHED },
   { event: "Stop", binary: "pushary-stop-hook", timeout: 10, delivery: "telemetry", since: ESTABLISHED },
   { event: "UserPromptSubmit", binary: "pushary-prompt-hook", timeout: 10, delivery: "telemetry", since: ESTABLISHED },
-  { event: "Notification", binary: "pushary-notification-hook", matcher: "permission_prompt|idle_prompt|agent_needs_input|agent_completed", timeout: 10, delivery: "telemetry", since: ESTABLISHED },
+  { event: "Notification", binary: "pushary-notification-hook", matcher: NOTIFICATION_MATCHED_TYPES.join("|"), timeout: 10, delivery: "telemetry", since: ESTABLISHED },
   { event: "SessionStart", binary: "pushary-session-start-hook", matcher: "startup|resume|clear", timeout: 10, delivery: "telemetry", since: ESTABLISHED },
   { event: "SessionEnd", binary: "pushary-session-end-hook", timeout: 10, delivery: "telemetry", since: ESTABLISHED },
   { event: "StopFailure", binary: "pushary-stopfailure-hook", timeout: 10, delivery: "telemetry", since: ESTABLISHED },

package/dist/{chunk-4TFXV5MW.js → chunk-TDUTNYAQ.js}

@@ -1,6 +1,6 @@
 import {
   pusharyDir
-} from "./chunk-CV2YD2JR.js";
+} from "./chunk-Y6XXFXVB.js";
 import {
   readJsonSafe
 } from "./chunk-4LL6LG5X.js";

package/dist/{chunk-BXTJVM7O.js → chunk-UZFVNEEU.js}

@@ -11,8 +11,9 @@ import {
   getBaseUrl
 } from "./chunk-2UMNXADU.js";
 import {
-  isValidApiKey
-} from "./chunk-VNMKIJZB.js";
+  isValidApiKey,
+  normalizeKeyScope
+} from "./chunk-Z6CP5ZZD.js";
 
 // src/session.ts
 var samePusharyAccount = (left, right) => left.kind === "ok" && right.kind === "ok" && left.identity.workspaceId !== "" && left.identity.workspaceId === right.identity.workspaceId && left.identity.siteId === right.identity.siteId;
@@ -20,7 +21,6 @@ var IDENTITY_PATH = "/api/v1/server/identity";
 var DEFAULT_TIMEOUT_MS = 1e4;
 var SUBSCRIPTION_REQUIRED_CODE = "subscription_required";
 var DEFAULT_UPGRADE_PATH = "/dashboard/settings?tab=billing";
-var KEY_SCOPES = ["full_access", "connector", "bound"];
 var SUBSCRIPTION_STATUSES = [
   "active",
   "past_due",
@@ -31,7 +31,6 @@ var SUBSCRIPTION_STATUSES = [
   "none"
 ];
 var asString = (value) => typeof value === "string" && value ? value : null;
-var asScope = (value) => KEY_SCOPES.includes(value) ? value : "full_access";
 var asStatus = (value) => SUBSCRIPTION_STATUSES.includes(value) ? value : "none";
 var asCount = (value) => typeof value === "number" && Number.isFinite(value) ? Math.max(0, Math.trunc(value)) : 0;
 var absoluteUrl = (baseUrl, pathOrUrl) => {
@@ -43,12 +42,13 @@ var toIdentity = (body) => {
   const raw = body;
   const keyId = asString(raw.keyId);
   const siteId = asString(raw.siteId);
-  if (!keyId || !siteId) return null;
+  const keyScope = normalizeKeyScope(raw.keyScope);
+  if (!keyId || !siteId || !keyScope) return null;
   return {
     keyId,
     keyPrefix: asString(raw.keyPrefix) ?? "",
     keyName: asString(raw.keyName) ?? "",
-    keyScope: asScope(raw.keyScope),
+    keyScope,
     siteId,
     siteSlug: asString(raw.siteSlug) ?? "",
     siteName: asString(raw.siteName) ?? "",

package/dist/{chunk-Z6RFZKY4.js → chunk-WY4ALDYN.js}

@@ -1,7 +1,7 @@
 import {
   describeKeyCheck,
   keyCheckFromResponse
-} from "./chunk-BXTJVM7O.js";
+} from "./chunk-UZFVNEEU.js";
 import {
   createIo
 } from "./chunk-5RUIFDTP.js";

package/dist/chunk-Y3UGCQQC.js

@@ -0,0 +1,53 @@
+import {
+  ASKED_IN_EVERY_MODE_TOOLS
+} from "./chunk-Z6CP5ZZD.js";
+
+// src/claude-tools.ts
+var PRETOOLUSE_GATED_TOOLS = [
+  "Bash",
+  "Write",
+  "Edit",
+  "MultiEdit",
+  "NotebookEdit",
+  "PowerShell",
+  "Monitor"
+];
+var PRETOOLUSE_PHONE_ANSWERED_TOOLS = ASKED_IN_EVERY_MODE_TOOLS;
+var POSTTOOLUSE_MIRROR_ONLY_TOOLS = ["TodoWrite", "Task", "WebFetch", "WebSearch"];
+var POSTTOOLUSE_MIRRORED_TOOLS = [...PRETOOLUSE_GATED_TOOLS, ...POSTTOOLUSE_MIRROR_ONLY_TOOLS];
+var PRETOOLUSE_HANDLED_TOOLS = /* @__PURE__ */ new Set([...PRETOOLUSE_GATED_TOOLS, ...PRETOOLUSE_PHONE_ANSWERED_TOOLS]);
+
+// src/claude-notifications.ts
+var NOTIFICATION_MATCHED_TYPES = [
+  // Blocks. The agent, or one of its workers, is waiting on a person.
+  "permission_prompt",
+  "idle_prompt",
+  "agent_needs_input",
+  "worker_permission_prompt",
+  // An MCP server asking the person for a value. The Elicitation hook answers it;
+  // this is the feed row saying one is open.
+  "elicitation_dialog",
+  "elicitation_url_dialog",
+  // Turn boundary.
+  "agent_completed",
+  // Quota. The island already reads plan usage, and these say when a limit hit,
+  // went stale, or was turned off, which no polling of the usage endpoint reveals.
+  "quota_auto_resume_fired",
+  "quota_auto_resume_stale",
+  "quota_auto_resume_disabled"
+];
+var NOTIFICATION_PUSH_TYPES = /* @__PURE__ */ new Set([
+  "idle_prompt",
+  "agent_needs_input",
+  "worker_permission_prompt"
+]);
+
+export {
+  PRETOOLUSE_GATED_TOOLS,
+  PRETOOLUSE_PHONE_ANSWERED_TOOLS,
+  POSTTOOLUSE_MIRROR_ONLY_TOOLS,
+  POSTTOOLUSE_MIRRORED_TOOLS,
+  PRETOOLUSE_HANDLED_TOOLS,
+  NOTIFICATION_MATCHED_TYPES,
+  NOTIFICATION_PUSH_TYPES
+};

package/dist/{chunk-CV2YD2JR.js → chunk-Y6XXFXVB.js}

@@ -1,7 +1,7 @@
 import {
   HOOK_BUDGETS,
   HOOK_LOCATOR_BINARY
-} from "./chunk-VNMKIJZB.js";
+} from "./chunk-Z6CP5ZZD.js";
 
 // src/removal-scope.ts
 var namesAppLocator = (command) => command.includes(HOOK_LOCATOR_BINARY);
@@ -34,11 +34,23 @@ var CODEX_HOOK_EVENTS = [
   { event: "PostToolUse", matcher: "Bash|apply_patch", delivery: "telemetry", timeout: 10 },
   { event: "UserPromptSubmit", delivery: "telemetry", timeout: 10 },
   { event: "Stop", delivery: "telemetry", timeout: 10 },
-  { event: "SessionStart", matcher: "startup|resume", delivery: "telemetry", timeout: 10 },
+  // `clear` alongside startup and resume, matching what we already do on Claude
+  // Code. Codex names all three in its own SessionStart sources, and without it a
+  // session the person started by clearing is one we never see begin.
+  { event: "SessionStart", matcher: "startup|resume|clear", delivery: "telemetry", timeout: 10 },
   // Codex caps SessionEnd at 3s and defaults it to 1s, unlike every other event
   // here. It also runs synchronously whatever `async` says, so the handler must
   // fit the window rather than assume the 10s Claude Code allows.
-  { event: "SessionEnd", delivery: "telemetry", timeout: 3 }
+  { event: "SessionEnd", delivery: "telemetry", timeout: 3 },
+  // Observability only, and the four Codex names we were not registering at all.
+  // Every one is in codex-cli 0.151.0's own `HookEventName` enum
+  // (subagent_start, subagent_stop, pre_compact, post_compact), and we already
+  // carry all four on Claude Code, so the island showed subagent and compaction
+  // shape for one agent and not the other. None of them decides anything.
+  { event: "SubagentStart", delivery: "telemetry", timeout: 5 },
+  { event: "SubagentStop", delivery: "telemetry", timeout: 5 },
+  { event: "PreCompact", matcher: "manual|auto", delivery: "telemetry", timeout: 5 },
+  { event: "PostCompact", matcher: "manual|auto", delivery: "telemetry", timeout: 5 }
 ];
 var CODEX_EVENT_KEY = {
   PermissionRequest: "permission_request",
@@ -47,7 +59,11 @@ var CODEX_EVENT_KEY = {
   UserPromptSubmit: "user_prompt_submit",
   Stop: "stop",
   SessionStart: "session_start",
-  SessionEnd: "session_end"
+  SessionEnd: "session_end",
+  SubagentStart: "subagent_start",
+  SubagentStop: "subagent_stop",
+  PreCompact: "pre_compact",
+  PostCompact: "post_compact"
 };
 var codexEventKeyOf = (event) => event.replace(/([a-z0-9])([A-Z])/g, "$1_$2").toLowerCase();
 var asRecord = (value) => value && typeof value === "object" && !Array.isArray(value) ? value : void 0;
@@ -209,14 +225,30 @@ var restoreCodexHookTrust = (config, hooksJsonPath, positions, snapshot) => {
   }
   return true;
 };
-var untrustedCodexHookEvents = (config, hooksJsonPath, command, positions) => {
+var codexTrustGaps = (config, hooksConfig, hooksJsonPath, command, positions) => {
   const state = asRecord(asRecord(config.hooks)?.state);
-  return CODEX_HOOK_EVENTS.filter((definition) => {
+  const hooks = asRecord(hooksConfig?.hooks);
+  const gaps = [];
+  for (const definition of CODEX_HOOK_EVENTS) {
     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);
+    if (!position) continue;
+    const stored = asRecord(state?.[codexHookStateKey(hooksJsonPath, definition.event, position)])?.trusted_hash;
+    const eventKey = CODEX_EVENT_KEY[definition.event] ?? definition.event;
+    const onDisk = asRecord(
+      asRecord(hooks?.[definition.event]) ?? (Array.isArray(hooks?.[definition.event]) ? hooks[definition.event][position[0]] : void 0)
+    );
+    const diskHash = onDisk ? codexEntryTrustHash(eventKey, onDisk) : void 0;
+    if (stored !== void 0 && diskHash !== void 0 && stored === diskHash) {
+      if (diskHash !== codexHookTrustHash(definition, command)) {
+        gaps.push({ event: definition.event, kind: "stale" });
+      }
+      continue;
+    }
+    if (stored !== (diskHash ?? codexHookTrustHash(definition, command))) {
+      gaps.push({ event: definition.event, kind: "untrusted" });
+    }
+  }
+  return gaps;
 };
 var removeCodexMcpServer = (config) => {
   const servers = asRecord(config.mcp_servers);
@@ -318,7 +350,7 @@ export {
   codexHookPositions,
   captureCodexHookTrust,
   restoreCodexHookTrust,
-  untrustedCodexHookEvents,
+  codexTrustGaps,
   removeCodexHookTrust,
   removeCodexSettings,
   addCodexHookTrust,

package/dist/{chunk-3HS4YGHB.js → chunk-YANV5TGK.js}

@@ -1,12 +1,12 @@
 import {
   openCodeConfigDirFrom
-} from "./chunk-CELX75MW.js";
+} from "./chunk-BSEAOCCQ.js";
 import {
   codexHomeFrom
-} from "./chunk-CV2YD2JR.js";
+} from "./chunk-Y6XXFXVB.js";
 import {
   HOOK_LOCATOR_BINARY
-} from "./chunk-VNMKIJZB.js";
+} from "./chunk-Z6CP5ZZD.js";
 
 // src/vscode-config.ts
 import { homedir } from "os";

package/dist/{chunk-VNMKIJZB.js → chunk-Z6CP5ZZD.js}

@@ -1,4 +1,6 @@
 // ../contracts/src/index.ts
+var KEY_SCOPES = ["full_access", "agent", "connector", "bound"];
+var normalizeKeyScope = (value) => typeof value === "string" && KEY_SCOPES.includes(value) ? value : null;
 var APPROVAL_MODES = ["push_only", "terminal_only", "push_first", "notify_only"];
 var isApprovalMode = (value) => typeof value === "string" && APPROVAL_MODES.includes(value);
 var MAX_AGENT_QUESTIONS = 4;
@@ -1347,6 +1349,7 @@ var elicitationContentFromAnswers = (ask, answers) => {
 };
 
 export {
+  normalizeKeyScope,
   parseAgentQuestions,
   parseAgentQuestionAnswers,
   normalizeInstallSource,

package/dist/{chunk-HDORB7WD.js → chunk-ZO2XG3CX.js}

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

package/dist/{chunk-SQYBP3QQ.js → chunk-ZTJF6ANY.js}

@@ -7,10 +7,10 @@ import {
 } from "./chunk-L4ZCFMWW.js";
 import {
   getMachineId
-} from "./chunk-2ACC5M7F.js";
+} from "./chunk-NVPYRDCT.js";
 import {
   pusharyDir
-} from "./chunk-CV2YD2JR.js";
+} from "./chunk-Y6XXFXVB.js";
 import {
   getPackageVersion
 } from "./chunk-DINDL2CF.js";

package/dist/src/index.d.ts

@@ -16,10 +16,12 @@ declare const handlePreToolUse: (input: ToolInput) => Promise<HookOutput | undef
 
 declare const getPolicy: (apiKey: string, expectedVersion?: string | null, agent?: string, repoAware?: boolean, sessionId?: string) => Promise<PolicyConfig>;
 
-declare const fetchModeState: (apiKey: string, sessionId?: string, reuseWithinMs?: number) => Promise<ModeState>;
+declare const fetchModeState: (apiKey: string, sessionId?: string, reuseWithinMs?: number, signal?: AbortSignal) => Promise<ModeState>;
 declare const fetchModeOverride: (apiKey: string) => Promise<ApprovalMode | null>;
 
 interface UsageReport {
+    readonly eventId: string;
+    readonly reportedAt: number;
     readonly tokensIn: number;
     readonly tokensOut: number;
     readonly costUsd: number;
@@ -52,8 +54,35 @@ interface AgentEvent {
     pid?: number;
 }
 interface ReportEventOptions {
+    signal?: AbortSignal;
     maxAttempts?: number;
     timeoutMs?: number;
+    /**
+     * Total wall clock this call may spend, acknowledge round trip included.
+     *
+     * Deliberately not `timeoutMs`. That option doubles as the "I am a side report"
+     * signal (`clientCanDrain` below is keyed on its absence), so a drain-carrying
+     * caller that set it to bound its time would silently stop delivering the
+     * instructions a person sent from their phone. This bounds the clock and says
+     * nothing about draining.
+     *
+     * Without it, a single report could spend `timeoutMs ?? 10_000` on the event
+     * POST and then a further `timeoutMs ?? 10_000` acknowledging a pending command,
+     * which is twice the ceiling the hook was given and, on Codex, twice what the
+     * agent will wait before killing the process mid-flight.
+     */
+    budgetMs?: number;
+    /**
+     * Tells the server not to pop a queued instruction for this report.
+     *
+     * `canDrainCommand: false` is not enough. The route's first disjunct is
+     * `event === "session_end" && consumesDrainedCommand(agentType)`, which never
+     * reads that flag, so any `session_end` from an agent whose Stop carries text
+     * back pops the queue destructively. A subagent's stop is a `session_end` and
+     * its caller throws the response away, which is a queued instruction destroyed
+     * rather than delivered. `skipCommandDrain` is the route's own first check.
+     */
+    skipDrain?: boolean;
     requireOk?: boolean;
     /**
      * Authenticate with this key instead of the ambient one.
@@ -102,6 +131,7 @@ declare const handleNotification: (input: {
     title?: string;
     type?: string;
     notification_type?: string;
+    hook_event_name?: string;
     cwd?: string;
     session_id?: string;
 }, agent?: AgentIdentity) => Promise<void>;
@@ -148,8 +178,8 @@ interface AnswerResult {
     note?: string;
 }
 declare const askUser: (apiKey: string, params: AskUserParams, timeoutMs?: number) => Promise<AskUserResponse>;
-declare const waitForAnswer: (apiKey: string, correlationId: string, timeoutMs?: number) => Promise<AnswerResult>;
-declare const cancelQuestion: (apiKey: string, correlationId: string) => Promise<void>;
+declare const waitForAnswer: (apiKey: string, correlationId: string, timeoutMs?: number, signal?: AbortSignal) => Promise<AnswerResult>;
+declare const cancelQuestion: (apiKey: string, correlationId: string, signal?: AbortSignal) => Promise<void>;
 
 declare const getApiKey: () => string;
 declare const getBaseUrl: () => string;