@livx.cc/agentx 0.99.30 → 0.99.32

package/dist/index.d.ts

@@ -1,14 +1,14 @@
-import { a as AgentOptions, H as Hooks, i as RunResult, A as Agent } from './Agent-DC7FEEjF.js';
-export { C as ChatFragment, b as CompactResult, D as DEFAULT_MUTATING, c as Decision, P as PermissionOptions, d as PermissionPolicy, e as PermissionRule, f as PreToolUseDecision, R as ReasoningEffort, g as RecordingHooks, h as RecordingLifecycle, T as ToolUse, j as ToolUseMeta, k as composeHooks, l as estimateTokens, p as planMode, r as reasoningToChatFragment } from './Agent-DC7FEEjF.js';
+import { a as AgentOptions, H as Hooks, i as RunResult, A as Agent } from './Agent-USp7SIao.js';
+export { C as ChatFragment, b as CompactResult, D as DEFAULT_MUTATING, c as Decision, P as PermissionOptions, d as PermissionPolicy, e as PermissionRule, f as PreToolUseDecision, R as ReasoningEffort, g as RecordingHooks, h as RecordingLifecycle, T as ToolUse, j as ToolUseMeta, k as composeHooks, l as estimateTokens, p as planMode, r as reasoningToChatFragment } from './Agent-USp7SIao.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, j as ToolCall, H as HostBridge, U as UserQuestion, g as MessageContent } from './tools-BZVppx-6.js';
-export { c as ContentPart, d as HostEvent, I as IMAGE_ELIDE_STUB, e as IMAGE_REF_SCHEME, f as ImageRef, M as Message, R as Role, S as SandboxJobRegistry, h as StreamChunk, T as TodoItem, i as Tool, k as ToolContext, l as bashTool, m as clearImageRefs, n as contentBytes, o as contentText, p as defaultTools, q as editTool, r as elideImages, s as elideInlineImages, t as elideStaleImages, u as exitSessionTool, v as expandImagesForSend, w as imagePart, x as imageRefPart, y as imageRefResult, z as makeContext, B as makeJobTools, D as messageHasImage, E as messageHasImageRef, F as messageHasInlineImage, G as mintImageRef, J as parseImageRef, K as readTool, L as remintImageRefs, N as sendBytes, O as sendBytesPer, P as toWireTools, Q as todoWriteTool, V as toolImageRef, W as toolRegistry, X as toolsByName } from './tools-BZVppx-6.js';
+import { A as AgentTool, C as ChatLike, a as ChatOptions, b as ChatResponse, j as ToolCall, H as HostBridge, U as UserQuestion, g as MessageContent } from './tools-Byyh_bae.js';
+export { c as ContentPart, d as HostEvent, I as IMAGE_ELIDE_STUB, e as IMAGE_REF_SCHEME, f as ImageRef, M as Message, R as Role, S as SandboxJobRegistry, h as StreamChunk, T as TodoItem, i as Tool, k as ToolContext, l as bashTool, m as clearImageRefs, n as contentBytes, o as contentText, p as defaultTools, q as editTool, r as elideImages, s as elideInlineImages, t as elideStaleImages, u as exitSessionTool, v as expandImagesForSend, w as imagePart, x as imageRefPart, y as imageRefResult, z as makeContext, B as makeJobTools, D as messageHasImage, E as messageHasImageRef, F as messageHasInlineImage, G as mintImageRef, J as parseImageRef, K as readTool, L as remintImageRefs, N as sendBytes, O as sendBytesPer, P as toWireTools, Q as todoWriteTool, V as toolImageRef, W as toolRegistry, X as toolsByName } from './tools-Byyh_bae.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-Cnq0pS95.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-Bd19NiCL.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

@@ -260,7 +260,13 @@ function stripContent(content, stub) {
   });
   return changed ? out : content;
 }
-var log2, p_sep, IMAGE_ELIDE_STUB, IMAGE_REF_SCHEME, REF_REGISTRY_MAX, refRegistry, isImageRefUrl, bearsImage;
+function endsOnAnnouncedAction(text) {
+  const sentences = text.split(/(?<=[.!?])\s+|\n+/).map((s) => s.trim()).filter(Boolean);
+  const last = sentences[sentences.length - 1];
+  if (!last || NEXT_STEP.test(last)) return false;
+  return ANNOUNCED_ACTION.test(last);
+}
+var log2, p_sep, IMAGE_ELIDE_STUB, IMAGE_REF_SCHEME, REF_REGISTRY_MAX, refRegistry, isImageRefUrl, bearsImage, ANNOUNCED_ACTION, NEXT_STEP;
 var init_llm = __esm({
   "src/llm.ts"() {
     "use strict";
@@ -273,6 +279,8 @@ var init_llm = __esm({
     refRegistry = /* @__PURE__ */ new Map();
     isImageRefUrl = (url) => !!url && url.startsWith(IMAGE_REF_SCHEME);
     bearsImage = (m) => messageHasImage(m.content) || toolImageRef(m.content) != null;
+    ANNOUNCED_ACTION = /^(?:also\s+|now\s+|then\s+)*(?:let me\b|i'?ll\b|i will\b|i'?m going to\b|(?:re-?)?(?:check|search|scan|read|verify|run|inspect|expand|look|examin|continu|proceed|try|fetch|load|open|test|build|grep|find|review|trac|dig|explor)\w*ing\b)/i;
+    NEXT_STEP = /^next (?:step|run|up)\b/i;
   }
 });
 
@@ -1869,20 +1877,23 @@ async function nodeSpawn() {
   return _spawn;
 }
 function makeRealShellTool(options) {
-  const timeoutMs = options.timeoutMs ?? 12e4;
+  const defaultTimeoutMs = options.timeoutMs ?? 12e4;
+  const maxTimeoutMs = Math.max(options.maxTimeoutMs ?? 6e5, defaultTimeoutMs);
   return {
     name: "Shell",
-    description: "Run a shell command via /bin/sh in the working directory. Executes any installed binary \u2014 ls, cat, grep, git, bun, node, curl, scripts, etc. Returns combined stdout+stderr; non-zero exits are prefixed `[exit N]`. Runs non-interactively with no terminal (stdin is /dev/null): commands that prompt for input fail fast rather than hang \u2014 for privileged actions use a non-interactive flag (e.g. `sudo -n`), or ask the user to run the command themselves. Set `background:true` for long-running processes (servers, watchers) \u2014 returns a job id immediately; poll with ShellOutput, stop with ShellKill.",
+    description: `Run a shell command via /bin/sh in the working directory. Executes any installed binary \u2014 ls, cat, grep, git, bun, node, curl, scripts, etc. Returns combined stdout+stderr; non-zero exits are prefixed \`[exit N]\`. Runs non-interactively with no terminal (stdin is /dev/null): commands that prompt for input fail fast rather than hang \u2014 for privileged actions use a non-interactive flag (e.g. \`sudo -n\`), or ask the user to run the command themselves. Each command is killed after ${defaultTimeoutMs}ms (result \`[exit 124]\` with whatever output it produced) \u2014 pass \`timeoutMs\` (max ${maxTimeoutMs}) for a legitimately slower command, and always bound network commands yourself (e.g. \`curl -m 10\`). Set \`background:true\` for long-running processes (servers, watchers) \u2014 returns a job id immediately; poll with ShellOutput, stop with ShellKill.`,
     parameters: {
       type: "object",
       required: ["command"],
       properties: {
         command: { type: "string", description: "the shell command line to execute" },
-        background: { type: "boolean", description: "run detached and return a job id immediately (for servers/watchers/long builds)" }
+        background: { type: "boolean", description: "run detached and return a job id immediately (for servers/watchers/long builds)" },
+        timeoutMs: { type: "number", description: "wall-clock cap for THIS command, overriding the default (clamped to the tool max)" }
       }
     },
-    async run({ command, background }, ctx) {
+    async run({ command, background, timeoutMs: askedTimeoutMs }, ctx) {
       const cmd = String(command ?? "");
+      const timeoutMs = Number.isFinite(askedTimeoutMs) && Number(askedTimeoutMs) > 0 ? Math.min(Number(askedTimeoutMs), maxTimeoutMs) : defaultTimeoutMs;
       if (!cmd.trim()) return "[exit 1] empty command";
       if (background) {
         if (!options.registry) return "Error: background execution is not enabled in this host (no job registry).";
@@ -3579,8 +3590,9 @@ var AgentOptions = class {
   traceDir;
   /** Stream tokens from the model. Takes effect only with a `host.notify`; off => current (non-stream) behavior. */
   stream = false;
-  /** Closure reflex for delegated runtimes (cursor/claude-code): when such a turn ends on a tool call with
-   *  no assistant text after it (the runtime went silent post-work), nudge ONE more step to ANSWER the user
+  /** Closure reflex for delegated runtimes (cursor/claude-code): when such a turn runs tools but never
+   *  closes — no assistant text after the last tool, or text that trails off on an action it announced
+   *  and never took ("Also checking for X.") — nudge ONE more step to ANSWER the user
    *  from the tool results already in the transcript — so the turn delivers a reply instead of trailing off
    *  mid-narration. Deliberately not a "summarize what you did" nudge: that produced process reports and
    *  permission-asking instead of answers (see the nudge text in runLoop).
@@ -4083,7 +4095,7 @@ var Agent = class _Agent {
       }
       if (toolCalls.length === 0) {
         if (this.drainInjections()) continue;
-        if (o.closeDelegatedTurns && res.endedOnToolNoText && !closureNudged && steps < o.maxSteps) {
+        if (o.closeDelegatedTurns && res.endedWithoutClosing && !closureNudged && steps < o.maxSteps) {
           closureNudged = true;
           log6.verbose("delegated turn went silent after a tool \u2014 nudging a closing answer");
           this.transcript.push({
@@ -4190,7 +4202,8 @@ var Agent = class _Agent {
     let usage;
     const delegated = /* @__PURE__ */ new Map();
     const delegatedOrder = [];
-    let endedOnToolNoText = false;
+    let sawTool = false;
+    let trailing = "";
     for await (const chunk of stream) {
       poke?.();
       if (this.options.signal?.aborted) break;
@@ -4210,11 +4223,12 @@ var Agent = class _Agent {
           if (a.output !== void 0) prev.output = a.output;
           prev.status = a.status;
         }
-        endedOnToolNoText = true;
+        sawTool = true;
+        trailing = "";
       }
       if (chunk.content) {
         content += chunk.content;
-        if (chunk.content.trim()) endedOnToolNoText = false;
+        trailing += chunk.content;
         this.options.host.notify({ kind: "text_delta", message: chunk.content });
       }
       if (chunk.finishReason) finishReason = chunk.finishReason;
@@ -4222,7 +4236,8 @@ var Agent = class _Agent {
       if (chunk.usage) usage = chunk.usage;
     }
     const delegatedTools = delegatedOrder.map((k) => delegated.get(k));
-    return { content, ...finishReason ? { finishReason } : {}, ...toolCalls ? { toolCalls } : {}, ...usage ? { usage } : {}, ...delegatedTools.length ? { delegatedTools } : {}, ...endedOnToolNoText ? { endedOnToolNoText: true } : {} };
+    const endedWithoutClosing = sawTool && (!trailing.trim() || endsOnAnnouncedAction(trailing));
+    return { content, ...finishReason ? { finishReason } : {}, ...toolCalls ? { toolCalls } : {}, ...usage ? { usage } : {}, ...delegatedTools.length ? { delegatedTools } : {}, ...endedWithoutClosing ? { endedWithoutClosing: true } : {} };
   }
   async dispatch(tc) {
     const tool = this.activeTools.find((t) => t.name === tc.function.name);