@markusylisiurunen/tau 0.3.20 → 0.3.21

package/dist/core/tools/send_input_to_agent.js

@@ -2,7 +2,7 @@ import { Type } from "typebox";
 import { z } from "zod";
 import { createToolError, createToolResult } from "../utils/messages.js";
 import { parseToolArgs } from "../utils/zod.js";
-import { isMainToolDispatchContext, } from "./registry.js";
+import { createToolDispatch, isMainToolDispatchContext, } from "./registry.js";
 import { buildSubagentUiText } from "./subagent_ui.js";
 import { TOOL_NAME_SEND_INPUT_TO_AGENT } from "./tool_names.js";
 const SEND_INPUT_TO_AGENT_DESCRIPTION = [
@@ -50,28 +50,27 @@ export function createSendInputToAgentToolDefinition(backend) {
                     headerTarget: details?.title ?? headerTarget,
                     reason,
                 };
-                return { kind: "single", toolResult, uiEvent };
+                return { toolResult, uiEvent };
             };
             const parsedArgs = parseToolArgs(sendInputArgsSchema, toolCall.arguments);
             if (!parsedArgs.ok) {
-                return blocked(`Invalid arguments: ${parsedArgs.error}`);
+                return createToolDispatch(() => blocked(`Invalid arguments: ${parsedArgs.error}`));
             }
             ({ id, prompt } = parsedArgs.data);
             headerTarget = id;
             if (!isMainToolDispatchContext(context)) {
-                return blocked("The send_input_to_agent tool is only available in the main session.", {
+                return createToolDispatch(() => blocked("The send_input_to_agent tool is only available in the main session.", {
                     id,
-                });
+                }));
             }
             const controlPlane = context.subagentControlPlane;
             const snapshot = controlPlane.getSnapshot(id);
             if (!snapshot) {
-                return blocked(`Unknown subagent ID: ${id}`, { id, title: id });
+                return createToolDispatch(() => blocked(`Unknown subagent ID: ${id}`, { id, title: id }));
             }
             const config = context.config;
             const target = resolveSnapshotTarget(snapshot);
             return {
-                kind: "phased",
                 startedUiEvent: {
                     type: "send_input_to_agent_started",
                     toolCallId: toolCall.id,
@@ -101,7 +100,7 @@ export function createSendInputToAgentToolDefinition(backend) {
                             message: reason,
                             uiText,
                         };
-                        return { kind: "single", toolResult, uiEvent };
+                        return { toolResult, uiEvent };
                     }
                     const sendResult = controlPlane.sendInput({
                         id,
@@ -123,7 +122,7 @@ export function createSendInputToAgentToolDefinition(backend) {
                             headerTarget: target.title,
                             reason: sendResult.reason,
                         };
-                        return { kind: "single", toolResult, uiEvent };
+                        return { toolResult, uiEvent };
                     }
                     const resultText = formatSendInputToolResult(sendResult);
                     const toolResult = createToolResult(toolCall, resultText, false);
@@ -143,7 +142,7 @@ export function createSendInputToAgentToolDefinition(backend) {
                         status: "success",
                         uiText,
                     };
-                    return { kind: "single", toolResult, uiEvent };
+                    return { toolResult, uiEvent };
                 })(),
             };
         },

package/dist/core/tools/send_input_to_agent.js.map

@@ -1 +1 @@
-{"version":3,"file":"send_input_to_agent.js","sourceRoot":"","sources":["../../../src/core/tools/send_input_to_agent.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"send_input_to_agent.js","sourceRoot":"","sources":["../../../src/core/tools/send_input_to_agent.ts"],"names":[],"mappings":"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"}

package/dist/core/tools/spawn_agent.js

@@ -6,7 +6,7 @@ import { getSubagentDescription, resolveSubagentEffectiveSettings } from "../sub
 import { formatCwd } from "../utils/format.js";
 import { createToolError, createToolResult } from "../utils/messages.js";
 import { parseToolArgs } from "../utils/zod.js";
-import { isMainToolDispatchContext, } from "./registry.js";
+import { createToolDispatch, isMainToolDispatchContext, } from "./registry.js";
 import { buildSubagentUiText } from "./subagent_ui.js";
 import { TOOL_NAME_SPAWN_AGENT } from "./tool_names.js";
 const SPAWN_AGENT_DESCRIPTION = [
@@ -86,21 +86,21 @@ export function createSpawnAgentToolDefinition(backend) {
                     headerTarget: details?.title ?? headerTarget,
                     reason,
                 };
-                return { kind: "single", toolResult, uiEvent };
+                return { toolResult, uiEvent };
             };
             const parsedArgs = parseToolArgs(spawnArgsSchema, toolCall.arguments);
             if (!parsedArgs.ok) {
-                return blocked(`Invalid arguments: ${parsedArgs.error}`);
+                return createToolDispatch(() => blocked(`Invalid arguments: ${parsedArgs.error}`));
             }
             const { prompt, model, workingDirectory } = parsedArgs.data;
             name = parsedArgs.data.name;
             title = parsedArgs.data.title;
             headerTarget = title;
             if (!isMainToolDispatchContext(context)) {
-                return blocked("The spawn_agent tool is only available in the main session.", {
+                return createToolDispatch(() => blocked("The spawn_agent tool is only available in the main session.", {
                     name,
                     title,
-                });
+                }));
             }
             const { persona, cwd: baseCwd, subagentPrompts } = context;
             const cwd = workingDirectory ? resolve(baseCwd, workingDirectory) : baseCwd;
@@ -110,7 +110,7 @@ export function createSpawnAgentToolDefinition(backend) {
             let effectiveSubagentPrompts = subagentPrompts;
             if (workingDirectory) {
                 if (!context.resolveSubagentRuntime) {
-                    return blocked("Working-directory context resolution is unavailable.", { name, title });
+                    return createToolDispatch(() => blocked("Working-directory context resolution is unavailable.", { name, title }));
                 }
                 try {
                     const runtime = await context.resolveSubagentRuntime({ cwd, persona });
@@ -120,53 +120,53 @@ export function createSpawnAgentToolDefinition(backend) {
                     effectiveSubagentPrompts = runtime.subagentPrompts;
                 }
                 catch (error) {
-                    return blocked(`Failed to build the subagent prompt for workingDirectory '${cwd}': ${error.message}`, {
+                    return createToolDispatch(() => blocked(`Failed to build the subagent prompt for workingDirectory '${cwd}': ${error.message}`, {
                         name,
                         title,
-                    });
+                    }));
                 }
             }
             if (!effectivePersona.subagents || Object.keys(effectivePersona.subagents).length === 0) {
-                return blocked("The spawn_agent tool is not enabled for the resolved persona.", {
+                return createToolDispatch(() => blocked("The spawn_agent tool is not enabled for the resolved persona.", {
                     name,
                     title,
-                });
+                }));
             }
             const personaConfig = effectivePersona.subagents[name];
             if (!personaConfig) {
-                return blocked(`Subagent '${name}' is not enabled for the resolved persona.`, {
+                return createToolDispatch(() => blocked(`Subagent '${name}' is not enabled for the resolved persona.`, {
                     name,
                     title,
-                });
+                }));
             }
             const systemPrompt = effectiveSubagentPrompts[name];
             if (!systemPrompt) {
-                return blocked(`Subagent '${name}' is missing its system prompt.`, {
+                return createToolDispatch(() => blocked(`Subagent '${name}' is missing its system prompt.`, {
                     name,
                     title,
-                });
+                }));
             }
             let launchModelOverride;
             if (model) {
                 const parsedLaunchModel = parseSubagentLaunchModel(model, { resolveModel: modelResolver });
                 if (parsedLaunchModel.error || !parsedLaunchModel.launchModel) {
-                    return blocked(`Invalid model parameter: ${parsedLaunchModel.error}.`, {
+                    return createToolDispatch(() => blocked(`Invalid model parameter: ${parsedLaunchModel.error}.`, {
                         name,
                         title,
-                    });
+                    }));
                 }
                 const launchModels = personaConfig.launchModels ?? [];
                 if (launchModels.length === 0) {
-                    return blocked(`Subagent '${name}' does not allow launch model overrides. Allowed values: ${formatAllowedLaunchModels(launchModels)}.`, {
+                    return createToolDispatch(() => blocked(`Subagent '${name}' does not allow launch model overrides. Allowed values: ${formatAllowedLaunchModels(launchModels)}.`, {
                         name,
                         title,
-                    });
+                    }));
                 }
                 if (!launchModels.includes(parsedLaunchModel.launchModel.normalized)) {
-                    return blocked(`Model '${parsedLaunchModel.launchModel.normalized}' is not allowed for subagent '${name}'. Allowed values: ${formatAllowedLaunchModels(launchModels)}.`, {
+                    return createToolDispatch(blocked(`Model '${parsedLaunchModel.launchModel.normalized}' is not allowed for subagent '${name}'. Allowed values: ${formatAllowedLaunchModels(launchModels)}.`, {
                         name,
                         title,
-                    });
+                    }));
                 }
                 launchModelOverride = parsedLaunchModel.launchModel;
             }
@@ -189,7 +189,6 @@ export function createSpawnAgentToolDefinition(backend) {
                 : undefined;
             const statusPrefixParts = [name, modelLabel, statusWorkingDirectory].filter(Boolean);
             return {
-                kind: "phased",
                 startedUiEvent: {
                     type: "spawn_agent_started",
                     toolCallId: toolCall.id,
@@ -217,7 +216,7 @@ export function createSpawnAgentToolDefinition(backend) {
                             message: reason,
                             uiText,
                         };
-                        return { kind: "single", toolResult, uiEvent };
+                        return { toolResult, uiEvent };
                     }
                     const spawnResult = controlPlane.spawn({
                         runtimeConfig,
@@ -241,7 +240,7 @@ export function createSpawnAgentToolDefinition(backend) {
                             headerTarget,
                             reason: spawnResult.reason,
                         };
-                        return { kind: "single", toolResult, uiEvent };
+                        return { toolResult, uiEvent };
                     }
                     const resultText = formatSpawnToolResult({
                         id: spawnResult.id,
@@ -267,7 +266,7 @@ export function createSpawnAgentToolDefinition(backend) {
                         agentId: spawnResult.id,
                         uiText,
                     };
-                    return { kind: "single", toolResult, uiEvent };
+                    return { toolResult, uiEvent };
                 })(),
             };
         },

package/dist/core/tools/spawn_agent.js.map

@@ -1 +1 @@
-{"version":3,"file":"spawn_agent.js","sourceRoot":"","sources":["../../../src/core/tools/spawn_agent.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"spawn_agent.js","sourceRoot":"","sources":["../../../src/core/tools/spawn_agent.ts"],"names":[],"mappings":"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"}

package/dist/core/tools/terminate_agent.js

@@ -2,7 +2,7 @@ import { Type } from "typebox";
 import { z } from "zod";
 import { createToolError, createToolResult } from "../utils/messages.js";
 import { parseToolArgs } from "../utils/zod.js";
-import { isMainToolDispatchContext, } from "./registry.js";
+import { createToolDispatch, isMainToolDispatchContext, } from "./registry.js";
 import { buildSubagentUiText, formatSubagentStatusLine } from "./subagent_ui.js";
 import { TOOL_NAME_TERMINATE_AGENT } from "./tool_names.js";
 const TERMINATE_AGENT_DESCRIPTION = [
@@ -65,20 +65,19 @@ export function createTerminateAgentToolDefinition() {
                     headerTarget,
                     reason,
                 };
-                return { kind: "single", toolResult, uiEvent };
+                return { toolResult, uiEvent };
             };
             const parsedArgs = parseToolArgs(terminateArgsSchema, toolCall.arguments);
             if (!parsedArgs.ok) {
-                return blocked(`Invalid arguments: ${parsedArgs.error}`);
+                return createToolDispatch(() => blocked(`Invalid arguments: ${parsedArgs.error}`));
             }
             ({ id } = parsedArgs.data);
             headerTarget = id;
             if (!isMainToolDispatchContext(context)) {
-                return blocked("The terminate_agent tool is only available in the main session.");
+                return createToolDispatch(() => blocked("The terminate_agent tool is only available in the main session."));
             }
             const controlPlane = context.subagentControlPlane;
             return {
-                kind: "phased",
                 startedUiEvent: {
                     type: "terminate_agent_started",
                     toolCallId: toolCall.id,
@@ -106,7 +105,7 @@ export function createTerminateAgentToolDefinition() {
                                 uiText,
                             };
                             const toolResult = createToolError(toolCall, message);
-                            return { kind: "single", toolResult, uiEvent };
+                            return { toolResult, uiEvent };
                         }
                         const resultText = formatTerminateResult(result);
                         const succeeded = result.status === "success";
@@ -134,7 +133,7 @@ export function createTerminateAgentToolDefinition() {
                             uiText,
                         };
                         const toolResult = createToolResult(toolCall, resultText, !succeeded);
-                        return { kind: "single", toolResult, uiEvent };
+                        return { toolResult, uiEvent };
                     }
                     catch (error) {
                         const message = error instanceof Error ? error.message : String(error);
@@ -155,7 +154,7 @@ export function createTerminateAgentToolDefinition() {
                             uiText,
                         };
                         const toolResult = createToolError(toolCall, reason);
-                        return { kind: "single", toolResult, uiEvent };
+                        return { toolResult, uiEvent };
                     }
                 })(),
             };

package/dist/core/tools/terminate_agent.js.map

@@ -1 +1 @@
-{"version":3,"file":"terminate_agent.js","sourceRoot":"","sources":["../../../src/core/tools/terminate_agent.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"terminate_agent.js","sourceRoot":"","sources":["../../../src/core/tools/terminate_agent.ts"],"names":[],"mappings":"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"}

package/dist/core/tools/view_image.js

@@ -5,6 +5,7 @@ import { z } from "zod";
 import { createToolError } from "../utils/messages.js";
 import { formatBytes } from "../utils/truncate.js";
 import { formatZodError } from "../utils/zod.js";
+import { createToolDispatch } from "./registry.js";
 import { TOOL_NAME_VIEW_IMAGE } from "./tool_names.js";
 const VIEW_IMAGE_DESCRIPTION = [
     "View an image file and return it to the model.",
@@ -155,65 +156,67 @@ export function createViewImageToolDefinition(backend) {
     return {
         schema: VIEW_IMAGE_TOOL,
         async dispatch(toolCall) {
-            const parsedArgs = parseViewImageArgs(toolCall.arguments);
-            const path = parsedArgs.ok ? parsedArgs.data.path : "";
-            const headerTarget = path || "(invalid arguments)";
-            const blocked = (reason) => {
-                const toolResult = createToolError(toolCall, reason);
-                const uiEvent = {
-                    type: "view_image_blocked",
-                    toolCallId: toolCall.id,
-                    path: path || "(invalid path)",
-                    headerTarget,
-                    reason,
+            return createToolDispatch(async () => {
+                const parsedArgs = parseViewImageArgs(toolCall.arguments);
+                const path = parsedArgs.ok ? parsedArgs.data.path : "";
+                const headerTarget = path || "(invalid arguments)";
+                const blocked = (reason) => {
+                    const toolResult = createToolError(toolCall, reason);
+                    const uiEvent = {
+                        type: "view_image_blocked",
+                        toolCallId: toolCall.id,
+                        path: path || "(invalid path)",
+                        headerTarget,
+                        reason,
+                    };
+                    return { toolResult, uiEvent };
                 };
-                return { kind: "single", toolResult, uiEvent };
-            };
-            if (!parsedArgs.ok) {
-                return blocked(`Invalid arguments: ${parsedArgs.error}`);
-            }
-            try {
-                const { path: resolvedPath, content } = await backend.readFileBinary(path, {
-                    maxBytes: VIEW_IMAGE_READ_MAX_BYTES,
-                });
-                const detected = await fileTypeFromBuffer(content);
-                const mimeType = detected?.mime;
-                if (!isSupportedImageType(mimeType)) {
-                    return blocked(`Unsupported image format. Supported formats: ${SUPPORTED_IMAGE_TYPES.join(", ")}.`);
+                if (!parsedArgs.ok) {
+                    return blocked(`Invalid arguments: ${parsedArgs.error}`);
                 }
-                const encodedImage = await prepareImageForModel(content, mimeType);
-                const data = encodedImage.content.toString("base64");
-                const resultText = `Viewed ${resolvedPath} (${encodedImage.mimeType})`;
-                const toolResult = {
-                    role: "toolResult",
-                    toolCallId: toolCall.id,
-                    toolName: toolCall.name,
-                    content: [
-                        { type: "text", text: resultText },
-                        { type: "image", data, mimeType: encodedImage.mimeType },
-                    ],
-                    isError: false,
-                    timestamp: Date.now(),
-                };
-                const uiText = buildViewImageUiText({
-                    mimeType: encodedImage.mimeType,
-                    fullText: resultText,
-                });
-                const uiEvent = {
-                    type: "view_image_success",
-                    toolCallId: toolCall.id,
-                    path: resolvedPath,
-                    headerTarget: resolvedPath,
-                    mimeType: encodedImage.mimeType,
-                    bytes: encodedImage.content.byteLength,
-                    uiText,
-                };
-                return { kind: "single", toolResult, uiEvent };
-            }
-            catch (e) {
-                const errorMessage = e instanceof Error ? e.message : String(e);
-                return blocked(`Tool view_image failed: ${errorMessage}`);
-            }
+                try {
+                    const { path: resolvedPath, content } = await backend.readFileBinary(path, {
+                        maxBytes: VIEW_IMAGE_READ_MAX_BYTES,
+                    });
+                    const detected = await fileTypeFromBuffer(content);
+                    const mimeType = detected?.mime;
+                    if (!isSupportedImageType(mimeType)) {
+                        return blocked(`Unsupported image format. Supported formats: ${SUPPORTED_IMAGE_TYPES.join(", ")}.`);
+                    }
+                    const encodedImage = await prepareImageForModel(content, mimeType);
+                    const data = encodedImage.content.toString("base64");
+                    const resultText = `Viewed ${resolvedPath} (${encodedImage.mimeType})`;
+                    const toolResult = {
+                        role: "toolResult",
+                        toolCallId: toolCall.id,
+                        toolName: toolCall.name,
+                        content: [
+                            { type: "text", text: resultText },
+                            { type: "image", data, mimeType: encodedImage.mimeType },
+                        ],
+                        isError: false,
+                        timestamp: Date.now(),
+                    };
+                    const uiText = buildViewImageUiText({
+                        mimeType: encodedImage.mimeType,
+                        fullText: resultText,
+                    });
+                    const uiEvent = {
+                        type: "view_image_success",
+                        toolCallId: toolCall.id,
+                        path: resolvedPath,
+                        headerTarget: resolvedPath,
+                        mimeType: encodedImage.mimeType,
+                        bytes: encodedImage.content.byteLength,
+                        uiText,
+                    };
+                    return { toolResult, uiEvent };
+                }
+                catch (e) {
+                    const errorMessage = e instanceof Error ? e.message : String(e);
+                    return blocked(`Tool view_image failed: ${errorMessage}`);
+                }
+            });
         },
     };
 }

package/dist/core/tools/view_image.js.map

@@ -1 +1 @@
-{"version":3,"file":"view_image.js","sourceRoot":"","sources":["../../../src/core/tools/view_image.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"view_image.js","sourceRoot":"","sources":["../../../src/core/tools/view_image.ts"],"names":[],"mappings":"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"}

package/dist/core/tools/wait_for_agents.js

@@ -3,7 +3,7 @@ import { z } from "zod";
 import { createToolError, createToolResult } from "../utils/messages.js";
 import { truncateForTokens } from "../utils/truncate.js";
 import { parseToolArgs } from "../utils/zod.js";
-import { isMainToolDispatchContext, } from "./registry.js";
+import { createToolDispatch, isMainToolDispatchContext, } from "./registry.js";
 import { buildSubagentUiText, formatSubagentStatusLine } from "./subagent_ui.js";
 import { TOOL_NAME_WAIT_FOR_AGENTS } from "./tool_names.js";
 const WAIT_FOR_AGENTS_DESCRIPTION = [
@@ -115,11 +115,11 @@ export function createWaitForAgentsToolDefinition() {
                     headerTarget,
                     reason,
                 };
-                return { kind: "single", toolResult, uiEvent };
+                return { toolResult, uiEvent };
             };
             const parsedArgs = parseToolArgs(waitArgsSchema, toolCall.arguments);
             if (!parsedArgs.ok) {
-                return blocked(`Invalid arguments: ${parsedArgs.error}`);
+                return createToolDispatch(() => blocked(`Invalid arguments: ${parsedArgs.error}`));
             }
             ({ ids } = parsedArgs.data);
             headerTarget = formatHeaderTarget(ids);
@@ -133,11 +133,10 @@ export function createWaitForAgentsToolDefinition() {
             }
             const dedupedTarget = formatHeaderTarget(deduped);
             if (!isMainToolDispatchContext(context)) {
-                return blocked("The wait_for_agents tool is only available in the main session.");
+                return createToolDispatch(() => blocked("The wait_for_agents tool is only available in the main session."));
             }
             const controlPlane = context.subagentControlPlane;
             return {
-                kind: "phased",
                 startedUiEvent: {
                     type: "wait_for_agents_started",
                     toolCallId: toolCall.id,
@@ -169,7 +168,7 @@ export function createWaitForAgentsToolDefinition() {
                             uiText,
                         };
                         const toolResult = createToolResult(toolCall, resultText, hasFailures);
-                        return { kind: "single", toolResult, uiEvent };
+                        return { toolResult, uiEvent };
                     }
                     catch (error) {
                         const message = error instanceof Error ? error.message : String(error);
@@ -189,7 +188,7 @@ export function createWaitForAgentsToolDefinition() {
                             uiText,
                         };
                         const toolResult = createToolError(toolCall, reason);
-                        return { kind: "single", toolResult, uiEvent };
+                        return { toolResult, uiEvent };
                     }
                 })(),
             };