@markusylisiurunen/tau 0.3.32 → 0.3.34

package/dist/core/tools/bash.js

@@ -3,11 +3,10 @@ import stripAnsi from "strip-ansi";
 import { Type } from "typebox";
 import { z } from "zod";
 import { formatCwd } from "../utils/format.js";
-import { createToolError, createToolResult } from "../utils/messages.js";
 import { bytesToTokens, formatTokenEstimate } from "../utils/token.js";
 import { buildHeadTailPreviewLines } from "../utils/tool_preview.js";
 import { formatBytes, TRUNCATION_MARKER, truncateForTokens, } from "../utils/truncate.js";
-import { createToolDispatch } from "./registry.js";
+import { createTextToolOutcome, executeTool, } from "./registry.js";
 import { TOOL_NAME_BASH } from "./tool_names.js";
 const BASH_MODEL_DEFAULT_MAX_TOKENS = 8192;
 const BASH_MODEL_DEFAULT_PREVIEW_TOKENS = 2048;
@@ -278,18 +277,19 @@ function getBashDisplayTarget(raw) {
     }
     return parsedArgs.data.commandForDisplay.split(/\r?\n/)[0] ?? parsedArgs.data.commandForDisplay;
 }
-export function createBashToolDefinition(backend) {
+export function createBashToolDefinition(backend, cwd) {
     return {
         schema: BASH_TOOL,
-        getDisplayTarget: (toolCall) => getBashDisplayTarget(toolCall.arguments),
-        async dispatch(toolCall, signal, context) {
+        describe: (toolCall) => ({ headerTarget: getBashDisplayTarget(toolCall.arguments) }),
+        async execute(toolCall, context) {
+            const { signal } = context;
             const parsedArgs = parseBashArgs(toolCall.arguments);
             const commandForDisplay = parsedArgs.ok
                 ? parsedArgs.data.commandForDisplay
                 : parsedArgs.commandForDisplay;
             const headerTarget = getBashDisplayTarget(toolCall.arguments);
             const blocked = (reason) => {
-                const toolResult = createToolError(toolCall, reason);
+                const outcome = createTextToolOutcome(reason, "blocked");
                 const uiEvent = {
                     type: "bash_blocked",
                     toolCallId: toolCall.id,
@@ -297,74 +297,71 @@ export function createBashToolDefinition(backend) {
                     headerTarget,
                     reason,
                 };
-                return { toolResult, uiEvent };
+                return { content: outcome.content, outcome: outcome.outcome, uiEvent };
             };
             if (!parsedArgs.ok) {
-                return createToolDispatch(() => blocked(`Invalid arguments: ${parsedArgs.error}`));
+                return executeTool(context, () => blocked(`Invalid arguments: ${parsedArgs.error}`));
             }
             const { command, workingDirectory, timeout, maxOutputTokens, hasMaxOutputTokens } = parsedArgs.data;
             const effectiveWorkingDirectory = resolveBashWorkingDirectory({
-                contextCwd: context.cwd,
+                contextCwd: cwd,
                 workingDirectory,
             });
-            return {
-                startedUiEvent: {
-                    type: "bash_started",
-                    toolCallId: toolCall.id,
-                    command,
-                    headerTarget,
-                },
-                run: (async () => {
-                    try {
-                        const startedAt = Date.now();
-                        const { output, exitCode, truncated: captureTruncated, } = await backend.runBash(command, {
-                            signal,
-                            timeoutMs: timeout ?? BASH_DEFAULT_TIMEOUT_MS,
-                            cwd: effectiveWorkingDirectory,
-                        });
-                        const durationMs = Math.max(0, Date.now() - startedAt);
-                        const outputPolicy = getBashOutputPolicy({
-                            mode: "model",
-                            maxOutputTokens,
-                            hasMaxOutputTokens,
-                        });
-                        const truncationInfo = await prepareBashOutput(output, captureTruncated, outputPolicy, backend);
-                        const toolText = formatBashToolResultText({ truncationInfo, exitCode });
-                        const isError = exitCode === null || exitCode !== 0;
-                        const uiText = buildBashUiText({
-                            truncationInfo,
-                            exitCode,
-                            durationMs,
-                            workingDirectory: workingDirectory ? effectiveWorkingDirectory : undefined,
-                            fullText: toolText,
-                        });
-                        const toolResult = createToolResult(toolCall, toolText, isError);
-                        const uiEvent = {
-                            type: "bash_execution",
-                            toolCallId: toolCall.id,
-                            command,
-                            headerTarget,
-                            exitCode,
-                            truncationInfo,
-                            uiText,
-                            durationMs,
-                        };
-                        return { toolResult, uiEvent };
-                    }
-                    catch (e) {
-                        const msg = `Bash tool execution failed: ${e instanceof Error ? e.message : String(e)}`;
-                        const toolResult = createToolError(toolCall, msg);
-                        const uiEvent = {
-                            type: "bash_blocked",
-                            command: commandForDisplay,
-                            headerTarget,
-                            reason: msg,
-                            toolCallId: toolCall.id,
-                        };
-                        return { toolResult, uiEvent };
-                    }
-                })(),
-            };
+            return executeTool(context, async () => {
+                try {
+                    const startedAt = Date.now();
+                    const { output, exitCode, truncated: captureTruncated, aborted, timedOut, } = await backend.runBash(command, {
+                        signal,
+                        timeoutMs: timeout ?? BASH_DEFAULT_TIMEOUT_MS,
+                        cwd: effectiveWorkingDirectory,
+                    });
+                    const durationMs = Math.max(0, Date.now() - startedAt);
+                    const outputPolicy = getBashOutputPolicy({
+                        mode: "model",
+                        maxOutputTokens,
+                        hasMaxOutputTokens,
+                    });
+                    const truncationInfo = await prepareBashOutput(output, captureTruncated, outputPolicy, backend);
+                    const toolText = formatBashToolResultText({ truncationInfo, exitCode });
+                    const isError = exitCode === null || exitCode !== 0;
+                    const uiText = buildBashUiText({
+                        truncationInfo,
+                        exitCode,
+                        durationMs,
+                        workingDirectory: workingDirectory ? effectiveWorkingDirectory : undefined,
+                        fullText: toolText,
+                    });
+                    const outcome = createTextToolOutcome(toolText, aborted || timedOut ? "cancelled" : isError ? "failed" : "succeeded");
+                    const uiEvent = {
+                        type: "bash_execution",
+                        toolCallId: toolCall.id,
+                        command,
+                        headerTarget,
+                        exitCode,
+                        truncationInfo,
+                        uiText,
+                        durationMs,
+                    };
+                    return { content: outcome.content, outcome: outcome.outcome, uiEvent };
+                }
+                catch (e) {
+                    const msg = `Bash tool execution failed: ${e instanceof Error ? e.message : String(e)}`;
+                    const outcome = createTextToolOutcome(msg, "failed");
+                    const uiEvent = {
+                        type: "bash_blocked",
+                        command: commandForDisplay,
+                        headerTarget,
+                        reason: msg,
+                        toolCallId: toolCall.id,
+                    };
+                    return { content: outcome.content, outcome: outcome.outcome, uiEvent };
+                }
+            }, {
+                type: "bash_started",
+                toolCallId: toolCall.id,
+                command,
+                headerTarget,
+            });
         },
     };
 }

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

@@ -1 +1 @@
-{"version":3,"file":"bash.js","sourceRoot":"","sources":["../../../src/core/tools/bash.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bash.js","sourceRoot":"","sources":["../../../src/core/tools/bash.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,SAAS,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACvE,OAAO,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AACrE,OAAO,EACL,WAAW,EACX,iBAAiB,EAEjB,iBAAiB,GAClB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAEL,qBAAqB,EACrB,WAAW,GAIZ,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,MAAM,6BAA6B,GAAG,IAAI,CAAC;AAC3C,MAAM,iCAAiC,GAAG,IAAI,CAAC;AAC/C,MAAM,gCAAgC,GAAG,KAAK,CAAC;AAC/C,MAAM,sBAAsB,GAAG,KAAK,CAAC;AACrC,MAAM,oBAAoB,GAAG,sBAAsB,CAAC;AAQpD,MAAM,yBAAyB,GAAqB;IAClD,SAAS,EAAE,6BAA6B;IACxC,YAAY,EAAE,IAAI;IAClB,aAAa,EAAE,iCAAiC;CACjD,CAAC;AAEF,MAAM,gBAAgB,GAAqB;IACzC,SAAS,EAAE,oBAAoB;CAChC,CAAC;AAEF,SAAS,iBAAiB,CAAC,KAAyB;IAClD,IAAI,KAAK,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IACrE,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,6BAA6B,CAAC,EAAE,sBAAsB,CAAC,CAAC;AAC1F,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,IAInC;IACC,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QACzB,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IAED,IAAI,IAAI,CAAC,kBAAkB,IAAI,IAAI,CAAC,eAAe,KAAK,SAAS,EAAE,CAAC;QAClE,MAAM,SAAS,GAAG,iBAAiB,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,6BAA6B,CAAC;QAC3F,OAAO,EAAE,SAAS,EAAE,CAAC;IACvB,CAAC;IAED,OAAO,yBAAyB,CAAC;AACnC,CAAC;AAED,MAAM,CAAC,MAAM,uBAAuB,GAAG,MAAM,CAAC;AAE9C,MAAM,gBAAgB,GAAG;IACvB,iHAAiH;IACjH,gHAAgH;CACjH,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAEZ,MAAM,wBAAwB,GAAG,8BAA8B,CAAC;AAEhE,MAAM,kCAAkC,GACtC,0HAA0H,CAAC;AAE7H,MAAM,wBAAwB,GAC5B,0IAA0I,CAAC;AAE7I,MAAM,kCAAkC,GAAG;IACzC,kEAAkE;IAClE,eAAe,6BAA6B,0TAA0T;IACtW,yDAAyD,6BAA6B,QAAQ,gCAAgC,GAAG;IACjI,eAAe,gCAAgC,yDAAyD,sBAAsB,GAAG;IACjI,6DAA6D,gCAAgC,gBAAgB;IAC7G,2CAA2C,6BAA6B,+BAA+B,iCAAiC,sCAAsC;CAC/K,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAEZ,MAAM,CAAC,MAAM,SAAS,GAAS;IAC7B,IAAI,EAAE,cAAc;IACpB,WAAW,EAAE,gBAAgB;IAC7B,UAAU,EAAE,IAAI,CAAC,MAAM,CACrB;QACE,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC;YACnB,WAAW,EAAE,wBAAwB;SACtC,CAAC;QACF,gBAAgB,EAAE,IAAI,CAAC,QAAQ,CAC7B,IAAI,CAAC,MAAM,CAAC;YACV,WAAW,EAAE,kCAAkC;SAChD,CAAC,CACH;QACD,OAAO,EAAE,IAAI,CAAC,QAAQ,CACpB,IAAI,CAAC,MAAM,CAAC;YACV,WAAW,EAAE,wBAAwB;SACtC,CAAC,CACH;QACD,eAAe,EAAE,IAAI,CAAC,QAAQ,CAC5B,IAAI,CAAC,OAAO,CAAC;YACX,WAAW,EAAE,kCAAkC;YAC/C,OAAO,EAAE,CAAC;YACV,OAAO,EAAE,sBAAsB;SAChC,CAAC,CACH;KACF,EACD,EAAE,oBAAoB,EAAE,KAAK,EAAE,CAChC;CACF,CAAC;AAUF,MAAM,yBAAyB,GAAG,KAAK,CAAC;AACxC,MAAM,qBAAqB,GAAG;;;;;;;;CAQ7B,CAAC,IAAI,EAAE,CAAC;AAET,KAAK,UAAU,sBAAsB,CAAC,OAA6B;IACjE,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,aAAa,CAAC,qBAAqB,EAAE,EAAE,EAAE;YACpE,SAAS,EAAE,yBAAyB;SACrC,CAAC,CAAC;QACH,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC;YAAE,OAAO,SAAS,CAAC;QAC5C,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,SAAS,CAAC;IAC3C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED,KAAK,UAAU,iBAAiB,CAC9B,OAA6B,EAC7B,OAAe;IAEf,IAAI,CAAC,OAAO;QAAE,OAAO,SAAS,CAAC;IAC/B,MAAM,QAAQ,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAAC,CAAC;IACvD,IAAI,CAAC,QAAQ;QAAE,OAAO,SAAS,CAAC;IAChC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC1D,OAAO,MAAM,CAAC,IAAI,CAAC;IACrB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED,SAAS,wBAAwB,CAAC,IAAuB;IACvD,IAAI,CAAC,IAAI,CAAC,IAAI;QAAE,OAAO,EAAE,CAAC;IAC1B,OAAO,yBAAyB,IAAI,CAAC,IAAI,kIAAkI,CAAC;AAC9K,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,MAAc,EACd,gBAAyB,EACzB,MAAwB,EACxB,OAA6B;IAE7B,MAAM,WAAW,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;IACtC,MAAM,aAAa,GAAG,iBAAiB,CAAC,WAAW,EAAE;QACnD,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,QAAQ,EAAE,QAAQ;KACnB,CAAC,CAAC;IACH,MAAM,cAAc,GAAG,aAAa,CAAC,SAAS;QAC5C,CAAC,CAAC,MAAM,iBAAiB,CAAC,OAAO,EAAE,WAAW,CAAC;QAC/C,CAAC,CAAC,SAAS,CAAC;IAEd,IAAI,MAAM,CAAC,YAAY,IAAI,aAAa,CAAC,SAAS,EAAE,CAAC;QACnD,MAAM,aAAa,GAAG,MAAM,CAAC,aAAa,IAAI,iCAAiC,CAAC;QAChF,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,WAAW,EAAE;YACvD,SAAS,EAAE,aAAa;YACxB,QAAQ,EAAE,QAAQ;SACnB,CAAC,CAAC;QACH,OAAO;YACL,MAAM,EAAE,iBAAiB,CAAC,OAAO;YACjC,KAAK,EAAE,iBAAiB;YACxB,gBAAgB;YAChB,KAAK,EAAE,IAAI;YACX,cAAc;SACf,CAAC;IACJ,CAAC;IAED,OAAO;QACL,MAAM,EAAE,aAAa,CAAC,OAAO;QAC7B,KAAK,EAAE,aAAa;QACpB,gBAAgB;QAChB,cAAc;KACf,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,IAGxC;IACC,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;IAC1C,MAAM,EAAE,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,cAAc,EAAE,GAAG,cAAc,CAAC;IAC1E,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,KAAK,CAAC,CAAC;IAE5C,IAAI,KAAK,EAAE,CAAC;QACV,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;QAC9B,MAAM,kBAAkB,GAAG,aAAa,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAC3D,MAAM,QAAQ,GAAG,2GAA2G,kBAAkB,WAAW,wBAAwB,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,yHAAyH,6BAA6B,IAAI,gCAAgC,iBAAiB,gCAAgC,yDAAyD,sBAAsB,+DAA+D,gCAAgC,iBAAiB,CAAC;QACtnB,MAAM,QAAQ,GAAG,QAAQ,KAAK,IAAI,IAAI,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,QAAQ,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACnF,OAAO,GAAG,OAAO,GAAG,QAAQ,GAAG,QAAQ,EAAE,CAAC;IAC5C,CAAC;IAED,IAAI,WAAW,IAAI,QAAQ,KAAK,CAAC,EAAE,CAAC;QAClC,OAAO,qCAAqC,CAAC;IAC/C,CAAC;IAED,MAAM,gBAAgB,GAAG,KAAK,CAAC,OAAO,CAAC;IACvC,MAAM,SAAS,GACb,KAAK,CAAC,SAAS,IAAI,gBAAgB;QACjC,CAAC,CAAC,sCAAsC,KAAK,CAAC,WAAW,YAAY,WAAW,CAAC,KAAK,CAAC,WAAW,CAAC,aAAa,KAAK,CAAC,UAAU,YAAY,WAAW,CAAC,KAAK,CAAC,UAAU,CAAC,4BAA4B,aAAa,CAAC,KAAK,CAAC,UAAU,CAAC,YAAY,wBAAwB,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,GAAG;QACrS,CAAC,CAAC,EAAE,CAAC;IACT,MAAM,QAAQ,GAAG,QAAQ,KAAK,IAAI,IAAI,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,QAAQ,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IACnF,OAAO,GAAG,gBAAgB,GAAG,SAAS,GAAG,QAAQ,EAAE,CAAC;AACtD,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,IAIzC;IACC,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;IACnD,MAAM,EAAE,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,GAAG,cAAc,CAAC;IAEnE,MAAM,gBAAgB,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,aAAa,CAAC;IAClE,MAAM,SAAS,GACb,KAAK,CAAC,SAAS,IAAI,gBAAgB;QACjC,CAAC,CAAC,sCAAsC,KAAK,CAAC,WAAW,YAAY,WAAW,CAAC,KAAK,CAAC,WAAW,CAAC,aAAa,KAAK,CAAC,UAAU,YAAY,WAAW,CAAC,KAAK,CAAC,UAAU,CAAC,4BAA4B,aAAa,CAAC,KAAK,CAAC,UAAU,CAAC,YAAY,wBAAwB,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,GAAG;QACrS,CAAC,CAAC,EAAE,CAAC;IACT,MAAM,QAAQ,GAAG,QAAQ,KAAK,IAAI,IAAI,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,QAAQ,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IACnF,MAAM,eAAe,GAAG,KAAK,OAAO,KAAK,gBAAgB,GAAG,SAAS,GAAG,QAAQ,EAAE,CAAC;IACnF,OAAO,yBAAyB,eAAe,EAAE,CAAC;AACpD,CAAC;AAED,MAAM,yBAAyB,GAAG,CAAC,CAAC;AACpC,MAAM,yBAAyB,GAAG,CAAC,CAAC;AAEpC,SAAS,gBAAgB,CAAC,UAAqC;IAC7D,IAAI,UAAU,KAAK,IAAI,IAAI,UAAU,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QACpF,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;IAC/C,IAAI,EAAE,GAAG,IAAI;QAAE,OAAO,GAAG,EAAE,IAAI,CAAC;IAChC,IAAI,EAAE,GAAG,MAAM;QAAE,OAAO,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;IACrD,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC;AACrC,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,IAO/B;IACC,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;IACtD,MAAM,EAAE,KAAK,EAAE,gBAAgB,EAAE,GAAG,cAAc,CAAC;IAEnD,MAAM,aAAa,GAAG,cAAc,CAAC,MAAM,CAAC;IAC5C,MAAM,kBAAkB,GAAG,yBAAyB,CAAC,aAAa,EAAE;QAClE,SAAS,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,IAAI,yBAAyB;QAC/D,SAAS,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,IAAI,yBAAyB;KAChE,CAAC,CAAC;IACH,MAAM,YAAY,GAAiB,kBAAkB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACnE,IAAI,EAAE,IAAI;KACX,CAAC,CAAC,CAAC;IAEJ,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;IACtC,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;IACtC,MAAM,SAAS,GAAG,WAAW,GAAG,CAAC,CAAC;IAElC,MAAM,WAAW,GAAG,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,QAAQ,EAAE,CAAC;IACtE,MAAM,qBAAqB,GAAG,IAAI,CAAC,gBAAgB;QACjD,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,gBAAgB,CAAC;QAClC,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,aAAa,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;IACnD,MAAM,SAAS,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,WAAW,QAAQ,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;IACjG,MAAM,UAAU,GAAG,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACpE,MAAM,UAAU,GAAG,SAAS,CAAC,CAAC,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC5E,MAAM,YAAY,GAAa,EAAE,CAAC;IAClC,IAAI,KAAK,CAAC,SAAS,IAAI,gBAAgB,EAAE,CAAC;QACxC,YAAY,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IACvC,CAAC;IACD,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC/B,IAAI,qBAAqB,EAAE,CAAC;QAC1B,YAAY,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;IAC3C,CAAC;IACD,YAAY,CAAC,IAAI,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;IAC5C,IAAI,UAAU,IAAI,UAAU,EAAE,CAAC;QAC7B,YAAY,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAC5C,CAAC;IACD,MAAM,WAAW,GAAG,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAE7C,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAChD,MAAM,SAAS,GAAiB,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAE/F,OAAO;QACL,YAAY;QACZ,UAAU,EAAE,WAAW;QACvB,SAAS;KACV,CAAC;AACJ,CAAC;AAED,SAAS,2BAA2B,CAAC,IAGpC;IACC,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IACjD,OAAO,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;AACnF,CAAC;AAED,MAAM,cAAc,GAAG,CAAC;KACrB,MAAM,CAAC;IACN,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACjC,gBAAgB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IACrD,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;IACzC,eAAe,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;CACxD,CAAC;KACD,MAAM,EAAE,CAAC;AAEZ,SAAS,aAAa,CAAC,GAAY;IAajC,MAAM,SAAS,GACb,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,CAAC,CAAC,CAAE,GAA+B,CAAC,CAAC,CAAC,SAAS,CAAC;IACzF,MAAM,kBAAkB,GAAG,SAAS,CAAC,CAAC,CAAC,iBAAiB,IAAI,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC;IAC9E,MAAM,iBAAiB,GACrB,SAAS,IAAI,OAAO,SAAS,CAAC,OAAO,KAAK,QAAQ;QAChD,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,mBAAmB;QACjD,CAAC,CAAC,mBAAmB,CAAC;IAE1B,MAAM,MAAM,GAAG,cAAc,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAC7C,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACpB,OAAO;YACL,EAAE,EAAE,KAAK;YACT,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;YACnE,iBAAiB;SAClB,CAAC;IACJ,CAAC;IAED,OAAO;QACL,EAAE,EAAE,IAAI;QACR,IAAI,EAAE;YACJ,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO;YAC5B,gBAAgB,EAAE,MAAM,CAAC,IAAI,CAAC,gBAAgB;YAC9C,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO;YAC5B,eAAe,EAAE,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC;YAC/D,kBAAkB;YAClB,iBAAiB,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO;SACvC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAAC,GAAY;IACxC,MAAM,UAAU,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;IACtC,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC;QACnB,OAAO,qBAAqB,CAAC;IAC/B,CAAC;IACD,OAAO,UAAU,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,iBAAiB,CAAC;AAClG,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,OAA6B,EAAE,GAAW;IACjF,OAAO;QACL,MAAM,EAAE,SAAS;QACjB,QAAQ,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,EAAE,YAAY,EAAE,oBAAoB,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;QACpF,KAAK,CAAC,OAAO,CACX,QAAkB,EAClB,OAA6B;YAE7B,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;YAC3B,MAAM,UAAU,GAAG,aAAa,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YACrD,MAAM,iBAAiB,GAAG,UAAU,CAAC,EAAE;gBACrC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,iBAAiB;gBACnC,CAAC,CAAC,UAAU,CAAC,iBAAiB,CAAC;YACjC,MAAM,YAAY,GAAG,oBAAoB,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YAE9D,MAAM,OAAO,GAAG,CAAC,MAAc,EAA6B,EAAE;gBAC5D,MAAM,OAAO,GAAG,qBAAqB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;gBACzD,MAAM,OAAO,GAAiB;oBAC5B,IAAI,EAAE,cAAc;oBACpB,UAAU,EAAE,QAAQ,CAAC,EAAE;oBACvB,OAAO,EAAE,iBAAiB;oBAC1B,YAAY;oBACZ,MAAM;iBACP,CAAC;gBACF,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC;YACzE,CAAC,CAAC;YAEF,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC;gBACnB,OAAO,WAAW,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,sBAAsB,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YACvF,CAAC;YAED,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,GAC/E,UAAU,CAAC,IAAI,CAAC;YAElB,MAAM,yBAAyB,GAAG,2BAA2B,CAAC;gBAC5D,UAAU,EAAE,GAAG;gBACf,gBAAgB;aACjB,CAAC,CAAC;YAEH,OAAO,WAAW,CAChB,OAAO,EACP,KAAK,IAAI,EAAE;gBACT,IAAI,CAAC;oBACH,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;oBAC7B,MAAM,EACJ,MAAM,EACN,QAAQ,EACR,SAAS,EAAE,gBAAgB,EAC3B,OAAO,EACP,QAAQ,GACT,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE;wBACjC,MAAM;wBACN,SAAS,EAAE,OAAO,IAAI,uBAAuB;wBAC7C,GAAG,EAAE,yBAAyB;qBAC/B,CAAC,CAAC;oBACH,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC,CAAC;oBAEvD,MAAM,YAAY,GAAG,mBAAmB,CAAC;wBACvC,IAAI,EAAE,OAAO;wBACb,eAAe;wBACf,kBAAkB;qBACnB,CAAC,CAAC;oBACH,MAAM,cAAc,GAAG,MAAM,iBAAiB,CAC5C,MAAM,EACN,gBAAgB,EAChB,YAAY,EACZ,OAAO,CACR,CAAC;oBACF,MAAM,QAAQ,GAAG,wBAAwB,CAAC,EAAE,cAAc,EAAE,QAAQ,EAAE,CAAC,CAAC;oBACxE,MAAM,OAAO,GAAG,QAAQ,KAAK,IAAI,IAAI,QAAQ,KAAK,CAAC,CAAC;oBACpD,MAAM,MAAM,GAAG,eAAe,CAAC;wBAC7B,cAAc;wBACd,QAAQ;wBACR,UAAU;wBACV,gBAAgB,EAAE,gBAAgB,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,SAAS;wBAC1E,QAAQ,EAAE,QAAQ;qBACnB,CAAC,CAAC;oBAEH,MAAM,OAAO,GAAG,qBAAqB,CACnC,QAAQ,EACR,OAAO,IAAI,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAW,CACrE,CAAC;oBACF,MAAM,OAAO,GAAiB;wBAC5B,IAAI,EAAE,gBAAgB;wBACtB,UAAU,EAAE,QAAQ,CAAC,EAAE;wBACvB,OAAO;wBACP,YAAY;wBACZ,QAAQ;wBACR,cAAc;wBACd,MAAM;wBACN,UAAU;qBACX,CAAC;oBACF,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC;gBACzE,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,MAAM,GAAG,GAAG,+BAA+B,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;oBACxF,MAAM,OAAO,GAAG,qBAAqB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;oBACrD,MAAM,OAAO,GAAiB;wBAC5B,IAAI,EAAE,cAAc;wBACpB,OAAO,EAAE,iBAAiB;wBAC1B,YAAY;wBACZ,MAAM,EAAE,GAAG;wBACX,UAAU,EAAE,QAAQ,CAAC,EAAE;qBACxB,CAAC;oBACF,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC;gBACzE,CAAC;YACH,CAAC,EACD;gBACE,IAAI,EAAE,cAAc;gBACpB,UAAU,EAAE,QAAQ,CAAC,EAAE;gBACvB,OAAO;gBACP,YAAY;aACb,CACF,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC"}

package/dist/core/tools/catalog.js

@@ -1,57 +1,81 @@
+import { AgentSupervisor } from "../subagents/agent_supervisor.js";
 import { createBashToolDefinition } from "./bash.js";
 import { createEditToolDefinition } from "./edit.js";
+import { scopeToolExecutionBackend } from "./execution_backend.js";
+import { createInterruptAgentToolDefinition } from "./interrupt_agent.js";
+import { createListAgentsToolDefinition } from "./list_agents.js";
 import { createNookToolDefinition } from "./nook.js";
 import { ToolRegistry } from "./registry.js";
 import { createSendInputToAgentToolDefinition } from "./send_input_to_agent.js";
 import { createSpawnAgentToolDefinition } from "./spawn_agent.js";
-import { createTerminateAgentToolDefinition } from "./terminate_agent.js";
 import { TOOL_NAME_BASH, TOOL_NAME_EDIT, TOOL_NAME_VIEW_IMAGE, TOOL_NAME_WEB, TOOL_NAME_WRITE, } from "./tool_names.js";
 import { createViewImageToolDefinition } from "./view_image.js";
 import { createWaitForAgentsToolDefinition } from "./wait_for_agents.js";
 import { createWebToolDefinition } from "./web.js";
 import { createWriteToolDefinition } from "./write.js";
 export const ToolCatalog = {
-    createRegistry(backend) {
-        return new ToolRegistry([
-            createBashToolDefinition(backend),
-            createWriteToolDefinition(backend),
-            createEditToolDefinition(backend),
-            createViewImageToolDefinition(backend),
-            createWebToolDefinition(backend),
-            createSpawnAgentToolDefinition(backend),
-            createSendInputToAgentToolDefinition(backend),
-            createWaitForAgentsToolDefinition(),
-            createTerminateAgentToolDefinition(),
-            createNookToolDefinition(backend),
-        ]);
+    createDebugRegistry(options) {
+        return this.createSessionRegistry({
+            ...options,
+            subagentPrompts: {},
+            supervisor: new AgentSupervisor({ onEvent: () => { } }),
+        });
     },
-    createSubagentRegistry(allowedTools, backend) {
+    createSessionRegistry(options) {
+        const tools = [
+            createBashToolDefinition(options.backend, options.cwd),
+            createWriteToolDefinition(options.backend),
+            createEditToolDefinition(options.backend),
+            createViewImageToolDefinition(options.backend),
+            createWebToolDefinition(options.backend, options.config),
+            createSpawnAgentToolDefinition({
+                backend: options.backend,
+                supervisor: options.supervisor,
+                persona: options.persona,
+                config: options.config,
+                modelResolver: options.modelResolver,
+                subagentPrompts: options.subagentPrompts,
+                cwd: options.cwd,
+                ...(options.resolveSubagentRuntime
+                    ? { resolveSubagentRuntime: options.resolveSubagentRuntime }
+                    : {}),
+            }),
+            createSendInputToAgentToolDefinition(options.supervisor),
+            createWaitForAgentsToolDefinition(options.supervisor),
+            createListAgentsToolDefinition(options.supervisor),
+            createInterruptAgentToolDefinition(options.supervisor),
+        ];
+        if (options.config.nook) {
+            tools.push(createNookToolDefinition(options.backend, options.config));
+        }
+        const enabledToolNames = new Set(options.persona.tools);
+        return new ToolRegistry(tools.filter((tool) => enabledToolNames.has(tool.schema.name)));
+    },
+    createSubagentRegistry(allowedTools, backend, cwd, config) {
+        const scopedBackend = scopeToolExecutionBackend(backend, cwd);
         const definitions = [];
         const seen = new Set();
-        const addTool = (tool) => {
+        for (const tool of allowedTools) {
             if (seen.has(tool))
-                return;
+                continue;
             seen.add(tool);
             switch (tool) {
                 case TOOL_NAME_BASH:
-                    definitions.push(createBashToolDefinition(backend));
+                    definitions.push(createBashToolDefinition(scopedBackend, cwd));
                     break;
                 case TOOL_NAME_WRITE:
-                    definitions.push(createWriteToolDefinition(backend));
+                    definitions.push(createWriteToolDefinition(scopedBackend));
                     break;
                 case TOOL_NAME_EDIT:
-                    definitions.push(createEditToolDefinition(backend));
+                    definitions.push(createEditToolDefinition(scopedBackend));
                     break;
                 case TOOL_NAME_VIEW_IMAGE:
-                    definitions.push(createViewImageToolDefinition(backend));
+                    definitions.push(createViewImageToolDefinition(scopedBackend));
                     break;
                 case TOOL_NAME_WEB:
-                    definitions.push(createWebToolDefinition(backend));
+                    definitions.push(createWebToolDefinition(scopedBackend, config));
                     break;
             }
-        };
-        for (const tool of allowedTools) {
-            addTool(tool);
         }
         return new ToolRegistry(definitions);
     },

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

@@ -1 +1 @@
-{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../../../src/core/tools/catalog.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AACrD,OAAO,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AAErD,OAAO,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AAErD,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,oCAAoC,EAAE,MAAM,0BAA0B,CAAC;AAChF,OAAO,EAAE,8BAA8B,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,kCAAkC,EAAE,MAAM,sBAAsB,CAAC;AAC1E,OAAO,EACL,cAAc,EACd,cAAc,EACd,oBAAoB,EACpB,aAAa,EACb,eAAe,GAChB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,6BAA6B,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,iCAAiC,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AACnD,OAAO,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAEvD,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,cAAc,CAAC,OAA6B;QAC1C,OAAO,IAAI,YAAY,CAAC;YACtB,wBAAwB,CAAC,OAAO,CAAC;YACjC,yBAAyB,CAAC,OAAO,CAAC;YAClC,wBAAwB,CAAC,OAAO,CAAC;YACjC,6BAA6B,CAAC,OAAO,CAAC;YACtC,uBAAuB,CAAC,OAAO,CAAC;YAChC,8BAA8B,CAAC,OAAO,CAAC;YACvC,oCAAoC,CAAC,OAAO,CAAC;YAC7C,iCAAiC,EAAE;YACnC,kCAAkC,EAAE;YACpC,wBAAwB,CAAC,OAAO,CAAC;SAClC,CAAC,CAAC;IACL,CAAC;IAED,sBAAsB,CACpB,YAAgC,EAChC,OAA6B;QAE7B,MAAM,WAAW,GAAqB,EAAE,CAAC;QACzC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;QAE/B,MAAM,OAAO,GAAG,CAAC,IAAsB,EAAQ,EAAE;YAC/C,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;gBAAE,OAAO;YAC3B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAEf,QAAQ,IAAI,EAAE,CAAC;gBACb,KAAK,cAAc;oBACjB,WAAW,CAAC,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC,CAAC;oBACpD,MAAM;gBACR,KAAK,eAAe;oBAClB,WAAW,CAAC,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC,CAAC;oBACrD,MAAM;gBACR,KAAK,cAAc;oBACjB,WAAW,CAAC,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC,CAAC;oBACpD,MAAM;gBACR,KAAK,oBAAoB;oBACvB,WAAW,CAAC,IAAI,CAAC,6BAA6B,CAAC,OAAO,CAAC,CAAC,CAAC;oBACzD,MAAM;gBACR,KAAK,aAAa;oBAChB,WAAW,CAAC,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC,CAAC;oBACnD,MAAM;YACV,CAAC;QACH,CAAC,CAAC;QAEF,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE,CAAC;YAChC,OAAO,CAAC,IAAI,CAAC,CAAC;QAChB,CAAC;QAED,OAAO,IAAI,YAAY,CAAC,WAAW,CAAC,CAAC;IACvC,CAAC;CACF,CAAC"}
+{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../../../src/core/tools/catalog.ts"],"names":[],"mappings":"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"}

package/dist/core/tools/code_mode.js

@@ -1,8 +1,7 @@
-import { createToolError, createToolResult } from "../utils/messages.js";
 import { bytesToTokens } from "../utils/token.js";
 import { formatBytes } from "../utils/truncate.js";
 import { buildBashUiText, prepareBashOutput } from "./bash.js";
-import { createToolDispatch } from "./registry.js";
+import { createTextToolOutcome, executeTool, } from "./registry.js";
 function getCodeModeTerminationNote(execution, timeoutMs) {
     if (execution.timedOut) {
         return `(tau) timed out${timeoutMs === undefined ? "" : ` after ${timeoutMs}ms`}`;
@@ -30,13 +29,16 @@ function formatCodeModeResultText(truncationInfo, execution, terminated) {
 export function createCodeModeToolDefinition(backend, implementation) {
     return {
         schema: implementation.schema,
-        getDisplayTarget: (toolCall) => implementation.parseArguments(toolCall.arguments).displayTarget,
-        getCodePreview: (toolCall) => implementation.parseArguments(toolCall.arguments).code,
-        async dispatch(toolCall, signal, context) {
+        describe: (toolCall) => {
+            const parsed = implementation.parseArguments(toolCall.arguments);
+            return { headerTarget: parsed.displayTarget, code: parsed.code };
+        },
+        async execute(toolCall, context) {
+            const { signal } = context;
             const parsed = implementation.parseArguments(toolCall.arguments);
             const headerTarget = parsed.displayTarget;
-            const blocked = (reason) => {
-                const toolResult = createToolError(toolCall, reason);
+            const blocked = (reason, semanticOutcome = "blocked") => {
+                const outcome = createTextToolOutcome(reason, semanticOutcome);
                 const uiEvent = {
                     type: "code_mode_blocked",
                     toolCallId: toolCall.id,
@@ -45,60 +47,65 @@ export function createCodeModeToolDefinition(backend, implementation) {
                     headerTarget,
                     reason,
                 };
-                return { toolResult, uiEvent };
+                return { content: outcome.content, outcome: outcome.outcome, uiEvent };
             };
             if (!parsed.ok) {
-                return createToolDispatch(() => blocked(`Invalid arguments: ${parsed.error}`));
+                return executeTool(context, () => blocked(`Invalid arguments: ${parsed.error}`));
             }
-            return {
-                startedUiEvent: {
-                    type: "code_mode_started",
-                    toolCallId: toolCall.id,
-                    toolName: implementation.schema.name,
-                    code: parsed.code,
-                    headerTarget,
-                },
-                run: (async () => {
-                    try {
-                        const startedAt = Date.now();
-                        const execution = await implementation.execute({
-                            args: parsed.args,
-                            code: parsed.code,
-                            backend,
-                            context,
-                            signal,
-                        });
-                        const durationMs = Math.max(0, Date.now() - startedAt);
-                        const terminationNote = getCodeModeTerminationNote(execution, implementation.timeoutMs);
-                        const output = terminationNote
-                            ? `${execution.output}${execution.output && !execution.output.endsWith("\n") ? "\n" : ""}${terminationNote}\n`
-                            : execution.output;
-                        const truncationInfo = await prepareBashOutput(output, execution.truncated, implementation.outputPolicy, backend);
-                        const toolText = formatCodeModeResultText(truncationInfo, execution, terminationNote !== undefined);
-                        const isError = execution.exitCode === null || execution.exitCode !== 0;
-                        const uiText = buildBashUiText({
-                            truncationInfo,
-                            exitCode: execution.exitCode,
-                            durationMs,
-                            fullText: toolText,
-                        });
-                        const toolResult = createToolResult(toolCall, toolText, isError);
-                        const uiEvent = {
-                            type: "code_mode_finished",
-                            toolCallId: toolCall.id,
-                            toolName: implementation.schema.name,
-                            code: parsed.code,
-                            headerTarget,
-                            status: isError ? "error" : "success",
-                            uiText,
-                        };
-                        return { toolResult, uiEvent };
-                    }
-                    catch (error) {
-                        return blocked(error instanceof Error ? error.message : String(error));
-                    }
-                })(),
-            };
+            const blockedReason = implementation.getBlockedReason?.(parsed.args);
+            if (blockedReason) {
+                return executeTool(context, () => blocked(blockedReason));
+            }
+            return executeTool(context, async () => {
+                try {
+                    const startedAt = Date.now();
+                    const execution = await implementation.execute({
+                        args: parsed.args,
+                        code: parsed.code,
+                        backend,
+                        signal,
+                    });
+                    const durationMs = Math.max(0, Date.now() - startedAt);
+                    const terminationNote = getCodeModeTerminationNote(execution, implementation.timeoutMs);
+                    const output = terminationNote
+                        ? `${execution.output}${execution.output && !execution.output.endsWith("\n") ? "\n" : ""}${terminationNote}\n`
+                        : execution.output;
+                    const truncationInfo = await prepareBashOutput(output, execution.truncated, implementation.outputPolicy, backend);
+                    const toolText = formatCodeModeResultText(truncationInfo, execution, terminationNote !== undefined);
+                    const isError = execution.exitCode === null || execution.exitCode !== 0;
+                    const semanticOutcome = execution.aborted || execution.timedOut
+                        ? "cancelled"
+                        : isError
+                            ? "failed"
+                            : "succeeded";
+                    const uiText = buildBashUiText({
+                        truncationInfo,
+                        exitCode: execution.exitCode,
+                        durationMs,
+                        fullText: toolText,
+                    });
+                    const outcome = createTextToolOutcome(toolText, semanticOutcome);
+                    const uiEvent = {
+                        type: "code_mode_finished",
+                        toolCallId: toolCall.id,
+                        toolName: implementation.schema.name,
+                        code: parsed.code,
+                        headerTarget,
+                        status: isError ? "error" : "success",
+                        uiText,
+                    };
+                    return { content: outcome.content, outcome: outcome.outcome, uiEvent };
+                }
+                catch (error) {
+                    return blocked(error instanceof Error ? error.message : String(error), "failed");
+                }
+            }, {
+                type: "code_mode_started",
+                toolCallId: toolCall.id,
+                toolName: implementation.schema.name,
+                code: parsed.code,
+                headerTarget,
+            });
         },
     };
 }

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

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

package/dist/core/tools/edit.js

@@ -1,9 +1,8 @@
 import { Type } from "typebox";
 import { z } from "zod";
 import { buildLineDiff } from "../utils/line_diff.js";
-import { createToolError, createToolSuccess } from "../utils/messages.js";
 import { formatZodError } from "../utils/zod.js";
-import { createToolDispatch } from "./registry.js";
+import { createTextToolOutcome, executeTool, } from "./registry.js";
 import { TOOL_NAME_EDIT } from "./tool_names.js";
 const EDIT_DESCRIPTION = [
     "Edit a file by replacing exact text matches.",
@@ -93,14 +92,14 @@ function buildEditUiText(args) {
 export function createEditToolDefinition(backend) {
     return {
         schema: EDIT_TOOL,
-        getDisplayTarget: (toolCall) => getEditDisplayTarget(toolCall.arguments),
-        async dispatch(toolCall) {
-            return createToolDispatch(async () => {
+        describe: (toolCall) => ({ headerTarget: getEditDisplayTarget(toolCall.arguments) }),
+        async execute(toolCall, context) {
+            return executeTool(context, async () => {
                 const parsedArgs = parseEditArgs(toolCall.arguments);
                 const path = parsedArgs.ok ? parsedArgs.data.path : "";
                 const headerTarget = getEditDisplayTarget(toolCall.arguments);
-                const blocked = (reason) => {
-                    const toolResult = createToolError(toolCall, reason);
+                const blocked = (reason, semanticOutcome = "blocked") => {
+                    const outcome = createTextToolOutcome(reason, semanticOutcome);
                     const uiEvent = {
                         type: "edit_blocked",
                         toolCallId: toolCall.id,
@@ -108,7 +107,7 @@ export function createEditToolDefinition(backend) {
                         headerTarget,
                         reason,
                     };
-                    return { toolResult, uiEvent };
+                    return { content: outcome.content, outcome: outcome.outcome, uiEvent };
                 };
                 if (!parsedArgs.ok) {
                     return blocked(`Invalid arguments: ${parsedArgs.error}`);
@@ -124,7 +123,7 @@ export function createEditToolDefinition(backend) {
                     if (e.code === "ENOENT") {
                         return blocked(`File not found at '${path}'. Verify the path is correct.`);
                     }
-                    return blocked(`Could not read file: ${errorMessage}`);
+                    return blocked(`Could not read file: ${errorMessage}`, "failed");
                 }
                 const matchCount = countOccurrences(content, oldText);
                 if (matchCount === 0) {
@@ -168,7 +167,7 @@ export function createEditToolDefinition(backend) {
                     const summaryLine = `Successfully edited ${path}: ${oldText.length} → ${newText.length} chars (${sizeDiffStr})`;
                     const statusLine = `+${added}, -${removed} · ${oldText.length} → ${newText.length} chars (${sizeDiffStr})`;
                     const resultText = formatEditToolResultText({ summaryLine });
-                    const toolResult = createToolSuccess(toolCall, resultText);
+                    const outcome = createTextToolOutcome(resultText, "succeeded");
                     const uiText = buildEditUiText({ summaryLine, statusLine, diffLines });
                     const uiEvent = {
                         type: "edit_success",
@@ -181,11 +180,11 @@ export function createEditToolDefinition(backend) {
                         newText,
                         uiText,
                     };
-                    return { toolResult, uiEvent };
+                    return { content: outcome.content, outcome: outcome.outcome, uiEvent };
                 }
                 catch (e) {
                     const errorMessage = e instanceof Error ? e.message : String(e);
-                    return blocked(`Could not write file: ${errorMessage}`);
+                    return blocked(`Could not write file: ${errorMessage}`, "failed");
                 }
             });
         },