@office-ai/aioncli-core 0.2.3 → 0.18.4

package/dist/src/core/coreToolScheduler.test.js

@@ -3,10 +3,17 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { describe, it, expect, vi } from 'vitest';
-import { CoreToolScheduler, convertToFunctionResponse, } from './coreToolScheduler.js';
-import { BaseDeclarativeTool, BaseToolInvocation, ToolConfirmationOutcome, Kind, ApprovalMode, } from '../index.js';
-import { MockModifiableTool, MockTool } from '../test-utils/tools.js';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { CoreToolScheduler, convertToFunctionResponse, truncateAndSaveToFile, } from './coreToolScheduler.js';
+import { DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES, DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD, BaseDeclarativeTool, BaseToolInvocation, ToolConfirmationOutcome, Kind, ApprovalMode, } from '../index.js';
+import { MockModifiableTool, MockTool, MOCK_TOOL_SHOULD_CONFIRM_EXECUTE, } from '../test-utils/mock-tool.js';
+import * as modifiableToolModule from '../tools/modifiable-tool.js';
+import * as fs from 'node:fs/promises';
+import * as path from 'node:path';
+import { isShellInvocationAllowlisted } from '../utils/shell-utils.js';
+vi.mock('fs/promises', () => ({
+    writeFile: vi.fn(),
+}));
 class TestApprovalTool extends BaseDeclarativeTool {
     config;
     static Name = 'testApprovalTool';
@@ -58,10 +65,114 @@ class TestApprovalInvocation extends BaseToolInvocation {
         };
     }
 }
+class AbortDuringConfirmationInvocation extends BaseToolInvocation {
+    abortController;
+    abortError;
+    constructor(abortController, abortError, params) {
+        super(params);
+        this.abortController = abortController;
+        this.abortError = abortError;
+    }
+    async shouldConfirmExecute(_signal) {
+        this.abortController.abort();
+        throw this.abortError;
+    }
+    async execute(_abortSignal) {
+        throw new Error('execute should not be called when confirmation fails');
+    }
+    getDescription() {
+        return 'Abort during confirmation invocation';
+    }
+}
+class AbortDuringConfirmationTool extends BaseDeclarativeTool {
+    abortController;
+    abortError;
+    constructor(abortController, abortError) {
+        super('abortDuringConfirmationTool', 'Abort During Confirmation Tool', 'A tool that aborts while confirming execution.', Kind.Other, {
+            type: 'object',
+            properties: {},
+        });
+        this.abortController = abortController;
+        this.abortError = abortError;
+    }
+    createInvocation(params) {
+        return new AbortDuringConfirmationInvocation(this.abortController, this.abortError, params);
+    }
+}
+async function waitForStatus(onToolCallsUpdate, status, timeout = 5000) {
+    return new Promise((resolve, reject) => {
+        const startTime = Date.now();
+        const check = () => {
+            if (Date.now() - startTime > timeout) {
+                const seenStatuses = onToolCallsUpdate.mock.calls
+                    .flatMap((call) => call[0])
+                    .map((toolCall) => toolCall.status);
+                reject(new Error(`Timed out waiting for status "${status}". Seen statuses: ${seenStatuses.join(', ')}`));
+                return;
+            }
+            const foundCall = onToolCallsUpdate.mock.calls
+                .flatMap((call) => call[0])
+                .find((toolCall) => toolCall.status === status);
+            if (foundCall) {
+                resolve(foundCall);
+            }
+            else {
+                setTimeout(check, 10); // Check again in 10ms
+            }
+        };
+        check();
+    });
+}
+function createMockConfig(overrides = {}) {
+    const defaultToolRegistry = {
+        getTool: () => undefined,
+        getToolByName: () => undefined,
+        getFunctionDeclarations: () => [],
+        tools: new Map(),
+        discovery: {},
+        registerTool: () => { },
+        getToolByDisplayName: () => undefined,
+        getTools: () => [],
+        discoverTools: async () => { },
+        getAllTools: () => [],
+        getToolsByServer: () => [],
+    };
+    const baseConfig = {
+        getSessionId: () => 'test-session-id',
+        getUsageStatisticsEnabled: () => true,
+        getDebugMode: () => false,
+        getApprovalMode: () => ApprovalMode.DEFAULT,
+        setApprovalMode: () => { },
+        getAllowedTools: () => [],
+        getContentGeneratorConfig: () => ({
+            model: 'test-model',
+            authType: 'oauth-personal',
+        }),
+        getShellExecutionConfig: () => ({
+            terminalWidth: 90,
+            terminalHeight: 30,
+        }),
+        storage: {
+            getProjectTempDir: () => '/tmp',
+        },
+        getTruncateToolOutputThreshold: () => DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
+        getTruncateToolOutputLines: () => DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES,
+        getToolRegistry: () => defaultToolRegistry,
+        getUseSmartEdit: () => false,
+        getUseModelRouter: () => false,
+        getGeminiClient: () => null,
+        getEnableMessageBusIntegration: () => false,
+        getMessageBus: () => null,
+        getPolicyEngine: () => null,
+    };
+    return { ...baseConfig, ...overrides };
+}
 describe('CoreToolScheduler', () => {
     it('should cancel a tool call if the signal is aborted before confirmation', async () => {
-        const mockTool = new MockTool();
-        mockTool.shouldConfirm = true;
+        const mockTool = new MockTool({
+            name: 'mockTool',
+            shouldConfirmExecute: MOCK_TOOL_SHOULD_CONFIRM_EXECUTE,
+        });
         const declarativeTool = mockTool;
         const mockToolRegistry = {
             getTool: () => declarativeTool,
@@ -78,23 +189,15 @@ describe('CoreToolScheduler', () => {
         };
         const onAllToolCallsComplete = vi.fn();
         const onToolCallsUpdate = vi.fn();
-        const mockConfig = {
-            getSessionId: () => 'test-session-id',
-            getUsageStatisticsEnabled: () => true,
-            getDebugMode: () => false,
-            getApprovalMode: () => ApprovalMode.DEFAULT,
-            getContentGeneratorConfig: () => ({
-                model: 'test-model',
-                authType: 'oauth-personal',
-            }),
-        };
+        const mockConfig = createMockConfig({
+            getToolRegistry: () => mockToolRegistry,
+            isInteractive: () => false,
+        });
         const scheduler = new CoreToolScheduler({
             config: mockConfig,
-            toolRegistry: mockToolRegistry,
             onAllToolCallsComplete,
             onToolCallsUpdate,
             getPreferredEditor: () => 'vscode',
-            onEditorClose: vi.fn(),
         });
         const abortController = new AbortController();
         const request = {
@@ -111,10 +214,262 @@ describe('CoreToolScheduler', () => {
             .calls[0][0];
         expect(completedCalls[0].status).toBe('cancelled');
     });
+    it('should cancel all tools when cancelAll is called', async () => {
+        const mockTool1 = new MockTool({
+            name: 'mockTool1',
+            shouldConfirmExecute: MOCK_TOOL_SHOULD_CONFIRM_EXECUTE,
+        });
+        const mockTool2 = new MockTool({ name: 'mockTool2' });
+        const mockTool3 = new MockTool({ name: 'mockTool3' });
+        const mockToolRegistry = {
+            getTool: (name) => {
+                if (name === 'mockTool1')
+                    return mockTool1;
+                if (name === 'mockTool2')
+                    return mockTool2;
+                if (name === 'mockTool3')
+                    return mockTool3;
+                return undefined;
+            },
+            getFunctionDeclarations: () => [],
+            tools: new Map(),
+            discovery: {},
+            registerTool: () => { },
+            getToolByName: (name) => {
+                if (name === 'mockTool1')
+                    return mockTool1;
+                if (name === 'mockTool2')
+                    return mockTool2;
+                if (name === 'mockTool3')
+                    return mockTool3;
+                return undefined;
+            },
+            getToolByDisplayName: () => undefined,
+            getTools: () => [],
+            discoverTools: async () => { },
+            getAllTools: () => [],
+            getToolsByServer: () => [],
+        };
+        const onAllToolCallsComplete = vi.fn();
+        const onToolCallsUpdate = vi.fn();
+        const mockConfig = createMockConfig({
+            getToolRegistry: () => mockToolRegistry,
+            isInteractive: () => false,
+        });
+        const scheduler = new CoreToolScheduler({
+            config: mockConfig,
+            onAllToolCallsComplete,
+            onToolCallsUpdate,
+            getPreferredEditor: () => 'vscode',
+        });
+        const abortController = new AbortController();
+        const requests = [
+            {
+                callId: '1',
+                name: 'mockTool1',
+                args: {},
+                isClientInitiated: false,
+                prompt_id: 'prompt-id-1',
+            },
+            {
+                callId: '2',
+                name: 'mockTool2',
+                args: {},
+                isClientInitiated: false,
+                prompt_id: 'prompt-id-1',
+            },
+            {
+                callId: '3',
+                name: 'mockTool3',
+                args: {},
+                isClientInitiated: false,
+                prompt_id: 'prompt-id-1',
+            },
+        ];
+        // Don't await, let it run in the background
+        void scheduler.schedule(requests, abortController.signal);
+        // Wait for the first tool to be awaiting approval
+        await waitForStatus(onToolCallsUpdate, 'awaiting_approval');
+        // Cancel all operations
+        scheduler.cancelAll(abortController.signal);
+        abortController.abort(); // Also fire the signal
+        await vi.waitFor(() => {
+            expect(onAllToolCallsComplete).toHaveBeenCalled();
+        });
+        const completedCalls = onAllToolCallsComplete.mock
+            .calls[0][0];
+        expect(completedCalls).toHaveLength(3);
+        expect(completedCalls.find((c) => c.request.callId === '1')?.status).toBe('cancelled');
+        expect(completedCalls.find((c) => c.request.callId === '2')?.status).toBe('cancelled');
+        expect(completedCalls.find((c) => c.request.callId === '3')?.status).toBe('cancelled');
+    });
+    it('should cancel all tools in a batch when one is cancelled via confirmation', async () => {
+        const mockTool1 = new MockTool({
+            name: 'mockTool1',
+            shouldConfirmExecute: MOCK_TOOL_SHOULD_CONFIRM_EXECUTE,
+        });
+        const mockTool2 = new MockTool({ name: 'mockTool2' });
+        const mockTool3 = new MockTool({ name: 'mockTool3' });
+        const mockToolRegistry = {
+            getTool: (name) => {
+                if (name === 'mockTool1')
+                    return mockTool1;
+                if (name === 'mockTool2')
+                    return mockTool2;
+                if (name === 'mockTool3')
+                    return mockTool3;
+                return undefined;
+            },
+            getFunctionDeclarations: () => [],
+            tools: new Map(),
+            discovery: {},
+            registerTool: () => { },
+            getToolByName: (name) => {
+                if (name === 'mockTool1')
+                    return mockTool1;
+                if (name === 'mockTool2')
+                    return mockTool2;
+                if (name === 'mockTool3')
+                    return mockTool3;
+                return undefined;
+            },
+            getToolByDisplayName: () => undefined,
+            getTools: () => [],
+            discoverTools: async () => { },
+            getAllTools: () => [],
+            getToolsByServer: () => [],
+        };
+        const onAllToolCallsComplete = vi.fn();
+        const onToolCallsUpdate = vi.fn();
+        const mockConfig = createMockConfig({
+            getToolRegistry: () => mockToolRegistry,
+            isInteractive: () => false,
+        });
+        const scheduler = new CoreToolScheduler({
+            config: mockConfig,
+            onAllToolCallsComplete,
+            onToolCallsUpdate,
+            getPreferredEditor: () => 'vscode',
+        });
+        const abortController = new AbortController();
+        const requests = [
+            {
+                callId: '1',
+                name: 'mockTool1',
+                args: {},
+                isClientInitiated: false,
+                prompt_id: 'prompt-id-1',
+            },
+            {
+                callId: '2',
+                name: 'mockTool2',
+                args: {},
+                isClientInitiated: false,
+                prompt_id: 'prompt-id-1',
+            },
+            {
+                callId: '3',
+                name: 'mockTool3',
+                args: {},
+                isClientInitiated: false,
+                prompt_id: 'prompt-id-1',
+            },
+        ];
+        // Don't await, let it run in the background
+        void scheduler.schedule(requests, abortController.signal);
+        // Wait for the first tool to be awaiting approval
+        const awaitingCall = (await waitForStatus(onToolCallsUpdate, 'awaiting_approval'));
+        // Cancel the first tool via its confirmation handler
+        await awaitingCall.confirmationDetails.onConfirm(ToolConfirmationOutcome.Cancel);
+        abortController.abort(); // User cancelling often involves an abort signal
+        await vi.waitFor(() => {
+            expect(onAllToolCallsComplete).toHaveBeenCalled();
+        });
+        const completedCalls = onAllToolCallsComplete.mock
+            .calls[0][0];
+        expect(completedCalls).toHaveLength(3);
+        expect(completedCalls.find((c) => c.request.callId === '1')?.status).toBe('cancelled');
+        expect(completedCalls.find((c) => c.request.callId === '2')?.status).toBe('cancelled');
+        expect(completedCalls.find((c) => c.request.callId === '3')?.status).toBe('cancelled');
+    });
+    it('should mark tool call as cancelled when abort happens during confirmation error', async () => {
+        const abortController = new AbortController();
+        const abortError = new Error('Abort requested during confirmation');
+        const declarativeTool = new AbortDuringConfirmationTool(abortController, abortError);
+        const mockToolRegistry = {
+            getTool: () => declarativeTool,
+            getFunctionDeclarations: () => [],
+            tools: new Map(),
+            discovery: {},
+            registerTool: () => { },
+            getToolByName: () => declarativeTool,
+            getToolByDisplayName: () => declarativeTool,
+            getTools: () => [],
+            discoverTools: async () => { },
+            getAllTools: () => [],
+            getToolsByServer: () => [],
+        };
+        const onAllToolCallsComplete = vi.fn();
+        const onToolCallsUpdate = vi.fn();
+        const mockConfig = createMockConfig({
+            getToolRegistry: () => mockToolRegistry,
+            isInteractive: () => false,
+        });
+        const scheduler = new CoreToolScheduler({
+            config: mockConfig,
+            onAllToolCallsComplete,
+            onToolCallsUpdate,
+            getPreferredEditor: () => 'vscode',
+        });
+        const request = {
+            callId: 'abort-1',
+            name: 'abortDuringConfirmationTool',
+            args: {},
+            isClientInitiated: false,
+            prompt_id: 'prompt-id-abort',
+        };
+        await scheduler.schedule([request], abortController.signal);
+        expect(onAllToolCallsComplete).toHaveBeenCalled();
+        const completedCalls = onAllToolCallsComplete.mock
+            .calls[0][0];
+        expect(completedCalls[0].status).toBe('cancelled');
+        const statuses = onToolCallsUpdate.mock.calls.flatMap((call) => call[0].map((toolCall) => toolCall.status));
+        expect(statuses).not.toContain('error');
+    });
+    describe('getToolSuggestion', () => {
+        it('should suggest the top N closest tool names for a typo', () => {
+            // Create mocked tool registry
+            const mockToolRegistry = {
+                getAllToolNames: () => ['list_files', 'read_file', 'write_file'],
+            };
+            const mockConfig = createMockConfig({
+                getToolRegistry: () => mockToolRegistry,
+                isInteractive: () => false,
+            });
+            // Create scheduler
+            const scheduler = new CoreToolScheduler({
+                config: mockConfig,
+                getPreferredEditor: () => 'vscode',
+            });
+            // Test that the right tool is selected, with only 1 result, for typos
+            // @ts-expect-error accessing private method
+            const misspelledTool = scheduler.getToolSuggestion('list_fils', 1);
+            expect(misspelledTool).toBe(' Did you mean "list_files"?');
+            // Test that the right tool is selected, with only 1 result, for prefixes
+            // @ts-expect-error accessing private method
+            const prefixedTool = scheduler.getToolSuggestion('github.list_files', 1);
+            expect(prefixedTool).toBe(' Did you mean "list_files"?');
+            // Test that the right tool is first
+            // @ts-expect-error accessing private method
+            const suggestionMultiple = scheduler.getToolSuggestion('list_fils');
+            expect(suggestionMultiple).toBe(' Did you mean one of: "list_files", "read_file", "write_file"?');
+        });
+    });
 });
 describe('CoreToolScheduler with payload', () => {
     it('should update args and diff and execute tool when payload is provided', async () => {
         const mockTool = new MockModifiableTool();
+        mockTool.executeFn = vi.fn();
         const declarativeTool = mockTool;
         const mockToolRegistry = {
             getTool: () => declarativeTool,
@@ -131,23 +486,15 @@ describe('CoreToolScheduler with payload', () => {
         };
         const onAllToolCallsComplete = vi.fn();
         const onToolCallsUpdate = vi.fn();
-        const mockConfig = {
-            getSessionId: () => 'test-session-id',
-            getUsageStatisticsEnabled: () => true,
-            getDebugMode: () => false,
-            getApprovalMode: () => ApprovalMode.DEFAULT,
-            getContentGeneratorConfig: () => ({
-                model: 'test-model',
-                authType: 'oauth-personal',
-            }),
-        };
+        const mockConfig = createMockConfig({
+            getToolRegistry: () => mockToolRegistry,
+            isInteractive: () => false,
+        });
         const scheduler = new CoreToolScheduler({
             config: mockConfig,
-            toolRegistry: mockToolRegistry,
             onAllToolCallsComplete,
             onToolCallsUpdate,
             getPreferredEditor: () => 'vscode',
-            onEditorClose: vi.fn(),
         });
         const abortController = new AbortController();
         const request = {
@@ -158,17 +505,16 @@ describe('CoreToolScheduler with payload', () => {
             prompt_id: 'prompt-id-2',
         };
         await scheduler.schedule([request], abortController.signal);
-        await vi.waitFor(() => {
-            const awaitingCall = onToolCallsUpdate.mock.calls.find((call) => call[0][0].status === 'awaiting_approval')?.[0][0];
-            expect(awaitingCall).toBeDefined();
-        });
-        const awaitingCall = onToolCallsUpdate.mock.calls.find((call) => call[0][0].status === 'awaiting_approval')?.[0][0];
+        const awaitingCall = (await waitForStatus(onToolCallsUpdate, 'awaiting_approval'));
         const confirmationDetails = awaitingCall.confirmationDetails;
         if (confirmationDetails) {
             const payload = { newContent: 'final version' };
             await confirmationDetails.onConfirm(ToolConfirmationOutcome.ProceedOnce, payload);
         }
-        expect(onAllToolCallsComplete).toHaveBeenCalled();
+        // Wait for the tool execution to complete
+        await vi.waitFor(() => {
+            expect(onAllToolCallsComplete).toHaveBeenCalled();
+        });
         const completedCalls = onAllToolCallsComplete.mock
             .calls[0][0];
         expect(completedCalls[0].status).toBe('success');
@@ -183,35 +529,41 @@ describe('convertToFunctionResponse', () => {
     it('should handle simple string llmContent', () => {
         const llmContent = 'Simple text output';
         const result = convertToFunctionResponse(toolName, callId, llmContent);
-        expect(result).toEqual({
-            functionResponse: {
-                name: toolName,
-                id: callId,
-                response: { output: 'Simple text output' },
+        expect(result).toEqual([
+            {
+                functionResponse: {
+                    name: toolName,
+                    id: callId,
+                    response: { output: 'Simple text output' },
+                },
             },
-        });
+        ]);
     });
     it('should handle llmContent as a single Part with text', () => {
         const llmContent = { text: 'Text from Part object' };
         const result = convertToFunctionResponse(toolName, callId, llmContent);
-        expect(result).toEqual({
-            functionResponse: {
-                name: toolName,
-                id: callId,
-                response: { output: 'Text from Part object' },
+        expect(result).toEqual([
+            {
+                functionResponse: {
+                    name: toolName,
+                    id: callId,
+                    response: { output: 'Text from Part object' },
+                },
             },
-        });
+        ]);
     });
     it('should handle llmContent as a PartListUnion array with a single text Part', () => {
         const llmContent = [{ text: 'Text from array' }];
         const result = convertToFunctionResponse(toolName, callId, llmContent);
-        expect(result).toEqual({
-            functionResponse: {
-                name: toolName,
-                id: callId,
-                response: { output: 'Text from array' },
+        expect(result).toEqual([
+            {
+                functionResponse: {
+                    name: toolName,
+                    id: callId,
+                    response: { output: 'Text from array' },
+                },
             },
-        });
+        ]);
     });
     it('should handle llmContent with inlineData', () => {
         const llmContent = {
@@ -288,24 +640,28 @@ describe('convertToFunctionResponse', () => {
     it('should handle llmContent as a generic Part (not text, inlineData, or fileData)', () => {
         const llmContent = { functionCall: { name: 'test', args: {} } };
         const result = convertToFunctionResponse(toolName, callId, llmContent);
-        expect(result).toEqual({
-            functionResponse: {
-                name: toolName,
-                id: callId,
-                response: { output: 'Tool execution succeeded.' },
+        expect(result).toEqual([
+            {
+                functionResponse: {
+                    name: toolName,
+                    id: callId,
+                    response: { output: 'Tool execution succeeded.' },
+                },
             },
-        });
+        ]);
     });
     it('should handle empty string llmContent', () => {
         const llmContent = '';
         const result = convertToFunctionResponse(toolName, callId, llmContent);
-        expect(result).toEqual({
-            functionResponse: {
-                name: toolName,
-                id: callId,
-                response: { output: '' },
+        expect(result).toEqual([
+            {
+                functionResponse: {
+                    name: toolName,
+                    id: callId,
+                    response: { output: '' },
+                },
             },
-        });
+        ]);
     });
     it('should handle llmContent as an empty array', () => {
         const llmContent = [];
@@ -323,13 +679,15 @@ describe('convertToFunctionResponse', () => {
     it('should handle llmContent as a Part with undefined inlineData/fileData/text', () => {
         const llmContent = {}; // An empty part object
         const result = convertToFunctionResponse(toolName, callId, llmContent);
-        expect(result).toEqual({
-            functionResponse: {
-                name: toolName,
-                id: callId,
-                response: { output: 'Tool execution succeeded.' },
+        expect(result).toEqual([
+            {
+                functionResponse: {
+                    name: toolName,
+                    id: callId,
+                    response: { output: 'Tool execution succeeded.' },
+                },
             },
-        });
+        ]);
     });
 });
 class MockEditToolInvocation extends BaseToolInvocation {
@@ -369,15 +727,14 @@ class MockEditTool extends BaseDeclarativeTool {
 describe('CoreToolScheduler edit cancellation', () => {
     it('should preserve diff when an edit is cancelled', async () => {
         const mockEditTool = new MockEditTool();
-        const declarativeTool = mockEditTool;
         const mockToolRegistry = {
-            getTool: () => declarativeTool,
+            getTool: () => mockEditTool,
             getFunctionDeclarations: () => [],
             tools: new Map(),
             discovery: {},
             registerTool: () => { },
-            getToolByName: () => declarativeTool,
-            getToolByDisplayName: () => declarativeTool,
+            getToolByName: () => mockEditTool,
+            getToolByDisplayName: () => mockEditTool,
             getTools: () => [],
             discoverTools: async () => { },
             getAllTools: () => [],
@@ -385,23 +742,15 @@ describe('CoreToolScheduler edit cancellation', () => {
         };
         const onAllToolCallsComplete = vi.fn();
         const onToolCallsUpdate = vi.fn();
-        const mockConfig = {
-            getSessionId: () => 'test-session-id',
-            getUsageStatisticsEnabled: () => true,
-            getDebugMode: () => false,
-            getApprovalMode: () => ApprovalMode.DEFAULT,
-            getContentGeneratorConfig: () => ({
-                model: 'test-model',
-                authType: 'oauth-personal',
-            }),
-        };
+        const mockConfig = createMockConfig({
+            getToolRegistry: () => mockToolRegistry,
+            isInteractive: () => false,
+        });
         const scheduler = new CoreToolScheduler({
             config: mockConfig,
-            toolRegistry: mockToolRegistry,
             onAllToolCallsComplete,
             onToolCallsUpdate,
             getPreferredEditor: () => 'vscode',
-            onEditorClose: vi.fn(),
         });
         const abortController = new AbortController();
         const request = {
@@ -412,9 +761,7 @@ describe('CoreToolScheduler edit cancellation', () => {
             prompt_id: 'prompt-id-1',
         };
         await scheduler.schedule([request], abortController.signal);
-        // Wait for the tool to reach awaiting_approval state
-        const awaitingCall = onToolCallsUpdate.mock.calls.find((call) => call[0][0].status === 'awaiting_approval')?.[0][0];
-        expect(awaitingCall).toBeDefined();
+        const awaitingCall = (await waitForStatus(onToolCallsUpdate, 'awaiting_approval'));
         // Cancel the edit
         const confirmationDetails = awaitingCall.confirmationDetails;
         if (confirmationDetails) {
@@ -435,13 +782,15 @@ describe('CoreToolScheduler edit cancellation', () => {
 describe('CoreToolScheduler YOLO mode', () => {
     it('should execute tool requiring confirmation directly without waiting', async () => {
         // Arrange
-        const mockTool = new MockTool();
-        mockTool.executeFn.mockReturnValue({
+        const executeFn = vi.fn().mockResolvedValue({
             llmContent: 'Tool executed',
             returnDisplay: 'Tool executed',
         });
-        // This tool would normally require confirmation.
-        mockTool.shouldConfirm = true;
+        const mockTool = new MockTool({
+            name: 'mockTool',
+            execute: executeFn,
+            shouldConfirmExecute: MOCK_TOOL_SHOULD_CONFIRM_EXECUTE,
+        });
         const declarativeTool = mockTool;
         const mockToolRegistry = {
             getTool: () => declarativeTool,
@@ -460,23 +809,16 @@ describe('CoreToolScheduler YOLO mode', () => {
         const onAllToolCallsComplete = vi.fn();
         const onToolCallsUpdate = vi.fn();
         // Configure the scheduler for YOLO mode.
-        const mockConfig = {
-            getSessionId: () => 'test-session-id',
-            getUsageStatisticsEnabled: () => true,
-            getDebugMode: () => false,
+        const mockConfig = createMockConfig({
+            getToolRegistry: () => mockToolRegistry,
             getApprovalMode: () => ApprovalMode.YOLO,
-            getContentGeneratorConfig: () => ({
-                model: 'test-model',
-                authType: 'oauth-personal',
-            }),
-        };
+            isInteractive: () => false,
+        });
         const scheduler = new CoreToolScheduler({
             config: mockConfig,
-            toolRegistry: mockToolRegistry,
             onAllToolCallsComplete,
             onToolCallsUpdate,
             getPreferredEditor: () => 'vscode',
-            onEditorClose: vi.fn(),
         });
         const abortController = new AbortController();
         const request = {
@@ -488,9 +830,13 @@ describe('CoreToolScheduler YOLO mode', () => {
         };
         // Act
         await scheduler.schedule([request], abortController.signal);
+        // Wait for the tool execution to complete
+        await vi.waitFor(() => {
+            expect(onAllToolCallsComplete).toHaveBeenCalled();
+        });
         // Assert
         // 1. The tool's execute method was called directly.
-        expect(mockTool.executeFn).toHaveBeenCalledWith({ param: 'value' });
+        expect(executeFn).toHaveBeenCalledWith({ param: 'value' });
         // 2. The tool call status never entered 'awaiting_approval'.
         const statusUpdates = onToolCallsUpdate.mock.calls
             .map((call) => call[0][0]?.status)
@@ -503,7 +849,6 @@ describe('CoreToolScheduler YOLO mode', () => {
             'success',
         ]);
         // 3. The final callback indicates the tool call was successful.
-        expect(onAllToolCallsComplete).toHaveBeenCalled();
         const completedCalls = onAllToolCallsComplete.mock
             .calls[0][0];
         expect(completedCalls).toHaveLength(1);
@@ -520,8 +865,8 @@ describe('CoreToolScheduler request queueing', () => {
         const firstCallPromise = new Promise((resolve) => {
             resolveFirstCall = resolve;
         });
-        const mockTool = new MockTool();
-        mockTool.executeFn.mockImplementation(() => firstCallPromise);
+        const executeFn = vi.fn().mockImplementation(() => firstCallPromise);
+        const mockTool = new MockTool({ name: 'mockTool', execute: executeFn });
         const declarativeTool = mockTool;
         const mockToolRegistry = {
             getTool: () => declarativeTool,
@@ -538,23 +883,16 @@ describe('CoreToolScheduler request queueing', () => {
         };
         const onAllToolCallsComplete = vi.fn();
         const onToolCallsUpdate = vi.fn();
-        const mockConfig = {
-            getSessionId: () => 'test-session-id',
-            getUsageStatisticsEnabled: () => true,
-            getDebugMode: () => false,
+        const mockConfig = createMockConfig({
+            getToolRegistry: () => mockToolRegistry,
             getApprovalMode: () => ApprovalMode.YOLO, // Use YOLO to avoid confirmation prompts
-            getContentGeneratorConfig: () => ({
-                model: 'test-model',
-                authType: 'oauth-personal',
-            }),
-        };
+            isInteractive: () => false,
+        });
         const scheduler = new CoreToolScheduler({
             config: mockConfig,
-            toolRegistry: mockToolRegistry,
             onAllToolCallsComplete,
             onToolCallsUpdate,
             getPreferredEditor: () => 'vscode',
-            onEditorClose: vi.fn(),
         });
         const abortController = new AbortController();
         const request1 = {
@@ -574,15 +912,11 @@ describe('CoreToolScheduler request queueing', () => {
         // Schedule the first call, which will pause execution.
         scheduler.schedule([request1], abortController.signal);
         // Wait for the first call to be in the 'executing' state.
-        await vi.waitFor(() => {
-            const calls = onToolCallsUpdate.mock.calls.at(-1)?.[0];
-            expect(calls?.[0]?.status).toBe('executing');
-        });
+        await waitForStatus(onToolCallsUpdate, 'executing');
         // Schedule the second call while the first is "running".
         const schedulePromise2 = scheduler.schedule([request2], abortController.signal);
         // Ensure the second tool call hasn't been executed yet.
-        expect(mockTool.executeFn).toHaveBeenCalledTimes(1);
-        expect(mockTool.executeFn).toHaveBeenCalledWith({ a: 1 });
+        expect(executeFn).toHaveBeenCalledWith({ a: 1 });
         // Complete the first tool call.
         resolveFirstCall({
             llmContent: 'First call complete',
@@ -590,14 +924,6 @@ describe('CoreToolScheduler request queueing', () => {
         });
         // Wait for the second schedule promise to resolve.
         await schedulePromise2;
-        // Wait for the second call to be in the 'executing' state.
-        await vi.waitFor(() => {
-            const calls = onToolCallsUpdate.mock.calls.at(-1)?.[0];
-            expect(calls?.[0]?.status).toBe('executing');
-        });
-        // Now the second tool call should have been executed.
-        expect(mockTool.executeFn).toHaveBeenCalledTimes(2);
-        expect(mockTool.executeFn).toHaveBeenCalledWith({ b: 2 });
         // Let the second call finish.
         const secondCallResult = {
             llmContent: 'Second call complete',
@@ -606,6 +932,11 @@ describe('CoreToolScheduler request queueing', () => {
         // Since the mock is shared, we need to resolve the current promise.
         // In a real scenario, a new promise would be created for the second call.
         resolveFirstCall(secondCallResult);
+        await vi.waitFor(() => {
+            // Now the second tool call should have been executed.
+            expect(executeFn).toHaveBeenCalledTimes(2);
+        });
+        expect(executeFn).toHaveBeenCalledWith({ b: 2 });
         // Wait for the second completion.
         await vi.waitFor(() => {
             expect(onAllToolCallsComplete).toHaveBeenCalledTimes(2);
@@ -614,8 +945,159 @@ describe('CoreToolScheduler request queueing', () => {
         expect(onAllToolCallsComplete.mock.calls[0][0][0].status).toBe('success');
         expect(onAllToolCallsComplete.mock.calls[1][0][0].status).toBe('success');
     });
+    it('should auto-approve a tool call if it is on the allowedTools list', async () => {
+        // Arrange
+        const executeFn = vi.fn().mockResolvedValue({
+            llmContent: 'Tool executed',
+            returnDisplay: 'Tool executed',
+        });
+        const mockTool = new MockTool({
+            name: 'mockTool',
+            execute: executeFn,
+            shouldConfirmExecute: MOCK_TOOL_SHOULD_CONFIRM_EXECUTE,
+        });
+        const declarativeTool = mockTool;
+        const toolRegistry = {
+            getTool: () => declarativeTool,
+            getToolByName: () => declarativeTool,
+            getFunctionDeclarations: () => [],
+            tools: new Map(),
+            discovery: {},
+            registerTool: () => { },
+            getToolByDisplayName: () => declarativeTool,
+            getTools: () => [],
+            discoverTools: async () => { },
+            getAllTools: () => [],
+            getToolsByServer: () => [],
+        };
+        const onAllToolCallsComplete = vi.fn();
+        const onToolCallsUpdate = vi.fn();
+        // Configure the scheduler to auto-approve the specific tool call.
+        const mockConfig = createMockConfig({
+            getAllowedTools: () => ['mockTool'], // Auto-approve this tool
+            getToolRegistry: () => toolRegistry,
+            getShellExecutionConfig: () => ({
+                terminalWidth: 80,
+                terminalHeight: 24,
+            }),
+            isInteractive: () => false,
+        });
+        const scheduler = new CoreToolScheduler({
+            config: mockConfig,
+            onAllToolCallsComplete,
+            onToolCallsUpdate,
+            getPreferredEditor: () => 'vscode',
+        });
+        const abortController = new AbortController();
+        const request = {
+            callId: '1',
+            name: 'mockTool',
+            args: { param: 'value' },
+            isClientInitiated: false,
+            prompt_id: 'prompt-auto-approved',
+        };
+        // Act
+        await scheduler.schedule([request], abortController.signal);
+        // Wait for the tool execution to complete
+        await vi.waitFor(() => {
+            expect(onAllToolCallsComplete).toHaveBeenCalled();
+        });
+        // Assert
+        // 1. The tool's execute method was called directly.
+        expect(executeFn).toHaveBeenCalledWith({ param: 'value' });
+        // 2. The tool call status never entered 'awaiting_approval'.
+        const statusUpdates = onToolCallsUpdate.mock.calls
+            .map((call) => call[0][0]?.status)
+            .filter(Boolean);
+        expect(statusUpdates).not.toContain('awaiting_approval');
+        expect(statusUpdates).toEqual([
+            'validating',
+            'scheduled',
+            'executing',
+            'success',
+        ]);
+        // 3. The final callback indicates the tool call was successful.
+        expect(onAllToolCallsComplete).toHaveBeenCalled();
+        const completedCalls = onAllToolCallsComplete.mock
+            .calls[0][0];
+        expect(completedCalls).toHaveLength(1);
+        const completedCall = completedCalls[0];
+        expect(completedCall.status).toBe('success');
+        if (completedCall.status === 'success') {
+            expect(completedCall.response.resultDisplay).toBe('Tool executed');
+        }
+    });
+    it('should require approval for a chained shell command even when prefix is allowlisted', async () => {
+        expect(isShellInvocationAllowlisted({
+            params: { command: 'git status && rm -rf /tmp/should-not-run' },
+        }, ['run_shell_command(git)'])).toBe(false);
+        const executeFn = vi.fn().mockResolvedValue({
+            llmContent: 'Shell command executed',
+            returnDisplay: 'Shell command executed',
+        });
+        const mockShellTool = new MockTool({
+            name: 'run_shell_command',
+            shouldConfirmExecute: (params) => Promise.resolve({
+                type: 'exec',
+                title: 'Confirm Shell Command',
+                command: String(params['command'] ?? ''),
+                rootCommand: 'git',
+                onConfirm: async () => { },
+            }),
+            execute: () => executeFn({}),
+        });
+        const toolRegistry = {
+            getTool: () => mockShellTool,
+            getToolByName: () => mockShellTool,
+            getFunctionDeclarations: () => [],
+            tools: new Map(),
+            discovery: {},
+            registerTool: () => { },
+            getToolByDisplayName: () => mockShellTool,
+            getTools: () => [],
+            discoverTools: async () => { },
+            getAllTools: () => [],
+            getToolsByServer: () => [],
+        };
+        const onAllToolCallsComplete = vi.fn();
+        const onToolCallsUpdate = vi.fn();
+        const mockConfig = createMockConfig({
+            getAllowedTools: () => ['run_shell_command(git)'],
+            getShellExecutionConfig: () => ({
+                terminalWidth: 80,
+                terminalHeight: 24,
+            }),
+            getToolRegistry: () => toolRegistry,
+            isInteractive: () => false,
+        });
+        const scheduler = new CoreToolScheduler({
+            config: mockConfig,
+            onAllToolCallsComplete,
+            onToolCallsUpdate,
+            getPreferredEditor: () => 'vscode',
+        });
+        const abortController = new AbortController();
+        const request = {
+            callId: 'shell-1',
+            name: 'run_shell_command',
+            args: { command: 'git status && rm -rf /tmp/should-not-run' },
+            isClientInitiated: false,
+            prompt_id: 'prompt-shell-auto-approved',
+        };
+        await scheduler.schedule([request], abortController.signal);
+        const statusUpdates = onToolCallsUpdate.mock.calls
+            .map((call) => call[0][0]?.status)
+            .filter(Boolean);
+        expect(statusUpdates).toContain('awaiting_approval');
+        expect(executeFn).not.toHaveBeenCalled();
+        expect(onAllToolCallsComplete).not.toHaveBeenCalled();
+    }, 20000);
     it('should handle two synchronous calls to schedule', async () => {
-        const mockTool = new MockTool();
+        const executeFn = vi.fn().mockResolvedValue({
+            llmContent: 'Tool executed',
+            returnDisplay: 'Tool executed',
+        });
+        const mockTool = new MockTool({ name: 'mockTool', execute: executeFn });
         const declarativeTool = mockTool;
         const mockToolRegistry = {
             getTool: () => declarativeTool,
@@ -632,23 +1114,16 @@ describe('CoreToolScheduler request queueing', () => {
         };
         const onAllToolCallsComplete = vi.fn();
         const onToolCallsUpdate = vi.fn();
-        const mockConfig = {
-            getSessionId: () => 'test-session-id',
-            getUsageStatisticsEnabled: () => true,
-            getDebugMode: () => false,
+        const mockConfig = createMockConfig({
+            getToolRegistry: () => mockToolRegistry,
             getApprovalMode: () => ApprovalMode.YOLO,
-            getContentGeneratorConfig: () => ({
-                model: 'test-model',
-                authType: 'oauth-personal',
-            }),
-        };
+            isInteractive: () => false,
+        });
         const scheduler = new CoreToolScheduler({
             config: mockConfig,
-            toolRegistry: mockToolRegistry,
             onAllToolCallsComplete,
             onToolCallsUpdate,
             getPreferredEditor: () => 'vscode',
-            onEditorClose: vi.fn(),
         });
         const abortController = new AbortController();
         const request1 = {
@@ -671,23 +1146,21 @@ describe('CoreToolScheduler request queueing', () => {
         // Wait for both promises to resolve.
         await Promise.all([schedulePromise1, schedulePromise2]);
         // Ensure the tool was called twice with the correct arguments.
-        expect(mockTool.executeFn).toHaveBeenCalledTimes(2);
-        expect(mockTool.executeFn).toHaveBeenCalledWith({ a: 1 });
-        expect(mockTool.executeFn).toHaveBeenCalledWith({ b: 2 });
+        expect(executeFn).toHaveBeenCalledTimes(2);
+        expect(executeFn).toHaveBeenCalledWith({ a: 1 });
+        expect(executeFn).toHaveBeenCalledWith({ b: 2 });
         // Ensure completion callbacks were called twice.
         expect(onAllToolCallsComplete).toHaveBeenCalledTimes(2);
     });
     it('should auto-approve remaining tool calls when first tool call is approved with ProceedAlways', async () => {
         let approvalMode = ApprovalMode.DEFAULT;
-        const mockConfig = {
-            getSessionId: () => 'test-session-id',
-            getUsageStatisticsEnabled: () => true,
-            getDebugMode: () => false,
+        const mockConfig = createMockConfig({
             getApprovalMode: () => approvalMode,
             setApprovalMode: (mode) => {
                 approvalMode = mode;
             },
-        };
+            isInteractive: () => false,
+        });
         const testTool = new TestApprovalTool(mockConfig);
         const toolRegistry = {
             getTool: () => testTool,
@@ -709,12 +1182,12 @@ describe('CoreToolScheduler request queueing', () => {
             discoverTools: async () => { },
             discovery: {},
         };
+        mockConfig.getToolRegistry = () => toolRegistry;
         const onAllToolCallsComplete = vi.fn();
         const onToolCallsUpdate = vi.fn();
         const pendingConfirmations = [];
         const scheduler = new CoreToolScheduler({
             config: mockConfig,
-            toolRegistry: toolRegistry,
             onAllToolCallsComplete,
             onToolCallsUpdate: (toolCalls) => {
                 onToolCallsUpdate(toolCalls);
@@ -732,7 +1205,6 @@ describe('CoreToolScheduler request queueing', () => {
                 });
             },
             getPreferredEditor: () => 'vscode',
-            onEditorClose: vi.fn(),
         });
         const abortController = new AbortController();
         // Schedule multiple tools that need confirmation
@@ -760,25 +1232,385 @@ describe('CoreToolScheduler request queueing', () => {
             },
         ];
         await scheduler.schedule(requests, abortController.signal);
-        // Wait for all tools to be awaiting approval
+        // Wait for the FIRST tool to be awaiting approval
         await vi.waitFor(() => {
             const calls = onToolCallsUpdate.mock.calls.at(-1)?.[0];
+            // With the sequential scheduler, the update includes the active call and the queue.
             expect(calls?.length).toBe(3);
-            expect(calls?.every((call) => call.status === 'awaiting_approval')).toBe(true);
+            expect(calls?.[0].status).toBe('awaiting_approval');
+            expect(calls?.[0].request.callId).toBe('1');
+            // Check that the other two are in the queue (still in 'validating' state)
+            expect(calls?.[1].status).toBe('validating');
+            expect(calls?.[2].status).toBe('validating');
         });
-        expect(pendingConfirmations.length).toBe(3);
+        expect(pendingConfirmations.length).toBe(1);
         // Approve the first tool with ProceedAlways
         const firstConfirmation = pendingConfirmations[0];
         firstConfirmation(ToolConfirmationOutcome.ProceedAlways);
         // Wait for all tools to be completed
         await vi.waitFor(() => {
             expect(onAllToolCallsComplete).toHaveBeenCalled();
-            const completedCalls = onAllToolCallsComplete.mock.calls.at(-1)?.[0];
-            expect(completedCalls?.length).toBe(3);
-            expect(completedCalls?.every((call) => call.status === 'success')).toBe(true);
         });
+        const completedCalls = onAllToolCallsComplete.mock.calls.at(-1)?.[0];
+        expect(completedCalls?.length).toBe(3);
+        expect(completedCalls?.every((call) => call.status === 'success')).toBe(true);
         // Verify approval mode was changed
         expect(approvalMode).toBe(ApprovalMode.AUTO_EDIT);
     });
 });
+describe('CoreToolScheduler Sequential Execution', () => {
+    it('should execute tool calls in a batch sequentially', async () => {
+        // Arrange
+        let firstCallFinished = false;
+        const executeFn = vi
+            .fn()
+            .mockImplementation(async (args) => {
+            if (args.call === 1) {
+                // First call, wait for a bit to simulate work
+                await new Promise((resolve) => setTimeout(resolve, 50));
+                firstCallFinished = true;
+                return { llmContent: 'First call done' };
+            }
+            if (args.call === 2) {
+                // Second call, should only happen after the first is finished
+                if (!firstCallFinished) {
+                    throw new Error('Second tool call started before the first one finished!');
+                }
+                return { llmContent: 'Second call done' };
+            }
+            return { llmContent: 'default' };
+        });
+        const mockTool = new MockTool({ name: 'mockTool', execute: executeFn });
+        const declarativeTool = mockTool;
+        const mockToolRegistry = {
+            getTool: () => declarativeTool,
+            getToolByName: () => declarativeTool,
+            getFunctionDeclarations: () => [],
+            tools: new Map(),
+            discovery: {},
+            registerTool: () => { },
+            getToolByDisplayName: () => declarativeTool,
+            getTools: () => [],
+            discoverTools: async () => { },
+            getAllTools: () => [],
+            getToolsByServer: () => [],
+        };
+        const onAllToolCallsComplete = vi.fn();
+        const onToolCallsUpdate = vi.fn();
+        const mockConfig = createMockConfig({
+            getToolRegistry: () => mockToolRegistry,
+            getApprovalMode: () => ApprovalMode.YOLO, // Use YOLO to avoid confirmation prompts
+            isInteractive: () => false,
+        });
+        const scheduler = new CoreToolScheduler({
+            config: mockConfig,
+            onAllToolCallsComplete,
+            onToolCallsUpdate,
+            getPreferredEditor: () => 'vscode',
+        });
+        const abortController = new AbortController();
+        const requests = [
+            {
+                callId: '1',
+                name: 'mockTool',
+                args: { call: 1 },
+                isClientInitiated: false,
+                prompt_id: 'prompt-1',
+            },
+            {
+                callId: '2',
+                name: 'mockTool',
+                args: { call: 2 },
+                isClientInitiated: false,
+                prompt_id: 'prompt-1',
+            },
+        ];
+        // Act
+        await scheduler.schedule(requests, abortController.signal);
+        // Assert
+        await vi.waitFor(() => {
+            expect(onAllToolCallsComplete).toHaveBeenCalled();
+        });
+        // Check that execute was called twice
+        expect(executeFn).toHaveBeenCalledTimes(2);
+        // Check the order of calls
+        const calls = executeFn.mock.calls;
+        expect(calls[0][0]).toEqual({ call: 1 });
+        expect(calls[1][0]).toEqual({ call: 2 });
+        // The onAllToolCallsComplete should be called once with both results
+        const completedCalls = onAllToolCallsComplete.mock
+            .calls[0][0];
+        expect(completedCalls).toHaveLength(2);
+        expect(completedCalls[0].status).toBe('success');
+        expect(completedCalls[1].status).toBe('success');
+    });
+    it('should cancel subsequent tools when the signal is aborted.', async () => {
+        // Arrange
+        const abortController = new AbortController();
+        let secondCallStarted = false;
+        const executeFn = vi
+            .fn()
+            .mockImplementation(async (args) => {
+            if (args.call === 1) {
+                return { llmContent: 'First call done' };
+            }
+            if (args.call === 2) {
+                secondCallStarted = true;
+                // This call will be cancelled while it's "running".
+                await new Promise((resolve) => setTimeout(resolve, 100));
+                // It should not return a value because it will be cancelled.
+                return { llmContent: 'Second call should not complete' };
+            }
+            if (args.call === 3) {
+                return { llmContent: 'Third call done' };
+            }
+            return { llmContent: 'default' };
+        });
+        const mockTool = new MockTool({ name: 'mockTool', execute: executeFn });
+        const declarativeTool = mockTool;
+        const mockToolRegistry = {
+            getTool: () => declarativeTool,
+            getToolByName: () => declarativeTool,
+            getFunctionDeclarations: () => [],
+            tools: new Map(),
+            discovery: {},
+            registerTool: () => { },
+            getToolByDisplayName: () => declarativeTool,
+            getTools: () => [],
+            discoverTools: async () => { },
+            getAllTools: () => [],
+            getToolsByServer: () => [],
+        };
+        const onAllToolCallsComplete = vi.fn();
+        const onToolCallsUpdate = vi.fn();
+        const mockConfig = createMockConfig({
+            getToolRegistry: () => mockToolRegistry,
+            getApprovalMode: () => ApprovalMode.YOLO,
+            isInteractive: () => false,
+        });
+        const scheduler = new CoreToolScheduler({
+            config: mockConfig,
+            onAllToolCallsComplete,
+            onToolCallsUpdate,
+            getPreferredEditor: () => 'vscode',
+        });
+        const requests = [
+            {
+                callId: '1',
+                name: 'mockTool',
+                args: { call: 1 },
+                isClientInitiated: false,
+                prompt_id: 'prompt-1',
+            },
+            {
+                callId: '2',
+                name: 'mockTool',
+                args: { call: 2 },
+                isClientInitiated: false,
+                prompt_id: 'prompt-1',
+            },
+            {
+                callId: '3',
+                name: 'mockTool',
+                args: { call: 3 },
+                isClientInitiated: false,
+                prompt_id: 'prompt-1',
+            },
+        ];
+        // Act
+        const schedulePromise = scheduler.schedule(requests, abortController.signal);
+        // Wait for the second call to start, then abort.
+        await vi.waitFor(() => {
+            expect(secondCallStarted).toBe(true);
+        });
+        abortController.abort();
+        await schedulePromise;
+        // Assert
+        await vi.waitFor(() => {
+            expect(onAllToolCallsComplete).toHaveBeenCalled();
+        });
+        // Check that execute was called for the first two tools only
+        expect(executeFn).toHaveBeenCalledTimes(2);
+        expect(executeFn).toHaveBeenCalledWith({ call: 1 });
+        expect(executeFn).toHaveBeenCalledWith({ call: 2 });
+        const completedCalls = onAllToolCallsComplete.mock
+            .calls[0][0];
+        expect(completedCalls).toHaveLength(3);
+        const call1 = completedCalls.find((c) => c.request.callId === '1');
+        const call2 = completedCalls.find((c) => c.request.callId === '2');
+        const call3 = completedCalls.find((c) => c.request.callId === '3');
+        expect(call1?.status).toBe('success');
+        expect(call2?.status).toBe('cancelled');
+        expect(call3?.status).toBe('cancelled');
+    });
+    it('should pass confirmation diff data into modifyWithEditor overrides', async () => {
+        const modifyWithEditorSpy = vi
+            .spyOn(modifiableToolModule, 'modifyWithEditor')
+            .mockResolvedValue({
+            updatedParams: { param: 'updated' },
+            updatedDiff: 'updated diff',
+        });
+        const mockModifiableTool = new MockModifiableTool('mockModifiableTool');
+        const mockToolRegistry = {
+            getTool: () => mockModifiableTool,
+            getToolByName: () => mockModifiableTool,
+            getFunctionDeclarations: () => [],
+            tools: new Map(),
+            discovery: {},
+            registerTool: () => { },
+            getToolByDisplayName: () => mockModifiableTool,
+            getTools: () => [],
+            discoverTools: async () => { },
+            getAllTools: () => [],
+            getToolsByServer: () => [],
+        };
+        const onAllToolCallsComplete = vi.fn();
+        const onToolCallsUpdate = vi.fn();
+        const mockConfig = createMockConfig({
+            getToolRegistry: () => mockToolRegistry,
+        });
+        const scheduler = new CoreToolScheduler({
+            config: mockConfig,
+            onAllToolCallsComplete,
+            onToolCallsUpdate,
+            getPreferredEditor: () => 'vscode',
+        });
+        const abortController = new AbortController();
+        await scheduler.schedule([
+            {
+                callId: '1',
+                name: 'mockModifiableTool',
+                args: {},
+                isClientInitiated: false,
+                prompt_id: 'prompt-1',
+            },
+        ], abortController.signal);
+        const toolCall = scheduler
+            .toolCalls[0];
+        expect(toolCall.status).toBe('awaiting_approval');
+        const confirmationSignal = new AbortController().signal;
+        await scheduler.handleConfirmationResponse(toolCall.request.callId, async () => { }, ToolConfirmationOutcome.ModifyWithEditor, confirmationSignal);
+        expect(modifyWithEditorSpy).toHaveBeenCalled();
+        const overrides = modifyWithEditorSpy.mock.calls[modifyWithEditorSpy.mock.calls.length - 1][4];
+        expect(overrides).toEqual({
+            currentContent: 'originalContent',
+            proposedContent: 'newContent',
+        });
+        modifyWithEditorSpy.mockRestore();
+    });
+});
+describe('truncateAndSaveToFile', () => {
+    const mockWriteFile = vi.mocked(fs.writeFile);
+    const THRESHOLD = 40_000;
+    const TRUNCATE_LINES = 1000;
+    beforeEach(() => {
+        vi.clearAllMocks();
+    });
+    it('should return content unchanged if below threshold', async () => {
+        const content = 'Short content';
+        const callId = 'test-call-id';
+        const projectTempDir = '/tmp';
+        const result = await truncateAndSaveToFile(content, callId, projectTempDir, THRESHOLD, TRUNCATE_LINES);
+        expect(result).toEqual({ content });
+        expect(mockWriteFile).not.toHaveBeenCalled();
+    });
+    it('should truncate content by lines when content has many lines', async () => {
+        // Create content that exceeds 100,000 character threshold with many lines
+        const lines = Array(2000).fill('x'.repeat(100)); // 100 chars per line * 2000 lines = 200,000 chars
+        const content = lines.join('\n');
+        const callId = 'test-call-id';
+        const projectTempDir = '/tmp';
+        mockWriteFile.mockResolvedValue(undefined);
+        const result = await truncateAndSaveToFile(content, callId, projectTempDir, THRESHOLD, TRUNCATE_LINES);
+        expect(result.outputFile).toBe(path.join(projectTempDir, `${callId}.output`));
+        expect(mockWriteFile).toHaveBeenCalledWith(path.join(projectTempDir, `${callId}.output`), content);
+        // Should contain the first and last lines with 1/5 head and 4/5 tail
+        const head = Math.floor(TRUNCATE_LINES / 5);
+        const beginning = lines.slice(0, head);
+        const end = lines.slice(-(TRUNCATE_LINES - head));
+        const expectedTruncated = beginning.join('\n') + '\n... [CONTENT TRUNCATED] ...\n' + end.join('\n');
+        expect(result.content).toContain('Tool output was too large and has been truncated');
+        expect(result.content).toContain('Truncated part of the output:');
+        expect(result.content).toContain(expectedTruncated);
+    });
+    it('should wrap and truncate content when content has few but long lines', async () => {
+        const content = 'a'.repeat(200_000); // A single very long line
+        const callId = 'test-call-id';
+        const projectTempDir = '/tmp';
+        const wrapWidth = 120;
+        mockWriteFile.mockResolvedValue(undefined);
+        // Manually wrap the content to generate the expected file content
+        const wrappedLines = [];
+        for (let i = 0; i < content.length; i += wrapWidth) {
+            wrappedLines.push(content.substring(i, i + wrapWidth));
+        }
+        const expectedFileContent = wrappedLines.join('\n');
+        const result = await truncateAndSaveToFile(content, callId, projectTempDir, THRESHOLD, TRUNCATE_LINES);
+        expect(result.outputFile).toBe(path.join(projectTempDir, `${callId}.output`));
+        // Check that the file was written with the wrapped content
+        expect(mockWriteFile).toHaveBeenCalledWith(path.join(projectTempDir, `${callId}.output`), expectedFileContent);
+        // Should contain the first and last lines with 1/5 head and 4/5 tail of the wrapped content
+        const head = Math.floor(TRUNCATE_LINES / 5);
+        const beginning = wrappedLines.slice(0, head);
+        const end = wrappedLines.slice(-(TRUNCATE_LINES - head));
+        const expectedTruncated = beginning.join('\n') + '\n... [CONTENT TRUNCATED] ...\n' + end.join('\n');
+        expect(result.content).toContain('Tool output was too large and has been truncated');
+        expect(result.content).toContain('Truncated part of the output:');
+        expect(result.content).toContain(expectedTruncated);
+    });
+    it('should handle file write errors gracefully', async () => {
+        const content = 'a'.repeat(2_000_000);
+        const callId = 'test-call-id';
+        const projectTempDir = '/tmp';
+        mockWriteFile.mockRejectedValue(new Error('File write failed'));
+        const result = await truncateAndSaveToFile(content, callId, projectTempDir, THRESHOLD, TRUNCATE_LINES);
+        expect(result.outputFile).toBeUndefined();
+        expect(result.content).toContain('[Note: Could not save full output to file]');
+        expect(mockWriteFile).toHaveBeenCalled();
+    });
+    it('should save to correct file path with call ID', async () => {
+        const content = 'a'.repeat(200_000);
+        const callId = 'unique-call-123';
+        const projectTempDir = '/custom/temp/dir';
+        const wrapWidth = 120;
+        mockWriteFile.mockResolvedValue(undefined);
+        // Manually wrap the content to generate the expected file content
+        const wrappedLines = [];
+        for (let i = 0; i < content.length; i += wrapWidth) {
+            wrappedLines.push(content.substring(i, i + wrapWidth));
+        }
+        const expectedFileContent = wrappedLines.join('\n');
+        const result = await truncateAndSaveToFile(content, callId, projectTempDir, THRESHOLD, TRUNCATE_LINES);
+        const expectedPath = path.join(projectTempDir, `${callId}.output`);
+        expect(result.outputFile).toBe(expectedPath);
+        expect(mockWriteFile).toHaveBeenCalledWith(expectedPath, expectedFileContent);
+    });
+    it('should include helpful instructions in truncated message', async () => {
+        const content = 'a'.repeat(2_000_000);
+        const callId = 'test-call-id';
+        const projectTempDir = '/tmp';
+        mockWriteFile.mockResolvedValue(undefined);
+        const result = await truncateAndSaveToFile(content, callId, projectTempDir, THRESHOLD, TRUNCATE_LINES);
+        expect(result.content).toContain('read_file tool with the absolute file path above');
+        expect(result.content).toContain('read_file tool with offset=0, limit=100');
+        expect(result.content).toContain('read_file tool with offset=N to skip N lines');
+        expect(result.content).toContain('read_file tool with limit=M to read only M lines');
+    });
+    it('should sanitize callId to prevent path traversal', async () => {
+        const content = 'a'.repeat(200_000);
+        const callId = '../../../../../etc/passwd';
+        const projectTempDir = '/tmp/safe_dir';
+        const wrapWidth = 120;
+        mockWriteFile.mockResolvedValue(undefined);
+        // Manually wrap the content to generate the expected file content
+        const wrappedLines = [];
+        for (let i = 0; i < content.length; i += wrapWidth) {
+            wrappedLines.push(content.substring(i, i + wrapWidth));
+        }
+        const expectedFileContent = wrappedLines.join('\n');
+        await truncateAndSaveToFile(content, callId, projectTempDir, THRESHOLD, TRUNCATE_LINES);
+        const expectedPath = path.join(projectTempDir, 'passwd.output');
+        expect(mockWriteFile).toHaveBeenCalledWith(expectedPath, expectedFileContent);
+    });
+});
 //# sourceMappingURL=coreToolScheduler.test.js.map