@google/gemini-cli-core 0.25.0-preview.0 → 0.26.0-nightly.20260115.6cb3ae4e0

package/dist/src/scheduler/state-manager.test.js

@@ -0,0 +1,386 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { SchedulerStateManager } from './state-manager.js';
+import { ToolConfirmationOutcome, } from '../tools/tools.js';
+import { MessageBusType } from '../confirmation-bus/types.js';
+describe('SchedulerStateManager', () => {
+    const mockRequest = {
+        callId: 'call-1',
+        name: 'test-tool',
+        args: { foo: 'bar' },
+        isClientInitiated: false,
+        prompt_id: 'prompt-1',
+    };
+    const mockTool = {
+        name: 'test-tool',
+        displayName: 'Test Tool',
+    };
+    const mockInvocation = {
+        shouldConfirmExecute: vi.fn(),
+    };
+    const createValidatingCall = (id = 'call-1') => ({
+        status: 'validating',
+        request: { ...mockRequest, callId: id },
+        tool: mockTool,
+        invocation: mockInvocation,
+        startTime: Date.now(),
+    });
+    const createMockResponse = (id) => ({
+        callId: id,
+        responseParts: [],
+        resultDisplay: 'Success',
+        error: undefined,
+        errorType: undefined,
+    });
+    let stateManager;
+    let mockMessageBus;
+    let onUpdate;
+    beforeEach(() => {
+        onUpdate = vi.fn();
+        mockMessageBus = {
+            publish: vi.fn(),
+            subscribe: vi.fn(),
+            unsubscribe: vi.fn(),
+        };
+        // Capture the update when published
+        vi.mocked(mockMessageBus.publish).mockImplementation((msg) => {
+            // Return a Promise to satisfy the void | Promise<void> signature if needed,
+            // though typically mocks handle it.
+            if (msg.type === MessageBusType.TOOL_CALLS_UPDATE) {
+                onUpdate(msg.toolCalls);
+            }
+            return Promise.resolve();
+        });
+        stateManager = new SchedulerStateManager(mockMessageBus);
+    });
+    describe('Initialization', () => {
+        it('should start with empty state', () => {
+            expect(stateManager.isActive).toBe(false);
+            expect(stateManager.activeCallCount).toBe(0);
+            expect(stateManager.queueLength).toBe(0);
+            expect(stateManager.getSnapshot()).toEqual([]);
+        });
+    });
+    describe('Lookup Operations', () => {
+        it('should find tool calls in active calls', () => {
+            const call = createValidatingCall('active-1');
+            stateManager.enqueue([call]);
+            stateManager.dequeue();
+            expect(stateManager.getToolCall('active-1')).toEqual(call);
+        });
+        it('should find tool calls in the queue', () => {
+            const call = createValidatingCall('queued-1');
+            stateManager.enqueue([call]);
+            expect(stateManager.getToolCall('queued-1')).toEqual(call);
+        });
+        it('should find tool calls in the completed batch', () => {
+            const call = createValidatingCall('completed-1');
+            stateManager.enqueue([call]);
+            stateManager.dequeue();
+            stateManager.updateStatus('completed-1', 'success', createMockResponse('completed-1'));
+            stateManager.finalizeCall('completed-1');
+            expect(stateManager.getToolCall('completed-1')).toBeDefined();
+        });
+        it('should return undefined for non-existent callIds', () => {
+            expect(stateManager.getToolCall('void')).toBeUndefined();
+        });
+    });
+    describe('Queue Management', () => {
+        it('should enqueue calls and notify', () => {
+            const call = createValidatingCall();
+            stateManager.enqueue([call]);
+            expect(stateManager.queueLength).toBe(1);
+            expect(onUpdate).toHaveBeenCalledWith([call]);
+        });
+        it('should dequeue calls and notify', () => {
+            const call = createValidatingCall();
+            stateManager.enqueue([call]);
+            const dequeued = stateManager.dequeue();
+            expect(dequeued).toEqual(call);
+            expect(stateManager.queueLength).toBe(0);
+            expect(stateManager.activeCallCount).toBe(1);
+            expect(onUpdate).toHaveBeenCalled();
+        });
+        it('should return undefined when dequeueing from empty queue', () => {
+            const dequeued = stateManager.dequeue();
+            expect(dequeued).toBeUndefined();
+        });
+    });
+    describe('Status Transitions', () => {
+        it('should transition validating to scheduled', () => {
+            const call = createValidatingCall();
+            stateManager.enqueue([call]);
+            stateManager.dequeue();
+            stateManager.updateStatus(call.request.callId, 'scheduled');
+            const snapshot = stateManager.getSnapshot();
+            expect(snapshot[0].status).toBe('scheduled');
+            expect(snapshot[0].request.callId).toBe(call.request.callId);
+        });
+        it('should transition scheduled to executing', () => {
+            const call = createValidatingCall();
+            stateManager.enqueue([call]);
+            stateManager.dequeue();
+            stateManager.updateStatus(call.request.callId, 'scheduled');
+            stateManager.updateStatus(call.request.callId, 'executing');
+            expect(stateManager.firstActiveCall?.status).toBe('executing');
+        });
+        it('should transition to success and move to completed batch', () => {
+            const call = createValidatingCall();
+            stateManager.enqueue([call]);
+            stateManager.dequeue();
+            const response = {
+                callId: call.request.callId,
+                responseParts: [],
+                resultDisplay: 'Success',
+                error: undefined,
+                errorType: undefined,
+            };
+            stateManager.updateStatus(call.request.callId, 'success', response);
+            stateManager.finalizeCall(call.request.callId);
+            expect(stateManager.isActive).toBe(false);
+            expect(stateManager.completedBatch).toHaveLength(1);
+            const completed = stateManager.completedBatch[0];
+            expect(completed.status).toBe('success');
+            expect(completed.response).toEqual(response);
+            expect(completed.durationMs).toBeDefined();
+        });
+        it('should transition to error and move to completed batch', () => {
+            const call = createValidatingCall();
+            stateManager.enqueue([call]);
+            stateManager.dequeue();
+            const response = {
+                callId: call.request.callId,
+                responseParts: [],
+                resultDisplay: 'Error',
+                error: new Error('Failed'),
+                errorType: undefined,
+            };
+            stateManager.updateStatus(call.request.callId, 'error', response);
+            stateManager.finalizeCall(call.request.callId);
+            expect(stateManager.isActive).toBe(false);
+            expect(stateManager.completedBatch).toHaveLength(1);
+            const completed = stateManager.completedBatch[0];
+            expect(completed.status).toBe('error');
+            expect(completed.response).toEqual(response);
+        });
+        it('should transition to awaiting_approval with details', () => {
+            const call = createValidatingCall();
+            stateManager.enqueue([call]);
+            stateManager.dequeue();
+            const details = {
+                type: 'info',
+                title: 'Confirm',
+                prompt: 'Proceed?',
+                onConfirm: vi.fn(),
+            };
+            stateManager.updateStatus(call.request.callId, 'awaiting_approval', details);
+            const active = stateManager.firstActiveCall;
+            expect(active.status).toBe('awaiting_approval');
+            expect(active.confirmationDetails).toEqual(details);
+        });
+        it('should transition to awaiting_approval with event-driven format', () => {
+            const call = createValidatingCall();
+            stateManager.enqueue([call]);
+            stateManager.dequeue();
+            const details = {
+                type: 'info',
+                title: 'Confirm',
+                prompt: 'Proceed?',
+            };
+            const eventDrivenData = {
+                correlationId: 'corr-123',
+                confirmationDetails: details,
+            };
+            stateManager.updateStatus(call.request.callId, 'awaiting_approval', eventDrivenData);
+            const active = stateManager.firstActiveCall;
+            expect(active.status).toBe('awaiting_approval');
+            expect(active.correlationId).toBe('corr-123');
+            expect(active.confirmationDetails).toEqual(details);
+        });
+        it('should preserve diff when cancelling an edit tool call', () => {
+            const call = createValidatingCall();
+            stateManager.enqueue([call]);
+            stateManager.dequeue();
+            const details = {
+                type: 'edit',
+                title: 'Edit',
+                fileName: 'test.txt',
+                filePath: '/path/to/test.txt',
+                fileDiff: 'diff',
+                originalContent: 'old',
+                newContent: 'new',
+                onConfirm: vi.fn(),
+            };
+            stateManager.updateStatus(call.request.callId, 'awaiting_approval', details);
+            stateManager.updateStatus(call.request.callId, 'cancelled', 'User said no');
+            stateManager.finalizeCall(call.request.callId);
+            const completed = stateManager.completedBatch[0];
+            expect(completed.status).toBe('cancelled');
+            expect(completed.response.resultDisplay).toEqual({
+                fileDiff: 'diff',
+                fileName: 'test.txt',
+                filePath: '/path/to/test.txt',
+                originalContent: 'old',
+                newContent: 'new',
+            });
+        });
+        it('should ignore status updates for non-existent callIds', () => {
+            stateManager.updateStatus('unknown', 'scheduled');
+            expect(onUpdate).not.toHaveBeenCalled();
+        });
+        it('should ignore status updates for terminal calls', () => {
+            const call = createValidatingCall();
+            stateManager.enqueue([call]);
+            stateManager.dequeue();
+            stateManager.updateStatus(call.request.callId, 'success', createMockResponse(call.request.callId));
+            stateManager.finalizeCall(call.request.callId);
+            vi.mocked(onUpdate).mockClear();
+            stateManager.updateStatus(call.request.callId, 'scheduled');
+            expect(onUpdate).not.toHaveBeenCalled();
+        });
+        it('should only finalize terminal calls', () => {
+            const call = createValidatingCall();
+            stateManager.enqueue([call]);
+            stateManager.dequeue();
+            stateManager.updateStatus(call.request.callId, 'executing');
+            stateManager.finalizeCall(call.request.callId);
+            expect(stateManager.isActive).toBe(true);
+            expect(stateManager.completedBatch).toHaveLength(0);
+            stateManager.updateStatus(call.request.callId, 'success', createMockResponse(call.request.callId));
+            stateManager.finalizeCall(call.request.callId);
+            expect(stateManager.isActive).toBe(false);
+            expect(stateManager.completedBatch).toHaveLength(1);
+        });
+        it('should merge liveOutput and pid during executing updates', () => {
+            const call = createValidatingCall();
+            stateManager.enqueue([call]);
+            stateManager.dequeue();
+            // Start executing
+            stateManager.updateStatus(call.request.callId, 'executing');
+            let active = stateManager.firstActiveCall;
+            expect(active.status).toBe('executing');
+            expect(active.liveOutput).toBeUndefined();
+            // Update with live output
+            stateManager.updateStatus(call.request.callId, 'executing', {
+                liveOutput: 'chunk 1',
+            });
+            active = stateManager.firstActiveCall;
+            expect(active.liveOutput).toBe('chunk 1');
+            // Update with pid (should preserve liveOutput)
+            stateManager.updateStatus(call.request.callId, 'executing', {
+                pid: 1234,
+            });
+            active = stateManager.firstActiveCall;
+            expect(active.liveOutput).toBe('chunk 1');
+            expect(active.pid).toBe(1234);
+            // Update live output again (should preserve pid)
+            stateManager.updateStatus(call.request.callId, 'executing', {
+                liveOutput: 'chunk 2',
+            });
+            active = stateManager.firstActiveCall;
+            expect(active.liveOutput).toBe('chunk 2');
+            expect(active.pid).toBe(1234);
+        });
+    });
+    describe('Argument Updates', () => {
+        it('should update args and invocation', () => {
+            const call = createValidatingCall();
+            stateManager.enqueue([call]);
+            stateManager.dequeue();
+            const newArgs = { foo: 'updated' };
+            const newInvocation = { ...mockInvocation };
+            stateManager.updateArgs(call.request.callId, newArgs, newInvocation);
+            const active = stateManager.firstActiveCall;
+            if (active && 'invocation' in active) {
+                expect(active.invocation).toEqual(newInvocation);
+            }
+            else {
+                throw new Error('Active call should have invocation');
+            }
+        });
+        it('should ignore arg updates for errored calls', () => {
+            const call = createValidatingCall();
+            stateManager.enqueue([call]);
+            stateManager.dequeue();
+            stateManager.updateStatus(call.request.callId, 'error', createMockResponse(call.request.callId));
+            stateManager.finalizeCall(call.request.callId);
+            stateManager.updateArgs(call.request.callId, { foo: 'new' }, mockInvocation);
+            const completed = stateManager.completedBatch[0];
+            expect(completed.request.args).toEqual(mockRequest.args);
+        });
+    });
+    describe('Outcome Tracking', () => {
+        it('should set outcome and notify', () => {
+            const call = createValidatingCall();
+            stateManager.enqueue([call]);
+            stateManager.dequeue();
+            stateManager.setOutcome(call.request.callId, ToolConfirmationOutcome.ProceedAlways);
+            const active = stateManager.firstActiveCall;
+            expect(active?.outcome).toBe(ToolConfirmationOutcome.ProceedAlways);
+            expect(onUpdate).toHaveBeenCalled();
+        });
+    });
+    describe('Batch Operations', () => {
+        it('should cancel all queued calls', () => {
+            stateManager.enqueue([
+                createValidatingCall('1'),
+                createValidatingCall('2'),
+            ]);
+            stateManager.cancelAllQueued('Batch cancel');
+            expect(stateManager.queueLength).toBe(0);
+            expect(stateManager.completedBatch).toHaveLength(2);
+            expect(stateManager.completedBatch.every((c) => c.status === 'cancelled')).toBe(true);
+        });
+        it('should clear batch and notify', () => {
+            const call = createValidatingCall();
+            stateManager.enqueue([call]);
+            stateManager.dequeue();
+            stateManager.updateStatus(call.request.callId, 'success', createMockResponse(call.request.callId));
+            stateManager.finalizeCall(call.request.callId);
+            stateManager.clearBatch();
+            expect(stateManager.completedBatch).toHaveLength(0);
+            expect(onUpdate).toHaveBeenCalledWith([]);
+        });
+        it('should return a copy of the completed batch (defensive)', () => {
+            const call = createValidatingCall();
+            stateManager.enqueue([call]);
+            stateManager.dequeue();
+            stateManager.updateStatus(call.request.callId, 'success', createMockResponse(call.request.callId));
+            stateManager.finalizeCall(call.request.callId);
+            const batch = stateManager.completedBatch;
+            expect(batch).toHaveLength(1);
+            // Mutate the returned array
+            batch.pop();
+            expect(batch).toHaveLength(0);
+            // Verify internal state is unchanged
+            expect(stateManager.completedBatch).toHaveLength(1);
+        });
+    });
+    describe('Snapshot and Ordering', () => {
+        it('should return snapshot in order: completed, active, queue', () => {
+            // 1. Completed
+            const call1 = createValidatingCall('1');
+            stateManager.enqueue([call1]);
+            stateManager.dequeue();
+            stateManager.updateStatus('1', 'success', createMockResponse('1'));
+            stateManager.finalizeCall('1');
+            // 2. Active
+            const call2 = createValidatingCall('2');
+            stateManager.enqueue([call2]);
+            stateManager.dequeue();
+            // 3. Queue
+            const call3 = createValidatingCall('3');
+            stateManager.enqueue([call3]);
+            const snapshot = stateManager.getSnapshot();
+            expect(snapshot).toHaveLength(3);
+            expect(snapshot[0].request.callId).toBe('1');
+            expect(snapshot[1].request.callId).toBe('2');
+            expect(snapshot[2].request.callId).toBe('3');
+        });
+    });
+});
+//# sourceMappingURL=state-manager.test.js.map

package/dist/src/scheduler/state-manager.test.js.map

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

package/dist/src/scheduler/types.d.ts

@@ -7,6 +7,7 @@ import type { Part } from '@google/genai';
 import type { AnyDeclarativeTool, AnyToolInvocation, ToolCallConfirmationDetails, ToolConfirmationOutcome, ToolResultDisplay } from '../tools/tools.js';
 import type { AnsiOutput } from '../utils/terminalSerializer.js';
 import type { ToolErrorType } from '../tools/tool-error.js';
+import type { SerializableConfirmationDetails } from '../confirmation-bus/types.js';
 export interface ToolCallRequestInfo {
     callId: string;
     name: string;
@@ -82,7 +83,15 @@ export type WaitingToolCall = {
     request: ToolCallRequestInfo;
     tool: AnyDeclarativeTool;
     invocation: AnyToolInvocation;
-    confirmationDetails: ToolCallConfirmationDetails;
+    /**
+     * Supports both legacy (with callbacks) and new (serializable) details.
+     * New code should treat this as SerializableConfirmationDetails.
+     *
+     * TODO: Remove ToolCallConfirmationDetails and collapse to just
+     * SerializableConfirmationDetails after migration.
+     */
+    confirmationDetails: ToolCallConfirmationDetails | SerializableConfirmationDetails;
+    correlationId?: string;
     startTime?: number;
     outcome?: ToolConfirmationOutcome;
 };