@livx.cc/agentx 0.99.74 → 0.99.75

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { a as AgentOptions, H as Hooks, n as RunResult, A as Agent, g as PermissionPolicy } from './Agent-Bs2ufrIU.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-Bs2ufrIU.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';

package/dist/index.js

@@ -4867,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;
@@ -4877,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");
@@ -5036,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) {