@livx.cc/agentx 0.99.73 → 0.99.75

package/dist/index.d.ts

@@ -1,15 +1,15 @@
-import { a as AgentOptions, H as Hooks, n as RunResult, A as Agent, g as PermissionPolicy } from './Agent-CSFGRC-I.js';
-export { C as ChatFragment, b as Classification, c as Classifier, d as CompactResult, D as DEFAULT_MUTATING, e as Decision, M as ModelRouter, f as ModelRouterOptions, P as PermissionOptions, h as PermissionRule, i as PreToolUseDecision, R as ReasoningEffort, j as RecordingHooks, k as RecordingLifecycle, l as RouteDecision, m as RouterState, T as Tier, o as ToolUse, p as ToolUseMeta, q as claudeCodeDisallowedTools, r as composeHooks, s as estimateTokens, t as jevAvailable, u as jevClassifier, v as pickTier, w as planMode, x as reasoningToChatFragment } from './Agent-CSFGRC-I.js';
+import { a as AgentOptions, H as Hooks, n as RunResult, A as Agent, g as PermissionPolicy } from './Agent-BBlKI8uD.js';
+export { C as ChatFragment, b as Classification, c as Classifier, d as CompactResult, D as DEFAULT_MUTATING, e as Decision, M as ModelRouter, f as ModelRouterOptions, P as PermissionOptions, h as PermissionRule, i as PreToolUseDecision, R as ReasoningEffort, j as RecordingHooks, k as RecordingLifecycle, l as RouteDecision, m as RouterState, T as Tier, o as ToolUse, p as ToolUseMeta, q as claudeCodeDisallowedTools, r as composeHooks, s as estimateTokens, t as jevAvailable, u as jevClassifier, v as pickTier, w as planMode, x as reasoningToChatFragment } from './Agent-BBlKI8uD.js';
 export { MODEL_ALIASES, ModelSwitch, ResolveModelSwitchOpts, modelShortLabel, resolveModelAlias, resolveModelSwitch } from './models.js';
 import { IFilesystem, FileMetadata } from '@livx.cc/wcli/core';
 export { CommandExecutor, FileMetadata, IFilesystem, IndexedDbFilesystem, MemFilesystem, registerHeadlessCommands } from '@livx.cc/wcli/core';
 import { BodDB } from '@bod.ee/db';
-import { A as AgentTool, C as ChatLike, a as ChatOptions, b as ChatResponse, r as ToolCall, H as HostBridge, U as UserQuestion, o as MessageContent } from './tools-wVQBhYwm.js';
-export { c as ContentPart, d as HostEvent, I as IMAGE_ELIDE_STUB, e as IMAGE_REF_SCHEME, f as ImageRef, J as JobCtx, g as JobHandle, h as JobInfo, i as JobKind, j as JobNotice, k as JobRegistry, l as JobRegistryOptions, n as JobTrackOptions, M as Message, m as RegistryJobStatus, R as Role, S as SandboxJobRegistry, p as StreamChunk, T as TodoItem, q as Tool, s as ToolContext, t as bashTool, u as clearImageRefs, v as contentBytes, w as contentText, x as defaultTools, y as editTool, z as elideImages, B as elideInlineImages, D as elideStaleImages, E as exitSessionTool, F as expandImagesForSend, G as formatJobNotice, K as imagePart, L as imageRefPart, N as imageRefResult, O as makeContext, P as makeJobTools, Q as messageHasImage, V as messageHasImageRef, W as messageHasInlineImage, X as mintImageRef, Y as parseImageRef, Z as readTool, _ as remintImageRefs, $ as sendBytes, a0 as sendBytesPer, a1 as toWireTools, a2 as todoWriteTool, a3 as toolImageRef, a4 as toolRegistry, a5 as toolsByName } from './tools-wVQBhYwm.js';
+import { A as AgentTool, C as ChatLike, a as ChatOptions, b as ChatResponse, r as ToolCall, H as HostBridge, U as UserQuestion, o as MessageContent } from './tools-lC3jn60o.js';
+export { c as ContentPart, d as HostEvent, I as IMAGE_ELIDE_STUB, e as IMAGE_REF_SCHEME, f as ImageRef, J as JobCtx, g as JobHandle, h as JobInfo, i as JobKind, j as JobNotice, k as JobRegistry, l as JobRegistryOptions, n as JobTrackOptions, M as Message, m as RegistryJobStatus, R as Role, S as SandboxJobRegistry, p as StreamChunk, T as TodoItem, q as Tool, s as ToolContext, t as bashTool, u as clearImageRefs, v as contentBytes, w as contentText, x as defaultTools, y as editTool, z as elideImages, B as elideInlineImages, D as elideStaleImages, E as exitSessionTool, F as expandImagesForSend, G as formatJobNotice, K as imagePart, L as imageRefPart, N as imageRefResult, O as makeContext, P as makeJobTools, Q as messageHasImage, V as messageHasImageRef, W as messageHasInlineImage, X as mintImageRef, Y as parseImageRef, Z as readTool, _ as remintImageRefs, $ as sendBytes, a0 as sendBytesPer, a1 as toWireTools, a2 as todoWriteTool, a3 as toolImageRef, a4 as toolRegistry, a5 as toolsByName } from './tools-lC3jn60o.js';
 import { ShellJobRegistry } from './tools.shell.js';
 import { SpokenSplitter } from '@bod.ee/voice';
 export { AudioSink, AudioSource, AuthProvider, CartesiaTTS, CartesiaTTSOptions, STT_SAMPLE_RATE, SonioxSTT, SonioxSTTOptions, SttLike, TTS_SAMPLE_RATE, TtsLike, VoiceEngine, VoiceEngineOptions, VoiceState, resolveAuth } from '@bod.ee/voice';
-export { M as McpCall, a as McpImage, b as McpRoute, c as McpRouteResolver, d as McpToolResult, e as McpToolSearchOptions, f as McpToolSpec, g as MountedMcpLike, h as buildMcpCatalog, m as makeLazyMcpToolSearch, i as makeMcpToolSearch, j as makeMcpToolSearchFromMounted, k as mcpToolToAgentTool, l as mcpToolsToAgentTools } from './mcp-8_lBApgs.js';
+export { M as McpCall, a as McpImage, b as McpRoute, c as McpRouteResolver, d as McpToolResult, e as McpToolSearchOptions, f as McpToolSpec, g as MountedMcpLike, h as buildMcpCatalog, m as makeLazyMcpToolSearch, i as makeMcpToolSearch, j as makeMcpToolSearchFromMounted, k as mcpToolToAgentTool, l as mcpToolsToAgentTools } from './mcp-BhTxN2I7.js';
 import * as libx_js_src_modules_log from 'libx.js/src/modules/log';
 export { log } from 'libx.js/src/modules/log';
 

package/dist/index.js

@@ -19,134 +19,14 @@ var init_logging = __esm({
 });
 
 // src/imageWire.ts
-import { readFileSync, writeFileSync, statSync, mkdtempSync, rmSync } from "fs";
-import { spawnSync } from "child_process";
-import { createHash } from "crypto";
-import { tmpdir } from "os";
-import { join } from "path";
-import { PNG } from "pngjs";
-import jpeg from "jpeg-js";
-function imageSize(b) {
-  const u16 = (i) => b[i] << 8 | b[i + 1];
-  const le16 = (i) => b[i] | b[i + 1] << 8;
-  const u32 = (i) => (b[i] << 24 >>> 0) + (b[i + 1] << 16) + (b[i + 2] << 8) + b[i + 3];
-  if (b[0] === 137 && b[1] === 80 && b.length >= 24) return { w: u32(16), h: u32(20) };
-  if (b[0] === 71 && b[1] === 73 && b.length >= 10) return { w: le16(6), h: le16(8) };
-  if (b[0] === 255 && b[1] === 216) {
-    for (let i = 2; i + 9 < b.length; ) {
-      if (b[i] !== 255) return null;
-      const m = b[i + 1];
-      if (m >= 192 && m <= 207 && m !== 196 && m !== 200 && m !== 204) return { w: u16(i + 7), h: u16(i + 5) };
-      i += 2 + u16(i + 2);
-    }
-    return null;
-  }
-  if (b.length >= 30 && String.fromCharCode(...b.subarray(8, 12)) === "WEBP") {
-    const kind = String.fromCharCode(...b.subarray(12, 16));
-    if (kind === "VP8X") return { w: 1 + (b[24] | b[25] << 8 | b[26] << 16), h: 1 + (b[27] | b[28] << 8 | b[29] << 16) };
-    if (kind === "VP8 ") return { w: le16(26) & 16383, h: le16(28) & 16383 };
-    if (kind === "VP8L") {
-      const v = b[21] | b[22] << 8 | b[23] << 16 | b[24] << 24;
-      return { w: (v & 16383) + 1, h: (v >> 14 & 16383) + 1 };
-    }
-  }
-  return null;
-}
-function imageNote(what, bytes, dims, why) {
-  return `[image ${what}${dims ? `, ${dims.w}x${dims.h}` : ""}, ${fmtBytes(bytes)} \u2014 not sent: ${why}]`;
-}
-function downscaleJs(buf, maxSide) {
-  let src;
-  try {
-    if (buf[0] === 137 && buf[1] === 80) src = PNG.sync.read(buf);
-    else if (buf[0] === 255 && buf[1] === 216) src = jpeg.decode(buf, { useTArray: true, maxMemoryUsageInMB: 1024 });
-    else return null;
-  } catch (e) {
-    log2.warn("pure-JS image decode failed", e);
-    return null;
-  }
-  const { width: sw, height: sh, data: s } = src;
-  const k = Math.min(1, maxSide / Math.max(sw, sh));
-  const w = Math.max(1, Math.round(sw * k)), h = Math.max(1, Math.round(sh * k));
-  const d = new Uint8Array(w * h * 4);
-  for (let y = 0; y < h; y++) {
-    const y0 = Math.floor(y * sh / h), y1 = Math.max(y0 + 1, Math.floor((y + 1) * sh / h));
-    for (let x = 0; x < w; x++) {
-      const x0 = Math.floor(x * sw / w), x1 = Math.max(x0 + 1, Math.floor((x + 1) * sw / w));
-      let r = 0, g = 0, b = 0, a = 0;
-      for (let yy = y0; yy < y1; yy++) for (let xx = x0; xx < x1; xx++) {
-        const i = (yy * sw + xx) * 4, al = s[i + 3];
-        r += s[i] * al;
-        g += s[i + 1] * al;
-        b += s[i + 2] * al;
-        a += al;
-      }
-      const o = (y * w + x) * 4, n = (y1 - y0) * (x1 - x0), bg = 255 * (n - a / 255);
-      d[o] = (r / 255 + bg) / n;
-      d[o + 1] = (g / 255 + bg) / n;
-      d[o + 2] = (b / 255 + bg) / n;
-      d[o + 3] = 255;
-    }
-  }
-  let out = Buffer.alloc(0);
-  for (const q of [80, 60, 40]) {
-    out = Buffer.from(jpeg.encode({ width: w, height: h, data: d }, q).data);
-    if (out.length <= IMAGE_MAX_BYTES) break;
-  }
-  return out;
-}
-function downscale(path, maxSide) {
-  const dir = mkdtempSync(join(tmpdir(), "agentx-img-"));
-  const out = join(dir, "x.jpg");
-  try {
-    const tries = [
-      ["sips", ["-Z", String(maxSide), "-s", "format", "jpeg", "-s", "formatOptions", "80", path, "--out", out]],
-      ["magick", [path, "-resize", `${maxSide}x${maxSide}>`, "-quality", "80", out]],
-      ["convert", [path, "-resize", `${maxSide}x${maxSide}>`, "-quality", "80", out]]
-    ];
-    for (const [cmd, args] of tries) {
-      const r = spawnSync(cmd, args, { stdio: "ignore", timeout: 15e3 });
-      if (r.status !== 0) continue;
-      try {
-        const o = readFileSync(out);
-        if (o.length <= IMAGE_MAX_BYTES) return o;
-        break;
-      } catch {
-      }
-    }
-    const js = downscaleJs(readFileSync(path), maxSide);
-    if (!js) log2.warn(`could not downscale ${path} (tried sips/magick/convert/pure JS)`);
-    return js;
-  } finally {
-    rmSync(dir, { recursive: true, force: true });
-  }
-}
+import { readFileSync, statSync } from "fs";
+import { imageWireOf, inlineImageForWire, scrubBase64Text, imageSize, imageNote, IMAGE_MAX_SIDE, IMAGE_MAX_BYTES } from "ai.libx.js";
 function remember(id, w) {
   cache.delete(id);
   cache.set(id, w);
   if (cache.size > CACHE_MAX) cache.delete(cache.keys().next().value);
   return w;
 }
-function wireOf(key, buf, mime, label, file) {
-  const dims = imageSize(buf);
-  const fits = buf.length <= IMAGE_MAX_BYTES && (!dims || Math.max(dims.w, dims.h) <= IMAGE_MAX_SIDE);
-  let small = null;
-  if (!fits) {
-    if (file) small = downscale(file, IMAGE_MAX_SIDE);
-    else {
-      const dir = mkdtempSync(join(tmpdir(), "agentx-img-in-"));
-      try {
-        const f = join(dir, `in.${mime.split("/")[1] || "img"}`);
-        writeFileSync(f, buf);
-        small = downscale(f, IMAGE_MAX_SIDE);
-      } finally {
-        rmSync(dir, { recursive: true, force: true });
-      }
-    }
-  }
-  const url = fits ? `data:${mime};base64,${buf.toString("base64")}` : small && small.length <= IMAGE_MAX_BYTES ? `data:image/jpeg;base64,${small.toString("base64")}` : null;
-  return { key, url, note: imageNote(label, buf.length, dims, url ? "this model can't see images" : "too large and it couldn't be downscaled") };
-}
 function imageForWire(path, mime, vision) {
   let st;
   try {
@@ -157,48 +37,30 @@ function imageForWire(path, mime, vision) {
   }
   const key = `${st.mtimeMs}:${st.size}`;
   let hit = cache.get(path);
-  if (!hit || hit.key !== key) hit = remember(path, wireOf(key, readFileSync(path), mime, path, path));
+  if (!hit || hit.key !== key) hit = remember(path, { key, ...imageWireOf(readFileSync(path), mime, path, path) });
   return vision && hit.url ? { url: hit.url } : { note: hit.note };
 }
-function inlineImageForWire(url, vision) {
-  const comma = url.indexOf(",");
-  const mime = url.slice(5, url.indexOf(";"));
-  if (vision && url.length < 3e5) {
-    const b64 = url.slice(comma + 1);
-    const dims = imageSize(Buffer.from(b64.slice(0, 4096), "base64")) ?? imageSize(Buffer.from(b64, "base64"));
-    if (!dims || Math.max(dims.w, dims.h) <= IMAGE_MAX_SIDE) return { url };
-  }
-  const id = `inline:${createHash("sha1").update(url).digest("base64")}`;
-  let hit = cache.get(id);
-  if (!hit) {
-    const buf = Buffer.from(url.slice(comma + 1), "base64");
-    hit = remember(id, wireOf(id, buf, mime, `(${mime})`));
-  }
-  return vision && hit.url ? { url: hit.url } : { note: hit.note };
+function imageTokens(dims) {
+  return dims ? Math.min(IMAGE_TOKENS_MAX, Math.max(1, Math.ceil(dims.w * dims.h / 750))) : IMAGE_TOKENS_MAX;
 }
-function imageWireBytes(path, mime, vision) {
-  const r = imageForWire(path, mime, vision);
-  return !r ? 0 : "url" in r ? r.url.length : r.note.length;
+function wiredImageWeight(r) {
+  if ("note" in r) return r.note.length;
+  const b64 = r.url.slice(r.url.indexOf(",") + 1);
+  return 4 * imageTokens(imageSize(Buffer.from(b64.slice(0, 4096), "base64")));
 }
-function scrubBase64Text(s) {
-  if (s.length < 2e3) return s;
-  const out = s.replace(DATA_URI, (m) => imageNote(m.slice(5, m.indexOf(";")), Math.floor((m.length - m.indexOf(",") - 1) * 3 / 4), null, "base64 is never sent as text")).replace(B64_RUN, (m) => !/[+/]/.test(m) || !/\d/.test(m) ? m : `[base64 data, ${fmtBytes(Math.floor(m.length * 3 / 4))} \u2014 not sent: base64 is never sent as text]`);
-  if (out !== s) log2.warn(`scrubbed base64 from request text (${s.length} \u2192 ${out.length} chars)`);
-  return out;
+function imageWireWeight(path, mime, vision) {
+  const r = imageForWire(path, mime, vision);
+  return r ? wiredImageWeight(r) : 0;
 }
-var log2, IMAGE_MAX_SIDE, IMAGE_MAX_BYTES, fmtBytes, cache, CACHE_MAX, DATA_URI, B64_RUN;
+var log2, cache, CACHE_MAX, IMAGE_TOKENS_MAX;
 var init_imageWire = __esm({
   "src/imageWire.ts"() {
     "use strict";
     init_logging();
     log2 = forComponent("imageWire");
-    IMAGE_MAX_SIDE = 1568;
-    IMAGE_MAX_BYTES = 1e6;
-    fmtBytes = (n) => n >= 1e6 ? `${(n / 1e6).toFixed(1)} MB` : n >= 1e3 ? `${Math.round(n / 1e3)} KB` : `${n} B`;
     cache = /* @__PURE__ */ new Map();
     CACHE_MAX = 8;
-    DATA_URI = /data:image\/[\w.+-]+;base64,[A-Za-z0-9+/=]+/g;
-    B64_RUN = /[A-Za-z0-9+/=]{2000,}/g;
+    IMAGE_TOKENS_MAX = 1600;
   }
 });
 
@@ -396,7 +258,7 @@ function sendBytesPer(messages, keepRecent = 1, vision = true, stub = IMAGE_ELID
 }
 function wireBytes(content, kept, vision, stub) {
   const tool = toolImageRef(content);
-  if (tool) return kept ? imageWireBytes(tool.path, tool.mime, vision) || stub.length : stub.length;
+  if (tool) return kept ? imageWireWeight(tool.path, tool.mime, vision) || stub.length : stub.length;
   if (content == null || typeof content === "string") return contentBytes(content);
   if (kept) {
     let n2 = 0;
@@ -404,7 +266,7 @@ function wireBytes(content, kept, vision, stub) {
       const url = p.type === "image_url" ? p.image_url?.url ?? "" : "";
       const ref = url ? parseImageRef(url) : null;
       const inline = url.startsWith("data:") ? inlineImageForWire(url, vision) : null;
-      n2 += ref ? imageWireBytes(ref.path, ref.mime, vision) : inline ? ("url" in inline ? inline.url : inline.note).length : contentBytes([p]);
+      n2 += ref ? imageWireWeight(ref.path, ref.mime, vision) : inline ? wiredImageWeight(inline) : contentBytes([p]);
     }
     return n2;
   }
@@ -3642,8 +3504,8 @@ ${sections.join("\n\n---\n\n")}`;
 
 // src/subagent.ts
 init_tools();
-import { mkdirSync as mkdirSync2, writeFileSync as writeFileSync2 } from "fs";
-import { join as join4 } from "path";
+import { mkdirSync as mkdirSync2, writeFileSync } from "fs";
+import { join as join3 } from "path";
 
 // src/models.ts
 var MODEL_ALIASES = {
@@ -3840,9 +3702,9 @@ function composeHooks(...list) {
 init_OverlayFilesystem();
 
 // src/worktree.ts
-import { spawnSync as spawnSync2 } from "child_process";
-import { symlinkSync, mkdirSync, statSync as statSync3, readFileSync as readFileSync3, rmSync as rmSync2 } from "fs";
-import { join as join2 } from "path";
+import { spawnSync } from "child_process";
+import { symlinkSync, mkdirSync, statSync as statSync3, readFileSync as readFileSync3, rmSync } from "fs";
+import { join } from "path";
 var VALID_SEGMENT = /^[a-zA-Z0-9._-]+$/;
 var MAX_SLUG_LENGTH = 64;
 var GIT_NO_PROMPT_ENV = { GIT_TERMINAL_PROMPT: "0", GIT_ASKPASS: "" };
@@ -3861,13 +3723,13 @@ function worktreeBranchName(slug2) {
   return `worktree-${flattenSlug(slug2)}`;
 }
 function worktreesDir(repoRoot) {
-  return join2(repoRoot, ".claude", "worktrees");
+  return join(repoRoot, ".claude", "worktrees");
 }
 function worktreePathFor(repoRoot, slug2) {
-  return join2(worktreesDir(repoRoot), flattenSlug(slug2));
+  return join(worktreesDir(repoRoot), flattenSlug(slug2));
 }
 function git(args, cwd) {
-  const r = spawnSync2("git", args, {
+  const r = spawnSync("git", args, {
     cwd,
     stdio: ["ignore", "pipe", "pipe"],
     env: { ...process.env, ...GIT_NO_PROMPT_ENV }
@@ -3880,14 +3742,14 @@ function findGitRoot(from) {
 }
 function readWorktreeHead(worktreePath) {
   try {
-    const gitFile = readFileSync3(join2(worktreePath, ".git"), "utf-8").trim();
+    const gitFile = readFileSync3(join(worktreePath, ".git"), "utf-8").trim();
     const m = gitFile.match(/^gitdir:\s*(.+)$/);
     if (!m) return null;
-    const headPath = join2(m[1], "HEAD");
+    const headPath = join(m[1], "HEAD");
     const head = readFileSync3(headPath, "utf-8").trim();
     const refMatch = head.match(/^ref:\s*(.+)$/);
     if (!refMatch) return head.length === 40 ? head : null;
-    const refPath = join2(m[1], "..", refMatch[1]);
+    const refPath = join(m[1], "..", refMatch[1]);
     try {
       return readFileSync3(refPath, "utf-8").trim();
     } catch {
@@ -3922,8 +3784,8 @@ function getOrCreateWorktree(repoRoot, slug2) {
 }
 function symlinkDirs(repoRoot, worktreePath, dirs) {
   for (const dir of dirs) {
-    const src = join2(repoRoot, dir);
-    const dst = join2(worktreePath, dir);
+    const src = join(repoRoot, dir);
+    const dst = join(worktreePath, dir);
     try {
       statSync3(src);
     } catch {
@@ -3951,7 +3813,7 @@ function cleanupWorktree(repoRoot, slug2, opts) {
   }
   for (const dir of ["node_modules", ".bun"]) {
     try {
-      rmSync2(join2(worktreePath, dir));
+      rmSync(join(worktreePath, dir));
     } catch {
     }
   }
@@ -4063,7 +3925,7 @@ function traceFileFor(dir, label, depth) {
   try {
     mkdirSync2(dir, { recursive: true });
     const id = `${Date.now().toString(36)}-${(traceSeq++).toString(36)}`;
-    return join4(dir, `${id}-d${depth}-${sanitizeSlug(label) || "sub"}.json`);
+    return join3(dir, `${id}-d${depth}-${sanitizeSlug(label) || "sub"}.json`);
   } catch (e) {
     log7.warn(`subagent trace dir unavailable (${dir}) \u2014 running without a trace: ${e instanceof Error ? e.message : String(e)}`);
     return void 0;
@@ -4071,7 +3933,7 @@ function traceFileFor(dir, label, depth) {
 }
 function flushTrace(file, meta, messages, status) {
   try {
-    writeFileSync2(file, JSON.stringify({ ...meta, status, updated: Date.now(), messages }, null, 2));
+    writeFileSync(file, JSON.stringify({ ...meta, status, updated: Date.now(), messages }, null, 2));
   } catch (e) {
     log7.warn(`subagent trace flush failed (${file}): ${e instanceof Error ? e.message : String(e)}`);
   }
@@ -5005,6 +4867,7 @@ var Agent = class _Agent {
     let steps = 0;
     const usage = { promptTokens: 0, completionTokens: 0, totalTokens: 0, cacheCreationTokens: 0, cacheReadTokens: 0 };
     let usageEstimated = false;
+    let spent = 0, prevPrompt = -1, stepPrompt = 0;
     const start = Date.now();
     this.parkedMs = 0;
     this.ctx.needsInput = void 0;
@@ -5015,12 +4878,12 @@ var Agent = class _Agent {
     let closureNudged = false;
     let lastProgressAt = start;
     const kill = (finishReason) => {
-      log8.warn(`kill-switch: ${finishReason} (steps=${steps}, tokens=${usage.totalTokens}, budgetTokens=${Math.round(usage.totalTokens - 0.9 * usage.cacheReadTokens)}, ms=${Date.now() - start - this.parkedMs}${finishReason === "timeout" ? `, idle=${Date.now() - lastProgressAt - this.parkedMs}ms` : ""}${this.parkedMs ? ` +${this.parkedMs} parked` : ""})`);
+      log8.warn(`kill-switch: ${finishReason} (steps=${steps}, tokens=${usage.totalTokens}, budgetTokens=${Math.round(spent)}, ms=${Date.now() - start - this.parkedMs}${finishReason === "timeout" ? `, idle=${Date.now() - lastProgressAt - this.parkedMs}ms` : ""}${this.parkedMs ? ` +${this.parkedMs} parked` : ""})`);
       this.jobs.killAll(`run ended: ${finishReason}`, true);
       const claims = this.survivingClaims();
-      return { text: lastAssistantText(this.transcript), steps, finishReason, messages: this.transcript, usage, usageEstimated, ...claims.length ? { fabricatedToolClaims: claims } : {} };
+      return { text: lastAssistantText(this.transcript), steps, finishReason, messages: this.transcript, usage, usageEstimated, ...finishReason === "budget" ? { budget: { spent: Math.round(spent), limit: o.maxTokens, stepPrompt } } : {}, ...claims.length ? { fabricatedToolClaims: claims } : {} };
     };
-    const overBudget = () => !!o.maxTokens && usage.totalTokens - 0.9 * usage.cacheReadTokens >= o.maxTokens;
+    const overBudget = () => !!o.maxTokens && spent >= o.maxTokens;
     const canNudge = () => steps < o.maxSteps && !overBudget();
     while (true) {
       if (o.signal?.aborted) return kill("aborted");
@@ -5174,6 +5037,14 @@ var Agent = class _Agent {
         usage.totalTokens += res.usage.totalTokens ?? 0;
         usage.cacheCreationTokens += res.usage.cacheCreationTokens ?? 0;
         usage.cacheReadTokens += res.usage.cacheReadTokens ?? 0;
+        const prompt = res.usage.promptTokens ?? 0, cacheRead = res.usage.cacheReadTokens ?? 0;
+        if (prevPrompt < 0) {
+          const u = sent.map((m) => m.role).lastIndexOf("user");
+          prevPrompt = u > 0 ? estimateTokens(sent.slice(0, u)) : 0;
+        }
+        const reused = Math.min(prompt, Math.max(cacheRead, prevPrompt));
+        spent += (res.usage.totalTokens ?? 0) - 0.9 * reused;
+        prevPrompt = stepPrompt = prompt;
       }
       const delegatedTools = res.delegatedTools ?? [];
       if (delegatedTools.length) {