@google/gemini-cli-core 0.24.0-nightly.20260103.30f5c4af4 → 0.25.0-nightly.20260112.15891721a

package/dist/src/routing/strategies/fallbackStrategy.test.js

@@ -79,5 +79,18 @@ describe('FallbackStrategy', () => {
         // Important: check that it queried snapshot with the RESOLVED model, not 'auto'
         expect(mockService.snapshot).toHaveBeenCalledWith(DEFAULT_GEMINI_MODEL);
     });
+    it('should respect requestedModel from context', async () => {
+        const requestedModel = 'requested-model';
+        const configModel = 'config-model';
+        vi.mocked(mockConfig.getModel).mockReturnValue(configModel);
+        vi.mocked(mockService.snapshot).mockReturnValue({ available: true });
+        const contextWithRequestedModel = {
+            requestedModel,
+        };
+        const decision = await strategy.route(contextWithRequestedModel, mockConfig, mockClient);
+        expect(decision).toBeNull();
+        // Should check availability of the requested model from context
+        expect(mockService.snapshot).toHaveBeenCalledWith(requestedModel);
+    });
 });
 //# sourceMappingURL=fallbackStrategy.test.js.map

package/dist/src/routing/strategies/fallbackStrategy.test.js.map

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

package/dist/src/routing/strategies/overrideStrategy.d.ts

@@ -11,5 +11,5 @@ import type { RoutingContext, RoutingDecision, RoutingStrategy } from '../routin
  */
 export declare class OverrideStrategy implements RoutingStrategy {
     readonly name = "override";
-    route(_context: RoutingContext, config: Config, _baseLlmClient: BaseLlmClient): Promise<RoutingDecision | null>;
+    route(context: RoutingContext, config: Config, _baseLlmClient: BaseLlmClient): Promise<RoutingDecision | null>;
 }

package/dist/src/routing/strategies/overrideStrategy.js

@@ -3,18 +3,18 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { DEFAULT_GEMINI_MODEL_AUTO, PREVIEW_GEMINI_MODEL_AUTO, resolveModel, } from '../../config/models.js';
+import { isAutoModel, resolveModel } from '../../config/models.js';
 /**
  * Handles cases where the user explicitly specifies a model (override).
  */
 export class OverrideStrategy {
     name = 'override';
-    async route(_context, config, _baseLlmClient) {
-        const overrideModel = config.getModel();
+    async route(context, config, _baseLlmClient) {
+        const overrideModel = context.requestedModel ?? config.getModel();
         // If the model is 'auto' we should pass to the next strategy.
-        if (overrideModel === DEFAULT_GEMINI_MODEL_AUTO ||
-            overrideModel === PREVIEW_GEMINI_MODEL_AUTO)
+        if (isAutoModel(overrideModel)) {
             return null;
+        }
         // Return the overridden model name.
         return {
             model: resolveModel(overrideModel, config.getPreviewFeatures()),

package/dist/src/routing/strategies/overrideStrategy.js.map

@@ -1 +1 @@
-{"version":3,"file":"overrideStrategy.js","sourceRoot":"","sources":["../../../../src/routing/strategies/overrideStrategy.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EACL,yBAAyB,EACzB,yBAAyB,EACzB,YAAY,GACb,MAAM,wBAAwB,CAAC;AAQhC;;GAEG;AACH,MAAM,OAAO,gBAAgB;IAClB,IAAI,GAAG,UAAU,CAAC;IAE3B,KAAK,CAAC,KAAK,CACT,QAAwB,EACxB,MAAc,EACd,cAA6B;QAE7B,MAAM,aAAa,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QAExC,8DAA8D;QAC9D,IACE,aAAa,KAAK,yBAAyB;YAC3C,aAAa,KAAK,yBAAyB;YAE3C,OAAO,IAAI,CAAC;QAEd,oCAAoC;QACpC,OAAO;YACL,KAAK,EAAE,YAAY,CAAC,aAAa,EAAE,MAAM,CAAC,kBAAkB,EAAE,CAAC;YAC/D,QAAQ,EAAE;gBACR,MAAM,EAAE,IAAI,CAAC,IAAI;gBACjB,SAAS,EAAE,CAAC;gBACZ,SAAS,EAAE,sDAAsD,aAAa,EAAE;aACjF;SACF,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"overrideStrategy.js","sourceRoot":"","sources":["../../../../src/routing/strategies/overrideStrategy.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAQnE;;GAEG;AACH,MAAM,OAAO,gBAAgB;IAClB,IAAI,GAAG,UAAU,CAAC;IAE3B,KAAK,CAAC,KAAK,CACT,OAAuB,EACvB,MAAc,EACd,cAA6B;QAE7B,MAAM,aAAa,GAAG,OAAO,CAAC,cAAc,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QAElE,8DAA8D;QAC9D,IAAI,WAAW,CAAC,aAAa,CAAC,EAAE,CAAC;YAC/B,OAAO,IAAI,CAAC;QACd,CAAC;QAED,oCAAoC;QACpC,OAAO;YACL,KAAK,EAAE,YAAY,CAAC,aAAa,EAAE,MAAM,CAAC,kBAAkB,EAAE,CAAC;YAC/D,QAAQ,EAAE;gBACR,MAAM,EAAE,IAAI,CAAC,IAAI;gBACjB,SAAS,EAAE,CAAC;gBACZ,SAAS,EAAE,sDAAsD,aAAa,EAAE;aACjF;SACF,CAAC;IACJ,CAAC;CACF"}

package/dist/src/routing/strategies/overrideStrategy.test.js

@@ -41,5 +41,19 @@ describe('OverrideStrategy', () => {
         expect(decision).not.toBeNull();
         expect(decision?.model).toBe(overrideModel);
     });
+    it('should respect requestedModel from context', async () => {
+        const requestedModel = 'requested-model';
+        const configModel = 'config-model';
+        const mockConfig = {
+            getModel: () => configModel,
+            getPreviewFeatures: () => false,
+        };
+        const contextWithRequestedModel = {
+            requestedModel,
+        };
+        const decision = await strategy.route(contextWithRequestedModel, mockConfig, mockClient);
+        expect(decision).not.toBeNull();
+        expect(decision?.model).toBe(requestedModel);
+    });
 });
 //# sourceMappingURL=overrideStrategy.test.js.map

package/dist/src/routing/strategies/overrideStrategy.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"overrideStrategy.test.js","sourceRoot":"","sources":["../../../../src/routing/strategies/overrideStrategy.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAIzD,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AAEnE,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAChC,MAAM,QAAQ,GAAG,IAAI,gBAAgB,EAAE,CAAC;IACxC,MAAM,WAAW,GAAG,EAAoB,CAAC;IACzC,MAAM,UAAU,GAAG,EAAmB,CAAC;IAEvC,EAAE,CAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;QAClE,MAAM,UAAU,GAAG;YACjB,QAAQ,EAAE,GAAG,EAAE,CAAC,yBAAyB;YACzC,kBAAkB,EAAE,GAAG,EAAE,CAAC,KAAK;SACtB,CAAC;QAEZ,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,WAAW,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;QAC3E,MAAM,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wEAAwE,EAAE,KAAK,IAAI,EAAE;QACtF,MAAM,aAAa,GAAG,uBAAuB,CAAC;QAC9C,MAAM,UAAU,GAAG;YACjB,QAAQ,EAAE,GAAG,EAAE,CAAC,aAAa;YAC7B,kBAAkB,EAAE,GAAG,EAAE,CAAC,KAAK;SACtB,CAAC;QAEZ,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,WAAW,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;QAE3E,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;QAChC,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC5C,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACnD,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,SAAS,CAC5C,4CAA4C,CAC7C,CAAC;QACF,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IAChE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;QAC5D,MAAM,aAAa,GAAG,+BAA+B,CAAC;QACtD,MAAM,UAAU,GAAG;YACjB,QAAQ,EAAE,GAAG,EAAE,CAAC,aAAa;YAC7B,kBAAkB,EAAE,GAAG,EAAE,CAAC,KAAK;SACtB,CAAC;QAEZ,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,WAAW,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;QAE3E,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;QAChC,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"overrideStrategy.test.js","sourceRoot":"","sources":["../../../../src/routing/strategies/overrideStrategy.test.ts"],"names":[],"mappings":"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"}

package/dist/src/scheduler/tool-executor.d.ts

@@ -0,0 +1,22 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { Config, AnsiOutput } from '../index.js';
+import type { CompletedToolCall, ToolCall } from './types.js';
+export interface ToolExecutionContext {
+    call: ToolCall;
+    signal: AbortSignal;
+    outputUpdateHandler?: (callId: string, output: string | AnsiOutput) => void;
+    onUpdateToolCall: (updatedCall: ToolCall) => void;
+}
+export declare class ToolExecutor {
+    private readonly config;
+    constructor(config: Config);
+    execute(context: ToolExecutionContext): Promise<CompletedToolCall>;
+    private createCancelledResult;
+    private createSuccessResult;
+    private createErrorResult;
+    private createErrorResponse;
+}

package/dist/src/scheduler/tool-executor.js

@@ -0,0 +1,198 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { ToolErrorType, ToolOutputTruncatedEvent, logToolOutputTruncated, runInDevTraceSpan, } from '../index.js';
+import { SHELL_TOOL_NAME } from '../tools/tool-names.js';
+import { ShellToolInvocation } from '../tools/shell.js';
+import { executeToolWithHooks } from '../core/coreToolHookTriggers.js';
+import { saveTruncatedContent } from '../utils/fileUtils.js';
+import { convertToFunctionResponse } from '../utils/generateContentResponseUtilities.js';
+export class ToolExecutor {
+    config;
+    constructor(config) {
+        this.config = config;
+    }
+    async execute(context) {
+        const { call, signal, outputUpdateHandler, onUpdateToolCall } = context;
+        const { request } = call;
+        const toolName = request.name;
+        const callId = request.callId;
+        if (!('tool' in call) || !call.tool || !('invocation' in call)) {
+            throw new Error(`Cannot execute tool call ${callId}: Tool or Invocation missing.`);
+        }
+        const { tool, invocation } = call;
+        // Setup live output handling
+        const liveOutputCallback = tool.canUpdateOutput && outputUpdateHandler
+            ? (outputChunk) => {
+                outputUpdateHandler(callId, outputChunk);
+            }
+            : undefined;
+        const shellExecutionConfig = this.config.getShellExecutionConfig();
+        const hooksEnabled = this.config.getEnableHooks();
+        const messageBus = this.config.getMessageBus();
+        return runInDevTraceSpan({
+            name: tool.name,
+            attributes: { type: 'tool-call' },
+        }, async ({ metadata: spanMetadata }) => {
+            spanMetadata.input = { request };
+            try {
+                let promise;
+                if (invocation instanceof ShellToolInvocation) {
+                    const setPidCallback = (pid) => {
+                        const executingCall = {
+                            ...call,
+                            status: 'executing',
+                            tool,
+                            invocation,
+                            pid,
+                            startTime: 'startTime' in call ? call.startTime : undefined,
+                        };
+                        onUpdateToolCall(executingCall);
+                    };
+                    promise = executeToolWithHooks(invocation, toolName, signal, messageBus, hooksEnabled, tool, liveOutputCallback, shellExecutionConfig, setPidCallback, this.config);
+                }
+                else {
+                    promise = executeToolWithHooks(invocation, toolName, signal, messageBus, hooksEnabled, tool, liveOutputCallback, shellExecutionConfig, undefined, this.config);
+                }
+                const toolResult = await promise;
+                spanMetadata.output = toolResult;
+                if (signal.aborted) {
+                    return this.createCancelledResult(call, 'User cancelled tool execution.');
+                }
+                else if (toolResult.error === undefined) {
+                    return await this.createSuccessResult(call, toolResult);
+                }
+                else {
+                    return this.createErrorResult(call, new Error(toolResult.error.message), toolResult.error.type);
+                }
+            }
+            catch (executionError) {
+                spanMetadata.error = executionError;
+                if (signal.aborted) {
+                    return this.createCancelledResult(call, 'User cancelled tool execution.');
+                }
+                const error = executionError instanceof Error
+                    ? executionError
+                    : new Error(String(executionError));
+                return this.createErrorResult(call, error, ToolErrorType.UNHANDLED_EXCEPTION);
+            }
+        });
+    }
+    createCancelledResult(call, reason) {
+        const errorMessage = `[Operation Cancelled] ${reason}`;
+        const startTime = 'startTime' in call ? call.startTime : undefined;
+        if (!('tool' in call) || !('invocation' in call)) {
+            // This should effectively never happen in execution phase, but we handle
+            // it safely
+            throw new Error('Cancelled tool call missing tool/invocation references');
+        }
+        return {
+            status: 'cancelled',
+            request: call.request,
+            response: {
+                callId: call.request.callId,
+                responseParts: [
+                    {
+                        functionResponse: {
+                            id: call.request.callId,
+                            name: call.request.name,
+                            response: { error: errorMessage },
+                        },
+                    },
+                ],
+                resultDisplay: undefined,
+                error: undefined,
+                errorType: undefined,
+                contentLength: errorMessage.length,
+            },
+            tool: call.tool,
+            invocation: call.invocation,
+            durationMs: startTime ? Date.now() - startTime : undefined,
+            outcome: call.outcome,
+        };
+    }
+    async createSuccessResult(call, toolResult) {
+        let content = toolResult.llmContent;
+        let outputFile;
+        const toolName = call.request.name;
+        const callId = call.request.callId;
+        if (typeof content === 'string' &&
+            toolName === SHELL_TOOL_NAME &&
+            this.config.getEnableToolOutputTruncation() &&
+            this.config.getTruncateToolOutputThreshold() > 0 &&
+            this.config.getTruncateToolOutputLines() > 0) {
+            const originalContentLength = content.length;
+            const threshold = this.config.getTruncateToolOutputThreshold();
+            const lines = this.config.getTruncateToolOutputLines();
+            const truncatedResult = await saveTruncatedContent(content, callId, this.config.storage.getProjectTempDir(), threshold, lines);
+            content = truncatedResult.content;
+            outputFile = truncatedResult.outputFile;
+            if (outputFile) {
+                logToolOutputTruncated(this.config, new ToolOutputTruncatedEvent(call.request.prompt_id, {
+                    toolName,
+                    originalContentLength,
+                    truncatedContentLength: content.length,
+                    threshold,
+                    lines,
+                }));
+            }
+        }
+        const response = convertToFunctionResponse(toolName, callId, content, this.config.getActiveModel());
+        const successResponse = {
+            callId,
+            responseParts: response,
+            resultDisplay: toolResult.returnDisplay,
+            error: undefined,
+            errorType: undefined,
+            outputFile,
+            contentLength: typeof content === 'string' ? content.length : undefined,
+        };
+        const startTime = 'startTime' in call ? call.startTime : undefined;
+        // Ensure we have tool and invocation
+        if (!('tool' in call) || !('invocation' in call)) {
+            throw new Error('Successful tool call missing tool or invocation');
+        }
+        return {
+            status: 'success',
+            request: call.request,
+            tool: call.tool,
+            response: successResponse,
+            invocation: call.invocation,
+            durationMs: startTime ? Date.now() - startTime : undefined,
+            outcome: call.outcome,
+        };
+    }
+    createErrorResult(call, error, errorType) {
+        const response = this.createErrorResponse(call.request, error, errorType);
+        const startTime = 'startTime' in call ? call.startTime : undefined;
+        return {
+            status: 'error',
+            request: call.request,
+            response,
+            tool: call.tool,
+            durationMs: startTime ? Date.now() - startTime : undefined,
+            outcome: call.outcome,
+        };
+    }
+    createErrorResponse(request, error, errorType) {
+        return {
+            callId: request.callId,
+            error,
+            responseParts: [
+                {
+                    functionResponse: {
+                        id: request.callId,
+                        name: request.name,
+                        response: { error: error.message },
+                    },
+                },
+            ],
+            resultDisplay: error.message,
+            errorType,
+            contentLength: error.message.length,
+        };
+    }
+}
+//# sourceMappingURL=tool-executor.js.map

package/dist/src/scheduler/tool-executor.js.map

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

package/dist/src/scheduler/tool-executor.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};

package/dist/src/scheduler/tool-executor.test.js

@@ -0,0 +1,231 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { ToolExecutor } from './tool-executor.js';
+import { makeFakeConfig } from '../test-utils/config.js';
+import { MockTool } from '../test-utils/mock-tool.js';
+import { SHELL_TOOL_NAME } from '../tools/tool-names.js';
+import * as fileUtils from '../utils/fileUtils.js';
+import * as coreToolHookTriggers from '../core/coreToolHookTriggers.js';
+import { ShellToolInvocation } from '../tools/shell.js';
+import { createMockMessageBus } from '../test-utils/mock-message-bus.js';
+// Mock file utils
+vi.mock('../utils/fileUtils.js', () => ({
+    saveTruncatedContent: vi.fn(),
+}));
+// Mock executeToolWithHooks
+vi.mock('../core/coreToolHookTriggers.js', () => ({
+    executeToolWithHooks: vi.fn(),
+}));
+describe('ToolExecutor', () => {
+    let config;
+    let executor;
+    beforeEach(() => {
+        // Use the standard fake config factory
+        config = makeFakeConfig();
+        executor = new ToolExecutor(config);
+        // Reset mocks
+        vi.resetAllMocks();
+        // Default mock implementation for saveTruncatedContent
+        vi.mocked(fileUtils.saveTruncatedContent).mockImplementation(async (_content, _callId, _tempDir, _threshold, _lines) => ({
+            content: 'TruncatedContent...',
+            outputFile: '/tmp/truncated_output.txt',
+        }));
+    });
+    afterEach(() => {
+        vi.restoreAllMocks();
+    });
+    it('should execute a tool successfully', async () => {
+        const mockTool = new MockTool({
+            name: 'testTool',
+            execute: async () => ({
+                llmContent: 'Tool output',
+                returnDisplay: 'Tool output',
+            }),
+        });
+        const invocation = mockTool.build({});
+        // Mock executeToolWithHooks to return success
+        vi.mocked(coreToolHookTriggers.executeToolWithHooks).mockResolvedValue({
+            llmContent: 'Tool output',
+            returnDisplay: 'Tool output',
+        });
+        const scheduledCall = {
+            status: 'scheduled',
+            request: {
+                callId: 'call-1',
+                name: 'testTool',
+                args: {},
+                isClientInitiated: false,
+                prompt_id: 'prompt-1',
+            },
+            tool: mockTool,
+            invocation: invocation,
+            startTime: Date.now(),
+        };
+        const onUpdateToolCall = vi.fn();
+        const result = await executor.execute({
+            call: scheduledCall,
+            signal: new AbortController().signal,
+            onUpdateToolCall,
+        });
+        expect(result.status).toBe('success');
+        if (result.status === 'success') {
+            const response = result.response.responseParts[0]?.functionResponse
+                ?.response;
+            expect(response).toEqual({ output: 'Tool output' });
+        }
+    });
+    it('should handle execution errors', async () => {
+        const mockTool = new MockTool({
+            name: 'failTool',
+        });
+        const invocation = mockTool.build({});
+        // Mock executeToolWithHooks to throw
+        vi.mocked(coreToolHookTriggers.executeToolWithHooks).mockRejectedValue(new Error('Tool Failed'));
+        const scheduledCall = {
+            status: 'scheduled',
+            request: {
+                callId: 'call-2',
+                name: 'failTool',
+                args: {},
+                isClientInitiated: false,
+                prompt_id: 'prompt-2',
+            },
+            tool: mockTool,
+            invocation: invocation,
+            startTime: Date.now(),
+        };
+        const result = await executor.execute({
+            call: scheduledCall,
+            signal: new AbortController().signal,
+            onUpdateToolCall: vi.fn(),
+        });
+        expect(result.status).toBe('error');
+        if (result.status === 'error') {
+            expect(result.response.error?.message).toBe('Tool Failed');
+        }
+    });
+    it('should return cancelled result when signal is aborted', async () => {
+        const mockTool = new MockTool({
+            name: 'slowTool',
+        });
+        const invocation = mockTool.build({});
+        // Mock executeToolWithHooks to simulate slow execution or cancellation check
+        vi.mocked(coreToolHookTriggers.executeToolWithHooks).mockImplementation(async () => {
+            await new Promise((r) => setTimeout(r, 100));
+            return { llmContent: 'Done', returnDisplay: 'Done' };
+        });
+        const scheduledCall = {
+            status: 'scheduled',
+            request: {
+                callId: 'call-3',
+                name: 'slowTool',
+                args: {},
+                isClientInitiated: false,
+                prompt_id: 'prompt-3',
+            },
+            tool: mockTool,
+            invocation: invocation,
+            startTime: Date.now(),
+        };
+        const controller = new AbortController();
+        const promise = executor.execute({
+            call: scheduledCall,
+            signal: controller.signal,
+            onUpdateToolCall: vi.fn(),
+        });
+        controller.abort();
+        const result = await promise;
+        expect(result.status).toBe('cancelled');
+    });
+    it('should truncate large shell output', async () => {
+        // 1. Setup Config for Truncation
+        vi.spyOn(config, 'getEnableToolOutputTruncation').mockReturnValue(true);
+        vi.spyOn(config, 'getTruncateToolOutputThreshold').mockReturnValue(10);
+        vi.spyOn(config, 'getTruncateToolOutputLines').mockReturnValue(5);
+        const mockTool = new MockTool({ name: SHELL_TOOL_NAME });
+        const invocation = mockTool.build({});
+        const longOutput = 'This is a very long output that should be truncated.';
+        // 2. Mock execution returning long content
+        vi.mocked(coreToolHookTriggers.executeToolWithHooks).mockResolvedValue({
+            llmContent: longOutput,
+            returnDisplay: longOutput,
+        });
+        const scheduledCall = {
+            status: 'scheduled',
+            request: {
+                callId: 'call-trunc',
+                name: SHELL_TOOL_NAME,
+                args: { command: 'echo long' },
+                isClientInitiated: false,
+                prompt_id: 'prompt-trunc',
+            },
+            tool: mockTool,
+            invocation: invocation,
+            startTime: Date.now(),
+        };
+        // 3. Execute
+        const result = await executor.execute({
+            call: scheduledCall,
+            signal: new AbortController().signal,
+            onUpdateToolCall: vi.fn(),
+        });
+        // 4. Verify Truncation Logic
+        expect(fileUtils.saveTruncatedContent).toHaveBeenCalledWith(longOutput, 'call-trunc', expect.any(String), // temp dir
+        10, // threshold
+        5);
+        expect(result.status).toBe('success');
+        if (result.status === 'success') {
+            const response = result.response.responseParts[0]?.functionResponse
+                ?.response;
+            // The content should be the *truncated* version returned by the mock saveTruncatedContent
+            expect(response).toEqual({ output: 'TruncatedContent...' });
+            expect(result.response.outputFile).toBe('/tmp/truncated_output.txt');
+        }
+    });
+    it('should report PID updates for shell tools', async () => {
+        // 1. Setup ShellToolInvocation
+        const messageBus = createMockMessageBus();
+        const shellInvocation = new ShellToolInvocation(config, { command: 'sleep 10' }, messageBus);
+        // We need a dummy tool that matches the invocation just for structure
+        const mockTool = new MockTool({ name: SHELL_TOOL_NAME });
+        // 2. Mock executeToolWithHooks to trigger the PID callback
+        const testPid = 12345;
+        vi.mocked(coreToolHookTriggers.executeToolWithHooks).mockImplementation(async (_inv, _name, _sig, _bus, _hooks, _tool, _liveCb, _shellCfg, setPidCallback) => {
+            // Simulate the shell tool reporting a PID
+            if (setPidCallback) {
+                setPidCallback(testPid);
+            }
+            return { llmContent: 'done', returnDisplay: 'done' };
+        });
+        const scheduledCall = {
+            status: 'scheduled',
+            request: {
+                callId: 'call-pid',
+                name: SHELL_TOOL_NAME,
+                args: { command: 'sleep 10' },
+                isClientInitiated: false,
+                prompt_id: 'prompt-pid',
+            },
+            tool: mockTool,
+            invocation: shellInvocation,
+            startTime: Date.now(),
+        };
+        const onUpdateToolCall = vi.fn();
+        // 3. Execute
+        await executor.execute({
+            call: scheduledCall,
+            signal: new AbortController().signal,
+            onUpdateToolCall,
+        });
+        // 4. Verify PID was reported
+        expect(onUpdateToolCall).toHaveBeenCalledWith(expect.objectContaining({
+            status: 'executing',
+            pid: testPid,
+        }));
+    });
+});
+//# sourceMappingURL=tool-executor.test.js.map

package/dist/src/scheduler/tool-executor.test.js.map

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

package/dist/src/scheduler/tool-modifier.d.ts

@@ -0,0 +1,23 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { EditorType } from '../utils/editor.js';
+import type { ToolConfirmationPayload } from '../tools/tools.js';
+import type { WaitingToolCall } from './types.js';
+export interface ModificationResult {
+    updatedParams: Record<string, unknown>;
+    updatedDiff?: string;
+}
+export declare class ToolModificationHandler {
+    /**
+     * Handles the "Modify with Editor" flow where an external editor is launched
+     * to modify the tool's parameters.
+     */
+    handleModifyWithEditor(toolCall: WaitingToolCall, editorType: EditorType, signal: AbortSignal): Promise<ModificationResult | undefined>;
+    /**
+     * Applies user-provided inline content updates (e.g. from the chat UI).
+     */
+    applyInlineModify(toolCall: WaitingToolCall, payload: ToolConfirmationPayload, signal: AbortSignal): Promise<ModificationResult | undefined>;
+}