@vietor/agent-core 0.7.2 → 0.7.4

package/README.md

@@ -425,7 +425,7 @@ interface Tool {
   readOnly?: boolean;
   description: string;
   parameters: Record<string, unknown>;   // JSON Schema object
-  summaryKeys?: string[];                // parameter keys used for display summary
+  argSummaryKeys?: string[];                // parameter keys used for display summary
   summarizeArgs?: (args: Record<string, unknown>) => string; // custom summary function
   summarizeResult?(result: TextResult): string; // result summary for timeline display
   execute(args: Record<string, unknown>, ctx: ToolContext): Promise<TextResult>;
@@ -436,7 +436,7 @@ interface Tool {
 - `parameters` is passed to the LLM as a JSON Schema to describe the tool's arguments.
 - When the LLM calls a tool, `execute` receives the parsed arguments and a context object.
 - `execute` returns a `TextResult` (`{ content, isError? }`). Expected failures return `toolError(...)` (exported from the package); unexpected errors may throw and are wrapped by the registry.
-- `summaryKeys` / `summarizeArgs` control what appears in the tool log entry's `argsSummary` field.
+- `argSummaryKeys` / `summarizeArgs` control what appears in the tool log entry's `argsSummary` field.
 - `summarizeResult` (optional) returns a short result summary for timeline display. Called after execution with the result; the registry prefixes the wall-clock duration. Falls back to a default summary (byte/line count) when not defined.
 
 ### `ToolContext`

package/dist/create-session.js

@@ -2,7 +2,7 @@ import { createLLM } from "./llm/client.js";
 import { Session } from "./runtime/session.js";
 import { ToolRegistry } from "./tools/registry.js";
 import { MCPServerManager } from "./mcp/manager.js";
-import { TOOL_USE_PROMPT } from "./runtime/prompts.js";
+import { renderToolUsePrompt } from "./runtime/prompts.js";
 import { DEFAULT_MAX_TURNS } from "./util/constants.js";
 import { TODO_WRITE_GUIDANCE } from "./tools/todo-write.js";
 import { ASK_USER_GUIDANCE } from "./tools/ask-user.js";
@@ -13,7 +13,7 @@ function contextLimitFor(maxInputTokens) {
 }
 function buildSystemPrompt(base, skills, builtInTools, maxTurns) {
     const parts = [base];
-    const toolUseLines = [TOOL_USE_PROMPT, `- Turn budget: ${maxTurns} tool-calling turns per run.`];
+    const toolUseLines = [renderToolUsePrompt(maxTurns)];
     if (typeof builtInTools === "object") {
         if (builtInTools.todoWrite)
             toolUseLines.push(TODO_WRITE_GUIDANCE);

package/dist/mcp/manager.js

@@ -125,12 +125,12 @@ export class MCPServerManager {
         this.markFailed(name, entry.type, error ?? "MCP server connection closed");
     }
     adapt(server, client, tool) {
-        const summaryKeys = summaryCandidates(tool.inputSchema);
+        const argSummaryKeys = summaryCandidates(tool.inputSchema);
         return {
             name: mcpToolName(server, tool.name),
             description: tool.description ?? `${server} ${tool.name}`,
             parameters: tool.inputSchema,
-            ...(summaryKeys.length ? { summaryKeys } : {}),
+            ...(argSummaryKeys.length ? { argSummaryKeys } : {}),
             async execute(args, ctx) {
                 const result = await withTimeoutFn((signal) => client.callTool(tool.name, args, signal), CALL_TIMEOUT_MS, ctx.signal, `MCP tool call timed out (${CALL_TIMEOUT_MS / 1000}s)`);
                 const text = extractContent(result);

package/dist/runtime/prompts.d.ts

@@ -1,5 +1,6 @@
 import type { Todo } from "../tools/types.js";
 export declare const TOOL_USE_PROMPT: string;
+export declare function renderToolUsePrompt(maxTurns: number): string;
 export declare const COMPACT_PROMPT: string;
 export declare function renderTodoReminder(todos: readonly Todo[]): string;
 export declare function renderIncompleteTodoNudge(todos: readonly Todo[]): string;

package/dist/runtime/prompts.js

@@ -8,6 +8,9 @@ export const TOOL_USE_PROMPT = [
     "- For file operations (read/write/edit/glob/grep) and fetching URLs, use the dedicated tool. Fall back to Shell only when no dedicated tool covers the task and Shell is available. A runtime error does not make Shell the fallback; do not retry that same operation through Shell.",
     "- If a tool call fails, read the error, adjust the arguments or approach, and continue; do not repeat the identical call and do not abandon the task over a single failure.",
 ].join("\n");
+export function renderToolUsePrompt(maxTurns) {
+    return [TOOL_USE_PROMPT, `- Turn budget: ${maxTurns} tool-calling turns per run.`].join("\n");
+}
 export const COMPACT_PROMPT = [
     "Summarize the conversation above for context continuation. Preserve:\n",
     "1. Primary goal, sub-goals, constraints, acceptance criteria.\n",
@@ -34,7 +37,7 @@ export function renderTodoReminder(todos) {
     const focusLine = focus ? ` Current focus: ${focus.content}` : "";
     const incomplete = todos.filter(t => t.status !== "completed");
     const warning = incomplete.length > 0
-        ? ` ${incomplete.length} incomplete. You MUST complete EVERY task before your final text-only response — update status via TodoWrite after each task finishes.`
+        ? ` ${incomplete.length} incomplete. You MUST complete EVERY task before your final text-only response. Mark them complete via TodoWrite as they finish; the final update may go in the same turn as your last tool call.`
         : "";
     return `<system-reminder>Tasks: ${items.join(" | ")}${focusLine}${warning}</system-reminder>`;
 }

package/dist/runtime/session-messages.d.ts

@@ -30,6 +30,7 @@ export declare class SessionMessages {
     add(msg: SessionMessage): void;
     toLLM(): LLMMessage[];
     export(): SessionMessage[];
+    lastAssistantText(): string;
     import(messages: SessionMessage[]): void;
     normalizeInterruptedToolCalls(): void;
     clear(): void;

package/dist/runtime/session-messages.js

@@ -86,6 +86,9 @@ export class SessionMessages {
     export() {
         return this.messages.slice();
     }
+    lastAssistantText() {
+        return lastAssistantText(this.messages);
+    }
     import(messages) {
         this.resetMessages(messages.slice(), messages.reduce((sum, m) => sum + estimateTokens(messageText(m)), 0));
         this.normalizeInterruptedToolCalls();

package/dist/runtime/sub-agent-runner.js

@@ -1,10 +1,10 @@
-import { SessionMessages, lastAssistantText } from "./session-messages.js";
+import { SessionMessages } from "./session-messages.js";
 import { Agent } from "./agent.js";
-import { TOOL_USE_PROMPT } from "./prompts.js";
+import { renderToolUsePrompt } from "./prompts.js";
 import { ToolRegistry } from "../tools/registry.js";
 export function createSubAgentRunner(opts) {
     return async (systemPrompt, task, signal) => {
-        const conversation = new SessionMessages([systemPrompt, TOOL_USE_PROMPT, `- Turn budget: ${opts.maxTurns} tool-calling turns per run.`].join("\n\n"));
+        const conversation = new SessionMessages([systemPrompt, renderToolUsePrompt(opts.maxTurns)].join("\n\n"));
         const subTools = new ToolRegistry();
         subTools.registerAll(opts.tools.filter((t) => t.readOnly === true));
         const subAgent = new Agent({
@@ -19,8 +19,8 @@ export function createSubAgentRunner(opts) {
             contextLimit: opts.contextLimit,
         });
         const status = await subAgent.run(task, undefined, signal);
-        const messages = conversation.export();
-        const reply = lastAssistantText(messages) || `(sub-agent produced no final text; status ${status})`;
+        const reply = conversation.lastAssistantText() || `(sub-agent produced no final text; status ${status})`;
+        const messages = status !== "ok" ? conversation.export() : [];
         return { status, reply, messages };
     };
 }

package/dist/tools/ask-user.js

@@ -21,6 +21,6 @@ export function createAskUserTool(ask) {
             }
             return { content: await ask(question, options) };
         },
-        summaryKeys: ["question"],
+        argSummaryKeys: ["question"],
     };
 }

package/dist/tools/file-edit.js

@@ -39,5 +39,5 @@ export const fileEditTool = {
             return "Edit failed";
         return "Edit completed";
     },
-    summaryKeys: ["path"],
+    argSummaryKeys: ["path"],
 };

package/dist/tools/file-read.js

@@ -89,5 +89,5 @@ export const fileReadTool = {
     summarizeResult(result) {
         return summaryBytes("Read", result, "Read failed");
     },
-    summaryKeys: ["path"],
+    argSummaryKeys: ["path"],
 };

package/dist/tools/file-write.js

@@ -21,5 +21,5 @@ export const fileWriteTool = {
             return "Write failed";
         return "Write completed";
     },
-    summaryKeys: ["path"],
+    argSummaryKeys: ["path"],
 };

package/dist/tools/glob.js

@@ -27,5 +27,5 @@ export const globTool = {
     summarizeResult(result) {
         return ripgrepResultSummary("file", result, "Glob failed", "Found 0 files");
     },
-    summaryKeys: ["pattern", "path"],
+    argSummaryKeys: ["pattern", "path"],
 };

package/dist/tools/grep.js

@@ -63,5 +63,5 @@ export const grepTool = {
     summarizeResult(result) {
         return ripgrepResultSummary("match", result, "Grep failed", "Found 0 matches");
     },
-    summaryKeys: ["pattern", "path", "glob"],
+    argSummaryKeys: ["pattern", "path", "glob"],
 };

package/dist/tools/registry.js

@@ -76,10 +76,10 @@ export class ToolRegistry {
             return "";
         if (tool.summarizeArgs)
             return tool.summarizeArgs(args);
-        if (!tool.summaryKeys)
+        if (!tool.argSummaryKeys)
             return "";
         const parts = [];
-        for (const k of tool.summaryKeys) {
+        for (const k of tool.argSummaryKeys) {
             const v = args[k];
             if (typeof v === "string" && v) {
                 parts.push(v);

package/dist/tools/shell.js

@@ -53,5 +53,5 @@ export const shellTool = {
     summarizeResult(result) {
         return summaryBytes("Command executed", result, "Command failed");
     },
-    summaryKeys: ["command"],
+    argSummaryKeys: ["command"],
 };

package/dist/tools/skill.js

@@ -12,7 +12,7 @@ export function createSkillTool(resolve) {
             },
             required: ["name"],
         },
-        summaryKeys: ["name"],
+        argSummaryKeys: ["name"],
         async execute(args, _ctx) {
             const name = (args.name || "").trim();
             if (!name) {

package/dist/tools/sub-agent.js

@@ -55,7 +55,7 @@ export function createSubAgentTool(deps) {
             },
             required: ["type", "task"],
         },
-        summaryKeys: ["type"],
+        argSummaryKeys: ["type"],
         async execute(args, ctx) {
             const type = args.type;
             const task = (args.task ?? "").trim();
@@ -69,11 +69,16 @@ export function createSubAgentTool(deps) {
             const { status, reply, messages } = await deps.runSubAgent(def.systemPrompt, task, ctx.signal);
             if (status === "ok")
                 return { content: reply };
-            const stallReason = status === "stalled"
-                ? [...messages].reverse()
-                    .map((m) => m.content)
-                    .find((c) => typeof c === "string" && c.startsWith(NOT_EXECUTED_PREFIX))
-                : undefined;
+            let stallReason;
+            if (status === "stalled") {
+                for (let i = messages.length - 1; i >= 0; i--) {
+                    const content = messages[i].content;
+                    if (typeof content === "string" && content.startsWith(NOT_EXECUTED_PREFIX)) {
+                        stallReason = content;
+                        break;
+                    }
+                }
+            }
             const suffix = stallReason ? ` ${stallReason}` : "";
             return { content: `Sub-agent "${type}" ended with status ${status}.${suffix}\n\n${reply}`, isError: true };
         },

package/dist/tools/todo-write.d.ts

@@ -1,3 +1,3 @@
 import type { Tool, Todo } from "./types.js";
-export declare const TODO_WRITE_GUIDANCE = "- For multi-step tasks (3+ steps), you MUST use TodoWrite: create the task list first, then update each task's status as you execute. Never execute a multi-step task without a TodoWrite task list.";
+export declare const TODO_WRITE_GUIDANCE = "- For multi-step tasks (5+ steps), you MUST use TodoWrite: create the task list first, then update statuses as tasks complete. Never execute a 5+ step task without a TodoWrite task list.";
 export declare function createTodoWriteTool(setTodos: (todos: Todo[]) => void): Tool;

package/dist/tools/todo-write.js

@@ -1,7 +1,7 @@
 import { toolError } from "./types.js";
-export const TODO_WRITE_GUIDANCE = "- For multi-step tasks (3+ steps), you MUST use TodoWrite: create the task list first, then update each task's status as you execute. Never execute a multi-step task without a TodoWrite task list.";
+export const TODO_WRITE_GUIDANCE = "- For multi-step tasks (5+ steps), you MUST use TodoWrite: create the task list first, then update statuses as tasks complete. Never execute a 5+ step task without a TodoWrite task list.";
 const STATUSES = ["pending", "inProgress", "completed"];
-const DESCRIPTION = "Manage the task list for tasks with 3+ steps. Pass the FULL list each call; it replaces the previous list. Keep one inProgress at a time. status: pending, inProgress, completed.";
+const DESCRIPTION = "Manage the task list for tasks with 5+ steps. Pass the FULL list each call; it replaces the previous list. Keep one inProgress at a time. status: pending, inProgress, completed.";
 function parseTodos(args) {
     const raw = args.todos;
     if (!Array.isArray(raw)) {
@@ -32,6 +32,13 @@ function parseTodos(args) {
         }
         todos.push({ content, status });
     }
+    if (!seenInProgress) {
+        const firstPending = todos.find((t) => t.status === "pending");
+        if (firstPending) {
+            firstPending.status = "inProgress";
+            normalized++;
+        }
+    }
     return { todos, done, normalized };
 }
 export function createTodoWriteTool(setTodos) {

package/dist/tools/types.d.ts

@@ -25,7 +25,7 @@ export interface Tool {
     readOnly?: boolean;
     description: string;
     parameters: Record<string, unknown>;
-    summaryKeys?: string[];
+    argSummaryKeys?: string[];
     summarizeArgs?: (args: Record<string, unknown>) => string;
     summarizeResult?(result: TextResult): string;
     execute(args: Record<string, unknown>, ctx: ToolContext): Promise<TextResult>;

package/dist/tools/web-fetch.js

@@ -100,5 +100,5 @@ export const webFetchTool = {
     summarizeResult(result) {
         return summaryBytes("Fetched", result, "Fetch failed");
     },
-    summaryKeys: ["url"],
+    argSummaryKeys: ["url"],
 };

package/dist/util/net.js

@@ -1,4 +1,4 @@
-import { ProxyAgent } from "undici";
+import { fetch, ProxyAgent } from "undici";
 let proxyAgent;
 let noProxyList;
 let proxyInitialized = false;
@@ -11,11 +11,12 @@ function ensureProxy() {
     proxyAgent = proxyUrl ? new ProxyAgent(proxyUrl) : null;
     noProxyList = noProxy?.split(",").map((s) => s.trim()).filter(Boolean);
 }
+const undiciFetch = fetch;
 export async function netFetch(input, init) {
     if (!proxyInitialized)
         ensureProxy();
     if (!proxyAgent)
-        return fetch(input, init);
+        return undiciFetch(input, init);
     const url = typeof input === "string" ? input : input instanceof URL ? input.href : input.url;
     if (noProxyList) {
         const hostname = new URL(url).hostname;
@@ -25,7 +26,7 @@ export async function netFetch(input, init) {
             return hostname === p || hostname.endsWith("." + p);
         });
         if (shouldBypass)
-            return fetch(input, init);
+            return undiciFetch(input, init);
     }
-    return fetch(input, { ...init, dispatcher: proxyAgent });
+    return undiciFetch(input, { ...init, dispatcher: proxyAgent });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vietor/agent-core",
-  "version": "0.7.2",
+  "version": "0.7.4",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",