@botbotgo/agent-harness 0.0.416 → 0.0.419

package/dist/runtime/adapter/stream-event-projection.js

@@ -382,6 +382,24 @@ function updateDelegationState(state, event, countConfiguredToolsForAgentId) {
         }
     }
 }
+function normalizePlanToolName(toolName) {
+    return typeof toolName === "string" ? toolName.trim().toLowerCase().replace(/[\s-]+/gu, "_") : "";
+}
+function isPlanToolName(toolName) {
+    const normalized = normalizePlanToolName(toolName);
+    return normalized === "write_todos"
+        || normalized === "read_todos"
+        || normalized === "tool_call_write_todos"
+        || normalized === "tool_call_read_todos"
+        || normalized === "call_write_todos"
+        || normalized === "call_read_todos";
+}
+function isWriteTodosToolName(toolName) {
+    const normalized = normalizePlanToolName(toolName);
+    return normalized === "write_todos"
+        || normalized === "tool_call_write_todos"
+        || normalized === "call_write_todos";
+}
 function extractTodoToolStart(event) {
     if (typeof event !== "object" || event === null) {
         return null;
@@ -391,11 +409,11 @@ function extractTodoToolStart(event) {
     const runType = typeof typed.run_type === "string" ? typed.run_type : "";
     const toolName = typeof typed.name === "string" ? typed.name : "";
     const isToolStart = eventName === "on_tool_start" || (eventName === "on_chain_start" && runType === "tool");
-    if (!isToolStart || (toolName !== "write_todos" && toolName !== "read_todos")) {
+    if (!isToolStart || !isPlanToolName(toolName)) {
         return null;
     }
     const input = unwrapPossibleToolInput(typed.data?.input);
-    if (toolName === "write_todos" && typeof input === "object" && input !== null && !Array.isArray(input)) {
+    if (isWriteTodosToolName(toolName) && typeof input === "object" && input !== null && !Array.isArray(input)) {
         const summary = summarizeBuiltinWriteTodosArgs(input);
         if (summary.summary.total === 0) {
             throw new Error("Error invoking tool 'write_todos' with kwargs {\"todos\":[]} with error: Error: Initial write_todos call cannot use an empty todo list. Send the concrete task steps with both content and status.");
@@ -472,7 +490,7 @@ export function projectRuntimeStreamEvent(params) {
         });
     }
     if (toolResult) {
-        const isTodoTool = toolResult.toolName === "write_todos" || toolResult.toolName === "read_todos";
+        const isTodoTool = isPlanToolName(toolResult.toolName);
         const salvagedTaskErrorFindings = toolResult.toolName === "task"
             && toolResult.isError === true
             && !!state.lastCompletedTaskDelegationFindings
@@ -485,8 +503,7 @@ export function projectRuntimeStreamEvent(params) {
             : toolResult.isError === true;
         const isSuccessfulTaskResult = toolResult.toolName === "task" && effectiveToolIsError !== true;
         const isDelegatedExecutionTool = (isDelegatedAgentEvent || state.openToolCapableTaskDelegations > 0)
-            && toolResult.toolName !== "write_todos"
-            && toolResult.toolName !== "read_todos"
+            && !isPlanToolName(toolResult.toolName)
             && toolResult.toolName !== "task";
         if (isDelegatedExecutionTool && toolResult.isError !== true) {
             recordDelegatedFindings(state, toolResult.output, "tool");

package/dist/runtime/adapter/tool/tool-arguments.js

@@ -2,6 +2,7 @@ import { salvageToolArgs } from "../../parsing/output-parsing.js";
 import { salvageJsonToolCalls } from "../../parsing/output-tool-args.js";
 import { isRecord } from "../../../utils/object.js";
 import { extractExplicitResourceReferences, hasExplicitResourceReference } from "../../harness/system/runtime-memory-policy.js";
+import { readCapturedPromptedJsonToolCalls } from "../model/prompted-json-tool-call-capture.js";
 function isObject(value) {
     return isRecord(value);
 }
@@ -109,6 +110,71 @@ function fillLatestUserInputForQueryLikeFields(args, shape, latestUserInput) {
     }
     return next;
 }
+function mapCommonArgumentAliases(args, shape) {
+    let next = args;
+    if ("args" in shape && !("args" in next) && Array.isArray(next.argv)) {
+        next = { ...next, args: next.argv };
+    }
+    if ("arguments" in shape && !("arguments" in next) && Array.isArray(next.args)) {
+        next = { ...next, arguments: next.args };
+    }
+    return next;
+}
+function schemaPartExpectsArray(schemaPart) {
+    if (!isObject(schemaPart)) {
+        return false;
+    }
+    if (schemaPart.type === "array") {
+        return true;
+    }
+    const def = schemaPart._def;
+    if (def?.typeName === "ZodArray" || def?.type === "array") {
+        return true;
+    }
+    return schemaPartExpectsArray(def?.innerType);
+}
+function mapStringArrayFields(args, shape) {
+    let next = args;
+    for (const [key, schemaPart] of Object.entries(shape)) {
+        const value = next[key];
+        if (typeof value !== "string") {
+            continue;
+        }
+        const raw = value.trim();
+        if (!raw) {
+            continue;
+        }
+        const looksLikeDelimitedList = /[,;\n]/u.test(raw) && /(?:s|list|items|areas|paths|files)$/iu.test(key);
+        if (!schemaPartExpectsArray(schemaPart) && !looksLikeDelimitedList) {
+            continue;
+        }
+        const items = raw
+            .split(/[,;\n]/u)
+            .map((item) => item.trim())
+            .filter(Boolean);
+        if (items.length > 0) {
+            next = { ...next, [key]: items };
+        }
+    }
+    return next;
+}
+function mapDelimitedListLikeArgs(args) {
+    let next = args;
+    for (const [key, value] of Object.entries(args)) {
+        if (typeof value !== "string") {
+            continue;
+        }
+        const raw = value.trim();
+        if (!/[,;\n]/u.test(raw) || !/(?:s|list|items|areas|paths|files)$/iu.test(key)) {
+            continue;
+        }
+        const items = raw.split(/[,;\n]/u).map((item) => item.trim()).filter(Boolean);
+        if (items.length > 0) {
+            next = { ...next, [key]: items };
+        }
+    }
+    return next;
+}
 export function normalizeToolArgsForSchema(args, schema, rawArgsInput, options = {}) {
     const schemaDef = isObject(schema) ? schema._def : undefined;
     const zodShape = schemaDef
@@ -123,17 +189,18 @@ export function normalizeToolArgsForSchema(args, schema, rawArgsInput, options =
         : undefined;
     const shape = zodShape && isRecord(zodShape) ? zodShape : jsonShape;
     if (!shape || !isRecord(shape)) {
-        return args;
+        return mapDelimitedListLikeArgs(args);
     }
+    const aliasMappedArgs = mapStringArrayFields(mapCommonArgumentAliases(args, shape), shape);
     const keys = Object.keys(shape);
     if (keys.length !== 1) {
-        return fillLatestUserInputForQueryLikeFields(args, shape, options.latestUserInput);
+        return fillLatestUserInputForQueryLikeFields(aliasMappedArgs, shape, options.latestUserInput);
     }
     const [expectedKey] = keys;
-    if (expectedKey in args) {
-        return args;
+    if (expectedKey in aliasMappedArgs) {
+        return aliasMappedArgs;
     }
-    const scalarMappedArgs = mapSingleFieldScalarArg(args, expectedKey, rawArgsInput);
+    const scalarMappedArgs = mapSingleFieldScalarArg(aliasMappedArgs, expectedKey, rawArgsInput);
     if (expectedKey in scalarMappedArgs) {
         return scalarMappedArgs;
     }
@@ -154,67 +221,90 @@ export function normalizeToolArgsForSchema(args, schema, rawArgsInput, options =
     return genericScalarMappedArgs;
 }
 export function extractToolCallsFromResult(result) {
+    const capturedToolCalls = readCapturedPromptedJsonToolCalls(result);
+    if (capturedToolCalls.length > 0) {
+        return [capturedToolCalls[capturedToolCalls.length - 1]];
+    }
     const messages = isRecord(result) && Array.isArray(result.messages) ? result.messages : [];
-    const lastMessage = messages.at(-1);
-    if (!isObject(lastMessage)) {
-        return [];
-    }
-    const messageKwargs = isObject(lastMessage.kwargs) ? lastMessage.kwargs : undefined;
-    const rawToolCalls = Array.isArray(lastMessage.tool_calls)
-        ? (lastMessage.tool_calls ?? [])
-        : Array.isArray(messageKwargs?.tool_calls)
-            ? messageKwargs.tool_calls
-            : [];
-    const extracted = rawToolCalls
-        .map((toolCall) => {
-        if (!isObject(toolCall)) {
-            return null;
-        }
-        const functionPayload = isObject(toolCall.function) ? toolCall.function : undefined;
-        const name = typeof toolCall.name === "string"
-            ? toolCall.name
-            : typeof functionPayload?.name === "string"
-                ? functionPayload.name
-                : null;
-        if (!name) {
-            return null;
-        }
-        const rawArgsInput = toolCall.args ?? functionPayload?.arguments;
-        const rawArgs = salvageToolArgs(rawArgsInput) ?? {};
-        if (!isObject(rawArgs)) {
-            return null;
-        }
-        const id = typeof toolCall.id === "string" ? toolCall.id : undefined;
-        return { id, name, args: rawArgs, rawArgsInput };
-    })
-        .filter((item) => item !== null);
-    if (extracted.length > 0) {
-        return extracted;
-    }
-    const directRole = typeof lastMessage.role === "string"
-        ? lastMessage.role.trim().toLowerCase()
-        : undefined;
-    const messageType = typeof lastMessage._getType === "function"
-        ? String(lastMessage._getType())
-        : undefined;
-    const constructorType = Array.isArray(lastMessage.id)
-        ? lastMessage.id.at(-1)
-        : undefined;
-    if (directRole === "tool" || messageType === "tool" || constructorType === "ToolMessage") {
-        return [];
-    }
-    const content = typeof lastMessage.content === "string"
-        ? lastMessage.content
-        : typeof messageKwargs?.content === "string"
-            ? messageKwargs.content
-            : "";
-    if (!content.trim()) {
-        return [];
-    }
-    return salvageJsonToolCalls(content).map((toolCall, index) => ({
-        id: `salvaged-json-${index + 1}`,
-        name: toolCall.name,
-        args: toolCall.args,
-        rawArgsInput: content,
-    }));
+    const answeredToolCallIds = new Set();
+    for (const message of messages) {
+        if (!isObject(message)) {
+            continue;
+        }
+        const id = message.tool_call_id;
+        if (typeof id === "string" && id.length > 0) {
+            answeredToolCallIds.add(id);
+        }
+    }
+    for (let index = messages.length - 1; index >= 0; index -= 1) {
+        const message = messages[index];
+        if (!isObject(message)) {
+            continue;
+        }
+        const messageKwargs = isObject(message.kwargs) ? message.kwargs : undefined;
+        const rawToolCalls = Array.isArray(message.tool_calls)
+            ? (message.tool_calls ?? [])
+            : Array.isArray(messageKwargs?.tool_calls)
+                ? messageKwargs.tool_calls
+                : [];
+        const extracted = rawToolCalls
+            .map((toolCall) => {
+            if (!isObject(toolCall)) {
+                return null;
+            }
+            const functionPayload = isObject(toolCall.function) ? toolCall.function : undefined;
+            const name = typeof toolCall.name === "string"
+                ? toolCall.name
+                : typeof functionPayload?.name === "string"
+                    ? functionPayload.name
+                    : null;
+            if (!name) {
+                return null;
+            }
+            const rawArgsInput = toolCall.args ?? functionPayload?.arguments;
+            const rawArgs = salvageToolArgs(rawArgsInput) ?? {};
+            if (!isObject(rawArgs)) {
+                return null;
+            }
+            const id = typeof toolCall.id === "string" ? toolCall.id : undefined;
+            if (id && answeredToolCallIds.has(id)) {
+                return null;
+            }
+            return { id, name, args: rawArgs, rawArgsInput };
+        })
+            .filter((item) => item !== null);
+        if (extracted.length > 0) {
+            return extracted;
+        }
+        const directRole = typeof message.role === "string"
+            ? message.role.trim().toLowerCase()
+            : undefined;
+        const messageType = typeof message._getType === "function"
+            ? String(message._getType())
+            : undefined;
+        const constructorType = Array.isArray(message.id)
+            ? message.id.at(-1)
+            : undefined;
+        if (directRole === "tool" || messageType === "tool" || constructorType === "ToolMessage") {
+            continue;
+        }
+        const content = typeof message.content === "string"
+            ? message.content
+            : typeof messageKwargs?.content === "string"
+                ? messageKwargs.content
+                : "";
+        if (!content.trim()) {
+            continue;
+        }
+        const salvaged = salvageJsonToolCalls(content);
+        if (salvaged.length > 0) {
+            return salvaged.map((toolCall, salvageIndex) => ({
+                id: `salvaged-json-${salvageIndex + 1}`,
+                name: toolCall.name,
+                args: toolCall.args,
+                rawArgsInput: content,
+            }));
+        }
+    }
+    return [];
 }

package/dist/runtime/adapter/tool/tool-replay.js

@@ -12,10 +12,6 @@ export function canReplayToolCallsLocally(binding, toolCalls, primaryTools, tool
         if (resolvedToolName === "task" || toolCall.name === "task") {
             return false;
         }
-        const executable = executableTools.get(toolCall.name) ?? executableTools.get(resolvedToolName);
-        if (executable) {
-            return false;
-        }
         const builtinExecutable = builtinExecutableTools.get(toolCall.name) ??
             builtinExecutableTools.get(resolvedToolName) ??
             createModelFacingToolNameLookupCandidates(toolCall.name)

package/dist/runtime/agent-runtime-adapter.d.ts

@@ -59,6 +59,9 @@ export declare class AgentRuntimeAdapter {
         state?: Record<string, unknown>;
         files?: Record<string, unknown>;
         memoryContext?: string;
+        toolRuntimeContext?: Record<string, unknown>;
+        suppressInitialRequiredPlanInstruction?: boolean;
+        externalPlanEvidence?: boolean;
     }): Promise<RequestResult>;
     private tryDelegateWithCompactRouter;
     private buildCompactDelegationReport;