@livx.cc/agentx 0.99.126 → 0.99.127

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { c as AgentOptions, H as Hooks, x as RunResult, k as Decider, b as Agent, q as PermissionPolicy, G as Gender, L as LineKind, d as ChannelMode, y as SecondChannelOptions, S as SecondChannel } from './secondChannel-B76KLrf7.js';
-export { A as ADVISE_LIMIT, a as AdvisorSetup, C as CC_WRITE_TOOLS, e as ChatFragment, f as ChatUsage, g as Classification, h as Classifier, i as CompactResult, j as ContextFileSpec, D as DEFAULT_MUTATING, l as Decision, M as ModelRouter, m as ModelRouterOptions, P as PLANNER_BLOCKED, n as PLANNER_REFUSAL, o as PLAN_FIRST, p as PermissionOptions, r as PermissionRule, s as PreToolUseDecision, R as ReasoningEffort, t as RecordingHooks, u as RecordingLifecycle, v as RouteDecision, w as RouterState, T as Tier, z as ToolUse, B as ToolUseMeta, W as WRITE_TOOLS, E as advisorFor, F as advisorPrompt, I as ccModeOptions, J as claudeCodeDisallowedTools, K as composeHooks, N as delegatePrompt, O as delegateTools, Q as delegateWorkerFor, U as estimateTokens, V as jevAvailable, X as jevClassifier, Y as loadContextFiles, Z as loadInstructions, _ as makeAdvisor, $ as meterWorkers, a0 as pickTier, a1 as planMode, a2 as plannerBlocks, a3 as reasoningToChatFragment } from './secondChannel-B76KLrf7.js';
+import { c as AgentOptions, H as Hooks, x as RunResult, k as Decider, b as Agent, q as PermissionPolicy, G as Gender, L as LineKind, d as ChannelMode, y as SecondChannelOptions, S as SecondChannel } from './secondChannel-CYU9qqwr.js';
+export { A as ADVISE_LIMIT, a as AdvisorSetup, C as CC_WRITE_TOOLS, e as ChatFragment, f as ChatUsage, g as Classification, h as Classifier, i as CompactResult, j as ContextFileSpec, D as DEFAULT_MUTATING, l as Decision, M as ModelRouter, m as ModelRouterOptions, P as PLANNER_BLOCKED, n as PLANNER_REFUSAL, o as PLAN_FIRST, p as PermissionOptions, r as PermissionRule, s as PreToolUseDecision, R as ReasoningEffort, t as RecordingHooks, u as RecordingLifecycle, v as RouteDecision, w as RouterState, T as Tier, z as ToolUse, B as ToolUseMeta, W as WRITE_TOOLS, E as advisorFor, F as advisorPrompt, I as ccModeOptions, J as claudeCodeDisallowedTools, K as composeHooks, N as delegatePrompt, O as delegateTools, Q as delegateWorkerFor, U as estimateTokens, V as jevAvailable, X as jevClassifier, Y as loadContextFiles, Z as loadInstructions, _ as makeAdvisor, $ as meterWorkers, a0 as pickTier, a1 as planMode, a2 as plannerBlocks, a3 as reasoningToChatFragment } from './secondChannel-CYU9qqwr.js';
 export { MODEL_ALIASES, ModelSwitch, ResolveModelSwitchOpts, latestClaude, 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

@@ -5217,6 +5217,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 });
@@ -5487,6 +5488,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");
@@ -5631,6 +5640,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) {
@@ -5639,7 +5649,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) {
@@ -5679,7 +5689,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;
@@ -5717,7 +5727,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();