@code-yeongyu/senpi 2026.9.4 → 2026.9.5

package/node_modules/@code-yeongyu/senpi-codemode/src/tool/eval-tool.ts

@@ -1,7 +1,7 @@
 import { randomUUID } from "node:crypto";
 import { join } from "node:path";
 import type { AgentToolResult, ExtensionContext, ToolDefinition } from "@code-yeongyu/senpi";
-import { defaultCodemodeSettings } from "../config/settings.ts";
+import { DEFAULT_FOREGROUND_WINDOW_SECONDS, defaultCodemodeSettings } from "../config/settings.ts";
 import { buildEvalPrompt } from "../prompt/eval-prompt.ts";
 import { TIMEOUT_PAUSE_OP, TIMEOUT_RESUME_OP } from "../timeouts/bridge-timeout.ts";
 import { abortError, CellExecution, defaultTimeoutFactory } from "./cell-execution.ts";
@@ -101,8 +101,19 @@ async function runEvalCell(
 	invocation: EvalCellInvocation,
 ): Promise<AgentToolResult<EvalToolDetails>> {
 	if (invocation.signal.aborted) throw abortError(invocation.signal.reason);
-	const timeoutMs = Math.floor((invocation.input.timeout ?? options.cellTimeoutSeconds) * 1_000);
 	const timeoutBehavior = evalTimeoutBehavior(invocation.input, invocation.ctx);
+	const requestedTimeoutMs = Math.floor((invocation.input.timeout ?? options.cellTimeoutSeconds) * 1_000);
+	// The `timeout` (and its `cellTimeoutSeconds` default) is the detach budget for interactive calls.
+	// Cap it at the foreground window so a large `timeout` — whose real purpose is to raise the
+	// wall-clock hard limit (see EvalDetachedCellManager) — frees the turn at the window instead of
+	// blocking the agent loop for its full duration. `on_timeout: "error"` (and print/json) keep the
+	// unclamped deadline, since there the cell is killed rather than detached.
+	const foregroundWindowMs = (options.foregroundWindowSeconds ?? DEFAULT_FOREGROUND_WINDOW_SECONDS) * 1_000;
+	const timeoutMs =
+		timeoutBehavior === "detach" ? Math.min(requestedTimeoutMs, foregroundWindowMs) : requestedTimeoutMs;
+	// A cell that pauses its watchdog for a host bridge call would otherwise wait the full pause grace
+	// (~10 min) before detaching; cap the grace at the foreground window too so the detach guarantee
+	// holds for bridge-parked cells. Error mode keeps the default grace (its timeout is the deadline).
 	const bridgeAbortController = new AbortController();
 	const cellSignal = AbortSignal.any([invocation.signal, bridgeAbortController.signal]);
 	const bridgeContext: ExtensionContext = { ...invocation.ctx, signal: cellSignal };
@@ -131,6 +142,7 @@ async function runEvalCell(
 		callerSignal: invocation.signal,
 		cellId: invocation.cellId,
 		timeoutMs,
+		...(timeoutBehavior === "detach" ? { maxPauseGraceMs: foregroundWindowMs } : {}),
 		timeoutFactory: options.timeoutFactory ?? defaultTimeoutFactory,
 		onTimeout: (error) => {
 			if (timeoutBehavior === "detach" && cellManager.detach(cell)) {

package/node_modules/@code-yeongyu/senpi-codemode/src/tool/types.ts

@@ -3,7 +3,7 @@ import { type TUnsafe, Type } from "typebox";
 import type { HostToKernelMessage, KernelToHostMessage } from "../bridge/protocol.ts";
 import type { TruncationMeta } from "../output/output-meta.ts";
 
-export const evalLanguageOrder = ["py", "js", "rb", "jl"] as const;
+export const evalLanguageOrder = ["js", "py", "rb", "jl"] as const;
 export type EvalLanguage = (typeof evalLanguageOrder)[number];
 export type EnabledEvalLanguages = Readonly<Record<EvalLanguage, boolean>>;
 
@@ -13,6 +13,12 @@ export function enabledLanguageList(enabled: EnabledEvalLanguages): EvalLanguage
 
 export const EVAL_SUMMARY_MAX_LENGTH = 80;
 
+const TIMEOUT_FIELD_DESCRIPTION =
+	"Seconds the cell may block the turn before it detaches, and the amount by which it raises the wall-clock hard limit. In interactive sessions the detach point is capped at the foreground window (default 60s), so a large value frees the turn at the window while the cell keeps running; on_timeout:'error' (and print/json) keep the full value as the uncapped deadline.";
+
+const ON_TIMEOUT_FIELD_DESCRIPTION =
+	"Timeout behavior. Interactive sessions detach by default (at the foreground window); print/json sessions error by default. 'error' uses the full timeout as an uncapped deadline.";
+
 export interface EvalToolInput {
 	readonly language: EvalLanguage;
 	readonly code: string;
@@ -37,7 +43,7 @@ const fullEvalInputSchema = Type.Object({
 		}),
 	),
 	language: Type.Optional(
-		Type.Union([Type.Literal("py"), Type.Literal("js"), Type.Literal("rb"), Type.Literal("jl")]),
+		Type.Union([Type.Literal("js"), Type.Literal("py"), Type.Literal("rb"), Type.Literal("jl")]),
 	),
 	code: Type.Optional(Type.String({ description: "Cell body, verbatim." })),
 	summary: Type.Optional(
@@ -47,10 +53,10 @@ const fullEvalInputSchema = Type.Object({
 				"REQUIRED for run. ONE line in the USER'S conversational language (Korean conversation -> Korean summary) stating WHAT this cell does and FOR WHAT PURPOSE; shown in the TUI while the cell runs. Longer values are force-truncated to 80 chars.",
 		}),
 	),
-	timeout: Type.Optional(Type.Number({ minimum: 1, description: "Timeout in seconds." })),
+	timeout: Type.Optional(Type.Number({ minimum: 1, description: TIMEOUT_FIELD_DESCRIPTION })),
 	on_timeout: Type.Optional(
 		Type.Union([Type.Literal("detach"), Type.Literal("error")], {
-			description: "Timeout behavior. Interactive sessions detach by default; print/json sessions error by default.",
+			description: ON_TIMEOUT_FIELD_DESCRIPTION,
 		}),
 	),
 	reset: Type.Optional(Type.Boolean({ description: "Reset this language kernel before running." })),
@@ -83,11 +89,10 @@ export function createEvalInputSchema(enabled: EnabledEvalLanguages): EvalInputS
 						"REQUIRED for run. ONE line in the USER'S conversational language (Korean conversation -> Korean summary) stating WHAT this cell does and FOR WHAT PURPOSE; shown in the TUI while the cell runs. Longer values are force-truncated to 80 chars.",
 				}),
 			),
-			timeout: Type.Optional(Type.Number({ minimum: 1, description: "Timeout in seconds." })),
+			timeout: Type.Optional(Type.Number({ minimum: 1, description: TIMEOUT_FIELD_DESCRIPTION })),
 			on_timeout: Type.Optional(
 				Type.Union([Type.Literal("detach"), Type.Literal("error")], {
-					description:
-						"Timeout behavior. Interactive sessions detach by default; print/json sessions error by default.",
+					description: ON_TIMEOUT_FIELD_DESCRIPTION,
 				}),
 			),
 			reset: Type.Optional(Type.Boolean({ description: "Reset this language kernel before running." })),

package/node_modules/@earendil-works/pi-agent-core/dist/agent-loop.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-loop.d.ts","sourceRoot":"","sources":["../src/agent-loop.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAIN,KAAK,OAAO,EAEZ,WAAW,EAIX,MAAM,uBAAuB,CAAC;AAU/B,OAAO,KAAK,EACX,YAAY,EACZ,UAAU,EACV,eAAe,EAEf,YAAY,EACZ,SAAS,EACT,aAAa,EAEb,QAAQ,EACR,MAAM,YAAY,CAAC;AAEpB,MAAM,MAAM,cAAc,GAAG,CAAC,KAAK,EAAE,UAAU,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AAEzE;;;GAGG;AACH,wBAAgB,SAAS,CACxB,OAAO,EAAE,YAAY,EAAE,EACvB,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,QAAQ,EAAE,QAAQ,GAChB,WAAW,CAAC,UAAU,EAAE,YAAY,EAAE,CAAC,CAiBzC;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAChC,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,QAAQ,EAAE,QAAQ,GAChB,WAAW,CAAC,UAAU,EAAE,YAAY,EAAE,CAAC,CAwBzC;AAED,wBAAsB,YAAY,CACjC,OAAO,EAAE,YAAY,EAAE,EACvB,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,eAAe,EACvB,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,QAAQ,EAAE,QAAQ,GAChB,OAAO,CAAC,YAAY,EAAE,CAAC,CAgBzB;AAED,wBAAsB,oBAAoB,CACzC,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,eAAe,EACvB,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,QAAQ,EAAE,QAAQ,GAChB,OAAO,CAAC,YAAY,EAAE,CAAC,CAiBzB;AAmBD,qBAAa,uBAAwB,SAAQ,KAAK;gBACrC,SAAS,EAAE,MAAM;CAM7B;AAqPD,uGAAuG;AACvG,wBAAsB,oBAAoB,CACzC,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,cAAc,GAAG,kBAAkB,CAAC,EAClE,MAAM,CAAC,EAAE,WAAW,GAClB,OAAO,CAAC,OAAO,CAAC,CAgBlB;AA+lBD,MAAM,WAAW,qBAAqB;IACrC,QAAQ,EAAE,aAAa,CAAC;IACxB,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,EAAE,OAAO,CAAC;CACd;AAED,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,GAAG,aAAa,CAYrG;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,GAAG,qBAAqB,CAOpG"}
+{"version":3,"file":"agent-loop.d.ts","sourceRoot":"","sources":["../src/agent-loop.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAIN,KAAK,OAAO,EAEZ,WAAW,EAIX,MAAM,uBAAuB,CAAC;AAU/B,OAAO,KAAK,EACX,YAAY,EACZ,UAAU,EACV,eAAe,EAEf,YAAY,EACZ,SAAS,EACT,aAAa,EAEb,QAAQ,EACR,MAAM,YAAY,CAAC;AAEpB,MAAM,MAAM,cAAc,GAAG,CAAC,KAAK,EAAE,UAAU,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AAEzE;;;GAGG;AACH,wBAAgB,SAAS,CACxB,OAAO,EAAE,YAAY,EAAE,EACvB,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,QAAQ,EAAE,QAAQ,GAChB,WAAW,CAAC,UAAU,EAAE,YAAY,EAAE,CAAC,CAiBzC;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAChC,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,QAAQ,EAAE,QAAQ,GAChB,WAAW,CAAC,UAAU,EAAE,YAAY,EAAE,CAAC,CAwBzC;AAED,wBAAsB,YAAY,CACjC,OAAO,EAAE,YAAY,EAAE,EACvB,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,eAAe,EACvB,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,QAAQ,EAAE,QAAQ,GAChB,OAAO,CAAC,YAAY,EAAE,CAAC,CAgBzB;AAED,wBAAsB,oBAAoB,CACzC,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,eAAe,EACvB,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,QAAQ,EAAE,QAAQ,GAChB,OAAO,CAAC,YAAY,EAAE,CAAC,CAiBzB;AAmBD,qBAAa,uBAAwB,SAAQ,KAAK;gBACrC,SAAS,EAAE,MAAM;CAM7B;AA2ND,uGAAuG;AACvG,wBAAsB,oBAAoB,CACzC,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,cAAc,GAAG,kBAAkB,CAAC,EAClE,MAAM,CAAC,EAAE,WAAW,GAClB,OAAO,CAAC,OAAO,CAAC,CAIlB;AA+mBD,MAAM,WAAW,qBAAqB;IACrC,QAAQ,EAAE,aAAa,CAAC;IACxB,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,EAAE,OAAO,CAAC;CACd;AAED,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,GAAG,aAAa,CAYrG;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,GAAG,qBAAqB,CAOpG"}

package/node_modules/@earendil-works/pi-agent-core/dist/agent-loop.js

@@ -96,9 +96,8 @@ async function runLoop(initialContext, newMessages, initialConfig, signal, emit,
     let config = initialConfig;
     let firstTurn = true;
     let firstProviderRequest = true;
-    // Check for steering messages at start (user may have typed while waiting)
-    let pendingMessages = (await config.getSteeringMessages?.()) || [];
     let drainedTerminatingQueue;
+    let turnStartAlreadyEmitted = false;
     const refreshTerminatingQueueDrain = async () => {
         if (!drainedTerminatingQueue || !config.restorePendingMessages)
             return;
@@ -110,12 +109,17 @@ async function runLoop(initialContext, newMessages, initialConfig, signal, emit,
             drainedTerminatingQueue = pendingMessages.length > 0 ? "followUp" : undefined;
         }
     };
+    // Check for steering messages at start (user may have typed while waiting)
+    let pendingMessages = (await config.getSteeringMessages?.()) || [];
     // Outer loop: continues when queued follow-up messages arrive after agent would stop
     while (true) {
         let hasMoreToolCalls = true;
         // Inner loop: process tool calls and steering messages
         while (hasMoreToolCalls || pendingMessages.length > 0) {
-            if (!firstTurn) {
+            if (turnStartAlreadyEmitted) {
+                turnStartAlreadyEmitted = false;
+            }
+            else if (!firstTurn) {
                 await emit({ type: "turn_start" });
             }
             else {
@@ -139,10 +143,7 @@ async function runLoop(initialContext, newMessages, initialConfig, signal, emit,
                 }
                 pendingMessages = [];
             }
-            // Stream assistant response. Continuation-scoped overrides apply to one
-            // provider request only. Once that request emits its first event, the
-            // configured idle timeout resumes so healthy reasoning gaps are not bound
-            // by the short liveness probe.
+            // Stream assistant response
             const isInitialProviderRequest = firstProviderRequest;
             firstProviderRequest = false;
             const requestConfig = isInitialProviderRequest
@@ -152,16 +153,10 @@ async function runLoop(initialContext, newMessages, initialConfig, signal, emit,
                     streamStartTimeoutMs: config.initialRequestStreamStartTimeoutMs ?? config.streamStartTimeoutMs,
                 }
                 : config;
-            const streamIdleTimeoutMs = isInitialProviderRequest ? config.timeoutMs : requestConfig.timeoutMs;
-            const streamed = await streamAssistantResponse(currentContext, requestConfig, signal, emit, withEmptyAssistantRecovery(requestConfig.model, streamFunction), streamIdleTimeoutMs);
+            const streamed = await streamAssistantResponse(currentContext, requestConfig, signal, emit, withEmptyAssistantRecovery(requestConfig.model, streamFunction), isInitialProviderRequest ? config.timeoutMs : requestConfig.timeoutMs);
             const message = promoteStopWithPendingToolCalls(streamed.message);
             const providerToolResults = streamed.providerToolResults;
             newMessages.push(message);
-            // Provider-resolved (Cursor exec-channel) tool results pair with
-            // already-resolved toolCall blocks in the assistant message. They are
-            // appended right after it — including on terminal error/abort paths,
-            // where dropping them would leave resolved calls unpaired and strip
-            // the interaction from every rebuilt transcript.
             const toolResults = [];
             for (const result of providerToolResults) {
                 await emit({ type: "message_start", message: result });
@@ -175,18 +170,14 @@ async function runLoop(initialContext, newMessages, initialConfig, signal, emit,
                 await emit({ type: "agent_end", messages: newMessages });
                 return;
             }
-            // Check for tool calls. Blocks stamped `kCursorExecResolved` were
-            // already executed by Cursor's exec channel mid-stream (their results
-            // arrived via `providerToolResults`); running them here again would
-            // duplicate side-effecting tools.
+            // Check for tool calls
             const toolCalls = message.content.filter((c) => c.type === "toolCall" && !isCursorExecResolved(c));
             hasMoreToolCalls = false;
             let toolBatchTerminated = false;
             if (toolCalls.length > 0) {
-                // A native "length" stop means the output was cut off by the token limit,
-                // so every tool call in the message may carry truncated arguments. Text
-                // tool-call middleware finalizes its calls as "toolUse", leaving only
-                // native, unwrapped length responses for this message-wide safeguard.
+                // A "length" stop means the output was cut off by the token limit, so
+                // every tool call in the message may carry truncated arguments. Fail
+                // them all instead of executing potentially borked calls.
                 const executedToolBatch = message.stopReason === "length"
                     ? await failToolCallsFromTruncatedMessage(toolCalls, emit)
                     : await executeToolCalls(currentContext, message, config, signal, emit);
@@ -209,34 +200,35 @@ async function runLoop(initialContext, newMessages, initialConfig, signal, emit,
                 context: currentContext,
                 newMessages,
             };
+            if (await config.shouldStopAfterTurn?.(nextTurnContext)) {
+                await emit({ type: "agent_end", messages: newMessages });
+                return;
+            }
             if (toolBatchTerminated) {
-                if (await config.shouldStopAfterTurn?.(nextTurnContext)) {
-                    await emit({ type: "agent_end", messages: newMessages });
-                    return;
-                }
                 pendingMessages = (await config.getSteeringMessages?.()) || [];
-                if (pendingMessages.length > 0) {
+                if (pendingMessages.length > 0)
                     drainedTerminatingQueue = "steering";
-                }
                 if (pendingMessages.length === 0) {
                     pendingMessages = (await config.getFollowUpMessages?.()) || [];
-                    if (pendingMessages.length > 0) {
+                    if (pendingMessages.length > 0)
                         drainedTerminatingQueue = "followUp";
-                    }
                 }
                 if (pendingMessages.length === 0) {
                     await emit({ type: "agent_end", messages: newMessages });
                     return;
                 }
+                // Give queue owners a boundary before preparation refreshes the drained
+                // snapshot, so a clear or replacement wins before admission.
+                await emit({ type: "turn_start" });
+                turnStartAlreadyEmitted = true;
             }
             let nextTurnSnapshot;
             try {
                 nextTurnSnapshot = await config.prepareNextTurn?.(nextTurnContext);
             }
             catch (error) {
-                if (drainedTerminatingQueue) {
+                if (drainedTerminatingQueue)
                     await config.restorePendingMessages?.(drainedTerminatingQueue, pendingMessages);
-                }
                 throw error;
             }
             if (nextTurnSnapshot) {
@@ -256,9 +248,8 @@ async function runLoop(initialContext, newMessages, initialConfig, signal, emit,
                 };
             }
             if (signal?.aborted) {
-                if (drainedTerminatingQueue) {
+                if (drainedTerminatingQueue)
                     await config.restorePendingMessages?.(drainedTerminatingQueue, pendingMessages);
-                }
                 await emit({ type: "agent_end", messages: newMessages });
                 return;
             }
@@ -268,16 +259,7 @@ async function runLoop(initialContext, newMessages, initialConfig, signal, emit,
                     await emit({ type: "agent_end", messages: newMessages });
                     return;
                 }
-            }
-            if (!toolBatchTerminated &&
-                (await config.shouldStopAfterTurn?.({
-                    message,
-                    toolResults,
-                    context: currentContext,
-                    newMessages,
-                }))) {
-                await emit({ type: "agent_end", messages: newMessages });
-                return;
+                drainedTerminatingQueue = undefined;
             }
             if (!toolBatchTerminated) {
                 pendingMessages = (await config.getSteeringMessages?.()) || [];
@@ -297,19 +279,10 @@ async function runLoop(initialContext, newMessages, initialConfig, signal, emit,
 }
 /** Build the provider context using the same transform and conversion pipeline as an agent request. */
 export async function buildProviderContext(context, config, signal) {
-    // Apply context transform if configured (AgentMessage[] → AgentMessage[])
     let messages = context.messages;
-    if (config.transformContext) {
+    if (config.transformContext)
         messages = await config.transformContext(messages, signal);
-    }
-    // Convert to LLM-compatible messages (AgentMessage[] → Message[])
-    const llmMessages = await config.convertToLlm(messages);
-    // Build LLM context
-    return {
-        systemPrompt: context.systemPrompt,
-        messages: llmMessages,
-        tools: context.tools,
-    };
+    return { systemPrompt: context.systemPrompt, messages: await config.convertToLlm(messages), tools: context.tools };
 }
 /**
  * Stream an assistant response from the LLM.
@@ -695,6 +668,7 @@ async function executeToolCallsSequential(currentContext, assistantMessage, tool
 }
 async function executeToolCallsParallel(currentContext, assistantMessage, toolCalls, config, signal, emit) {
     const finalizedCalls = [];
+    const preparedCalls = [];
     let lastSequentialCall;
     let currentParallelWave = [];
     for (const toolCall of toolCalls) {
@@ -711,24 +685,44 @@ async function executeToolCallsParallel(currentContext, assistantMessage, toolCa
             : lastSequentialCall
                 ? [lastSequentialCall]
                 : [];
-        const finalizedCall = (async () => {
-            await Promise.all(dependencies);
-            const finalized = await runPreparedToolCall(currentContext, assistantMessage, preparation, config, signal, emit);
-            await emitToolExecutionEnd(finalized, emit);
-            return finalized;
-        })();
-        finalizedCalls.push(finalizedCall);
+        preparedCalls.push({ preparation, isSequential, dependencies });
         if (isSequential) {
-            lastSequentialCall = finalizedCall;
+            // Dependencies are assigned in the second phase after all preflight hooks
+            // have completed, so a later preflight abort vetoes every execution.
+            lastSequentialCall = undefined;
             currentParallelWave = [];
         }
         else {
-            currentParallelWave.push(finalizedCall);
+            currentParallelWave.push(Promise.resolve(undefined));
         }
         if (signal?.aborted) {
             break;
         }
     }
+    let previousSequential;
+    let previousWave = [];
+    for (const { preparation, isSequential } of preparedCalls) {
+        const dependencies = isSequential
+            ? [...(previousSequential ? [previousSequential] : []), ...previousWave]
+            : previousSequential
+                ? [previousSequential]
+                : [];
+        const finalizedCall = (async () => {
+            await Promise.all(dependencies);
+            const finalized = signal?.aborted
+                ? { toolCall: preparation.toolCall, result: createErrorToolResult("Operation aborted"), isError: true }
+                : await runPreparedToolCall(currentContext, assistantMessage, preparation, config, signal, emit);
+            await emitToolExecutionEnd(finalized, emit);
+            return finalized;
+        })();
+        finalizedCalls.push(finalizedCall);
+        if (isSequential) {
+            previousSequential = finalizedCall;
+            previousWave = [];
+        }
+        else
+            previousWave.push(finalizedCall);
+    }
     const orderedFinalizedCalls = await Promise.all(finalizedCalls);
     const messages = [];
     for (const finalized of orderedFinalizedCalls) {