@vybestack/llxprt-code-agents 0.10.0-nightly.260613.1adad3b34

package/dist/src/scheduler/result-aggregator.d.ts

@@ -0,0 +1,127 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/**
+ * @internal
+ * Owns result buffering, ordered publishing, and batch output-limit computation.
+ * Extracted from CoreToolScheduler as part of the Phase 2 decomposition
+ * (issue 1580).
+ *
+ * Ordering guarantee: results are published in `executionIndex` order
+ * regardless of which tool finishes first, using a reentrancy-guarded loop
+ * with a `setImmediate` recovery path for the race where a result arrives
+ * after the loop exits but before the flag is cleared.
+ */
+import type { ToolCallResponseInfo } from '../core/turn.js';
+import type { ToolResult } from '@vybestack/llxprt-code-tools';
+import { type ToolOutputSettingsProvider } from '@vybestack/llxprt-code-core/utils/toolOutputLimiter.js';
+import type { ScheduledToolCall } from '@vybestack/llxprt-code-core/scheduler/types.js';
+/**
+ * Callbacks provided by CoreToolScheduler so ResultAggregator can publish
+ * without importing the scheduler class (prevents circular dependency).
+ */
+export interface ResultPublishCallbacks {
+    /** Transition a call to the 'success' terminal state. */
+    setSuccess(callId: string, response: ToolCallResponseInfo): void;
+    /** Transition a call to the 'error' terminal state. */
+    setError(callId: string, response: ToolCallResponseInfo): void;
+    /**
+     * Returns the active Config (or equivalent provider) so ResultAggregator
+     * can compute per-tool token limits when no batch override is in effect.
+     */
+    getFallbackOutputConfig(): ToolOutputSettingsProvider;
+}
+/**
+ * @internal
+ */
+export declare class ResultAggregator {
+    private readonly callbacks;
+    /** Pending tool results keyed by callId. */
+    private readonly pendingResults;
+    /** The executionIndex of the next result to publish. */
+    private nextPublishIndex;
+    /** Total tools in the current batch; set by {@link beginBatch}. */
+    private currentBatchSize;
+    /**
+     * Per-tool output config derived by dividing the batch token budget equally.
+     * Undefined when the batch has ≤ 1 tool.
+     */
+    private batchOutputConfig;
+    /** Reentrancy guard for {@link publishBufferedResults}. */
+    private isPublishingBufferedResults;
+    /** Set when a second publish is requested during an active publish pass. */
+    private pendingPublishRequest;
+    constructor(callbacks: ResultPublishCallbacks);
+    /** Store a successful tool result for ordered publishing. */
+    bufferResult(callId: string, toolName: string, scheduledCall: ScheduledToolCall, result: ToolResult, executionIndex: number): void;
+    /** Store an error result (ToolResult with `.error` set) for ordered publishing. */
+    bufferError(callId: string, toolName: string, scheduledCall: ScheduledToolCall, error: Error, executionIndex: number): void;
+    /**
+     * Store a placeholder for a cancelled call so the ordered-publish loop can
+     * advance past this index.  The call is already in 'cancelled' terminal state
+     * so no callback is fired — the entry is simply discarded after its index is
+     * consumed.
+     */
+    bufferCancelled(callId: string, scheduledCall: ScheduledToolCall, executionIndex: number): void;
+    /**
+     * Called once at the start of each execution batch to record how many tools
+     * are participating and to apply proportional output-token limits when the
+     * batch has more than one tool.
+     */
+    beginBatch(size: number): void;
+    /**
+     * Publishes buffered results in `executionIndex` order.
+     *
+     * Reentrancy guard: if called while a publish pass is already running the
+     * call sets `pendingPublishRequest` and returns immediately.  The running
+     * pass will loop once more before releasing the lock.
+     *
+     * Recovery path: after releasing the lock we check whether any buffered
+     * results are ready (i.e. the next expected index is present) and schedule
+     * a follow-up via `setImmediate` to avoid missing results that arrived while
+     * the lock was held.
+     */
+    publishBufferedResults(signal: AbortSignal): Promise<void>;
+    /**
+     * Clears all buffered state.  Called by `CoreToolScheduler.cancelAll()` and
+     * indirectly by `dispose()`.
+     */
+    reset(): void;
+    /** Find a buffered entry by its executionIndex. */
+    private findByExecutionIndex;
+    /**
+     * Issue #987 fix: if tools complete before `beginBatch` is called,
+     * `currentBatchSize` may still be 0.  Recover it from the actual pending
+     * entries so publishing can proceed.
+     */
+    private recoverBatchSizeIfNeeded;
+    /** When the entire batch has been published, reset counters for the next batch. */
+    private resetBatchIfComplete;
+    private publishBufferedResultsPass;
+    /**
+     * After releasing the reentrancy lock, schedule a follow-up publish via
+     * `setImmediate` when the next expected result is already buffered.  This
+     * handles the race where:
+     *  1. We break the inner `while` loop waiting for result N.
+     *  2. Result N arrives and calls `publishBufferedResults`.
+     *  3. That call sees the lock held, sets `pendingPublishRequest`, and returns.
+     *  4. We exit the `do-while` without seeing the flag (it was set after the check).
+     */
+    private scheduleFollowUpIfNeeded;
+    /**
+     * Convert a buffered result to a `ToolCallResponseInfo` and invoke the
+     * appropriate status callback (`setSuccess` or `setError`).
+     */
+    private publishResult;
+    /**
+     * Apply batch-level output limits for parallel tool batches. (#1301)
+     *
+     * `tool-output-max-tokens` is treated as a budget for the entire batch.
+     * For batches of 2+ tools this method divides the budget equally and stores
+     * the reduced per-tool limit in {@link batchOutputConfig}, which
+     * {@link publishResult} picks up when building function-response parts.
+     */
+    private applyBatchOutputLimits;
+}

package/dist/src/scheduler/result-aggregator.js

@@ -0,0 +1,302 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { ToolErrorType } from '@vybestack/llxprt-code-tools';
+import { DEFAULT_AGENT_ID } from '../core/turn.js';
+import { convertToFunctionResponse, extractAgentIdFromMetadata, createErrorResponse, } from '@vybestack/llxprt-code-core/utils/generateContentResponseUtilities.js';
+import { DEFAULT_MAX_TOKENS, } from '@vybestack/llxprt-code-core/utils/toolOutputLimiter.js';
+import { DebugLogger } from '@vybestack/llxprt-code-core/debug/index.js';
+const logger = new DebugLogger('llxprt:scheduler:result-aggregator');
+// ---- ResultAggregator -------------------------------------------------------
+/**
+ * @internal
+ */
+export class ResultAggregator {
+    callbacks;
+    /** Pending tool results keyed by callId. */
+    pendingResults = new Map();
+    /** The executionIndex of the next result to publish. */
+    nextPublishIndex = 0;
+    /** Total tools in the current batch; set by {@link beginBatch}. */
+    currentBatchSize = 0;
+    /**
+     * Per-tool output config derived by dividing the batch token budget equally.
+     * Undefined when the batch has ≤ 1 tool.
+     */
+    batchOutputConfig = undefined;
+    /** Reentrancy guard for {@link publishBufferedResults}. */
+    isPublishingBufferedResults = false;
+    /** Set when a second publish is requested during an active publish pass. */
+    pendingPublishRequest = false;
+    constructor(callbacks) {
+        this.callbacks = callbacks;
+    }
+    // ---- public buffering API ------------------------------------------------
+    /** Store a successful tool result for ordered publishing. */
+    bufferResult(callId, toolName, scheduledCall, result, executionIndex) {
+        this.pendingResults.set(callId, {
+            result,
+            callId,
+            toolName,
+            scheduledCall,
+            executionIndex,
+        });
+    }
+    /** Store an error result (ToolResult with `.error` set) for ordered publishing. */
+    bufferError(callId, toolName, scheduledCall, error, executionIndex) {
+        const errorResult = {
+            error: {
+                message: error.message,
+                type: ToolErrorType.UNHANDLED_EXCEPTION,
+            },
+            llmContent: error.message,
+            returnDisplay: error.message,
+        };
+        this.pendingResults.set(callId, {
+            result: errorResult,
+            callId,
+            toolName,
+            scheduledCall,
+            executionIndex,
+        });
+    }
+    /**
+     * Store a placeholder for a cancelled call so the ordered-publish loop can
+     * advance past this index.  The call is already in 'cancelled' terminal state
+     * so no callback is fired — the entry is simply discarded after its index is
+     * consumed.
+     */
+    bufferCancelled(callId, scheduledCall, executionIndex) {
+        const cancelledResult = {
+            error: {
+                message: 'Tool call cancelled by user.',
+                type: ToolErrorType.EXECUTION_FAILED,
+            },
+            llmContent: 'Tool call cancelled by user.',
+            returnDisplay: 'Cancelled',
+        };
+        this.pendingResults.set(callId, {
+            result: cancelledResult,
+            callId,
+            toolName: scheduledCall.request.name,
+            scheduledCall,
+            executionIndex,
+            isCancelled: true,
+        });
+    }
+    // ---- batch initialisation ------------------------------------------------
+    /**
+     * Called once at the start of each execution batch to record how many tools
+     * are participating and to apply proportional output-token limits when the
+     * batch has more than one tool.
+     */
+    beginBatch(size) {
+        this.currentBatchSize = size;
+        this.applyBatchOutputLimits(size);
+    }
+    // ---- publishing ----------------------------------------------------------
+    /**
+     * Publishes buffered results in `executionIndex` order.
+     *
+     * Reentrancy guard: if called while a publish pass is already running the
+     * call sets `pendingPublishRequest` and returns immediately.  The running
+     * pass will loop once more before releasing the lock.
+     *
+     * Recovery path: after releasing the lock we check whether any buffered
+     * results are ready (i.e. the next expected index is present) and schedule
+     * a follow-up via `setImmediate` to avoid missing results that arrived while
+     * the lock was held.
+     */
+    async publishBufferedResults(signal) {
+        if (this.isPublishingBufferedResults) {
+            this.pendingPublishRequest = true;
+            return;
+        }
+        this.isPublishingBufferedResults = true;
+        this.pendingPublishRequest = false;
+        try {
+            await this.publishBufferedResultsPass(signal);
+        }
+        finally {
+            this.isPublishingBufferedResults = false;
+            this.scheduleFollowUpIfNeeded(signal);
+        }
+    }
+    // ---- state reset ---------------------------------------------------------
+    /**
+     * Clears all buffered state.  Called by `CoreToolScheduler.cancelAll()` and
+     * indirectly by `dispose()`.
+     */
+    reset() {
+        this.pendingResults.clear();
+        this.nextPublishIndex = 0;
+        this.currentBatchSize = 0;
+        this.isPublishingBufferedResults = false;
+        this.pendingPublishRequest = false;
+        this.batchOutputConfig = undefined;
+    }
+    // ---- private helpers -----------------------------------------------------
+    /** Find a buffered entry by its executionIndex. */
+    findByExecutionIndex(index) {
+        for (const entry of this.pendingResults.values()) {
+            if (entry.executionIndex === index) {
+                return entry;
+            }
+        }
+        return undefined;
+    }
+    /**
+     * Issue #987 fix: if tools complete before `beginBatch` is called,
+     * `currentBatchSize` may still be 0.  Recover it from the actual pending
+     * entries so publishing can proceed.
+     */
+    recoverBatchSizeIfNeeded() {
+        if (this.currentBatchSize !== 0 || this.pendingResults.size === 0) {
+            return;
+        }
+        let maxIndex = -1;
+        for (const entry of this.pendingResults.values()) {
+            if (entry.executionIndex > maxIndex) {
+                maxIndex = entry.executionIndex;
+            }
+        }
+        const recovered = Math.min(maxIndex + 1, this.pendingResults.size);
+        this.currentBatchSize = recovered > 0 ? recovered : 1;
+        if (logger.enabled) {
+            logger.debug(() => `Recovered batch size from pending results: currentBatchSize=${this.currentBatchSize}, ` +
+                `pendingResults.size=${this.pendingResults.size}, maxIndex=${maxIndex}`);
+        }
+    }
+    /** When the entire batch has been published, reset counters for the next batch. */
+    resetBatchIfComplete() {
+        if (this.nextPublishIndex === this.currentBatchSize &&
+            this.currentBatchSize > 0) {
+            this.nextPublishIndex = 0;
+            this.currentBatchSize = 0;
+            this.pendingResults.clear();
+            this.batchOutputConfig = undefined;
+        }
+    }
+    async publishBufferedResultsPass(signal) {
+        this.pendingPublishRequest = false;
+        this.recoverBatchSizeIfNeeded();
+        while (this.nextPublishIndex < this.currentBatchSize) {
+            const nextBuffered = this.findByExecutionIndex(this.nextPublishIndex);
+            if (!nextBuffered) {
+                break; // Gap — wait for the missing result to arrive
+            }
+            if (nextBuffered.isCancelled !== true) {
+                await this.publishResult(nextBuffered, signal);
+            }
+            this.pendingResults.delete(nextBuffered.callId);
+            this.nextPublishIndex++;
+        }
+        this.resetBatchIfComplete();
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- Async publish reentrancy can flip this flag while awaiting result publication.
+        if (this.pendingPublishRequest) {
+            await this.publishBufferedResultsPass(signal);
+        }
+    }
+    /**
+     * After releasing the reentrancy lock, schedule a follow-up publish via
+     * `setImmediate` when the next expected result is already buffered.  This
+     * handles the race where:
+     *  1. We break the inner `while` loop waiting for result N.
+     *  2. Result N arrives and calls `publishBufferedResults`.
+     *  3. That call sees the lock held, sets `pendingPublishRequest`, and returns.
+     *  4. We exit the `do-while` without seeing the flag (it was set after the check).
+     */
+    scheduleFollowUpIfNeeded(signal) {
+        if (this.pendingResults.size === 0) {
+            return;
+        }
+        const hasNext = this.findByExecutionIndex(this.nextPublishIndex) !== undefined;
+        if (hasNext) {
+            setImmediate(() => {
+                void this.publishBufferedResults(signal);
+            });
+        }
+    }
+    /**
+     * Convert a buffered result to a `ToolCallResponseInfo` and invoke the
+     * appropriate status callback (`setSuccess` or `setError`).
+     */
+    async publishResult(buffered, _signal) {
+        const { result, callId, toolName, scheduledCall } = buffered;
+        if (result.error === undefined) {
+            const outputConfig = this.batchOutputConfig ?? this.callbacks.getFallbackOutputConfig();
+            const responseParts = convertToFunctionResponse(toolName, callId, result.llmContent, outputConfig);
+            const metadataAgentId = extractAgentIdFromMetadata(result.metadata);
+            const successResponse = {
+                callId,
+                responseParts,
+                resultDisplay: result.returnDisplay,
+                error: undefined,
+                errorType: undefined,
+                agentId: metadataAgentId ?? scheduledCall.request.agentId ?? DEFAULT_AGENT_ID,
+                ...(result.suppressDisplay !== undefined && {
+                    suppressDisplay: result.suppressDisplay,
+                }),
+            };
+            logger.debug(`callId=${callId}, toolName=${toolName}, returnDisplay type=${typeof result.returnDisplay}, hasValue=${Boolean(result.returnDisplay)}`);
+            this.callbacks.setSuccess(callId, successResponse);
+        }
+        else {
+            const error = new Error(result.error.message);
+            const errorResponse = createErrorResponse(scheduledCall.request, error, result.error.type);
+            this.callbacks.setError(callId, errorResponse);
+        }
+    }
+    /**
+     * Apply batch-level output limits for parallel tool batches. (#1301)
+     *
+     * `tool-output-max-tokens` is treated as a budget for the entire batch.
+     * For batches of 2+ tools this method divides the budget equally and stores
+     * the reduced per-tool limit in {@link batchOutputConfig}, which
+     * {@link publishResult} picks up when building function-response parts.
+     */
+    applyBatchOutputLimits(batchSize) {
+        if (batchSize <= 1) {
+            this.batchOutputConfig = undefined;
+            return;
+        }
+        try {
+            const fallback = this.callbacks.getFallbackOutputConfig();
+            const ephemeral = typeof fallback.getEphemeralSettings === 'function'
+                ? fallback.getEphemeralSettings()
+                : {};
+            const maxBatchTokens = ephemeral['tool-output-max-tokens'] ??
+                DEFAULT_MAX_TOKENS;
+            const perToolBudget = Math.max(1000, Math.floor(maxBatchTokens / batchSize));
+            if (logger.enabled) {
+                logger.debug(() => `Batch of ${batchSize} tools: applying per-tool output limit ` +
+                    `of ${perToolBudget} tokens (batch budget: ${maxBatchTokens}).`);
+            }
+            this.batchOutputConfig = {
+                getEphemeralSettings: () => ({
+                    ...ephemeral,
+                    'tool-output-max-tokens': perToolBudget,
+                    // eslint-disable-next-line sonarjs/expression-complexity -- Existing structure is intentionally preserved; refactoring this boundary is outside the lint slice.
+                    ...(ephemeral['tool-output-truncate-mode'] !== undefined &&
+                        ephemeral['tool-output-truncate-mode'] !== null &&
+                        ephemeral['tool-output-truncate-mode'] !== false &&
+                        ephemeral['tool-output-truncate-mode'] !== 0 &&
+                        ephemeral['tool-output-truncate-mode'] !== '' &&
+                        !(typeof ephemeral['tool-output-truncate-mode'] === 'number' &&
+                            Number.isNaN(ephemeral['tool-output-truncate-mode']))
+                        ? {}
+                        : { 'tool-output-truncate-mode': 'truncate' }),
+                }),
+            };
+        }
+        catch (error) {
+            if (logger.enabled) {
+                logger.debug(() => `Failed to compute batch output limits; skipping budget guard: ${error}`);
+            }
+            this.batchOutputConfig = undefined;
+        }
+    }
+}
+//# sourceMappingURL=result-aggregator.js.map

package/dist/src/scheduler/result-aggregator.js.map

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

package/dist/src/scheduler/status-transitions.d.ts

@@ -0,0 +1,39 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/**
+ * Pure transition builder functions for ToolCall state machine.
+ * Extracted from CoreToolScheduler.setStatusInternal to keep functions under 80 lines.
+ */
+import type { ToolCall, ValidatingToolCall, ScheduledToolCall, ExecutingToolCall, SuccessfulToolCall, ErroredToolCall, CancelledToolCall, WaitingToolCall, Status } from '@vybestack/llxprt-code-core/scheduler/types.js';
+import type { ToolCallResponseInfo } from '@vybestack/llxprt-code-core/core/turn.js';
+import type { ToolCallConfirmationDetails } from '@vybestack/llxprt-code-tools';
+import type { SerializableConfirmationDetails } from '@vybestack/llxprt-code-core/confirmation-bus/types.js';
+/**
+ * Common context extracted from a non-terminal tool call for building transitions.
+ */
+interface TransitionContext {
+    request: ToolCall['request'];
+    tool: Exclude<ToolCall, ErroredToolCall>['tool'];
+    invocation: Exclude<ToolCall, ErroredToolCall | WaitingToolCall>['invocation'];
+    startTime?: number;
+    outcome?: ToolCall['outcome'];
+}
+export declare function buildSuccessTransition(ctx: TransitionContext, response: ToolCallResponseInfo): SuccessfulToolCall;
+export declare function buildErrorTransition(ctx: TransitionContext, response: ToolCallResponseInfo): ErroredToolCall;
+export declare function buildCancelledTransition(ctx: TransitionContext, reason: string, currentStatus: Status, currentCall: ToolCall): CancelledToolCall;
+export declare function buildAwaitingApprovalTransition(ctx: TransitionContext, confirmationDetails: ToolCallConfirmationDetails | SerializableConfirmationDetails): WaitingToolCall;
+export declare function buildSimpleTransition(ctx: TransitionContext, status: 'scheduled' | 'validating' | 'executing'): ScheduledToolCall | ValidatingToolCall | ExecutingToolCall;
+/**
+ * Build a cancelled tool call from cancelAll() — simpler than the setStatusInternal
+ * path because we don't need to check for edit confirmations or use a reason string.
+ */
+export declare function buildCancelAllEntry(call: ValidatingToolCall | ScheduledToolCall | ExecutingToolCall | WaitingToolCall): CancelledToolCall;
+/**
+ * Apply a status transition to a single tool call.
+ * Returns the original call if it's in a terminal state or doesn't match the target callId.
+ */
+export declare function applyTransition(currentCall: ToolCall, targetCallId: string, newStatus: Status, auxiliaryData?: unknown): ToolCall;
+export {};

package/dist/src/scheduler/status-transitions.js

@@ -0,0 +1,184 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { DEFAULT_AGENT_ID } from '@vybestack/llxprt-code-core/core/turn.js';
+import { ToolConfirmationOutcome } from '@vybestack/llxprt-code-tools';
+function getTransitionContext(call) {
+    // Terminal states cannot transition further
+    if (call.status === 'success' ||
+        call.status === 'error' ||
+        call.status === 'cancelled') {
+        return undefined;
+    }
+    return {
+        request: call.request,
+        tool: call.tool,
+        invocation: call.invocation,
+        startTime: call.startTime,
+        outcome: call.outcome,
+    };
+}
+function computeDuration(startTime) {
+    return startTime != null ? Date.now() - startTime : undefined;
+}
+function ensureAgentId(response, request) {
+    const copy = { ...response };
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- intentional falsy coalescing: agentId is string | undefined, empty string should fall through
+    if (!copy.agentId) {
+        copy.agentId = request.agentId ?? DEFAULT_AGENT_ID;
+    }
+    return copy;
+}
+export function buildSuccessTransition(ctx, response) {
+    return {
+        request: ctx.request,
+        tool: ctx.tool,
+        invocation: ctx.invocation,
+        status: 'success',
+        response: ensureAgentId(response, ctx.request),
+        durationMs: computeDuration(ctx.startTime),
+        outcome: ctx.outcome,
+    };
+}
+export function buildErrorTransition(ctx, response) {
+    return {
+        request: ctx.request,
+        status: 'error',
+        tool: ctx.tool,
+        invocation: ctx.invocation,
+        response: ensureAgentId(response, ctx.request),
+        durationMs: computeDuration(ctx.startTime),
+        outcome: ctx.outcome,
+    };
+}
+export function buildCancelledTransition(ctx, reason, currentStatus, currentCall) {
+    // Preserve diff for cancelled edit operations
+    let resultDisplay = undefined;
+    if (currentStatus === 'awaiting_approval') {
+        const waitingCall = currentCall;
+        if (waitingCall.confirmationDetails.type === 'edit') {
+            resultDisplay = {
+                fileDiff: waitingCall.confirmationDetails.fileDiff,
+                fileName: waitingCall.confirmationDetails.fileName,
+                originalContent: waitingCall.confirmationDetails.originalContent,
+                newContent: waitingCall.confirmationDetails.newContent,
+                filePath: waitingCall.confirmationDetails.filePath,
+            };
+        }
+    }
+    return {
+        request: ctx.request,
+        tool: ctx.tool,
+        invocation: ctx.invocation,
+        status: 'cancelled',
+        response: {
+            callId: ctx.request.callId,
+            responseParts: [
+                {
+                    functionResponse: {
+                        id: ctx.request.callId,
+                        name: ctx.request.name,
+                        response: {
+                            error: `[Operation Cancelled] Reason: ${reason}`,
+                        },
+                    },
+                },
+            ],
+            resultDisplay,
+            error: undefined,
+            errorType: undefined,
+            agentId: ctx.request.agentId ?? DEFAULT_AGENT_ID,
+        },
+        durationMs: computeDuration(ctx.startTime),
+        outcome: ctx.outcome,
+    };
+}
+export function buildAwaitingApprovalTransition(ctx, confirmationDetails) {
+    return {
+        request: ctx.request,
+        tool: ctx.tool,
+        status: 'awaiting_approval',
+        confirmationDetails,
+        startTime: ctx.startTime,
+        outcome: ctx.outcome,
+        invocation: ctx.invocation,
+    };
+}
+export function buildSimpleTransition(ctx, status) {
+    return {
+        request: ctx.request,
+        tool: ctx.tool,
+        status,
+        startTime: ctx.startTime,
+        outcome: ctx.outcome,
+        invocation: ctx.invocation,
+    };
+}
+/**
+ * Build a cancelled tool call from cancelAll() — simpler than the setStatusInternal
+ * path because we don't need to check for edit confirmations or use a reason string.
+ */
+export function buildCancelAllEntry(call) {
+    return {
+        status: 'cancelled',
+        request: call.request,
+        response: {
+            callId: call.request.callId,
+            responseParts: [
+                {
+                    functionResponse: {
+                        id: call.request.callId,
+                        name: call.request.name,
+                        response: {
+                            error: 'Tool call cancelled by user.',
+                        },
+                    },
+                },
+            ],
+            resultDisplay: undefined,
+            error: undefined,
+            errorType: undefined,
+            agentId: call.request.agentId ?? DEFAULT_AGENT_ID,
+        },
+        tool: call.tool,
+        invocation: call.invocation,
+        durationMs: call.startTime != null ? Date.now() - call.startTime : undefined,
+        outcome: ToolConfirmationOutcome.Cancel,
+    };
+}
+/**
+ * Apply a status transition to a single tool call.
+ * Returns the original call if it's in a terminal state or doesn't match the target callId.
+ */
+export function applyTransition(currentCall, targetCallId, newStatus, auxiliaryData) {
+    if (currentCall.request.callId !== targetCallId ||
+        currentCall.status === 'success' ||
+        currentCall.status === 'error' ||
+        currentCall.status === 'cancelled') {
+        return currentCall;
+    }
+    const ctx = getTransitionContext(currentCall);
+    if (!ctx)
+        return currentCall;
+    switch (newStatus) {
+        case 'success':
+            return buildSuccessTransition(ctx, auxiliaryData);
+        case 'error':
+            return buildErrorTransition(ctx, auxiliaryData);
+        case 'cancelled':
+            return buildCancelledTransition(ctx, auxiliaryData, currentCall.status, currentCall);
+        case 'awaiting_approval':
+            return buildAwaitingApprovalTransition(ctx, auxiliaryData);
+        case 'scheduled':
+        case 'validating':
+        case 'executing':
+            return buildSimpleTransition(ctx, newStatus);
+        default: {
+            const exhaustiveCheck = newStatus;
+            return exhaustiveCheck;
+        }
+    }
+}
+//# sourceMappingURL=status-transitions.js.map