agent.libx.js 0.94.17 → 0.94.19

package/dist/index.d.ts

@@ -1,11 +1,11 @@
-import { a as AgentOptions, H as Hooks, h as RunResult, A as Agent } from './Agent-COa80xYy.js';
-export { C as ChatFragment, D as DEFAULT_MUTATING, b as Decision, P as PermissionOptions, c as PermissionPolicy, d as PermissionRule, e as PreToolUseDecision, R as ReasoningEffort, f as RecordingHooks, g as RecordingLifecycle, T as ToolUse, i as ToolUseMeta, j as composeHooks, p as planMode, r as reasoningToChatFragment } from './Agent-COa80xYy.js';
+import { a as AgentOptions, H as Hooks, h as RunResult, A as Agent } from './Agent-DmsB5hzp.js';
+export { C as ChatFragment, D as DEFAULT_MUTATING, b as Decision, P as PermissionOptions, c as PermissionPolicy, d as PermissionRule, e as PreToolUseDecision, R as ReasoningEffort, f as RecordingHooks, g as RecordingLifecycle, T as ToolUse, i as ToolUseMeta, j as composeHooks, p as planMode, r as reasoningToChatFragment } from './Agent-DmsB5hzp.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, h as ToolCall, H as HostBridge, U as UserQuestion, e as MessageContent } from './tools-GPWp7oXq.js';
-export { c as ContentPart, d as HostEvent, M as Message, R as Role, S as SandboxJobRegistry, f as StreamChunk, T as TodoItem, g as Tool, i as ToolContext, j as bashTool, k as contentText, l as defaultTools, m as editTool, n as exitSessionTool, o as imagePart, p as makeContext, q as makeJobTools, r as readTool, t as toWireTools, s as todoWriteTool, u as toolRegistry, v as toolsByName } from './tools-GPWp7oXq.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-C5GuDinb.js';
+import { A as AgentTool, C as ChatLike, a as ChatOptions, b as ChatResponse, h as ToolCall, H as HostBridge, U as UserQuestion, e as MessageContent } from './tools-9AUK6SG2.js';
+export { c as ContentPart, d as HostEvent, M as Message, R as Role, S as SandboxJobRegistry, f as StreamChunk, T as TodoItem, g as Tool, i as ToolContext, j as bashTool, k as contentText, l as defaultTools, m as editTool, n as exitSessionTool, o as imagePart, p as makeContext, q as makeJobTools, r as readTool, t as toWireTools, s as todoWriteTool, u as toolRegistry, v as toolsByName } from './tools-9AUK6SG2.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-D00OuccC.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

@@ -2586,9 +2586,10 @@ function planMode(opts) {
     parameters: { type: "object", required: ["plan"], properties: { plan: { type: "string", description: "the concrete steps you will take" } } },
     async run({ plan }, _ctx) {
       if (opts?.host?.confirm) {
-        const ok = await opts.host.confirm(`Approve this plan?
+        const confirm = opts.host.confirm(`Approve this plan?
 
 ${String(plan ?? "")}`);
+        const ok = await (_ctx?.parkHuman ? _ctx.parkHuman(confirm) : confirm);
         if (!ok) return "Plan not approved. Revise it and call ExitPlanMode again.";
       }
       approved = true;
@@ -2744,7 +2745,8 @@ var AgentOptions = class {
   tools = defaultTools();
   maxSteps = 25;
   // --- automatic kill-switches (always on; protect the API budget against runaway loops/abuse) ---
-  /** Hard ceiling on accumulated tokens (prompt+completion) across the run. 0 = unbounded. */
+  /** Hard ceiling on accumulated tokens (prompt+completion) across the run; cache READS count at 0.1×
+   *  (their real price) so a fat cached context doesn't trip the guard on healthy turns. 0 = unbounded. */
   maxTokens = 2e5;
   /** Wall-clock ceiling in ms for the whole run. 0 = unbounded. */
   timeoutMs = 12e4;
@@ -2846,6 +2848,18 @@ var Agent = class _Agent {
   // the assembled system prompt from the last prepare()
   started = false;
   // session-start lifecycle hook fires once per conversation
+  parkedMs = 0;
+  // cumulative time blocked on the HUMAN (permission/plan prompts) — excluded from the timeout
+  /** Time a human-blocking await (a permission/plan prompt) and bank it in `parkedMs` so idle prompt
+   *  time never trips the wall-clock kill-switch. The agent did no work while parked on the user. */
+  async park(p) {
+    const t = Date.now();
+    try {
+      return await p;
+    } finally {
+      this.parkedMs += Date.now() - t;
+    }
+  }
   /** Force the next `send()`/`run()` to rebuild the system prompt, tools, plan-mode and permission hooks
    *  from `options` — apply mid-conversation changes to `planMode`/`permissions`/`model` etc. (prepare()
    *  is otherwise memoized per conversation). */
@@ -2874,6 +2888,7 @@ var Agent = class _Agent {
     if (this.options.lintOnWrite) this.ctx.lint = checkSyntax;
     this.ctx.ai = this.options.ai;
     this.ctx.model = this.options.model;
+    this.ctx.parkHuman = (p) => this.park(p);
     if (this.options.backgroundJobs) this.ctx.jobs = new SandboxJobRegistry();
   }
   /**
@@ -3019,19 +3034,21 @@ var Agent = class _Agent {
     const usage = { promptTokens: 0, completionTokens: 0, totalTokens: 0, cacheCreationTokens: 0, cacheReadTokens: 0 };
     let usageEstimated = false;
     const start = Date.now();
+    this.parkedMs = 0;
     let toolCallsTotal = 0;
     let lastFp = "";
     let repeats = 0;
     const kill = (finishReason) => {
-      log3.warn(`kill-switch: ${finishReason} (steps=${steps}, tokens=${usage.totalTokens}, ms=${Date.now() - start})`);
+      log3.warn(`kill-switch: ${finishReason} (steps=${steps}, tokens=${usage.totalTokens}, budgetTokens=${Math.round(usage.totalTokens - 0.9 * usage.cacheReadTokens)}, ms=${Date.now() - start - this.parkedMs}${this.parkedMs ? ` +${this.parkedMs} parked` : ""})`);
       this.ctx.jobs?.killAll();
       return { text: lastAssistantText(this.transcript), steps, finishReason, messages: this.transcript, usage, usageEstimated };
     };
     while (true) {
       if (o.signal?.aborted) return kill("aborted");
       if (steps >= o.maxSteps) return kill("max_steps");
-      if (o.timeoutMs && Date.now() - start >= o.timeoutMs) return kill("timeout");
-      if (o.maxTokens && usage.totalTokens >= o.maxTokens) return kill("budget");
+      if (o.timeoutMs && Date.now() - start - this.parkedMs >= o.timeoutMs) return kill("timeout");
+      const budgetTokens = usage.totalTokens - 0.9 * usage.cacheReadTokens;
+      if (o.maxTokens && budgetTokens >= o.maxTokens) return kill("budget");
       steps++;
       this.options.host?.notify?.({ kind: "turn_start", message: `step ${steps}` });
       let res;
@@ -3166,7 +3183,7 @@ var Agent = class _Agent {
     const hooks = this.activeHooks;
     const call = { name: tc.function.name, args };
     const meta = { id: tc.id };
-    const decision = await hooks?.preToolUse?.(call, meta);
+    const decision = await this.park(Promise.resolve(hooks?.preToolUse?.(call, meta)));
     if (decision?.block) {
       const blocked = `Blocked by hook: ${decision.reason ?? "no reason given"}`;
       log3.debug(`${tc.function.name} -> ${blocked}`);
@@ -3208,6 +3225,7 @@ var Agent = class _Agent {
       this.ctx.emit = void 0;
     }
     if (!threw) result = await this.maybeAutoTest(tc.function.name, result);
+    if (images?.length && !result) result = `[${images.length} image${images.length > 1 ? "s" : ""} attached]`;
     const cap = this.options.maxToolResultBytes ?? 0;
     if (!threw && cap > 0 && result.length > cap) {
       const info = { tool: tc.function.name, args };