@machina.ai/cell-cli-core 1.0.21-rc4 → 1.4.0-rc1

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

@@ -7,12 +7,87 @@ 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';
+class TestApprovalTool extends BaseDeclarativeTool {
+    config;
+    static Name = 'testApprovalTool';
+    constructor(config) {
+        super(TestApprovalTool.Name, 'TestApprovalTool', 'A tool for testing approval logic', Kind.Edit, {
+            properties: { id: { type: 'string' } },
+            required: ['id'],
+            type: 'object',
+        });
+        this.config = config;
+    }
+    createInvocation(params) {
+        return new TestApprovalInvocation(this.config, params);
+    }
+}
+class TestApprovalInvocation extends BaseToolInvocation {
+    config;
+    constructor(config, params) {
+        super(params);
+        this.config = config;
+    }
+    getDescription() {
+        return `Test tool ${this.params.id}`;
+    }
+    async shouldConfirmExecute() {
+        // Need confirmation unless approval mode is AUTO_EDIT
+        if (this.config.getApprovalMode() === ApprovalMode.AUTO_EDIT) {
+            return false;
+        }
+        return {
+            type: 'edit',
+            title: `Confirm Test Tool ${this.params.id}`,
+            fileName: `test-${this.params.id}.txt`,
+            filePath: `/test-${this.params.id}.txt`,
+            fileDiff: 'Test diff content',
+            originalContent: '',
+            newContent: 'Test content',
+            onConfirm: async (outcome) => {
+                if (outcome === ToolConfirmationOutcome.ProceedAlways) {
+                    this.config.setApprovalMode(ApprovalMode.AUTO_EDIT);
+                }
+            },
+        };
+    }
+    async execute() {
+        return {
+            llmContent: `Executed test tool ${this.params.id}`,
+            returnDisplay: `Executed test tool ${this.params.id}`,
+        };
+    }
+}
+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();
+    });
+}
 describe('CoreToolScheduler', () => {
     it('should cancel a tool call if the signal is aborted before confirmation', async () => {
         const mockTool = new MockTool();
         mockTool.shouldConfirm = true;
         const declarativeTool = mockTool;
-        const toolRegistry = {
+        const mockToolRegistry = {
             getTool: () => declarativeTool,
             getFunctionDeclarations: () => [],
             tools: new Map(),
@@ -32,14 +107,17 @@ describe('CoreToolScheduler', () => {
             getUsageStatisticsEnabled: () => true,
             getDebugMode: () => false,
             getApprovalMode: () => ApprovalMode.DEFAULT,
+            getAllowedTools: () => [],
             getContentGeneratorConfig: () => ({
                 model: 'test-model',
                 authType: 'oauth-personal',
             }),
+            getToolRegistry: () => mockToolRegistry,
+            getUseSmartEdit: () => false,
+            getGeminiClient: () => null, // No client needed for these tests
         };
         const scheduler = new CoreToolScheduler({
             config: mockConfig,
-            toolRegistry: Promise.resolve(toolRegistry),
             onAllToolCallsComplete,
             onToolCallsUpdate,
             getPreferredEditor: () => 'vscode',
@@ -60,12 +138,43 @@ describe('CoreToolScheduler', () => {
             .calls[0][0];
         expect(completedCalls[0].status).toBe('cancelled');
     });
+    describe('getToolSuggestion', () => {
+        it('should suggest the top N closest tool names for a typo', () => {
+            // Create mocked tool registry
+            const mockConfig = {
+                getToolRegistry: () => mockToolRegistry,
+                getUseSmartEdit: () => false,
+                getGeminiClient: () => null, // No client needed for these tests
+            };
+            const mockToolRegistry = {
+                getAllToolNames: () => ['list_files', 'read_file', 'write_file'],
+            };
+            // Create scheduler
+            const scheduler = new CoreToolScheduler({
+                config: mockConfig,
+                getPreferredEditor: () => 'vscode',
+                onEditorClose: vi.fn(),
+            });
+            // 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();
         const declarativeTool = mockTool;
-        const toolRegistry = {
+        const mockToolRegistry = {
             getTool: () => declarativeTool,
             getFunctionDeclarations: () => [],
             tools: new Map(),
@@ -85,14 +194,17 @@ describe('CoreToolScheduler with payload', () => {
             getUsageStatisticsEnabled: () => true,
             getDebugMode: () => false,
             getApprovalMode: () => ApprovalMode.DEFAULT,
+            getAllowedTools: () => [],
             getContentGeneratorConfig: () => ({
                 model: 'test-model',
                 authType: 'oauth-personal',
             }),
+            getToolRegistry: () => mockToolRegistry,
+            getUseSmartEdit: () => false,
+            getGeminiClient: () => null, // No client needed for these tests
         };
         const scheduler = new CoreToolScheduler({
             config: mockConfig,
-            toolRegistry: Promise.resolve(toolRegistry),
             onAllToolCallsComplete,
             onToolCallsUpdate,
             getPreferredEditor: () => 'vscode',
@@ -107,11 +219,7 @@ 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' };
@@ -132,35 +240,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 = {
@@ -237,24 +351,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 = [];
@@ -272,13 +390,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 {
@@ -318,15 +438,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 toolRegistry = {
-            getTool: () => declarativeTool,
+        const mockToolRegistry = {
+            getTool: () => mockEditTool,
             getFunctionDeclarations: () => [],
             tools: new Map(),
             discovery: {},
             registerTool: () => { },
-            getToolByName: () => declarativeTool,
-            getToolByDisplayName: () => declarativeTool,
+            getToolByName: () => mockEditTool,
+            getToolByDisplayName: () => mockEditTool,
             getTools: () => [],
             discoverTools: async () => { },
             getAllTools: () => [],
@@ -339,14 +458,17 @@ describe('CoreToolScheduler edit cancellation', () => {
             getUsageStatisticsEnabled: () => true,
             getDebugMode: () => false,
             getApprovalMode: () => ApprovalMode.DEFAULT,
+            getAllowedTools: () => [],
             getContentGeneratorConfig: () => ({
                 model: 'test-model',
                 authType: 'oauth-personal',
             }),
+            getToolRegistry: () => mockToolRegistry,
+            getUseSmartEdit: () => false,
+            getGeminiClient: () => null, // No client needed for these tests
         };
         const scheduler = new CoreToolScheduler({
             config: mockConfig,
-            toolRegistry: Promise.resolve(toolRegistry),
             onAllToolCallsComplete,
             onToolCallsUpdate,
             getPreferredEditor: () => 'vscode',
@@ -361,9 +483,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) {
@@ -392,7 +512,7 @@ describe('CoreToolScheduler YOLO mode', () => {
         // This tool would normally require confirmation.
         mockTool.shouldConfirm = true;
         const declarativeTool = mockTool;
-        const toolRegistry = {
+        const mockToolRegistry = {
             getTool: () => declarativeTool,
             getToolByName: () => declarativeTool,
             // Other properties are not needed for this test but are included for type consistency.
@@ -414,14 +534,17 @@ describe('CoreToolScheduler YOLO mode', () => {
             getUsageStatisticsEnabled: () => true,
             getDebugMode: () => false,
             getApprovalMode: () => ApprovalMode.YOLO,
+            getAllowedTools: () => [],
             getContentGeneratorConfig: () => ({
                 model: 'test-model',
                 authType: 'oauth-personal',
             }),
+            getToolRegistry: () => mockToolRegistry,
+            getUseSmartEdit: () => false,
+            getGeminiClient: () => null, // No client needed for these tests
         };
         const scheduler = new CoreToolScheduler({
             config: mockConfig,
-            toolRegistry: Promise.resolve(toolRegistry),
             onAllToolCallsComplete,
             onToolCallsUpdate,
             getPreferredEditor: () => 'vscode',
@@ -472,7 +595,7 @@ describe('CoreToolScheduler request queueing', () => {
         const mockTool = new MockTool();
         mockTool.executeFn.mockImplementation(() => firstCallPromise);
         const declarativeTool = mockTool;
-        const toolRegistry = {
+        const mockToolRegistry = {
             getTool: () => declarativeTool,
             getToolByName: () => declarativeTool,
             getFunctionDeclarations: () => [],
@@ -492,14 +615,17 @@ describe('CoreToolScheduler request queueing', () => {
             getUsageStatisticsEnabled: () => true,
             getDebugMode: () => false,
             getApprovalMode: () => ApprovalMode.YOLO, // Use YOLO to avoid confirmation prompts
+            getAllowedTools: () => [],
             getContentGeneratorConfig: () => ({
                 model: 'test-model',
                 authType: 'oauth-personal',
             }),
+            getToolRegistry: () => mockToolRegistry,
+            getUseSmartEdit: () => false,
+            getGeminiClient: () => null, // No client needed for these tests
         };
         const scheduler = new CoreToolScheduler({
             config: mockConfig,
-            toolRegistry: Promise.resolve(toolRegistry),
             onAllToolCallsComplete,
             onToolCallsUpdate,
             getPreferredEditor: () => 'vscode',
@@ -523,10 +649,7 @@ 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.
@@ -539,14 +662,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',
@@ -555,6 +670,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(mockTool.executeFn).toHaveBeenCalledTimes(2);
+        });
+        expect(mockTool.executeFn).toHaveBeenCalledWith({ b: 2 });
         // Wait for the second completion.
         await vi.waitFor(() => {
             expect(onAllToolCallsComplete).toHaveBeenCalledTimes(2);
@@ -563,10 +683,92 @@ 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 mockTool = new MockTool('mockTool');
+        mockTool.executeFn.mockReturnValue({
+            llmContent: 'Tool executed',
+            returnDisplay: 'Tool executed',
+        });
+        // This tool would normally require confirmation.
+        mockTool.shouldConfirm = true;
+        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 = {
+            getSessionId: () => 'test-session-id',
+            getUsageStatisticsEnabled: () => true,
+            getDebugMode: () => false,
+            getApprovalMode: () => ApprovalMode.DEFAULT, // Not YOLO mode
+            getAllowedTools: () => ['mockTool'], // Auto-approve this tool
+            getToolRegistry: () => toolRegistry,
+            getContentGeneratorConfig: () => ({
+                model: 'test-model',
+                authType: 'oauth-personal',
+            }),
+            getUseSmartEdit: () => false,
+            getGeminiClient: () => null, // No client needed for these tests
+        };
+        const scheduler = new CoreToolScheduler({
+            config: mockConfig,
+            onAllToolCallsComplete,
+            onToolCallsUpdate,
+            getPreferredEditor: () => 'vscode',
+            onEditorClose: vi.fn(),
+        });
+        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);
+        // Assert
+        // 1. The tool's execute method was called directly.
+        expect(mockTool.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 handle two synchronous calls to schedule', async () => {
         const mockTool = new MockTool();
         const declarativeTool = mockTool;
-        const toolRegistry = {
+        const mockToolRegistry = {
             getTool: () => declarativeTool,
             getToolByName: () => declarativeTool,
             getFunctionDeclarations: () => [],
@@ -586,14 +788,17 @@ describe('CoreToolScheduler request queueing', () => {
             getUsageStatisticsEnabled: () => true,
             getDebugMode: () => false,
             getApprovalMode: () => ApprovalMode.YOLO,
+            getAllowedTools: () => [],
             getContentGeneratorConfig: () => ({
                 model: 'test-model',
                 authType: 'oauth-personal',
             }),
+            getToolRegistry: () => mockToolRegistry,
+            getUseSmartEdit: () => false,
+            getGeminiClient: () => null, // No client needed for these tests
         };
         const scheduler = new CoreToolScheduler({
             config: mockConfig,
-            toolRegistry: Promise.resolve(toolRegistry),
             onAllToolCallsComplete,
             onToolCallsUpdate,
             getPreferredEditor: () => 'vscode',
@@ -626,5 +831,111 @@ describe('CoreToolScheduler request queueing', () => {
         // 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,
+            getApprovalMode: () => approvalMode,
+            getAllowedTools: () => [],
+            setApprovalMode: (mode) => {
+                approvalMode = mode;
+            },
+            getUseSmartEdit: () => false,
+            getGeminiClient: () => null, // No client needed for these tests
+        };
+        const testTool = new TestApprovalTool(mockConfig);
+        const toolRegistry = {
+            getTool: () => testTool,
+            getFunctionDeclarations: () => [],
+            getFunctionDeclarationsFiltered: () => [],
+            registerTool: () => { },
+            discoverAllTools: async () => { },
+            discoverMcpTools: async () => { },
+            discoverToolsForServer: async () => { },
+            removeMcpToolsByServer: () => { },
+            getAllTools: () => [],
+            getToolsByServer: () => [],
+            tools: new Map(),
+            config: mockConfig,
+            mcpClientManager: undefined,
+            getToolByName: () => testTool,
+            getToolByDisplayName: () => testTool,
+            getTools: () => [],
+            discoverTools: async () => { },
+            discovery: {},
+        };
+        mockConfig.getToolRegistry = () => toolRegistry;
+        const onAllToolCallsComplete = vi.fn();
+        const onToolCallsUpdate = vi.fn();
+        const pendingConfirmations = [];
+        const scheduler = new CoreToolScheduler({
+            config: mockConfig,
+            onAllToolCallsComplete,
+            onToolCallsUpdate: (toolCalls) => {
+                onToolCallsUpdate(toolCalls);
+                // Capture confirmation handlers for awaiting_approval tools
+                toolCalls.forEach((call) => {
+                    if (call.status === 'awaiting_approval') {
+                        const waitingCall = call;
+                        if (waitingCall.confirmationDetails?.onConfirm) {
+                            const originalHandler = pendingConfirmations.find((h) => h === waitingCall.confirmationDetails.onConfirm);
+                            if (!originalHandler) {
+                                pendingConfirmations.push(waitingCall.confirmationDetails.onConfirm);
+                            }
+                        }
+                    }
+                });
+            },
+            getPreferredEditor: () => 'vscode',
+            onEditorClose: vi.fn(),
+        });
+        const abortController = new AbortController();
+        // Schedule multiple tools that need confirmation
+        const requests = [
+            {
+                callId: '1',
+                name: 'testApprovalTool',
+                args: { id: 'first' },
+                isClientInitiated: false,
+                prompt_id: 'prompt-1',
+            },
+            {
+                callId: '2',
+                name: 'testApprovalTool',
+                args: { id: 'second' },
+                isClientInitiated: false,
+                prompt_id: 'prompt-2',
+            },
+            {
+                callId: '3',
+                name: 'testApprovalTool',
+                args: { id: 'third' },
+                isClientInitiated: false,
+                prompt_id: 'prompt-3',
+            },
+        ];
+        await scheduler.schedule(requests, abortController.signal);
+        // Wait for all tools to be awaiting approval
+        await vi.waitFor(() => {
+            const calls = onToolCallsUpdate.mock.calls.at(-1)?.[0];
+            expect(calls?.length).toBe(3);
+            expect(calls?.every((call) => call.status === 'awaiting_approval')).toBe(true);
+        });
+        expect(pendingConfirmations.length).toBe(3);
+        // 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);
+        });
+        // Verify approval mode was changed
+        expect(approvalMode).toBe(ApprovalMode.AUTO_EDIT);
+    });
 });
 //# sourceMappingURL=coreToolScheduler.test.js.map