@livx.cc/agentx 0.99.30 → 0.99.32

package/dist/{Agent-DC7FEEjF.d.ts → Agent-USp7SIao.d.ts}

@@ -1,5 +1,5 @@
 import { IFilesystem } from '@livx.cc/wcli/core';
-import { M as Message, H as HostBridge, A as AgentTool, C as ChatLike, g as MessageContent, U as UserQuestion } from './tools-BZVppx-6.js';
+import { M as Message, H as HostBridge, A as AgentTool, C as ChatLike, g as MessageContent, U as UserQuestion } from './tools-Byyh_bae.js';
 
 /**
  * Hooks — deterministic interception points around tool execution, run by the
@@ -325,8 +325,9 @@ declare class AgentOptions {
     traceDir?: string;
     /** Stream tokens from the model. Takes effect only with a `host.notify`; off => current (non-stream) behavior. */
     stream: boolean;
-    /** 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).

package/dist/cli.d.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env bun
-import { H as Hooks, i as RunResult, R as ReasoningEffort, A as Agent } from './Agent-DC7FEEjF.js';
+import { H as Hooks, i as RunResult, R as ReasoningEffort, A as Agent } from './Agent-USp7SIao.js';
 import { IFilesystem } from '@livx.cc/wcli/core';
-import { M as Message, U as UserQuestion, H as HostBridge, c as ContentPart, g as MessageContent } from './tools-BZVppx-6.js';
+import { M as Message, U as UserQuestion, H as HostBridge, c as ContentPart, g as MessageContent } from './tools-Byyh_bae.js';
 
 /**
  * On-disk session store for the CLI: each conversation is one JSON file at

package/dist/cli.js

@@ -258,7 +258,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";
@@ -271,6 +277,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;
   }
 });
 
@@ -2033,20 +2041,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).";
@@ -3614,8 +3625,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).
@@ -4118,7 +4130,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({
@@ -4225,7 +4237,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;
@@ -4245,11 +4258,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;
@@ -4257,7 +4271,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);
@@ -9038,7 +9053,8 @@ The filesystem root '/' is the real machine root \u2014 you have full filesystem
         const list = [...names];
         return `You are agentx (an agent runtime) \u2014 NOT Claude Code or Claude Desktop, which are separate agents with their own config. Your MCP servers are configured in .agent/settings.json or .agent/config.* (this project's .agent/ or ~/.agent/), and their tools are already in your tool list as \`mcp__<server>__<tool>\`.${list.length ? ` Configured MCP servers: ${list.join(", ")}.` : " No MCP servers are currently configured."} When asked which MCPs/tools you have, answer from your own tool list \u2014 never read Claude Code/Desktop config (e.g. ~/.claude.json, claude_desktop_config.json) to answer; those belong to a different agent.`;
       })();
-      const extra = [o.appendSystemPrompt, envNote, cwdNote, shellNote, toneNote, mountNote, mcpNote].filter(Boolean).join("\n\n");
+      const closureNote = isDelegated ? "Never end your turn on an action you only announced. If you say you are about to search, read, check or run something, DO it in the same turn before you stop. Your last message must be the ANSWER \u2014 the result and what it means \u2014 or an explicit statement that you are blocked and why. Narration of what you are about to do is not an ending." : "";
+      const extra = [o.appendSystemPrompt, envNote, cwdNote, shellNote, toneNote, mountNote, mcpNote, closureNote].filter(Boolean).join("\n\n");
       const basePrompt = (() => {
         let p = new AgentOptions().systemPrompt;
         if (!virtual) p = p.replace("operating on a virtual filesystem", "operating on the host filesystem");