billion-context-pi 0.1.48 → 0.1.49-pr.201.19

package/README.md

@@ -104,6 +104,7 @@ The full delegate result is saved to a file (`/tmp/acp-delegate/<runId>.out`); t
 
 - **Interactive (TUI) & RPC modes**: `async:true` (default) runs the child in the background; a short completion notification is injected into the chat when it finishes.
 - **Print / JSON modes** (`pi -p`, SDK): `async:true` auto-downgrades to **synchronous** — the result returns as the tool result in the same turn (the parent exits after one turn, so background injection would be lost).
+- **Failures are loud, never silent.** A run that fails (nonzero exit, spawn error, watchdog timeout) injects a `FAILED ⚠️` notification carrying a short error excerpt, so a failed delegate cannot hide among sibling completions. If a notification cannot be delivered at all, a recovery notice is attached to the next delegate notification or the next `acp_delegate` / `acp_delegate_wait` / `acp_delegate_cancel` tool result — a dispatched run's failure always reaches the model before it wraps up.
 
 In the **interactive TUI**, async runs also show a live status widget below the editor (agent, elapsed seconds, task preview), so you always know what's running and for how long. Disabled automatically in RPC/print/JSON.
 

package/dist/delegate-tool.d.ts

@@ -104,6 +104,26 @@ declare const WaitParams: Type.TObject<{
 }>;
 export declare function accumulateUsage(a: Usage | undefined, b: Usage): Usage;
 export declare function makeDelegateTool(pi: ExtensionAPI): ToolDefinition<typeof DelegateParams>;
+/** Runs that reached a terminal state but whose result never reached the
+ *  model: no parked waiter, not consumed by a tool result, and never injected
+ *  as a notification. The model was promised a notification ("do NOT keep
+ *  waiting"), so these must eventually be recovered, or a failed delegate
+ *  stays invisible until the very end of the task. */
+export declare function findUndeliveredRuns(all: DelegateRun[], excludeRunId?: string): DelegateRun[];
+/** Compute the recovery notice for undelivered runs WITHOUT marking them
+ *  delivered. The caller commits the marking (covered[].injected = true) only
+ *  after the carrier message is actually sent: if the send throws, the runs
+ *  must stay undelivered so a later carrier can recover them. */
+export declare function buildRecoveryNotice(all: DelegateRun[], excludeRunId?: string): {
+    text: string;
+    covered: DelegateRun[];
+};
+/** Build a recovery notice for undelivered runs and mark each covered run
+ *  injected=true (this notice IS its delivery) so it is never re-notified and
+ *  a later wait dedups instead of re-delivering the payload. For carriers the
+ *  host owns (delegate tool results); injectResult commits the marking itself
+ *  only after its send succeeds (see buildRecoveryNotice). */
+export declare function undeliveredNoticeFrom(all: DelegateRun[], excludeRunId?: string): string;
 /** If the delegate already delivered its result via a system notification
  *  (the close handler injected before this wait was called), return a short
  *  "already delivered" message pointing at the result file, so the model
@@ -143,5 +163,5 @@ export declare function buildChildArgs(args: DelegateArgs, rolePrompt: string, c
     isAsync: boolean;
     useJsonStream: boolean;
 }>;
-export declare function injectResult(pi: ExtensionAPI, agent: string, runId: string, task: string, code: number | null, file: string, timedOut?: string, usage?: Usage, mode?: "merged" | "separate", usageAlreadyReported?: boolean): boolean;
+export declare function injectResult(pi: ExtensionAPI, agent: string, runId: string, task: string, code: number | null, file: string, timedOut?: string, usage?: Usage, mode?: "merged" | "separate", usageAlreadyReported?: boolean, body?: string): boolean;
 export {};

package/dist/index.js

@@ -3753,6 +3753,15 @@ function extractText(content) {
 function stripRefTag(text) {
   return text.replace(REF_TAG, "").replace(TRAILING_REF_TAG, "");
 }
+function countImageBlocks(content) {
+  if (!Array.isArray(content)) return 0;
+  let n = 0;
+  for (const block of content) {
+    const b = block;
+    if (b?.type === "image") n++;
+  }
+  return n;
+}
 function messageIdentity(message) {
   return JSON.stringify(normalizeIdentityValue(message, true));
 }
@@ -9172,12 +9181,29 @@ function collectCoveredMessageIds(state) {
   }
   return ids;
 }
-function estimateTokens(messages, coveredIds) {
+var IMAGE_TOKEN_COST = 1600;
+function modelSupportsImages(model) {
+  const input = model?.input;
+  return Array.isArray(input) && input.includes("image");
+}
+function collectImageTokens(entries, visionCapable) {
+  const out = /* @__PURE__ */ new Map();
+  if (!visionCapable) return out;
+  for (const e of entries) {
+    if (e.type !== "message") continue;
+    const n = countImageBlocks(e.message?.content);
+    if (n > 0) out.set(e.id, n * IMAGE_TOKEN_COST);
+  }
+  return out;
+}
+function estimateTokens(messages, coveredIds, imageTokensById) {
   let tokens = 0;
   for (const m of messages) {
     if (m.toolName === "compress") continue;
     if (coveredIds?.has(m.id)) continue;
     tokens += defaultCountTokens(m.text ?? "");
+    const img = imageTokensById?.get(m.id);
+    if (img) tokens += img;
   }
   return tokens;
 }
@@ -9306,12 +9332,13 @@ async function handleCompress(args, runtime, ctx, toolCallId) {
   if (typeof maybeRanges === "string") throw new Error(maybeRanges);
   const ranges = maybeRanges;
   if (ranges.length === 0) return "No ranges provided.";
-  const { state: initialState, coreMessages } = await runtime.stateFor(ctx);
+  const { state: initialState, coreMessages, entries } = await runtime.stateFor(ctx);
   const config = runtime.configFor(ctx);
   const modelId = ctx.model?.id ?? "default";
   const systemPromptText = getSystemPromptText(ctx);
   const systemPromptTokens = systemPromptText ? defaultCountTokens(systemPromptText) : 0;
-  const sentTokens = estimateTokens(coreMessages, collectCoveredMessageIds(initialState)) + systemPromptTokens;
+  const imageTokens = collectImageTokens(entries, modelSupportsImages(ctx.model));
+  const sentTokens = estimateTokens(coreMessages, collectCoveredMessageIds(initialState), imageTokens) + systemPromptTokens;
   const turn = runtime.core.processTurn({
     messages: coreMessages,
     state: initialState,
@@ -9321,7 +9348,7 @@ async function handleCompress(args, runtime, ctx, toolCallId) {
   const state = turn.state;
   const messages = turn.messages;
   const density = runtime.density.densityFor(modelId);
-  const beforeTokens = calibrateTokens(estimateTokens(messages, collectCoveredMessageIds(state)), density);
+  const beforeTokens = calibrateTokens(estimateTokens(messages, collectCoveredMessageIds(state), imageTokens), density);
   const summaryMaxChars = args.summaryMaxChars;
   const topLevelTopic = args.topic;
   debug.event("compress-in", {
@@ -9361,7 +9388,7 @@ async function handleCompress(args, runtime, ctx, toolCallId) {
     config,
     tokenCount: calibrateTokens(sentTokens, density)
   });
-  const afterTokens = calibrateTokens(estimateTokens(afterTurn.messages, collectCoveredMessageIds(applied.state)), density);
+  const afterTokens = calibrateTokens(estimateTokens(afterTurn.messages, collectCoveredMessageIds(applied.state), imageTokens), density);
   const reclaimed = Math.max(0, beforeTokens - afterTokens);
   const newBlocks = applied.state.blocks.slice(-blocksCreated);
   debug.event("compress-out", {
@@ -10414,30 +10441,63 @@ The delegate runs in its own clean pi process \u2014 it does NOT see this conver
       "Delegate to get a focused result in a clean context, or to parallelize independent work.",
       "The sub-agent has NO access to this conversation \u2014 write a fully self-contained task.",
       "Prefer async=true and launch several; results arrive back automatically when each finishes.",
+      "A FAILED notification (\u26A0\uFE0F) means that task produced no usable result \u2014 decide whether to re-dispatch it before wrapping up.",
       "For changes you must apply yourself, delegate read-only investigation (reviewer/researcher/oracle) and keep the main context as the sole writer."
     ],
     parameters: DelegateParams,
     async execute(toolCallId, params, signal, _onUpdate, ctx) {
       const args = params;
-      const outcome = await runDelegate(pi, args, ctx, signal);
+      let outcome = await runDelegate(pi, args, ctx, signal);
+      const notice = undeliveredNotice();
+      if (notice) outcome = `${notice}
+
+${outcome}`;
       return { details: void 0, content: [{ type: "text", text: outcome }] };
     }
   };
 }
 function formatRunResult(run) {
   const timeoutNote = run.timedOut ? ` (timed out: ${run.timedOut})` : "";
-  const header = run.status === "completed" ? `Delegate **${run.agent}** (runId \`${run.runId}\`) completed (exit ${run.exitCode ?? "?"})${timeoutNote}${remainingLineForWait(run.runId)}` : `Delegate **${run.agent}** (runId \`${run.runId}\`) ${run.status} (exit ${run.exitCode ?? "?"})${timeoutNote}${remainingLineForWait(run.runId)}`;
+  const header = run.status === "completed" ? `Delegate **${run.agent}** (runId \`${run.runId}\`) completed (exit ${run.exitCode ?? "?"})${timeoutNote}${remainingLineForWait(run.runId)}` : `Delegate **${run.agent}** (runId \`${run.runId}\`) ${run.status === "failed" ? "FAILED \u26A0\uFE0F" : run.status} (exit ${run.exitCode ?? "?"})${timeoutNote}${remainingLineForWait(run.runId)}`;
   return formatPayload(header, run.result?.file ?? "", run.task, run.result?.body);
 }
 function remainingLineForWait(selfRunId) {
   const remaining = Array.from(runs.values()).filter((r) => r.status === "running" && r.runId !== selfRunId).length;
   return remaining > 0 ? ` ${remaining} delegate${remaining === 1 ? " is" : "s are"} still running.` : "";
 }
+function findUndeliveredRuns(all, excludeRunId) {
+  return all.filter(
+    (r) => r.runId !== excludeRunId && (r.status === "completed" || r.status === "failed") && !r.waiter && !r.consumed && !r.injected
+  );
+}
+function buildRecoveryNotice(all, excludeRunId) {
+  const pending = findUndeliveredRuns(all, excludeRunId);
+  if (pending.length === 0) return { text: "", covered: [] };
+  const anyFailed = pending.some((r) => r.status === "failed");
+  const header = `\u26A0\uFE0F Recovery notice: ${pending.length} earlier delegate result${pending.length === 1 ? "" : "s"} never reached you (notification delivery failed).${anyFailed ? " At least one FAILED \u2014 that task's work is missing; read its result below and decide whether to re-dispatch before concluding." : ""}`;
+  return { text: [header, ...pending.map((r) => formatRunResult(r))].join("\n"), covered: pending };
+}
+function undeliveredNoticeFrom(all, excludeRunId) {
+  const { text, covered } = buildRecoveryNotice(all, excludeRunId);
+  for (const r of covered) r.injected = true;
+  return text;
+}
+function undeliveredNotice(excludeRunId) {
+  return undeliveredNoticeFrom(Array.from(runs.values()), excludeRunId);
+}
+function withUndeliveredNotice(result) {
+  const notice = undeliveredNotice();
+  const first = result.content[0];
+  if (notice && first && first.type === "text") first.text = `${notice}
+
+${first.text}`;
+  return result;
+}
 function injectedWaitMessage(run, runId, remainingLine) {
   if (!run.injected) return null;
   const file = run.result?.file;
   const fileLine = file ? ` If you need details, read the result file: \`${file}\`.` : "";
-  return `Delegate \`${runId}\` already delivered its result via a system notification when it finished \u2014 no need to wait on it again.${remainingLine}${fileLine}`;
+  return `Delegate \`${runId}\` already delivered its result (system notification or recovery notice) when it finished \u2014 no need to wait on it again.${remainingLine}${fileLine}`;
 }
 function buildWaitResult(run, content, mode = "separate", contentType = "text") {
   if (run.usage && !run.usageReported) {
@@ -10472,6 +10532,61 @@ function buildCancelResult(run, content, mode = "separate") {
   return { details: void 0, content: [{ type: "text", text: content }] };
 }
 function makeDelegateWaitTool(_pi) {
+  const exec = async (args, signal) => {
+    const run = runs.get(args.runId);
+    if (!run) {
+      return { details: void 0, content: [{ type: "text", text: `No delegate run with runId \`${args.runId}\`. It may have already been reported or never existed.` }] };
+    }
+    const displayMode = delegateDisplayUsage;
+    if (run.status === "cancelled") {
+      run.consumed = true;
+      return buildWaitResult(run, `Delegate \`${args.runId}\` was cancelled (no result).${remainingLineForWait(args.runId)}`, displayMode);
+    }
+    if (run.status !== "running") {
+      const dedup = injectedWaitMessage(run, args.runId, remainingLineForWait(args.runId));
+      if (dedup) {
+        run.consumed = true;
+        return buildWaitResult(run, dedup, displayMode);
+      }
+      run.consumed = true;
+      if (!run.result) {
+        return buildWaitResult(run, `Delegate \`${args.runId}\` finished but no result is available (persist error).`, displayMode);
+      }
+      return buildWaitResult(run, formatRunResult(run), displayMode);
+    }
+    const timeoutMs = resolveWaitTimeoutMs(args.timeout);
+    if (run.waiter) {
+      return { details: void 0, content: [{ type: "text", text: `Delegate \`${args.runId}\` already has a wait in progress; do not wait on it twice.` }] };
+    }
+    return new Promise((resolve3) => {
+      let settled = false;
+      let timer2;
+      const finish2 = (result) => {
+        if (settled) return;
+        settled = true;
+        run.waiter = void 0;
+        if (timer2) clearTimeout(timer2);
+        signal?.removeEventListener("abort", onAbort);
+        resolve3(result);
+      };
+      const onAbort = () => {
+        finish2({ details: void 0, content: [{ type: "text", text: `Aborted; delegate \`${args.runId}\` is still running in the background. A notification will be injected when it finishes.` }] });
+      };
+      run.waiter = () => {
+        run.consumed = true;
+        if (run.status === "cancelled") {
+          finish2(buildWaitResult(run, `Delegate \`${run.runId}\` was cancelled (no result).${remainingLineForWait(run.runId)}`, displayMode));
+          return;
+        }
+        finish2(buildWaitResult(run, formatRunResult(run), displayMode));
+      };
+      signal?.addEventListener("abort", onAbort);
+      timer2 = setTimeout(
+        () => finish2({ details: void 0, content: [{ type: "text", text: `Failed: delegate \`${args.runId}\` result not ready after ${Math.round(timeoutMs / 1e3)}s. Do NOT keep waiting or retry \u2014 go do other work now. The run continues in the background and a completion notification (with the result file path) will be injected into the chat when it finishes.` }] }),
+        timeoutMs
+      );
+    });
+  };
   return {
     name: "acp_delegate_wait",
     label: "ACP Delegate Wait",
@@ -10483,64 +10598,32 @@ function makeDelegateWaitTool(_pi) {
     ],
     parameters: WaitParams,
     async execute(_toolCallId, params, signal) {
-      const args = params;
-      const run = runs.get(args.runId);
-      if (!run) {
-        return { details: void 0, content: [{ type: "text", text: `No delegate run with runId \`${args.runId}\`. It may have already been reported or never existed.` }] };
-      }
-      const displayMode = delegateDisplayUsage;
-      if (run.status === "cancelled") {
-        run.consumed = true;
-        return buildWaitResult(run, `Delegate \`${args.runId}\` was cancelled (no result).${remainingLineForWait(args.runId)}`, displayMode);
-      }
-      if (run.status !== "running") {
-        const dedup = injectedWaitMessage(run, args.runId, remainingLineForWait(args.runId));
-        if (dedup) {
-          run.consumed = true;
-          return buildWaitResult(run, dedup, displayMode);
-        }
-        run.consumed = true;
-        if (!run.result) {
-          return buildWaitResult(run, `Delegate \`${args.runId}\` finished but no result is available (persist error).`, displayMode);
-        }
-        return buildWaitResult(run, formatRunResult(run), displayMode);
-      }
-      const timeoutMs = resolveWaitTimeoutMs(args.timeout);
-      if (run.waiter) {
-        return { details: void 0, content: [{ type: "text", text: `Delegate \`${args.runId}\` already has a wait in progress; do not wait on it twice.` }] };
-      }
-      return new Promise((resolve3) => {
-        let settled = false;
-        let timer2;
-        const finish2 = (result) => {
-          if (settled) return;
-          settled = true;
-          run.waiter = void 0;
-          if (timer2) clearTimeout(timer2);
-          signal?.removeEventListener("abort", onAbort);
-          resolve3(result);
-        };
-        const onAbort = () => {
-          finish2({ details: void 0, content: [{ type: "text", text: `Aborted; delegate \`${args.runId}\` is still running in the background. A notification will be injected when it finishes.` }] });
-        };
-        run.waiter = () => {
-          run.consumed = true;
-          if (run.status === "cancelled") {
-            finish2(buildWaitResult(run, `Delegate \`${run.runId}\` was cancelled (no result).${remainingLineForWait(run.runId)}`, displayMode));
-            return;
-          }
-          finish2(buildWaitResult(run, formatRunResult(run), displayMode));
-        };
-        signal?.addEventListener("abort", onAbort);
-        timer2 = setTimeout(
-          () => finish2({ details: void 0, content: [{ type: "text", text: `Failed: delegate \`${args.runId}\` result not ready after ${Math.round(timeoutMs / 1e3)}s. Do NOT keep waiting or retry \u2014 go do other work now. The run continues in the background and a completion notification (with the result file path) will be injected into the chat when it finishes.` }] }),
-          timeoutMs
-        );
-      });
+      return withUndeliveredNotice(await exec(params, signal));
     }
   };
 }
 function makeDelegateCancelTool(_pi) {
+  const exec = async (params) => {
+    const { runId } = params;
+    const run = runs.get(runId);
+    if (!run) {
+      return { details: void 0, content: [{ type: "text", text: `Unknown runId "${runId}".` }] };
+    }
+    if (run.status !== "running") {
+      return buildCancelResult(run, `Run ${runId} already ${run.status} (no action).`);
+    }
+    run.status = "cancelled";
+    run.consumed = true;
+    try {
+      run.child?.kill("SIGTERM");
+    } catch (err) {
+      debug.event("delegate-cancel-kill-error", { runId, error: String(err) });
+      logError("delegate", { event: "cancel-kill-error", runId, error: String(err) });
+    }
+    delegateStatusWidget.poke();
+    const displayMode = delegateDisplayUsage;
+    return buildCancelResult(run, `Cancelled ${runId} (${run.agent}).`, displayMode);
+  };
   return {
     name: "acp_delegate_cancel",
     label: "ACP Delegate Cancel",
@@ -10549,25 +10632,7 @@ function makeDelegateCancelTool(_pi) {
     promptGuidelines: [],
     parameters: CancelParams,
     async execute(toolCallId, params) {
-      const { runId } = params;
-      const run = runs.get(runId);
-      if (!run) {
-        return { details: void 0, content: [{ type: "text", text: `Unknown runId "${runId}".` }] };
-      }
-      if (run.status !== "running") {
-        return buildCancelResult(run, `Run ${runId} already ${run.status} (no action).`);
-      }
-      run.status = "cancelled";
-      run.consumed = true;
-      try {
-        run.child?.kill("SIGTERM");
-      } catch (err) {
-        debug.event("delegate-cancel-kill-error", { runId, error: String(err) });
-        logError("delegate", { event: "cancel-kill-error", runId, error: String(err) });
-      }
-      delegateStatusWidget.poke();
-      const displayMode = delegateDisplayUsage;
-      return buildCancelResult(run, `Cancelled ${runId} (${run.agent}).`, displayMode);
+      return withUndeliveredNotice(await exec(params));
     }
   };
 }
@@ -10597,6 +10662,7 @@ async function runDelegate(pi, args, ctx, signal) {
   const runId = `del_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 6)}`;
   debug.event("delegate-spawn", { agent: args.agent, runId, cwd, async: isAsync, useJsonStream, cliArgs });
   logInfo("delegate", { event: "spawn", agent: args.agent, runId, cwd, async: isAsync, useJsonStream, mode: ctx.mode, parentDepth });
+  await mkdir2(OUT_DIR, { recursive: true });
   const child = spawn(
     process.execPath,
     [resolvePiCliEntry(process.argv[1] ?? "", process.env, isPiHost(ctx.sessionManager)), ...cliArgs],
@@ -10628,7 +10694,6 @@ async function runDelegate(pi, args, ctx, signal) {
     );
     const replyFile = join6(OUT_DIR, `${runId}.out`);
     const activityFile = join6(OUT_DIR, `${runId}.activity`);
-    await mkdir2(OUT_DIR, { recursive: true });
     const replyStream = createWriteStream(replyFile, { flags: "a" });
     const activityStream = useJsonStream ? createWriteStream(activityFile, { flags: "a" }) : null;
     const endStream = (s) => new Promise((resolve3) => {
@@ -10721,7 +10786,7 @@ async function runDelegate(pi, args, ctx, signal) {
             return;
           }
           const mode = delegateDisplayUsage;
-          const injected = injectResult(pi, args.agent, runId, args.task, code, file2, run.timedOut, run.usage, mode, run.usageReported);
+          const injected = injectResult(pi, args.agent, runId, args.task, code, file2, run.timedOut, run.usage, mode, run.usageReported, run.status === "failed" ? body2 : void 0);
           if (run.usage && !run.usageReported && (mode === "separate" || injected)) {
             run.usageReported = true;
           }
@@ -10734,7 +10799,7 @@ async function runDelegate(pi, args, ctx, signal) {
           run.finishedAt = Date.now();
           debug.event("delegate-done-error", { runId, error: String(err) });
           logError("delegate", { event: "done-error", runId, agent: args.agent, error: String(err) });
-          run.waiter?.();
+          notifyTerminalFailure(pi, run, `result persistence error: ${String(err)}`);
           delegateStatusWidget.poke();
         }
       })();
@@ -10755,7 +10820,8 @@ async function runDelegate(pi, args, ctx, signal) {
         run.result = { code: null, file: "", body: `spawn error: ${String(err)}` };
         debug.event("delegate-spawn-error", { runId, error: String(err) });
         logError("delegate", { event: "spawn-error", runId, agent: args.agent, error: String(err) });
-        run.waiter?.();
+        if (run.status === "failed") notifyTerminalFailure(pi, run, `spawn error: ${String(err)}`);
+        else run.waiter?.();
         delegateStatusWidget.poke();
       }
     });
@@ -10837,7 +10903,7 @@ function waitForChild(child, signal) {
   });
 }
 function formatSyncResult(agent, runId, task, r, file) {
-  const status = r.timedOut ? "timed out" : r.code === 0 ? "completed" : "failed";
+  const status = r.timedOut ? "timed out" : r.code === 0 ? "completed" : "FAILED \u26A0\uFE0F";
   const header = `Delegate **${agent}** ${status} (runId \`${runId}\`, exit ${r.code ?? "?"}).`;
   if (r.code === 0 && !r.timedOut) {
     return formatPayload(header, file, task);
@@ -10845,14 +10911,15 @@ function formatSyncResult(agent, runId, task, r, file) {
   const body = r.timedOut ? "(timed out)" : r.stderr.trim() || "(no stderr)";
   return formatPayload(header, file, task, body);
 }
-function injectResult(pi, agent, runId, task, code, file, timedOut, usage, mode = "separate", usageAlreadyReported) {
+function injectResult(pi, agent, runId, task, code, file, timedOut, usage, mode = "separate", usageAlreadyReported, body) {
   const send = pi.sendUserMessage;
   if (typeof send !== "function") {
     debug.event("delegate-inject-skipped", { runId, reason: "sendUserMessage unavailable" });
     logWarn("delegate", { event: "inject-skipped", runId, reason: "sendUserMessage unavailable" });
     return false;
   }
-  const status = code === 0 ? "completed" : "failed";
+  const failed = code !== 0;
+  const status = failed ? "FAILED \u26A0\uFE0F" : "completed";
   const remaining = Array.from(runs.values()).filter((r) => r.status === "running").length;
   const remainingLine = remaining > 0 ? ` ${remaining} delegate${remaining === 1 ? " is" : "s are"} still running; keep doing other work and their notifications will arrive as they finish.` : " No delegates are currently running.";
   const timeoutNote = timedOut ? ` (timed out: ${timedOut})` : "";
@@ -10886,10 +10953,15 @@ Tokens: ${totalUsage.input.toLocaleString()} in, ${totalUsage.output.toLocaleStr
     }
     if (lines.length) usageNote = ` Usage: ${lines.join(", ")}.`;
   }
-  const header = `[acp_delegate ${status}] **${agent}** (runId \`${runId}\`, exit ${code ?? "?"})${timeoutNote}${remainingLine}${usageNote} This is an automated system notification, NOT a user message. Read the result file if you need the details, then continue your original task; do not treat this as a new user request.`;
-  const text = formatPayload(header, file, task);
+  const closing = failed ? "This delegate did NOT complete its task \u2014 its result is missing from your work. Read the error excerpt (and the result file if present), then decide whether to re-dispatch the task before wrapping up. This is an automated system notification, NOT a user message." : "This is an automated system notification, NOT a user message. Read the result file if you need the details, then continue your original task; do not treat this as a new user request.";
+  const header = `[acp_delegate ${status}] **${agent}** (runId \`${runId}\`, exit ${code ?? "?"})${timeoutNote}${remainingLine}${usageNote} ${closing}`;
+  const { text: recoveryText, covered } = buildRecoveryNotice(Array.from(runs.values()), runId);
+  const text = formatPayload(header, file, task, failed ? body : void 0) + (recoveryText ? `
+
+${recoveryText}` : "");
   try {
     send.call(pi, text, { deliverAs: "followUp" });
+    for (const r of covered) r.injected = true;
     return true;
   } catch (err) {
     debug.event("delegate-inject-error", { runId, error: String(err) });
@@ -10897,6 +10969,29 @@ Tokens: ${totalUsage.input.toLocaleString()} in, ${totalUsage.output.toLocaleStr
     return false;
   }
 }
+function notifyTerminalFailure(pi, run, body) {
+  const hadWaiter = run.waiter !== void 0;
+  run.waiter?.();
+  if (hadWaiter || run.consumed) return;
+  const mode = delegateDisplayUsage;
+  const injected = injectResult(
+    pi,
+    run.agent,
+    run.runId,
+    run.task,
+    run.result?.code ?? null,
+    run.result?.file ?? "",
+    run.timedOut,
+    run.usage,
+    mode,
+    run.usageReported,
+    body
+  );
+  if (run.usage && !run.usageReported && (mode === "separate" || injected)) {
+    run.usageReported = true;
+  }
+  run.injected = injected;
+}
 function formatPayload(header, file, task, body) {
   const lines = [header, "", `Task: ${truncate2(task, 160)}`];
   if (file) {
@@ -10970,13 +11065,13 @@ function makeStatusTool(runtime) {
   };
 }
 async function handleStatus(args, runtime, ctx) {
-  const { state, coreMessages } = await runtime.stateFor(ctx);
+  const { state, coreMessages, entries } = await runtime.stateFor(ctx);
   const config = runtime.configFor(ctx);
   const coveredIds = collectCoveredMessageIds(state);
   const modelId = ctx.model?.id ?? "default";
   const systemPromptText = getSystemPromptText(ctx);
   const systemPromptTokens = systemPromptText ? defaultCountTokens(systemPromptText) : 0;
-  const sentTokens = estimateTokens(coreMessages, coveredIds) + systemPromptTokens;
+  const sentTokens = estimateTokens(coreMessages, coveredIds, collectImageTokens(entries, modelSupportsImages(ctx.model))) + systemPromptTokens;
   const turn = runtime.core.processTurn({
     messages: coreMessages,
     state,
@@ -11460,12 +11555,14 @@ async function statusReport(runtime, ctx) {
   const realUsage = ctx.getContextUsage?.();
   const systemPromptText = getSystemPromptText(ctx);
   const systemPromptTokens = systemPromptText ? defaultCountTokens(systemPromptText) : 0;
-  const sessionTokens = realUsage?.tokens && realUsage.tokens > 0 ? realUsage.tokens : defaultCountTokens(coreMessages.map((m) => m.text ?? "").join("\n"));
+  const imageTokens = collectImageTokens(entries, modelSupportsImages(ctx.model));
+  const imageTokensTotal = [...imageTokens.values()].reduce((a, b) => a + b, 0);
+  const sessionTokens = realUsage?.tokens && realUsage.tokens > 0 ? realUsage.tokens : defaultCountTokens(coreMessages.map((m) => m.text ?? "").join("\n")) + imageTokensTotal;
   const coveredIds = collectCoveredMessageIds(state);
   const modelId = ctx.model?.id ?? "default";
-  const sentTokens = estimateTokens(coreMessages, coveredIds) + systemPromptTokens;
+  const sentTokens = estimateTokens(coreMessages, coveredIds, imageTokens) + systemPromptTokens;
   const turn = runtime.core.processTurn({ messages: coreMessages, state, config, tokenCount: calibrateTokens(sentTokens, runtime.density.densityFor(modelId)) });
-  const versionStr = "0.1.48" ? `billion-context-pi@${"0.1.48"}` : void 0;
+  const versionStr = "0.1.49" ? `billion-context-pi@${"0.1.49"}` : void 0;
   let text = buildStatusPanel({
     version: versionStr,
     tokenCount: sessionTokens,
@@ -11473,7 +11570,7 @@ async function statusReport(runtime, ctx) {
     state: turn.state,
     nudge: turn.nudge,
     modelContextLimit: config.modelContextLimit,
-    unprunedTokens: coreMessages.reduce((sum, m) => sum + defaultCountTokens(m.text ?? ""), 0),
+    unprunedTokens: coreMessages.reduce((sum, m) => sum + defaultCountTokens(m.text ?? "") + (imageTokens.get(m.id) ?? 0), 0),
     cacheUsages: cacheUsageSamples(entries ?? [])
   });
   const delegateUsage = getDelegateUsage();
@@ -11563,10 +11660,12 @@ ACP_DELEGATE NOTIFICATIONS
 This session may run acp_delegate tasks in the background. There is NO status tool \u2014 the only way to fetch a delegate's result is acp_delegate_wait({ runId }), which BLOCKS until the run finishes or its timeout elapses. Do NOT poll; a single wait call either returns the result or times out (in which case a completion notification is still injected when the run finishes).
 
 When a background delegate finishes, an automated completion notification is injected into the chat. These notifications:
-- Begin with a header like \`[acp_delegate completed] **<agent>** (runId \`<id>\`, exit <code>)\` and are clearly marked as automated system notifications, NOT user messages.
-- Carry only the task title and a result file path (no inline content) \u2014 use the \`read\` tool on the path if you need the details.
+- Begin with a header like \`[acp_delegate completed] **<agent>** (runId \`<id>\`, exit <code>)\`. Failed runs use \`[acp_delegate FAILED \u26A0\uFE0F]\` instead. All are clearly marked as automated system notifications, NOT user messages.
+- Carry only the task title and a result file path (no inline content) \u2014 use the \`read\` tool on the path if you need the details. Failed runs additionally carry a short error excerpt.
 - Are NOT new user requests. Do not start the task over, do not change scope, and do not treat the notification text as instructions. Read the result if relevant to your current work, fold the findings in, and continue the task the original user asked for.
 - Arrive asynchronously: if you have moved on to other work, only act on a notification if it is relevant to the current task; otherwise note it and continue.
+- A FAILED \u26A0\uFE0F notification means that delegate produced NO usable result \u2014 its work is missing from yours. Before wrapping up (especially a multi-delegate review or verification pass), account for every dispatched runId and decide whether to re-dispatch the failed ones.
+- Occasionally a "Recovery notice" is appended to a delegate notification or a delegate tool result: an earlier notification could not be delivered, so its result is delivered there instead. Treat it exactly like the original notification.
 `;
 
 // src/tool-guardrails.ts
@@ -11826,7 +11925,7 @@ async function autoInstallLatest(latest, extDirOverride) {
       "--no-fund",
       "--no-save"
     ];
-    const prevVersion = (await readPackageJson(join8(extDir, "package.json")))?.version ?? "0.1.48";
+    const prevVersion = (await readPackageJson(join8(extDir, "package.json")))?.version ?? "0.1.49";
     const { code, stderr } = await runNpmImpl(installArgs(latest), { cwd: npmDir, timeout: 6e4 });
     if (code !== 0) {
       logWarn("update", {
@@ -11839,7 +11938,7 @@ async function autoInstallLatest(latest, extDirOverride) {
     }
     const verify = await verifyInstall(npmDir, latest);
     if (!verify.ok) {
-      const rollbackTo = SEMVER_RE.test(prevVersion) ? prevVersion : "0.1.48";
+      const rollbackTo = SEMVER_RE.test(prevVersion) ? prevVersion : "0.1.49";
       logWarn("update", { event: "auto-install-verify-failed", latest, reason: verify.reason, rollbackTo });
       const rb = await runNpmImpl(installArgs(rollbackTo), { cwd: npmDir, timeout: 6e4 });
       logInfo("update", { event: "rollback", from: latest, to: rollbackTo, ok: rb.code === 0 });
@@ -11900,7 +11999,7 @@ async function checkForUpdate(autoUpdate, notify) {
     const runtimeVersion = await getRuntimeVersion();
     const latest = await fetchLatestVersion();
     if (!latest) return;
-    const current = runtimeVersion ?? "0.1.48";
+    const current = runtimeVersion ?? "0.1.49";
     const hasUpdate = isNewer(latest, current);
     debug.event("update-check", {
       current,
@@ -11979,7 +12078,7 @@ function wireSessionLifecycle(pi, runtime) {
     const sid = ctx.sessionManager.getSessionId();
     runtime.clearSessionTracking(sid);
     const modelInfo = ctx.model;
-    logInfo("session", { event: "start", sid, cwd: ctx.cwd, debug: runtime.adapter.debug ?? null, version: true ? "0.1.48" : null, model: modelInfo?.id ?? null, modelApi: modelInfo?.api ?? null, contextWindow: modelInfo?.contextWindow ?? null });
+    logInfo("session", { event: "start", sid, cwd: ctx.cwd, debug: runtime.adapter.debug ?? null, version: true ? "0.1.49" : null, model: modelInfo?.id ?? null, modelApi: modelInfo?.api ?? null, contextWindow: modelInfo?.contextWindow ?? null });
     try {
       await runtime.reloadConfig(ctx.cwd);
       setDelegateDisplayUsage(resolveDelegate(runtime.adapter).displayUsage);
@@ -12038,7 +12137,7 @@ function wireContextTransform(pi, runtime) {
       const realUsage = ctx.getContextUsage?.();
       const systemPromptText = getSystemPromptText(ctx);
       const systemPromptTokens = systemPromptText ? defaultCountTokens(systemPromptText) : 0;
-      const sentTokens = estimateTokens(coreMessages, coveredIds) + systemPromptTokens;
+      const sentTokens = estimateTokens(coreMessages, coveredIds, collectImageTokens(entries, modelSupportsImages(ctx.model))) + systemPromptTokens;
       let tokenCount = calibrateTokens(sentTokens, runtime.density.densityFor(modelId));
       if (ov.armed && config.modelContextLimit > 0) {
         ov.armed = false;