@livx.cc/agentx 0.99.126 → 0.99.127

package/dist/cli.d.ts

@@ -1,5 +1,5 @@
 #!/usr/bin/env bun
-import { w as RouterState, H as Hooks, c as AgentOptions, x as RunResult, f as ChatUsage, R as ReasoningEffort, d as ChannelMode, b as Agent } from './secondChannel-B76KLrf7.js';
+import { w as RouterState, H as Hooks, c as AgentOptions, x as RunResult, f as ChatUsage, R as ReasoningEffort, d as ChannelMode, b as Agent } from './secondChannel-CYU9qqwr.js';
 import { IFilesystem } from '@livx.cc/wcli/core';
 import { M as Message, U as UserQuestion, H as HostBridge, c as ContentPart, o as MessageContent } from './tools-DwfeF8VQ.js';
 

package/dist/cli.js

@@ -5326,6 +5326,7 @@ var Agent = class _Agent {
     return texts;
   }
   /** Fold any host-injected messages into the transcript as user turns. Returns true if any landed. */
+  reopen = () => this.drainInjections();
   drainInjections() {
     if (!this.pendingInjections.length) return false;
     for (const content of this.pendingInjections.splice(0)) this.transcript.push({ role: "user", content });
@@ -5596,6 +5597,14 @@ var Agent = class _Agent {
     };
     const overBudget = () => !!o.maxTokens && spent >= o.maxTokens;
     const canNudge = () => steps < o.maxSteps && !overBudget();
+    this.reopen = () => {
+      if (!this.pendingInjections.length) return false;
+      if (steps >= o.maxSteps || overBudget()) {
+        log9.warn(`answer finished with ${this.pendingInjections.length} injection(s) pending and no step/budget left \u2014 they wait for the next run`);
+        return false;
+      }
+      return this.drainInjections();
+    };
     while (true) {
       if (o.signal?.aborted) return kill("aborted");
       if (steps >= o.maxSteps) return kill("max_steps");
@@ -5740,6 +5749,7 @@ var Agent = class _Agent {
         usage.cacheCreationTokens += res.usage.cacheCreationTokens ?? 0;
         usage.cacheReadTokens += res.usage.cacheReadTokens ?? 0;
         const prompt = res.usage.promptTokens ?? 0, cacheRead = res.usage.cacheReadTokens ?? 0;
+        const ctxTokens = res.usage.contextTokens ?? prompt;
         usage.contextTokens = res.usage.contextTokens ?? prompt;
         usage.contextWindow = res.usage.contextWindow || _Agent.contextCap(o);
         if (prevPrompt < 0) {
@@ -5748,7 +5758,7 @@ var Agent = class _Agent {
         }
         const reused = Math.min(prompt, Math.max(cacheRead, prevPrompt));
         spent += (res.usage.totalTokens ?? 0) - 0.9 * reused;
-        prevPrompt = stepPrompt = prompt;
+        prevPrompt = stepPrompt = ctxTokens;
       }
       const delegatedTools = res.delegatedTools ?? [];
       if (delegatedTools.length) {
@@ -5788,7 +5798,7 @@ var Agent = class _Agent {
         });
       }
       if (toolCalls.length === 0) {
-        if (this.drainInjections()) continue;
+        if (this.reopen()) continue;
         if (emptyTurn && o.failEmptyTurns) {
           if (!emptyNudged && canNudge()) {
             emptyNudged = true;
@@ -5826,7 +5836,7 @@ var Agent = class _Agent {
         const drained = await this.jobs.drain(o.signal);
         if (o.signal?.aborted) return kill("aborted");
         if (drained.length) lastProgressAt = Date.now();
-        if (this.drainInjections()) continue;
+        if (this.reopen()) continue;
         this.releaseStaleImages();
         await this.activeHooks?.onStop?.(res.content ?? "");
         const claims = this.survivingClaims();