@pushary/agent-hooks 0.92.1 → 0.93.1

package/dist/{chunk-L4E2BIJ2.js → chunk-4PE2SQVM.js}

@@ -5,7 +5,7 @@ import {
   FILE_TARGET_TOOLS,
   redactSecrets,
   redactSecretsDeep
-} from "./chunk-VNMKIJZB.js";
+} from "./chunk-Z6CP5ZZD.js";
 
 // ../hook-mapping/src/describe.ts
 import { isAbsolute, relative, resolve } from "path";
@@ -20,8 +20,14 @@ var hookPrefixes = {
   // Without an entry here the fallback stringifies the whole tool input, and for
   // ExitPlanMode that input IS the plan: the action line became a truncated dump of
   // the plan markdown. The plan belongs in the body, not the one-line summary.
-  ExitPlanMode: () => "finished planning and wants to start coding"
-};
+  ExitPlanMode: () => "finished planning and wants to start coding",
+  // Mirrored on PostToolUse since the matcher was widened. Without entries the
+  // fallback prints `Task: done` and `WebSearch: done`, which name the tool and
+  // drop the only part a person reads: which subagent, and what it looked for.
+  Task: (input) => `subagent: ${describeTaskCall(input)}`,
+  WebSearch: (input) => `web search: ${firstString(input.query) ?? "(no query)"}`
+};
+var describeTaskCall = (input) => firstString(input.description) ?? firstString(input.subagent_type) ?? "(unnamed)";
 var describeTodoProgress = (todos) => {
   if (!Array.isArray(todos)) return "updated the plan";
   const items = todos.filter((t) => !!t && typeof t === "object");
@@ -42,7 +48,9 @@ var eventPrefixes = {
   Edit: (input) => `edited: ${input.file_path ?? "unknown"}`,
   MultiEdit: (input) => `edited: ${input.file_path ?? "unknown"}`,
   Read: (input) => `read: ${input.file_path ?? "unknown"}`,
-  TodoWrite: (input) => describeTodoProgress(input.todos)
+  TodoWrite: (input) => describeTodoProgress(input.todos),
+  Task: (input) => `ran subagent: ${describeTaskCall(input)}`,
+  WebSearch: (input) => `searched: ${firstString(input.query) ?? "the web"}`
 };
 var MCP_TOOL_PREFIX = "mcp__";
 var parseMcpToolName = (toolName) => {
@@ -287,6 +295,7 @@ var AGENT_IDENTITIES = {
   vscode: { type: "vscode", label: AGENT_LABELS_BY_TYPE.vscode },
   opencode: { type: "opencode", label: AGENT_LABELS_BY_TYPE.opencode }
 };
+var TEAMMATE_IDLE_ACTION = "A teammate went idle";
 var TASK_TITLE_MAX_LENGTH = 120;
 var STOP_SUMMARY_MAX_LENGTH = 200;
 var SESSION_END_ACTIONS = {
@@ -333,6 +342,45 @@ var sessionStartAction = (source) => source === "resume" ? "Session resumed" : "
 var sessionEndAction = (reason) => typeof reason === "string" && SESSION_END_ACTIONS[reason] || "Session ended";
 var taskTitleFrom = (prompt) => typeof prompt === "string" ? prompt.replace(/\s+/g, " ").trim().slice(0, TASK_TITLE_MAX_LENGTH) || void 0 : void 0;
 var asString = (value) => typeof value === "string" && value.length > 0 ? value : void 0;
+var NOTIFICATION_ACTION_MAX_LENGTH = 200;
+var STOP_FAILURE_REASON_MAX_LENGTH = 300;
+var notificationTypeOf = (payload) => asString(payload.notification_type) ?? asString(payload.type);
+var notificationAction = (payload) => {
+  const text = asString(payload.message) ?? asString(payload.title);
+  const collapsed = redactSecrets(text ?? "").replace(/\s+/g, " ").trim();
+  return collapsed ? collapsed.slice(0, NOTIFICATION_ACTION_MAX_LENGTH) : "Notification";
+};
+var STOP_FAILURE_REASONS = {
+  rate_limit: "Rate limited by the API",
+  overloaded: "The API is overloaded right now",
+  authentication_failed: "Authentication failed",
+  billing_error: "A billing error stopped the turn"
+};
+var STOP_FAILURE_FALLBACK = "The turn ended on an API error (rate limit, billing, or auth).";
+var describeStopFailure = (error) => {
+  const fromString = (value) => {
+    const trimmed = value.trim();
+    if (!trimmed) return void 0;
+    return STOP_FAILURE_REASONS[trimmed] ?? redactSecrets(trimmed).slice(0, STOP_FAILURE_REASON_MAX_LENGTH);
+  };
+  if (typeof error === "string") {
+    const described = fromString(error);
+    if (described) return described;
+  } else if (error && typeof error === "object") {
+    for (const key of ["type", "message", "error", "code"]) {
+      const value = error[key];
+      if (typeof value === "string") {
+        const described = fromString(value);
+        if (described) return described;
+      }
+    }
+  }
+  return STOP_FAILURE_FALLBACK;
+};
+var permissionDeniedAction = (toolName) => {
+  const tool = asString(toolName);
+  return tool ? `Auto-mode blocked ${tool}` : "Auto-mode blocked a tool call";
+};
 var sessionIdentityOf = (payload) => {
   const sessionId = asString(payload.session_id);
   const agentId = asString(payload.agent_id);
@@ -356,11 +404,16 @@ export {
   deriveAction,
   deriveBlocker,
   AGENT_IDENTITIES,
+  TEAMMATE_IDLE_ACTION,
   summarizeStop,
   subagentStopSummary,
   compactionAction,
   sessionStartAction,
   sessionEndAction,
   taskTitleFrom,
+  notificationTypeOf,
+  notificationAction,
+  describeStopFailure,
+  permissionDeniedAction,
   sessionIdentityOf
 };

package/dist/{chunk-YXDYKECP.js → chunk-5HGLZGI4.js}

@@ -13,14 +13,18 @@ import {
   savePendingCommand,
   sendNotification,
   waitForAnswer
-} from "./chunk-F7OURW3C.js";
+} from "./chunk-RER3FRTD.js";
 import {
   AGENT_IDENTITIES,
+  TEAMMATE_IDLE_ACTION,
   compactionAction,
   deriveReceiptMeta,
   deriveToolTarget,
+  describeStopFailure,
   describeToolCall,
   isToolResultError,
+  notificationAction,
+  notificationTypeOf,
   parseApplyPatchFiles,
   parseApplyPatchOps,
   sessionEndAction,
@@ -30,16 +34,20 @@ import {
   summarizeStop,
   taskTitleFrom,
   toolResultErrorText
-} from "./chunk-L4E2BIJ2.js";
+} from "./chunk-4PE2SQVM.js";
+import {
+  NOTIFICATION_PUSH_TYPES,
+  POSTTOOLUSE_MIRROR_ONLY_TOOLS
+} from "./chunk-Y3UGCQQC.js";
 import {
   getMachineId
-} from "./chunk-2ACC5M7F.js";
+} from "./chunk-NVPYRDCT.js";
 import {
   withRetry
-} from "./chunk-BSZYIAZL.js";
+} from "./chunk-EYRGBYZG.js";
 import {
   reportedInstallSource
-} from "./chunk-JW4KO5AF.js";
+} from "./chunk-ODL52O5V.js";
 import {
   getApiKey,
   getBaseUrl
@@ -55,7 +63,7 @@ import {
   pendingCommandEvents,
   resolveAutoResolveOrigin,
   resolvePolicy
-} from "./chunk-VNMKIJZB.js";
+} from "./chunk-Z6CP5ZZD.js";
 
 // src/policy.ts
 import { createHash } from "crypto";
@@ -174,7 +182,7 @@ var readReusableMode = (apiKey, sessionId, maxAgeMs) => {
   if (Date.now() - last.at >= maxAgeMs) return null;
   return { ...last.state, degraded: false };
 };
-var fetchModeState = async (apiKey, sessionId, reuseWithinMs = 0) => {
+var fetchModeState = async (apiKey, sessionId, reuseWithinMs = 0, signal) => {
   if (reuseWithinMs > 0) {
     const reusable = readReusableMode(apiKey, sessionId, reuseWithinMs);
     if (reusable) return reusable;
@@ -184,7 +192,7 @@ var fetchModeState = async (apiKey, sessionId, reuseWithinMs = 0) => {
     const url = sessionId ? `${baseUrl}/api/mcp/mode?session=${encodeURIComponent(sessionId)}` : `${baseUrl}/api/mcp/mode`;
     const response = await fetch(url, {
       headers: { "Authorization": `Bearer ${apiKey}` },
-      signal: AbortSignal.timeout(3e3)
+      signal: AbortSignal.any([AbortSignal.timeout(3e3), ...signal ? [signal] : []])
     });
     if (!response.ok) {
       return degradedFallback(apiKey, response.status === 401 || response.status === 403);
@@ -284,6 +292,7 @@ var repoKeyFor = (cwd) => {
 
 // src/usage.ts
 import { closeSync, mkdirSync, openSync, readFileSync as readFileSync3, readSync, statSync as statSync2, writeFileSync as writeFileSync2 } from "fs";
+import { createHash as createHash2 } from "crypto";
 import { join as join3 } from "path";
 import { tmpdir as tmpdir2 } from "os";
 var DEFAULT_PRICES = [
@@ -423,10 +432,12 @@ var readLastUserPrompt = (transcriptPath) => {
 };
 var readNewUsage = (transcriptPath, sessionId) => {
   try {
-    const size = statSync2(transcriptPath).size;
+    const file = statSync2(transcriptPath);
+    const size = file.size;
     const path = stateFile(sessionId);
     let state = readState(path);
     if (size < state.offset) state = { ...emptyState(), recentIds: state.recentIds };
+    const startOffset = state.offset;
     let deltaUsd = 0;
     if (size > state.offset) {
       const buffer = readRange(transcriptPath, state.offset, size);
@@ -443,6 +454,18 @@ var readNewUsage = (transcriptPath, sessionId) => {
     writeFileSync2(path, JSON.stringify(state), "utf-8");
     if (state.tokensIn === 0 && state.tokensOut === 0) return null;
     return {
+      // Identical cursor-range reports share an identity across transport retries.
+      // Native message identity distinguishes an in-place rotation of the range.
+      // This does not serialize readers of different, potentially overlapping ranges.
+      eventId: createHash2("sha256").update(JSON.stringify([
+        sessionId,
+        file.dev,
+        file.ino,
+        startOffset,
+        state.offset,
+        state.recentIds.at(-1)
+      ])).digest("hex").slice(0, 32),
+      reportedAt: Date.now(),
       tokensIn: state.tokensIn,
       tokensOut: state.tokensOut,
       costUsd: state.costUsd,
@@ -521,10 +544,10 @@ var phoneDrivenEnv = (base) => ({
 // src/throttle.ts
 import { join as join4 } from "path";
 import { tmpdir as tmpdir3 } from "os";
-import { createHash as createHash2 } from "crypto";
+import { createHash as createHash3 } from "crypto";
 import { existsSync as existsSync3, mkdirSync as mkdirSync2, statSync as statSync3, writeFileSync as writeFileSync3 } from "fs";
 var THROTTLE_DIR = join4(tmpdir3(), "pushary-throttle");
-var markerPath = (key) => join4(THROTTLE_DIR, createHash2("sha256").update(key).digest("hex").slice(0, 16));
+var markerPath = (key) => join4(THROTTLE_DIR, createHash3("sha256").update(key).digest("hex").slice(0, 16));
 var throttlePass = (key, windowMs) => {
   try {
     const path = markerPath(key);
@@ -569,20 +592,21 @@ var pendingQuestionsToSettle = (sessionId, toolUseId) => {
   const settledElsewhere = toolUseId ? listPendingQuestionsForToolUse(sessionId, toolUseId) : [];
   return [.../* @__PURE__ */ new Set([...settledElsewhere, ...listPendingQuestions(sessionId)])];
 };
-var reconcileQuestions = async (sessionId, files) => {
+var reconcileQuestions = async (sessionId, files, signal) => {
   const late = [];
   try {
     if (files.length === 0) return late;
     const apiKey = getApiKey();
+    if (signal) signal = AbortSignal.any([signal, AbortSignal.timeout(2e3)]);
     for (const correlationId of files) {
+      if (signal?.aborted) break;
       try {
-        const answer = await waitForAnswer(apiKey, correlationId, 1e3);
+        const answer = await waitForAnswer(apiKey, correlationId, 1e3, signal);
         if (answer.answered) {
           late.push({ correlationId, value: answer.value });
           continue;
         }
-        await cancelQuestion(apiKey, correlationId).catch(() => {
-        });
+        await cancelQuestion(apiKey, correlationId, signal);
       } catch {
         continue;
       }
@@ -592,7 +616,7 @@ var reconcileQuestions = async (sessionId, files) => {
   }
   return late;
 };
-var reconcilePendingQuestions = (sessionId, toolUseId) => reconcileQuestions(sessionId, pendingQuestionsToSettle(sessionId, toolUseId));
+var reconcilePendingQuestions = (sessionId, toolUseId, signal) => reconcileQuestions(sessionId, pendingQuestionsToSettle(sessionId, toolUseId), signal);
 var describeLateAnswer = (value) => {
   const v = (value ?? "").trim();
   if (v === "yes") return "approved it";
@@ -605,7 +629,7 @@ var buildLateAnswerContext = (late) => {
   const parts = late.map((l) => `you ${describeLateAnswer(l.value)} on your phone`);
   return `Pushary: a permission prompt you were sent was answered late \u2014 ${parts.join("; ")} \u2014 after the terminal already took over. Treat this as the user's latest intent; do not assume the earlier terminal decision matched it.`;
 };
-var notifyLateAnswers = async (apiKey, late, agentName, sessionId) => {
+var notifyLateAnswers = async (apiKey, late, agentName, sessionId, signal) => {
   if (late.length === 0) return;
   const summary = late.map((l) => describeLateAnswer(l.value)).join(", ");
   await sendNotification(apiKey, {
@@ -613,7 +637,7 @@ var notifyLateAnswers = async (apiKey, late, agentName, sessionId) => {
     body: `You ${summary} after the agent had already moved on.`,
     agentName,
     sessionId
-  }, 2500).catch(() => {
+  }, 2500, signal).catch(() => {
   });
 };
 var CLAUDE_CODE_AGENT = { type: "claude_code", label: "Claude Code" };
@@ -687,8 +711,10 @@ var consumesActivityContext = (agentType) => {
   return pendingCommandEvents(source).some((event) => event !== "Stop");
 };
 var detectInstallMode = () => (process.argv[1] ?? "").includes("_npx") ? "npx" : "cli";
-var acknowledgePendingCommand = async (apiKey, baseUrl, commandId, sessionId, machineId, timeoutMs, state = "delivered") => {
+var acknowledgePendingCommand = async (apiKey, baseUrl, commandId, sessionId, machineId, timeoutMs, state = "delivered", signal) => {
   try {
+    signal?.throwIfAborted();
+    if (timeoutMs <= 0) return false;
     const response = await fetch(`${baseUrl}/api/agent/command/ack`, {
       method: "POST",
       headers: {
@@ -702,13 +728,14 @@ var acknowledgePendingCommand = async (apiKey, baseUrl, commandId, sessionId, ma
         state,
         ...state === "failed" ? { failureCode: "consumer_rejected" } : {}
       }),
-      signal: AbortSignal.timeout(timeoutMs)
+      signal: AbortSignal.any([AbortSignal.timeout(timeoutMs), ...signal ? [signal] : []])
     });
     return response.ok;
   } catch {
     return false;
   }
 };
+var ACK_RESERVE_MS = 1500;
 var reportEvent = async (event, options = {}) => {
   const apiKey = options.apiKey ?? getApiKey();
   const baseUrl = getBaseUrl();
@@ -716,7 +743,14 @@ var reportEvent = async (event, options = {}) => {
   const sessionKey = event.sessionId || DEFAULT_SESSION;
   const receiptNamespace = `${apiKey}:${machineId}:${event.agentType}`;
   const clientCanDrain = consumesActivityContext(event.agentType) && options.timeoutMs === void 0;
+  const deadlineMs = options.budgetMs === void 0 ? void 0 : Date.now() + options.budgetMs;
+  const ackReserveMs = deadlineMs === void 0 ? 0 : Math.min(ACK_RESERVE_MS, Math.floor((options.budgetMs ?? 0) * 0.4));
+  const postTimeoutMs = (fallback) => deadlineMs === void 0 ? fallback : Math.max(0, Math.min(fallback, deadlineMs - ackReserveMs - Date.now()));
+  const ackTimeoutMs = (fallback) => deadlineMs === void 0 ? fallback : Math.max(0, Math.min(fallback, deadlineMs - Date.now()));
   return withRetry(async () => {
+    options.signal?.throwIfAborted();
+    const timeoutMs = postTimeoutMs(options.timeoutMs ?? 1e4);
+    if (timeoutMs <= 0) return null;
     const storedCommand = clientCanDrain ? readPendingCommand(sessionKey, receiptNamespace) : null;
     const res = await fetch(`${baseUrl}/api/agent/event`, {
       method: "POST",
@@ -744,11 +778,11 @@ var reportEvent = async (event, options = {}) => {
         ...driverFromEnv(process.env) ? { driver: driverFromEnv(process.env) } : {},
         canDrainCommand: clientCanDrain && !storedCommand,
         ackMode: clientCanDrain && !storedCommand,
-        skipCommandDrain: storedCommand != null
+        skipCommandDrain: options.skipDrain === true || storedCommand != null
       }),
-      signal: AbortSignal.timeout(options.timeoutMs ?? 1e4)
+      signal: AbortSignal.any([AbortSignal.timeout(timeoutMs), ...options.signal ? [options.signal] : []])
     });
-    if (options.requireOk && !res.ok) throw new Error(`/api/agent/event rejected (${res.status})`);
+    if ((options.requireOk || event.usage !== void 0) && !res.ok) throw new Error(`/api/agent/event rejected (${res.status})`);
     try {
       const result = await res.json();
       const withoutPending = () => ({ ...result, pendingCommand: void 0, pendingCommandId: void 0 });
@@ -760,8 +794,9 @@ var reportEvent = async (event, options = {}) => {
           storedCommand.id,
           event.sessionId,
           machineId,
-          options.timeoutMs ?? 1e4,
-          failed ? "failed" : "delivered"
+          ackTimeoutMs(options.timeoutMs ?? 1e4),
+          failed ? "failed" : "delivered",
+          options.signal
         );
         if (!acknowledged) return withoutPending();
         if (storedCommand.delivered || failed) {
@@ -785,7 +820,9 @@ var reportEvent = async (event, options = {}) => {
           result.pendingCommandId,
           event.sessionId,
           machineId,
-          options.timeoutMs ?? 1e4
+          ackTimeoutMs(options.timeoutMs ?? 1e4),
+          "delivered",
+          options.signal
         );
         if (!acknowledged || !markPendingCommandDelivered(sessionKey, result.pendingCommandId, receiptNamespace)) {
           return withoutPending();
@@ -797,13 +834,17 @@ var reportEvent = async (event, options = {}) => {
     }
   }, { maxAttempts: options.maxAttempts ?? 2, baseDelayMs: 300 });
 };
-var NON_GATED_MIRROR_TOOLS = /* @__PURE__ */ new Set(["TodoWrite"]);
+var NON_GATED_MIRROR_TOOLS = new Set(POSTTOOLUSE_MIRROR_ONLY_TOOLS);
+var HOOK_BUDGET_MS = 9e3;
+var DRAINING_REPORT_BUDGET_MS = 8e3;
 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) => {
+  const deadline = Date.now() + HOOK_BUDGET_MS;
+  const signal = AbortSignal.timeout(HOOK_BUDGET_MS);
   try {
     const projectName = basename2(input.cwd ?? process.cwd());
     const action = describeToolCall(input.tool_name, input.tool_input, "event");
@@ -812,8 +853,10 @@ var handlePostToolUse = async (input, agent = CLAUDE_CODE_AGENT) => {
     const isError = isToolResultError(toolResult);
     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, input.tool_use_id);
+    const [liveMode, late] = await Promise.all([
+      fetchModeState(getApiKey(), input.session_id, MODE_REUSE_MS, signal),
+      reconcilePendingQuestions(sessionKey, input.tool_use_id, signal)
+    ]);
     let additionalContext;
     if (late.length > 0 && agent.type === CLAUDE_CODE_AGENT.type) {
       additionalContext = buildLateAnswerContext(late);
@@ -833,7 +876,7 @@ var handlePostToolUse = async (input, agent = CLAUDE_CODE_AGENT) => {
       ...beacon ? { decisionOrigin: beacon.decisionOrigin, toolName: beacon.toolName, toolTarget: beacon.toolTarget } : {},
       meta: receiptsEnabled ? deriveReceiptMeta(lookup.tool, lookup.input, toolResult, input.cwd ?? process.cwd()) : void 0,
       usage: deriveUsage(input.transcript_path, input.session_id)
-    }, { maxAttempts: 1 });
+    }, { maxAttempts: 1, budgetMs: Math.min(DRAINING_REPORT_BUDGET_MS, Math.max(0, deadline - Date.now())), signal });
     const extraReports = [];
     if (throttlePass(`hookactive:${sessionKey}`, HOOK_ACTIVE_WINDOW_MS)) {
       extraReports.push(
@@ -844,7 +887,7 @@ var handlePostToolUse = async (input, agent = CLAUDE_CODE_AGENT) => {
             agentName: `${agent.label} - ${projectName}`,
             sessionId: input.session_id
           },
-          { maxAttempts: 1, timeoutMs: 800 }
+          { maxAttempts: 1, timeoutMs: 800, signal }
         )
       );
     }
@@ -858,13 +901,15 @@ var handlePostToolUse = async (input, agent = CLAUDE_CODE_AGENT) => {
   }
 };
 var handleUserPrompt = async (input, agent = CLAUDE_CODE_AGENT) => {
+  const deadline = Date.now() + HOOK_BUDGET_MS;
+  const signal = AbortSignal.timeout(HOOK_BUDGET_MS);
   try {
     const projectName = basename2(input.cwd ?? process.cwd());
     const sessionKey = input.session_id || DEFAULT_SESSION;
     const titlesEnabled = process.env.PUSHARY_TASK_TITLES !== "off";
     const taskTitle = titlesEnabled ? taskTitleFrom(input.prompt) : void 0;
     if (input.prompt) saveLastPrompt(sessionKey, input.prompt);
-    const late = await reconcilePendingQuestions(sessionKey);
+    const late = await reconcilePendingQuestions(sessionKey, void 0, signal);
     let additionalContext;
     if (late.length > 0 && agent.type === CLAUDE_CODE_AGENT.type) {
       additionalContext = buildLateAnswerContext(late);
@@ -877,7 +922,7 @@ var handleUserPrompt = async (input, agent = CLAUDE_CODE_AGENT) => {
         agentName: `${agent.label} - ${projectName}`,
         sessionId: input.session_id,
         taskTitle
-      }, { maxAttempts: 1, timeoutMs: 800 })
+      }, { maxAttempts: 1, budgetMs: Math.min(DRAINING_REPORT_BUDGET_MS, Math.max(0, deadline - Date.now())), signal })
     ]);
     if (consumesActivityContext(agent.type)) {
       additionalContext = mergeAdditionalContext(additionalContext, reported);
@@ -888,10 +933,12 @@ var handleUserPrompt = async (input, agent = CLAUDE_CODE_AGENT) => {
   }
 };
 var handleStop = async (input, agent = CLAUDE_CODE_AGENT) => {
+  const deadline = Date.now() + HOOK_BUDGET_MS;
+  const signal = AbortSignal.timeout(HOOK_BUDGET_MS);
   try {
     const projectName = basename2(input.cwd ?? process.cwd());
     const sessionKey = input.session_id || DEFAULT_SESSION;
-    const late = await reconcilePendingQuestions(sessionKey);
+    const late = await reconcilePendingQuestions(sessionKey, void 0, signal);
     const tasks = [
       reportEvent({
         event: "session_end",
@@ -900,13 +947,13 @@ var handleStop = async (input, agent = CLAUDE_CODE_AGENT) => {
         action: summarizeStop(input),
         ...sessionIdentityOf(input),
         usage: deriveUsage(input.transcript_path, input.session_id)
-      }, { maxAttempts: 1 })
+      }, { maxAttempts: 1, budgetMs: Math.min(DRAINING_REPORT_BUDGET_MS, Math.max(0, deadline - Date.now())), signal })
     ];
     if (late.length > 0) {
-      tasks.push(notifyLateAnswers(getApiKey(), late, `${agent.label} - ${projectName}`, input.session_id));
+      tasks.push(notifyLateAnswers(getApiKey(), late, `${agent.label} - ${projectName}`, input.session_id, signal));
       for (const l of late) removePendingQuestion(sessionKey, l.correlationId);
     }
-    if (!isDefaultSession(sessionKey)) removePendingSession(sessionKey);
+    if (!isDefaultSession(sessionKey) && listPendingQuestions(sessionKey).length === 0) removePendingSession(sessionKey);
     const [reported] = await Promise.allSettled(tasks);
     const pendingCommand = reported.status === "fulfilled" ? reported.value?.pendingCommand : void 0;
     if (typeof pendingCommand === "string" && pendingCommand.trim().length > 0) {
@@ -931,7 +978,10 @@ var handleSubagentStop = async (input, agent = CLAUDE_CODE_AGENT) => {
       agentName: `${agent.label} - ${projectName}`,
       action: subagentStopSummary(input),
       ...sessionIdentityOf(input)
-    }, { maxAttempts: 1, timeoutMs: SUBAGENT_STOP_REPORT_TIMEOUT_MS });
+      // A subagent's end is a `session_end` like any other as far as the route is
+      // concerned, and this caller discards the response, so without this the
+      // parent's queued instruction is popped and thrown away.
+    }, { maxAttempts: 1, timeoutMs: SUBAGENT_STOP_REPORT_TIMEOUT_MS, skipDrain: true });
   } catch {
   }
 };
@@ -945,7 +995,7 @@ var handleCompaction = async (input, agent = CLAUDE_CODE_AGENT) => {
       agentType: agent.type,
       agentName: `${agent.label} - ${projectName}`,
       action: compactionAction(input.hook_event_name, input.trigger),
-      sessionId: input.session_id
+      ...sessionIdentityOf(input)
     }, { maxAttempts: 1, timeoutMs: COMPACTION_REPORT_TIMEOUT_MS });
   } catch {
   }
@@ -988,14 +1038,39 @@ var handleSessionEnd = async (input, agent = CLAUDE_CODE_AGENT, options = {}) =>
   } catch {
   }
 };
-var NOTIFICATION_PUSH_TYPES = /* @__PURE__ */ new Set(["idle_prompt", "agent_needs_input"]);
 var NOTIFICATION_THROTTLE_MS = 60 * 1e3;
 var handleNotification = async (input, agent = CLAUDE_CODE_AGENT) => {
+  const signal = AbortSignal.timeout(HOOK_BUDGET_MS);
   try {
     const projectName = basename2(input.cwd ?? process.cwd());
-    const notifType = input.notification_type ?? input.type ?? "";
+    const notifType = notificationTypeOf(input) ?? "";
     const sessionKey = input.session_id || DEFAULT_SESSION;
-    if (NOTIFICATION_PUSH_TYPES.has(notifType)) {
+    const teammateIdle = input.hook_event_name === "TeammateIdle";
+    const action = teammateIdle ? TEAMMATE_IDLE_ACTION : notificationAction(input);
+    const failed = !teammateIdle && notifType === "error";
+    await reportEvent({
+      event: teammateIdle ? "teammate_idle" : failed ? "error" : "notification",
+      agentType: agent.type,
+      agentName: `${agent.label} - ${projectName}`,
+      action,
+      sessionId: input.session_id,
+      error: failed ? action : void 0
+      // `timeoutMs` is not decoration. It is this file's way of saying "side
+      // report", and it sets `clientCanDrain` false. Without it this call
+      // advertises itself as able to consume a phone-queued instruction, and the
+      // stored-command replay inside `reportEvent` hands one back, acknowledges it
+      // as delivered and marks the local receipt delivered, to a caller that
+      // discards the return value. The notification hook prints nothing, so the
+      // instruction is destroyed rather than delayed. Hoisting this report out of
+      // the else-branch put every notification type on that path, not just the
+      // quiet ones.
+      //
+      // 2.5s rather than the 4s a side report usually gets: on the push branch
+      // this is followed by a ~3s `fetchModeState` and a 4s `sendNotification`,
+      // and all three have to fit inside Claude Code's 10s Notification budget.
+    }, { maxAttempts: 1, timeoutMs: 2500, signal }).catch(() => {
+    });
+    if (!teammateIdle && NOTIFICATION_PUSH_TYPES.has(notifType)) {
       if (!throttlePass(`notify:${sessionKey}:${notifType}`, NOTIFICATION_THROTTLE_MS)) return;
       let apiKey;
       try {
@@ -1003,61 +1078,24 @@ var handleNotification = async (input, agent = CLAUDE_CODE_AGENT) => {
       } catch {
         return;
       }
-      const mode = await fetchModeState(apiKey, input.session_id, MODE_REUSE_MS).catch(() => null);
+      const mode = await fetchModeState(apiKey, input.session_id, MODE_REUSE_MS, signal).catch(() => null);
       if (mode?.kill || mode?.mode === "terminal_only") return;
       await sendNotification(apiKey, {
         title: `${agent.label} is waiting`,
-        body: (input.message ?? "Your agent is waiting for you.").slice(0, 200),
+        body: input.message ? action.slice(0, 200) : "Your agent is waiting for you.",
         agentName: `${agent.label} - ${projectName}`,
         sessionId: input.session_id,
         // Makes this an `update` server-side, so resolveSiteMode gates it on
         // the wildcard policy too. `info` because nothing finished.
         context: { type: "info" }
-      }, 4e3).catch(() => {
+      }, 4e3, signal).catch(() => {
       });
-      return;
     }
-    await reportEvent({
-      event: notifType === "error" ? "error" : "notification",
-      agentType: agent.type,
-      agentName: `${agent.label} - ${projectName}`,
-      action: input.message ?? input.title ?? "Notification",
-      sessionId: input.session_id,
-      error: notifType === "error" ? input.message ?? input.title : void 0
-    }).catch(() => {
-    });
   } catch {
   }
 };
-var STOPFAILURE_MAX_ERROR_LENGTH = 300;
-var STOPFAILURE_REASONS = {
-  rate_limit: "Rate limited by the API",
-  overloaded: "The API is overloaded right now",
-  authentication_failed: "Authentication failed",
-  billing_error: "A billing error stopped the turn"
-};
-var describeStopFailure = (error) => {
-  const fromString = (s) => {
-    const v = s.trim();
-    if (!v) return void 0;
-    return STOPFAILURE_REASONS[v] ?? v.slice(0, STOPFAILURE_MAX_ERROR_LENGTH);
-  };
-  if (typeof error === "string") {
-    const described = fromString(error);
-    if (described) return described;
-  } else if (error && typeof error === "object") {
-    const e = error;
-    for (const key of ["type", "message", "error", "code"]) {
-      const val = e[key];
-      if (typeof val === "string") {
-        const described = fromString(val);
-        if (described) return described;
-      }
-    }
-  }
-  return "The turn ended on an API error (rate limit, billing, or auth).";
-};
 var handleStopFailure = async (input, agent = CLAUDE_CODE_AGENT) => {
+  const signal = AbortSignal.timeout(HOOK_BUDGET_MS);
   try {
     let apiKey;
     try {
@@ -1066,16 +1104,29 @@ var handleStopFailure = async (input, agent = CLAUDE_CODE_AGENT) => {
       return;
     }
     const projectName = basename2(input.cwd ?? process.cwd());
-    const mode = await fetchModeState(apiKey, input.session_id, MODE_REUSE_MS).catch(() => null);
-    if (mode?.kill || mode?.mode === "terminal_only") return;
     const reason = describeStopFailure(input.error);
+    await reportEvent({
+      event: "turn_error",
+      agentType: agent.type,
+      agentName: `${agent.label} - ${projectName}`,
+      action: reason,
+      error: reason,
+      sessionId: input.session_id
+      // Same reason as the Notification report above, and the same budget shape:
+      // this is followed by a ~3s fetchModeState and a 4s sendNotification inside
+      // Claude Code's 10s StopFailure budget. The stopfailure hook prints nothing,
+      // so without this the phone's queued instruction is taken and destroyed.
+    }, { maxAttempts: 1, timeoutMs: 2500, signal }).catch(() => {
+    });
+    const mode = await fetchModeState(apiKey, input.session_id, MODE_REUSE_MS, signal).catch(() => null);
+    if (mode?.kill || mode?.mode === "terminal_only") return;
     await sendNotification(apiKey, {
       title: `${agent.label} stopped on an error`,
       body: reason,
       agentName: `${agent.label} - ${projectName}`,
       sessionId: input.session_id,
       context: { type: "error", errorMessage: reason }
-    }, 4e3).catch(() => {
+    }, 4e3, signal).catch(() => {
     });
   } catch {
   }
@@ -1101,6 +1152,7 @@ export {
   permissionTimeoutDecision,
   preToolUseTimeoutDecision,
   readLastPrompt,
+  CLAUDE_CODE_AGENT,
   reportEvent,
   settleQuestionsForToolUse,
   handlePostToolUse,

package/dist/{chunk-OSALSIUF.js → chunk-6BIMJIRG.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-BC3VCZ3E.js";
 import {
   resolveInstallSourceFor
-} from "./chunk-JW4KO5AF.js";
+} from "./chunk-ODL52O5V.js";
 import {
   backupFile,
   readJsonSafe,

package/dist/{chunk-UZNKVRLE.js → chunk-6WYL3XIP.js}

@@ -1,6 +1,6 @@
 import {
   readTranscriptPreference
-} from "./chunk-OSALSIUF.js";
+} from "./chunk-6BIMJIRG.js";
 
 // src/transcript-setting.ts
 var fromEnv = () => {

package/dist/{chunk-CELX75MW.js → chunk-BSEAOCCQ.js}

@@ -1,7 +1,7 @@
 import {
   HOOK_BUDGETS,
   OPENCODE_APPROVAL_EVENT
-} from "./chunk-VNMKIJZB.js";
+} from "./chunk-Z6CP5ZZD.js";
 
 // src/opencode-plugin.ts
 var OPENCODE_PLUGIN_MARKER = "pushary-opencode-plugin w1";