@google/gemini-cli-core 0.15.0-nightly.20251107.cd27cae8 → 0.15.0-nightly.20251111.51f952e7

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

@@ -7,6 +7,7 @@ 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';
@@ -122,6 +123,50 @@ async function waitForStatus(onToolCallsUpdate, status, timeout = 5000) {
         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({
@@ -144,33 +189,9 @@ describe('CoreToolScheduler', () => {
         };
         const onAllToolCallsComplete = vi.fn();
         const onToolCallsUpdate = vi.fn();
-        const mockConfig = {
-            getSessionId: () => 'test-session-id',
-            getUsageStatisticsEnabled: () => true,
-            getDebugMode: () => false,
-            getApprovalMode: () => ApprovalMode.DEFAULT,
-            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,
+        const mockConfig = createMockConfig({
             getToolRegistry: () => mockToolRegistry,
-            getUseSmartEdit: () => false,
-            getUseModelRouter: () => false,
-            getGeminiClient: () => null, // No client needed for these tests
-            getEnableMessageBusIntegration: () => false,
-            getMessageBus: () => null,
-            getPolicyEngine: () => null,
-        };
+        });
         const scheduler = new CoreToolScheduler({
             config: mockConfig,
             onAllToolCallsComplete,
@@ -231,33 +252,9 @@ describe('CoreToolScheduler', () => {
         };
         const onAllToolCallsComplete = vi.fn();
         const onToolCallsUpdate = vi.fn();
-        const mockConfig = {
-            getSessionId: () => 'test-session-id',
-            getUsageStatisticsEnabled: () => true,
-            getDebugMode: () => false,
-            getApprovalMode: () => ApprovalMode.DEFAULT,
-            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,
+        const mockConfig = createMockConfig({
             getToolRegistry: () => mockToolRegistry,
-            getUseSmartEdit: () => false,
-            getUseModelRouter: () => false,
-            getGeminiClient: () => null, // No client needed for these tests
-            getEnableMessageBusIntegration: () => false,
-            getMessageBus: () => null,
-            getPolicyEngine: () => null,
-        };
+        });
         const scheduler = new CoreToolScheduler({
             config: mockConfig,
             onAllToolCallsComplete,
@@ -344,33 +341,9 @@ describe('CoreToolScheduler', () => {
         };
         const onAllToolCallsComplete = vi.fn();
         const onToolCallsUpdate = vi.fn();
-        const mockConfig = {
-            getSessionId: () => 'test-session-id',
-            getUsageStatisticsEnabled: () => true,
-            getDebugMode: () => false,
-            getApprovalMode: () => ApprovalMode.DEFAULT,
-            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,
+        const mockConfig = createMockConfig({
             getToolRegistry: () => mockToolRegistry,
-            getUseSmartEdit: () => false,
-            getUseModelRouter: () => false,
-            getGeminiClient: () => null, // No client needed for these tests
-            getEnableMessageBusIntegration: () => false,
-            getMessageBus: () => null,
-            getPolicyEngine: () => null,
-        };
+        });
         const scheduler = new CoreToolScheduler({
             config: mockConfig,
             onAllToolCallsComplete,
@@ -438,33 +411,9 @@ describe('CoreToolScheduler', () => {
         };
         const onAllToolCallsComplete = vi.fn();
         const onToolCallsUpdate = vi.fn();
-        const mockConfig = {
-            getSessionId: () => 'test-session-id',
-            getUsageStatisticsEnabled: () => true,
-            getDebugMode: () => false,
-            getApprovalMode: () => ApprovalMode.DEFAULT,
-            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,
+        const mockConfig = createMockConfig({
             getToolRegistry: () => mockToolRegistry,
-            getUseSmartEdit: () => false,
-            getUseModelRouter: () => false,
-            getGeminiClient: () => null,
-            getEnableMessageBusIntegration: () => false,
-            getMessageBus: () => null,
-            getPolicyEngine: () => null,
-        };
+        });
         const scheduler = new CoreToolScheduler({
             config: mockConfig,
             onAllToolCallsComplete,
@@ -493,15 +442,9 @@ describe('CoreToolScheduler', () => {
             const mockToolRegistry = {
                 getAllToolNames: () => ['list_files', 'read_file', 'write_file'],
             };
-            const mockConfig = {
+            const mockConfig = createMockConfig({
                 getToolRegistry: () => mockToolRegistry,
-                getUseSmartEdit: () => false,
-                getUseModelRouter: () => false,
-                getGeminiClient: () => null, // No client needed for these tests
-                getEnableMessageBusIntegration: () => false,
-                getMessageBus: () => null,
-                getPolicyEngine: () => null,
-            };
+            });
             // Create scheduler
             const scheduler = new CoreToolScheduler({
                 config: mockConfig,
@@ -543,33 +486,9 @@ 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,
-            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,
+        const mockConfig = createMockConfig({
             getToolRegistry: () => mockToolRegistry,
-            getUseSmartEdit: () => false,
-            getUseModelRouter: () => false,
-            getGeminiClient: () => null, // No client needed for these tests
-            getEnableMessageBusIntegration: () => false,
-            getMessageBus: () => null,
-            getPolicyEngine: () => null,
-        };
+        });
         const scheduler = new CoreToolScheduler({
             config: mockConfig,
             onAllToolCallsComplete,
@@ -823,31 +742,9 @@ 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,
-            getAllowedTools: () => [],
-            getContentGeneratorConfig: () => ({
-                model: 'test-model',
-                authType: 'oauth-personal',
-            }),
-            getShellExecutionConfig: () => ({
-                terminalWidth: 90,
-                terminalHeight: 30,
-            }),
-            storage: {
-                getProjectTempDir: () => '/tmp',
-            },
+        const mockConfig = createMockConfig({
             getToolRegistry: () => mockToolRegistry,
-            getUseSmartEdit: () => false,
-            getUseModelRouter: () => false,
-            getGeminiClient: () => null, // No client needed for these tests
-            getEnableMessageBusIntegration: () => false,
-            getMessageBus: () => null,
-            getPolicyEngine: () => null,
-        };
+        });
         const scheduler = new CoreToolScheduler({
             config: mockConfig,
             onAllToolCallsComplete,
@@ -912,33 +809,10 @@ 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,
-            getApprovalMode: () => ApprovalMode.YOLO,
-            getAllowedTools: () => [],
-            getContentGeneratorConfig: () => ({
-                model: 'test-model',
-                authType: 'oauth-personal',
-            }),
-            getShellExecutionConfig: () => ({
-                terminalWidth: 90,
-                terminalHeight: 30,
-            }),
-            storage: {
-                getProjectTempDir: () => '/tmp',
-            },
+        const mockConfig = createMockConfig({
             getToolRegistry: () => mockToolRegistry,
-            getTruncateToolOutputThreshold: () => DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
-            getTruncateToolOutputLines: () => DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES,
-            getUseSmartEdit: () => false,
-            getUseModelRouter: () => false,
-            getGeminiClient: () => null, // No client needed for these tests
-            getEnableMessageBusIntegration: () => false,
-            getMessageBus: () => null,
-            getPolicyEngine: () => null,
-        };
+            getApprovalMode: () => ApprovalMode.YOLO,
+        });
         const scheduler = new CoreToolScheduler({
             config: mockConfig,
             onAllToolCallsComplete,
@@ -1009,33 +883,10 @@ describe('CoreToolScheduler request queueing', () => {
         };
         const onAllToolCallsComplete = vi.fn();
         const onToolCallsUpdate = vi.fn();
-        const mockConfig = {
-            getSessionId: () => 'test-session-id',
-            getUsageStatisticsEnabled: () => true,
-            getDebugMode: () => false,
-            getApprovalMode: () => ApprovalMode.YOLO, // Use YOLO to avoid confirmation prompts
-            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,
+        const mockConfig = createMockConfig({
             getToolRegistry: () => mockToolRegistry,
-            getUseSmartEdit: () => false,
-            getUseModelRouter: () => false,
-            getGeminiClient: () => null, // No client needed for these tests
-            getEnableMessageBusIntegration: () => false,
-            getMessageBus: () => null,
-            getPolicyEngine: () => null,
-        };
+            getApprovalMode: () => ApprovalMode.YOLO, // Use YOLO to avoid confirmation prompts
+        });
         const scheduler = new CoreToolScheduler({
             config: mockConfig,
             onAllToolCallsComplete,
@@ -1122,35 +973,14 @@ describe('CoreToolScheduler request queueing', () => {
         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
+        const mockConfig = createMockConfig({
             getAllowedTools: () => ['mockTool'], // Auto-approve this tool
             getToolRegistry: () => toolRegistry,
-            getContentGeneratorConfig: () => ({
-                model: 'test-model',
-                authType: 'oauth-personal',
-            }),
             getShellExecutionConfig: () => ({
                 terminalWidth: 80,
                 terminalHeight: 24,
             }),
-            getTerminalWidth: vi.fn(() => 80),
-            getTerminalHeight: vi.fn(() => 24),
-            storage: {
-                getProjectTempDir: () => '/tmp',
-            },
-            getTruncateToolOutputThreshold: () => DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
-            getTruncateToolOutputLines: () => DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES,
-            getUseSmartEdit: () => false,
-            getUseModelRouter: () => false,
-            getGeminiClient: () => null, // No client needed for these tests
-            getEnableMessageBusIntegration: () => false,
-            getMessageBus: () => null,
-            getPolicyEngine: () => null,
-        };
+        });
         const scheduler = new CoreToolScheduler({
             config: mockConfig,
             onAllToolCallsComplete,
@@ -1231,35 +1061,14 @@ describe('CoreToolScheduler request queueing', () => {
         };
         const onAllToolCallsComplete = vi.fn();
         const onToolCallsUpdate = vi.fn();
-        const mockConfig = {
-            getSessionId: () => 'test-session-id',
-            getUsageStatisticsEnabled: () => true,
-            getDebugMode: () => false,
-            getApprovalMode: () => ApprovalMode.DEFAULT,
+        const mockConfig = createMockConfig({
             getAllowedTools: () => ['run_shell_command(git)'],
-            getContentGeneratorConfig: () => ({
-                model: 'test-model',
-                authType: 'oauth-personal',
-            }),
             getShellExecutionConfig: () => ({
                 terminalWidth: 80,
                 terminalHeight: 24,
             }),
-            getTerminalWidth: vi.fn(() => 80),
-            getTerminalHeight: vi.fn(() => 24),
-            storage: {
-                getProjectTempDir: () => '/tmp',
-            },
-            getTruncateToolOutputThreshold: () => DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
-            getTruncateToolOutputLines: () => DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES,
             getToolRegistry: () => toolRegistry,
-            getUseSmartEdit: () => false,
-            getUseModelRouter: () => false,
-            getGeminiClient: () => null,
-            getEnableMessageBusIntegration: () => false,
-            getMessageBus: () => null,
-            getPolicyEngine: () => null,
-        };
+        });
         const scheduler = new CoreToolScheduler({
             config: mockConfig,
             onAllToolCallsComplete,
@@ -1305,33 +1114,10 @@ describe('CoreToolScheduler request queueing', () => {
         };
         const onAllToolCallsComplete = vi.fn();
         const onToolCallsUpdate = vi.fn();
-        const mockConfig = {
-            getSessionId: () => 'test-session-id',
-            getUsageStatisticsEnabled: () => true,
-            getDebugMode: () => false,
-            getApprovalMode: () => ApprovalMode.YOLO,
-            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,
+        const mockConfig = createMockConfig({
             getToolRegistry: () => mockToolRegistry,
-            getUseSmartEdit: () => false,
-            getUseModelRouter: () => false,
-            getGeminiClient: () => null, // No client needed for these tests
-            getEnableMessageBusIntegration: () => false,
-            getMessageBus: () => null,
-            getPolicyEngine: () => null,
-        };
+            getApprovalMode: () => ApprovalMode.YOLO,
+        });
         const scheduler = new CoreToolScheduler({
             config: mockConfig,
             onAllToolCallsComplete,
@@ -1368,31 +1154,12 @@ describe('CoreToolScheduler request queueing', () => {
     });
     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,
-            getAllowedTools: () => [],
             setApprovalMode: (mode) => {
                 approvalMode = mode;
             },
-            getShellExecutionConfig: () => ({
-                terminalWidth: 90,
-                terminalHeight: 30,
-            }),
-            storage: {
-                getProjectTempDir: () => '/tmp',
-            },
-            getTruncateToolOutputThreshold: () => DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
-            getTruncateToolOutputLines: () => DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES,
-            getUseSmartEdit: () => false,
-            getUseModelRouter: () => false,
-            getGeminiClient: () => null, // No client needed for these tests
-            getEnableMessageBusIntegration: () => false,
-            getMessageBus: () => null,
-            getPolicyEngine: () => null,
-        };
+        });
         const testTool = new TestApprovalTool(mockConfig);
         const toolRegistry = {
             getTool: () => testTool,
@@ -1530,32 +1297,10 @@ describe('CoreToolScheduler Sequential Execution', () => {
         };
         const onAllToolCallsComplete = vi.fn();
         const onToolCallsUpdate = vi.fn();
-        const mockConfig = {
-            getSessionId: () => 'test-session-id',
-            getUsageStatisticsEnabled: () => true,
-            getDebugMode: () => false,
-            getApprovalMode: () => ApprovalMode.YOLO, // Use YOLO to avoid confirmation prompts
-            getAllowedTools: () => [],
-            getContentGeneratorConfig: () => ({
-                model: 'test-model',
-                authType: 'oauth-personal',
-            }),
-            getShellExecutionConfig: () => ({
-                terminalWidth: 90,
-                terminalHeight: 30,
-            }),
-            storage: {
-                getProjectTempDir: () => '/tmp',
-            },
+        const mockConfig = createMockConfig({
             getToolRegistry: () => mockToolRegistry,
-            getTruncateToolOutputThreshold: () => DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
-            getTruncateToolOutputLines: () => DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES,
-            getUseSmartEdit: () => false,
-            getUseModelRouter: () => false,
-            getGeminiClient: () => null,
-            getEnableMessageBusIntegration: () => false,
-            getMessageBus: () => null,
-        };
+            getApprovalMode: () => ApprovalMode.YOLO, // Use YOLO to avoid confirmation prompts
+        });
         const scheduler = new CoreToolScheduler({
             config: mockConfig,
             onAllToolCallsComplete,
@@ -1638,32 +1383,10 @@ describe('CoreToolScheduler Sequential Execution', () => {
         };
         const onAllToolCallsComplete = vi.fn();
         const onToolCallsUpdate = vi.fn();
-        const mockConfig = {
-            getSessionId: () => 'test-session-id',
-            getUsageStatisticsEnabled: () => true,
-            getDebugMode: () => false,
-            getApprovalMode: () => ApprovalMode.YOLO,
-            getAllowedTools: () => [],
-            getContentGeneratorConfig: () => ({
-                model: 'test-model',
-                authType: 'oauth-personal',
-            }),
-            getShellExecutionConfig: () => ({
-                terminalWidth: 90,
-                terminalHeight: 30,
-            }),
-            storage: {
-                getProjectTempDir: () => '/tmp',
-            },
+        const mockConfig = createMockConfig({
             getToolRegistry: () => mockToolRegistry,
-            getTruncateToolOutputThreshold: () => DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
-            getTruncateToolOutputLines: () => DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES,
-            getUseSmartEdit: () => false,
-            getUseModelRouter: () => false,
-            getGeminiClient: () => null,
-            getEnableMessageBusIntegration: () => false,
-            getMessageBus: () => null,
-        };
+            getApprovalMode: () => ApprovalMode.YOLO,
+        });
         const scheduler = new CoreToolScheduler({
             config: mockConfig,
             onAllToolCallsComplete,
@@ -1720,6 +1443,62 @@ describe('CoreToolScheduler Sequential Execution', () => {
         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',
+            onEditorClose: vi.fn(),
+        });
+        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][5];
+        expect(overrides).toEqual({
+            currentContent: 'originalContent',
+            proposedContent: 'newContent',
+        });
+        modifyWithEditorSpy.mockRestore();
+    });
 });
 describe('truncateAndSaveToFile', () => {
     const mockWriteFile = vi.mocked(fs.writeFile);