@pushary/agent-hooks 1.7.1 → 1.7.3

package/dist/{chunk-O5PRIYFZ.js → chunk-U4TMAANR.js}

@@ -30,6 +30,8 @@ var truthyLevel = (value) => {
   const parsed = Number(value);
   return Number.isFinite(parsed) ? parsed : 1;
 };
+var ANSI_RESET = "\x1B[0m";
+var ansiPainter = (enabled) => (open) => (text) => enabled() ? `${open}${text}${ANSI_RESET}` : text;
 var useColor = (context = {}, stream = process.stdout) => {
   const forced = truthyLevel(process.env.FORCE_COLOR);
   if (forced !== void 0) return forced > 0;
@@ -103,6 +105,7 @@ var createIo = (stream = process.stdout, context = {}) => {
 export {
   clipToRow,
   terminalColumns,
+  ansiPainter,
   useColor,
   createIo
 };

package/dist/{chunk-WM3U2RUK.js → chunk-U6RVDUJ5.js}

@@ -1,30 +1,42 @@
+import {
+  DEFAULT_SESSION,
+  isDefaultSession,
+  listPendingQuestions,
+  listPendingQuestionsForToolUse,
+  markPendingCommandDelivered,
+  readPendingCommand,
+  removePendingCommand,
+  removePendingQuestion,
+  removePendingSession,
+  savePendingCommand
+} from "./chunk-N6IOSZOE.js";
 import {
   NOTIFICATION_PUSH_TYPES,
   POSTTOOLUSE_MIRROR_ONLY_TOOLS
-} from "./chunk-4C4NRDIC.js";
+} from "./chunk-EUGNVLMG.js";
 import {
   cancelQuestion,
   isPolicyConfig,
   sendNotification,
   waitForAnswer
-} from "./chunk-ZIIYTQHC.js";
+} from "./chunk-YC27PROF.js";
 import {
   clientErrorKindOf,
   reportClientError
-} from "./chunk-KSNAAMU5.js";
+} from "./chunk-N5MZH5A6.js";
 import {
   withRetry
-} from "./chunk-NQFGVAT6.js";
+} from "./chunk-VE7TXLR4.js";
 import {
   getMachineId
-} from "./chunk-P5CBNSYL.js";
+} from "./chunk-OVC5QXN5.js";
 import {
   reportedInstallSource
-} from "./chunk-UPKP67TA.js";
+} from "./chunk-62CVUUNU.js";
 import {
   getApiKey,
   getBaseUrl
-} from "./chunk-OAL44FM2.js";
+} from "./chunk-R6OYCUNK.js";
 import {
   ACTION_BODY_MAX,
   AGENT_LABELS_BY_TYPE,
@@ -48,7 +60,7 @@ import {
   resolveAutoResolveOrigin,
   resolvePolicy,
   toToolLookup
-} from "./chunk-XFNVG3OV.js";
+} from "./chunk-G4GLCLKK.js";
 
 // src/policy.ts
 import { createHash } from "crypto";
@@ -865,190 +877,19 @@ var codexReviewerDenialsSince = (reviews, since) => {
   });
 };
 
-// src/pending.ts
-import { join as join2 } from "path";
-import { homedir, tmpdir as tmpdir2 } from "os";
-import { createHash as createHash2 } from "crypto";
-import { existsSync as existsSync2, mkdirSync, writeFileSync as writeFileSync2, readFileSync as readFileSync2, readdirSync, renameSync, unlinkSync, rmSync, statSync } from "fs";
-var PENDING_DIR = join2(tmpdir2(), "pushary-pending");
-var commandRoot = () => process.env.PUSHARY_COMMAND_DIR?.trim() || join2(homedir(), ".pushary", "run", "commands");
-var DEFAULT_SESSION = "_no_session";
-var GRACE_MS = 10 * 60 * 1e3;
-var sanitize = (sessionId) => sessionId.replace(/[^A-Za-z0-9_-]/g, "_").slice(0, 128) || DEFAULT_SESSION;
-var dirFor = (sessionId) => join2(PENDING_DIR, sanitize(sessionId));
-var commandDirFor = (sessionId, namespace = "") => join2(
-  commandRoot(),
-  createHash2("sha256").update(namespace).digest("hex").slice(0, 16),
-  sanitize(sessionId)
-);
-var legacyCommandFile = (sessionId, namespace = "") => join2(commandDirFor(sessionId, namespace), "command.json");
-var commandFile = (sessionId, id, namespace = "") => join2(commandDirFor(sessionId, namespace), `${createHash2("sha256").update(id).digest("hex")}.json`);
-var readCommandFile = (file) => {
-  try {
-    const value = JSON.parse(readFileSync2(file, "utf-8"));
-    if (typeof value.id !== "string" || typeof value.text !== "string" || typeof value.expiresAtMs !== "number") return null;
-    if (value.expiresAtMs <= Date.now()) {
-      unlinkSync(file);
-      return null;
-    }
-    return {
-      ...value,
-      delivered: value.delivered === true,
-      ...value.failed === true ? { failed: true } : {}
-    };
-  } catch {
-    return null;
-  }
-};
-var readPendingCommandById = (sessionId, id, namespace = "") => {
-  const current = readCommandFile(commandFile(sessionId, id, namespace));
-  if (current?.id === id) return current;
-  const legacy = readCommandFile(legacyCommandFile(sessionId, namespace));
-  return legacy?.id === id ? legacy : null;
-};
-var pruneExpiredCommands = (dir) => {
-  let files;
-  try {
-    files = readdirSync(dir).filter((file) => file.endsWith(".json"));
-  } catch {
-    return [];
-  }
-  return files.flatMap((file) => {
-    const command = readCommandFile(join2(dir, file));
-    return command ? [command] : [];
-  });
-};
-var pruneExpiredCommandStore = () => {
-  let namespaces;
-  try {
-    namespaces = readdirSync(commandRoot(), { withFileTypes: true });
-  } catch {
-    return;
-  }
-  for (const namespace of namespaces.filter((entry) => entry.isDirectory())) {
-    const namespaceDir = join2(commandRoot(), namespace.name);
-    let sessions;
-    try {
-      sessions = readdirSync(namespaceDir, { withFileTypes: true });
-    } catch {
-      continue;
-    }
-    for (const session of sessions.filter((entry) => entry.isDirectory())) {
-      pruneExpiredCommands(join2(namespaceDir, session.name));
-    }
-  }
-};
-var readPendingCommand = (sessionId, namespace = "") => {
-  const commands = pruneExpiredCommands(commandDirFor(sessionId, namespace));
-  return commands.find((command) => !command.delivered && !command.failed) ?? commands[0] ?? null;
-};
-var savePendingCommand = (sessionId, command, namespace = "") => {
-  const dir = commandDirFor(sessionId, namespace);
-  try {
-    mkdirSync(dir, { recursive: true, mode: 448 });
-    pruneExpiredCommandStore();
-    if (readPendingCommandById(sessionId, command.id, namespace)) return false;
-    writeFileSync2(commandFile(sessionId, command.id, namespace), JSON.stringify(command), { encoding: "utf-8", mode: 384, flag: "wx" });
-    return true;
-  } catch {
-    return false;
-  }
-};
-var updatePendingCommand = (sessionId, id, update, namespace = "") => {
-  const command = readPendingCommandById(sessionId, id, namespace);
-  if (!command) return false;
-  const currentFile = commandFile(sessionId, id, namespace);
-  const file = existsSync2(currentFile) ? currentFile : legacyCommandFile(sessionId, namespace);
-  const temporary = `${file}.${process.pid}.tmp`;
-  try {
-    writeFileSync2(temporary, JSON.stringify({ ...command, ...update, text: "" }), { encoding: "utf-8", mode: 384 });
-    renameSync(temporary, file);
-    return true;
-  } catch {
-    try {
-      unlinkSync(temporary);
-    } catch {
-    }
-    return false;
-  }
-};
-var markPendingCommandDelivered = (sessionId, id, namespace = "") => updatePendingCommand(sessionId, id, { delivered: true, failed: void 0 }, namespace);
-var markPendingCommandFailed = (sessionId, id, namespace = "") => updatePendingCommand(sessionId, id, { delivered: false, failed: true }, namespace);
-var removePendingCommand = (sessionId, id, namespace = "") => {
-  if (!readPendingCommandById(sessionId, id, namespace)) return;
-  try {
-    unlinkSync(commandFile(sessionId, id, namespace));
-  } catch {
-  }
-  try {
-    if (readCommandFile(legacyCommandFile(sessionId, namespace))?.id === id) {
-      unlinkSync(legacyCommandFile(sessionId, namespace));
-    }
-  } catch {
-  }
-};
-var isDefaultSession = (sessionId) => sanitize(sessionId) === DEFAULT_SESSION;
-var listPendingQuestionsForToolUse = (sessionId, toolUseId) => {
-  if (!toolUseId) return [];
-  const dir = dirFor(sessionId);
-  let files;
-  try {
-    files = readdirSync(dir);
-  } catch {
-    return [];
-  }
-  return files.filter((name) => {
-    try {
-      return readFileSync2(join2(dir, name), "utf-8") === toolUseId;
-    } catch {
-      return false;
-    }
-  });
-};
-var listPendingQuestions = (sessionId) => {
-  const dir = dirFor(sessionId);
-  let files;
-  try {
-    files = readdirSync(dir);
-  } catch {
-    return [];
-  }
-  if (!isDefaultSession(sessionId)) return files;
-  const cutoff = Date.now() - GRACE_MS;
-  return files.filter((name) => {
-    try {
-      return statSync(join2(dir, name)).mtimeMs < cutoff;
-    } catch {
-      return false;
-    }
-  });
-};
-var removePendingQuestion = (sessionId, correlationId) => {
-  try {
-    unlinkSync(join2(dirFor(sessionId), correlationId));
-  } catch {
-  }
-};
-var removePendingSession = (sessionId) => {
-  try {
-    rmSync(dirFor(sessionId), { recursive: true, force: true });
-  } catch {
-  }
-};
-
 // src/repo.ts
-import { existsSync as existsSync3, readFileSync as readFileSync3, statSync as statSync2 } from "fs";
-import { basename as basename2, dirname, isAbsolute as isAbsolute2, join as join3, resolve as resolve2 } from "path";
+import { existsSync as existsSync2, readFileSync as readFileSync2, statSync } from "fs";
+import { basename as basename2, dirname, isAbsolute as isAbsolute2, join as join2, resolve as resolve2 } from "path";
 var MAX_PARENT_WALK = 64;
 var GIT_FILE_PREFIX = "gitdir:";
 var findGitDir = (startDir) => {
   let current = resolve2(startDir);
   for (let depth = 0; depth < MAX_PARENT_WALK; depth += 1) {
-    const candidate = join3(current, ".git");
+    const candidate = join2(current, ".git");
     try {
-      if (existsSync3(candidate)) {
-        if (statSync2(candidate).isDirectory()) return candidate;
-        const pointer = readFileSync3(candidate, "utf-8").trim();
+      if (existsSync2(candidate)) {
+        if (statSync(candidate).isDirectory()) return candidate;
+        const pointer = readFileSync2(candidate, "utf-8").trim();
         if (pointer.startsWith(GIT_FILE_PREFIX)) {
           const target = pointer.slice(GIT_FILE_PREFIX.length).trim();
           return isAbsolute2(target) ? target : resolve2(current, target);
@@ -1064,7 +905,7 @@ var findGitDir = (startDir) => {
 };
 var configPathFor = (gitDir) => {
   const index = gitDir.replace(/\\/g, "/").indexOf("/worktrees/");
-  return index === -1 ? join3(gitDir, "config") : join3(gitDir.slice(0, index), "config");
+  return index === -1 ? join2(gitDir, "config") : join2(gitDir.slice(0, index), "config");
 };
 var ORIGIN_SECTION = /^\[remote "origin"\]/;
 var SECTION_HEADER = /^\[/;
@@ -1072,9 +913,9 @@ var URL_LINE = /^url\s*=\s*(.+)$/;
 var readOriginRemote = (gitDir) => {
   try {
     const configPath = configPathFor(gitDir);
-    if (!existsSync3(configPath)) return void 0;
+    if (!existsSync2(configPath)) return void 0;
     let inOrigin = false;
-    for (const rawLine of readFileSync3(configPath, "utf-8").split("\n")) {
+    for (const rawLine of readFileSync2(configPath, "utf-8").split("\n")) {
       const line = rawLine.trim();
       if (SECTION_HEADER.test(line)) {
         inOrigin = ORIGIN_SECTION.test(line);
@@ -1121,10 +962,10 @@ var repoKeyFor = (cwd) => {
 };
 
 // src/usage.ts
-import { closeSync, mkdirSync as mkdirSync2, openSync, readFileSync as readFileSync4, readSync, statSync as statSync3, writeFileSync as writeFileSync3 } from "fs";
-import { createHash as createHash3 } from "crypto";
-import { join as join4 } from "path";
-import { tmpdir as tmpdir3 } from "os";
+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 = [
   { match: "opus-4-1", in: 15, out: 75 },
   { match: "opus-4-0", in: 15, out: 75 },
@@ -1159,12 +1000,12 @@ var estimateCostUsd = (usage, model) => {
   const perTokenOut = price.out / 1e6;
   return usage.inputTokens * perTokenIn + usage.outputTokens * perTokenOut + usage.cacheCreationTokens * perTokenIn * CACHE_WRITE_MULTIPLIER + usage.cacheReadTokens * perTokenIn * CACHE_READ_MULTIPLIER;
 };
-var stateDir = () => process.env.PUSHARY_USAGE_DIR?.trim() || join4(tmpdir3(), "pushary-usage");
-var stateFile = (sessionId) => join4(stateDir(), sessionId.replace(/[^a-zA-Z0-9_-]/g, "_"));
+var stateDir = () => process.env.PUSHARY_USAGE_DIR?.trim() || join3(tmpdir2(), "pushary-usage");
+var stateFile = (sessionId) => join3(stateDir(), sessionId.replace(/[^a-zA-Z0-9_-]/g, "_"));
 var emptyState = () => ({ offset: 0, tokensIn: 0, tokensOut: 0, costUsd: 0, recentIds: [] });
 var readState = (path) => {
   try {
-    const parsed = JSON.parse(readFileSync4(path, "utf-8"));
+    const parsed = JSON.parse(readFileSync3(path, "utf-8"));
     if (typeof parsed.offset === "number" && parsed.offset >= 0 && typeof parsed.tokensIn === "number" && typeof parsed.tokensOut === "number" && typeof parsed.costUsd === "number" && Array.isArray(parsed.recentIds)) {
       return {
         offset: parsed.offset,
@@ -1239,7 +1080,7 @@ var extractUserText = (content) => {
 };
 var readLastUserPrompt = (transcriptPath) => {
   try {
-    const size = statSync3(transcriptPath).size;
+    const size = statSync2(transcriptPath).size;
     const start = Math.max(0, size - USER_PROMPT_TAIL_BYTES);
     const lines = readRange(transcriptPath, start, size).toString("utf-8").split("\n");
     for (let i = lines.length - 1; i >= 0; i -= 1) {
@@ -1262,7 +1103,7 @@ var readLastUserPrompt = (transcriptPath) => {
 };
 var readNewUsage = (transcriptPath, sessionId) => {
   try {
-    const file = statSync3(transcriptPath);
+    const file = statSync2(transcriptPath);
     const size = file.size;
     const path = stateFile(sessionId);
     let state = readState(path);
@@ -1280,14 +1121,14 @@ var readNewUsage = (transcriptPath, sessionId) => {
         state.offset += lastNewline + 1;
       }
     }
-    mkdirSync2(stateDir(), { recursive: true });
-    writeFileSync3(path, JSON.stringify(state), "utf-8");
+    mkdirSync(stateDir(), { recursive: true });
+    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: createHash3("sha256").update(JSON.stringify([
+      eventId: createHash2("sha256").update(JSON.stringify([
         sessionId,
         file.dev,
         file.ino,
@@ -1372,57 +1213,58 @@ var phoneDrivenEnv = (base) => ({
 });
 
 // src/throttle.ts
-import { join as join5 } from "path";
-import { tmpdir as tmpdir4 } from "os";
-import { createHash as createHash4 } from "crypto";
-import { existsSync as existsSync4, mkdirSync as mkdirSync3, statSync as statSync4, writeFileSync as writeFileSync4, rmSync as rmSync2 } from "fs";
-var THROTTLE_DIR = join5(tmpdir4(), "pushary-throttle");
-var markerPath = (key) => join5(THROTTLE_DIR, createHash4("sha256").update(key).digest("hex").slice(0, 16));
+import { join as join4 } from "path";
+import { tmpdir as tmpdir3 } from "os";
+import { createHash as createHash3 } from "crypto";
+import { existsSync as existsSync3, mkdirSync as mkdirSync2, statSync as statSync3, writeFileSync as writeFileSync3, rmSync } from "fs";
+var THROTTLE_DIR = join4(tmpdir3(), "pushary-throttle");
+var markerPath = (key) => join4(THROTTLE_DIR, createHash3("sha256").update(key).digest("hex").slice(0, 16));
 var claimThrottle = (key, windowMs) => {
   try {
     const path = markerPath(key);
-    if (existsSync4(path) && Date.now() - statSync4(path).mtimeMs < windowMs) return "throttled";
-    mkdirSync3(THROTTLE_DIR, { recursive: true });
-    writeFileSync4(path, "", "utf-8");
+    if (existsSync3(path) && Date.now() - statSync3(path).mtimeMs < windowMs) return "throttled";
+    mkdirSync2(THROTTLE_DIR, { recursive: true });
+    writeFileSync3(path, "", "utf-8");
     return "passed";
   } catch {
     return "unavailable";
   }
 };
 var releaseThrottle = (key) => {
-  rmSync2(markerPath(key), { force: true });
+  rmSync(markerPath(key), { force: true });
 };
 
 // src/events.ts
-import { basename as basename3, join as join6 } from "path";
-import { existsSync as existsSync5, mkdirSync as mkdirSync4, readFileSync as readFileSync5, statSync as statSync5, writeFileSync as writeFileSync5 } from "fs";
-import { tmpdir as tmpdir5 } from "os";
-var INTENT_DIR = join6(tmpdir5(), "pushary-intent");
+import { basename as basename3, join as join5 } from "path";
+import { existsSync as existsSync4, mkdirSync as mkdirSync3, readFileSync as readFileSync4, statSync as statSync4, writeFileSync as writeFileSync4 } from "fs";
+import { tmpdir as tmpdir4 } from "os";
+var INTENT_DIR = join5(tmpdir4(), "pushary-intent");
 var INTENT_MAX_BYTES = 2048;
 var INTENT_GRACE_MS = 10 * 60 * 1e3;
 var sanitizeSession = (sessionId) => sessionId.replace(/[^A-Za-z0-9_-]/g, "_").slice(0, 128) || DEFAULT_SESSION;
-var intentFile = (sessionId) => join6(INTENT_DIR, sanitizeSession(sessionId));
+var intentFile = (sessionId) => join5(INTENT_DIR, sanitizeSession(sessionId));
 var saveLastPrompt = (sessionId, prompt) => {
   try {
     const trimmed = prompt.replace(/\s+/g, " ").trim().slice(0, INTENT_MAX_BYTES);
     if (!trimmed) return;
-    mkdirSync4(INTENT_DIR, { recursive: true });
-    writeFileSync5(intentFile(sessionId), trimmed, "utf-8");
+    mkdirSync3(INTENT_DIR, { recursive: true });
+    writeFileSync4(intentFile(sessionId), trimmed, "utf-8");
   } catch {
   }
 };
 var readLastPrompt = (sessionId) => {
   try {
     const path = intentFile(sessionId);
-    if (isDefaultSession(sessionId) && statSync5(path).mtimeMs < Date.now() - INTENT_GRACE_MS) return void 0;
-    const value = readFileSync5(path, "utf-8").trim();
+    if (isDefaultSession(sessionId) && statSync4(path).mtimeMs < Date.now() - INTENT_GRACE_MS) return void 0;
+    const value = readFileSync4(path, "utf-8").trim();
     return value.length > 0 ? value : void 0;
   } catch {
     return void 0;
   }
 };
-var pendingQuestionsToSettle = (sessionId, toolUseId) => {
+var pendingQuestionsToSettle = (sessionId, toolUseId, insideSubagent = false) => {
   const settledElsewhere = toolUseId ? listPendingQuestionsForToolUse(sessionId, toolUseId) : [];
+  if (insideSubagent) return settledElsewhere;
   return [.../* @__PURE__ */ new Set([...settledElsewhere, ...listPendingQuestions(sessionId)])];
 };
 var reconcileQuestions = async (sessionId, files, signal) => {
@@ -1478,8 +1320,8 @@ var POLICY_CACHE_TTL_MS = 5 * 60 * 1e3;
 var readFreshCachedPolicy = (apiKey, agentType, sessionId) => {
   const request = policyRequestFor(agentType);
   const path = policyCacheFile(apiKey, request.agent, request.repoAware);
-  if (!existsSync5(path)) return null;
-  const cached = JSON.parse(readFileSync5(path, "utf-8"));
+  if (!existsSync4(path)) return null;
+  const cached = JSON.parse(readFileSync4(path, "utf-8"));
   if (!isPolicyConfig(cached)) return null;
   if ((cached._sessionId ?? null) !== (sessionId ?? null)) return null;
   if (!cached._cachedAt || Date.now() - cached._cachedAt >= POLICY_CACHE_TTL_MS) return null;
@@ -1575,7 +1417,7 @@ var reportEvent = async (event, options = {}) => {
   const machineId = event.machineId ?? getMachineId();
   const sessionKey = event.sessionId || DEFAULT_SESSION;
   const receiptNamespace = `${apiKey}:${machineId}:${event.agentType}`;
-  const clientCanDrain = consumesActivityContext(event.agentType) && options.timeoutMs === void 0;
+  const clientCanDrain = consumesActivityContext(event.agentType) && options.timeoutMs === void 0 && options.skipDrain !== true;
   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()));
@@ -1675,6 +1517,7 @@ var settleQuestionsForToolUse = async (sessionId, toolUseId) => {
   const late = await reconcileQuestions(sessionId, listPendingQuestionsForToolUse(sessionId, toolUseId));
   for (const answer of late) removePendingQuestion(sessionId, answer.correlationId);
 };
+var ranInsideSubagent = (input) => sessionIdentityOf(input).parentSessionId !== void 0;
 var handlePostToolUse = async (input, agent = CLAUDE_CODE_AGENT) => {
   const occurredAt = (/* @__PURE__ */ new Date()).toISOString();
   const deadline = Date.now() + HOOK_BUDGET_MS;
@@ -1687,9 +1530,11 @@ 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 insideSubagent = ranInsideSubagent(input);
+    const questionsToSettle = pendingQuestionsToSettle(sessionKey, input.tool_use_id, insideSubagent);
     const [liveMode, late] = await Promise.all([
       fetchModeState(getApiKey(), input.session_id, MODE_REUSE_MS, signal),
-      reconcilePendingQuestions(sessionKey, input.tool_use_id, signal)
+      reconcileQuestions(sessionKey, questionsToSettle, signal)
     ]);
     let additionalContext;
     if (late.length > 0 && agent.type === CLAUDE_CODE_AGENT.type) {
@@ -1712,7 +1557,12 @@ 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, budgetMs: Math.min(DRAINING_REPORT_BUDGET_MS, Math.max(0, deadline - Date.now())), signal });
+    }, {
+      maxAttempts: 1,
+      budgetMs: Math.min(DRAINING_REPORT_BUDGET_MS, Math.max(0, deadline - Date.now())),
+      signal,
+      skipDrain: insideSubagent
+    });
     const extraReports = [];
     if (claimThrottle(`hookactive:${sessionKey}`, HOOK_ACTIVE_WINDOW_MS) === "passed") {
       extraReports.push(
@@ -1992,13 +1842,6 @@ export {
   isCodexGuardianRolloutHead,
   scanCodexGuardianReviews,
   codexReviewerDenialsSince,
-  DEFAULT_SESSION,
-  readPendingCommandById,
-  readPendingCommand,
-  savePendingCommand,
-  markPendingCommandDelivered,
-  markPendingCommandFailed,
-  removePendingCommand,
   repoKeyFor,
   claimThrottle,
   releaseThrottle,

package/dist/{chunk-KBLIVEFJ.js → chunk-UOQRM7JQ.js}

@@ -3,28 +3,28 @@ import {
   addPusharyToolPermissions,
   isPusharyHook,
   removeClaudeMcpServers
-} from "./chunk-WSC53O7I.js";
+} from "./chunk-G3OMOTJ4.js";
 import {
   CLAUDE_HOOK_EVENTS,
   addGeminiMcpServer,
   removeGeminiMcpServer
-} from "./chunk-WZWXBTRF.js";
+} from "./chunk-MIXWMA73.js";
 import {
   CLAUDE_CODE_AGENT,
   parseApplyPatchFiles
-} from "./chunk-WM3U2RUK.js";
+} from "./chunk-U6RVDUJ5.js";
 import {
   guardBinary,
   holdBudgetOf,
   registerHookEntry
-} from "./chunk-454KMJHF.js";
+} from "./chunk-MZBRL5H5.js";
 import {
   PHONE_ANSWERED_TOOLS,
   hookCompatibleProfile,
   hookCompatibleProfileBySource,
   toToolLookup,
   withHookHoldBudget
-} from "./chunk-XFNVG3OV.js";
+} from "./chunk-G4GLCLKK.js";
 
 // src/compatible-config.ts
 import { homedir } from "os";

package/dist/{chunk-NQFGVAT6.js → chunk-VE7TXLR4.js}

@@ -1,9 +1,12 @@
+import {
+  keyCheckFromResponse
+} from "./chunk-EEEJ2JIL.js";
 import {
   installNetworkDefaults
-} from "./chunk-JTQDP4ZL.js";
+} from "./chunk-DUQO4C4I.js";
 import {
   getBaseUrl
-} from "./chunk-OAL44FM2.js";
+} from "./chunk-R6OYCUNK.js";
 
 // src/retry.ts
 var isRetryable = (err) => {
@@ -35,6 +38,17 @@ var withRetry = async (fn, options = {}) => {
 
 // src/mcp-http.ts
 installNetworkDefaults();
+var SUBSCRIPTION_REQUIRED_MESSAGE = "Pushary MCP error: 403 Subscription required";
+var SubscriptionRequiredError = class extends Error {
+  plan;
+  upgradeUrl;
+  constructor(plan, upgradeUrl) {
+    super(SUBSCRIPTION_REQUIRED_MESSAGE);
+    this.name = "SubscriptionRequiredError";
+    this.plan = plan;
+    this.upgradeUrl = upgradeUrl;
+  }
+};
 var parseSseMessages = (body) => {
   const messages = [];
   for (const event of body.split(/\r?\n\r?\n/)) {
@@ -77,6 +91,8 @@ var sendMcpRequest = async (apiKey, message, options = {}) => {
       body: JSON.stringify(message),
       signal: options.timeoutMs ? AbortSignal.any([AbortSignal.timeout(options.timeoutMs), ...options.signal ? [options.signal] : []]) : options.signal
     });
+    const lock = response.ok ? null : await keyCheckFromResponse(response, baseUrl);
+    if (lock?.kind === "locked") throw new SubscriptionRequiredError(lock.plan, lock.upgradeUrl);
     const body = await response.text();
     const contentType = response.headers.get("content-type");
     let data = null;
@@ -115,6 +131,7 @@ var callMcpTool = async (apiKey, toolName, params, options = {}) => {
 
 export {
   withRetry,
+  SubscriptionRequiredError,
   parseSseMessages,
   sendMcpRequest,
   callMcpTool

package/dist/{chunk-IGBDOZUO.js → chunk-VKVSRCBO.js}

@@ -1,7 +1,7 @@
 import {
   HOOK_HOLD_BUDGET_ENV,
   hookHoldBudgetProof
-} from "./chunk-XFNVG3OV.js";
+} from "./chunk-G4GLCLKK.js";
 
 // src/hold-budget.ts
 var takeHookHoldBudget = (args = process.argv.slice(2), env = process.env) => {

package/dist/{chunk-ZEMSCGDD.js → chunk-VYPJHGG6.js}

@@ -1,6 +1,9 @@
+import {
+  NpmMissingError
+} from "./chunk-MZBRL5H5.js";
 import {
   NPX_LATEST_COMMAND
-} from "./chunk-EIZW73P5.js";
+} from "./chunk-YYCTF4Q5.js";
 
 // src/setup/agent-failure.ts
 var AgentConfigError = class extends Error {
@@ -21,12 +24,14 @@ var AGENT_FAILURE_DETAILS = {
 var describedAgentFailure = (agent, kind) => ({
   agent,
   kind,
-  detail: AGENT_FAILURE_DETAILS[kind]
+  detail: AGENT_FAILURE_DETAILS[kind],
+  remedy: "retry-agent"
 });
 var agentFailureFromError = (agent, error, describeError) => ({
   agent,
   kind: error instanceof AgentConfigError ? error.kind : "installer-error",
-  detail: describeError(error)
+  detail: describeError(error),
+  remedy: error instanceof NpmMissingError ? "install-node" : "retry-agent"
 });
 var retryAgentCommand = (agent) => `${NPX_LATEST_COMMAND} setup --agents ${agent}`;
 var REMAINING_AGENTS_CONTINUE = "Other agents will continue. Re-run setup to retry.";

package/dist/{chunk-YQN7S57T.js → chunk-WGMW7OXW.js}

@@ -2,27 +2,27 @@ import {
   detectProviderLiveCapabilities,
   hasSpawnProvider,
   resolveControlPolicy
-} from "./chunk-Q7QRR6YL.js";
+} from "./chunk-Y4ZH64UK.js";
 import {
   daemonHasRemoteProof,
   daemonServiceManagerAvailable,
   hasDaemonServiceDefinition,
   readDaemonNeedsLogin,
   readDaemonStatus
-} from "./chunk-AAGLDXH4.js";
+} from "./chunk-ZKJ34T2F.js";
 import {
   readControlMode,
   readKeySource
-} from "./chunk-YZKS3ME3.js";
+} from "./chunk-D6OODZCM.js";
 import {
   getMachineId
-} from "./chunk-P5CBNSYL.js";
+} from "./chunk-OVC5QXN5.js";
 import {
   getBaseUrl
-} from "./chunk-OAL44FM2.js";
+} from "./chunk-R6OYCUNK.js";
 import {
   getPackageVersion
-} from "./chunk-XFNVG3OV.js";
+} from "./chunk-G4GLCLKK.js";
 
 // src/machines.ts
 import { hostname } from "os";

package/dist/{chunk-OTZHT34O.js → chunk-WPX67AKT.js}

@@ -1,6 +1,6 @@
 import {
   getBaseUrl
-} from "./chunk-OAL44FM2.js";
+} from "./chunk-R6OYCUNK.js";
 
 // src/transcript-api.ts
 var fetchTranscriptRecipients = async (apiKey, baseUrl = getBaseUrl()) => {