@google/gemini-cli 0.12.0-nightly.20251023.c4c0c0d1 → 0.12.0-preview.0

package/dist/src/ui/hooks/useTimer.test.js

@@ -1,10 +1,12 @@
+import { jsx as _jsx } from "react/jsx-runtime";
 /**
  * @license
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { renderHook, act } from '@testing-library/react';
+import { act } from 'react';
+import { render } from 'ink-testing-library';
 import { useTimer } from './useTimer.js';
 describe('useTimer', () => {
     beforeEach(() => {
@@ -13,19 +15,36 @@ describe('useTimer', () => {
     afterEach(() => {
         vi.restoreAllMocks();
     });
+    const renderTimerHook = (initialIsActive, initialResetKey) => {
+        let hookResult;
+        function TestComponent({ isActive, resetKey, }) {
+            hookResult = useTimer(isActive, resetKey);
+            return null;
+        }
+        const { rerender, unmount } = render(_jsx(TestComponent, { isActive: initialIsActive, resetKey: initialResetKey }));
+        return {
+            result: {
+                get current() {
+                    return hookResult;
+                },
+            },
+            rerender: (newProps) => rerender(_jsx(TestComponent, { ...newProps })),
+            unmount,
+        };
+    };
     it('should initialize with 0', () => {
-        const { result } = renderHook(() => useTimer(false, 0));
+        const { result } = renderTimerHook(false, 0);
         expect(result.current).toBe(0);
     });
     it('should not increment time if isActive is false', () => {
-        const { result } = renderHook(() => useTimer(false, 0));
+        const { result } = renderTimerHook(false, 0);
         act(() => {
             vi.advanceTimersByTime(5000);
         });
         expect(result.current).toBe(0);
     });
     it('should increment time every second if isActive is true', () => {
-        const { result } = renderHook(() => useTimer(true, 0));
+        const { result } = renderTimerHook(true, 0);
         act(() => {
             vi.advanceTimersByTime(1000);
         });
@@ -36,9 +55,11 @@ describe('useTimer', () => {
         expect(result.current).toBe(3);
     });
     it('should reset to 0 and start incrementing when isActive becomes true from false', () => {
-        const { result, rerender } = renderHook(({ isActive, resetKey }) => useTimer(isActive, resetKey), { initialProps: { isActive: false, resetKey: 0 } });
+        const { result, rerender } = renderTimerHook(false, 0);
         expect(result.current).toBe(0);
-        rerender({ isActive: true, resetKey: 0 });
+        act(() => {
+            rerender({ isActive: true, resetKey: 0 });
+        });
         expect(result.current).toBe(0); // Should reset to 0 upon becoming active
         act(() => {
             vi.advanceTimersByTime(1000);
@@ -46,12 +67,14 @@ describe('useTimer', () => {
         expect(result.current).toBe(1);
     });
     it('should reset to 0 when resetKey changes while active', () => {
-        const { result, rerender } = renderHook(({ isActive, resetKey }) => useTimer(isActive, resetKey), { initialProps: { isActive: true, resetKey: 0 } });
+        const { result, rerender } = renderTimerHook(true, 0);
         act(() => {
             vi.advanceTimersByTime(3000); // 3s
         });
         expect(result.current).toBe(3);
-        rerender({ isActive: true, resetKey: 1 }); // Change resetKey
+        act(() => {
+            rerender({ isActive: true, resetKey: 1 }); // Change resetKey
+        });
         expect(result.current).toBe(0); // Should reset to 0
         act(() => {
             vi.advanceTimersByTime(1000);
@@ -59,27 +82,33 @@ describe('useTimer', () => {
         expect(result.current).toBe(1); // Starts incrementing from 0
     });
     it('should be 0 if isActive is false, regardless of resetKey changes', () => {
-        const { result, rerender } = renderHook(({ isActive, resetKey }) => useTimer(isActive, resetKey), { initialProps: { isActive: false, resetKey: 0 } });
+        const { result, rerender } = renderTimerHook(false, 0);
         expect(result.current).toBe(0);
-        rerender({ isActive: false, resetKey: 1 });
+        act(() => {
+            rerender({ isActive: false, resetKey: 1 });
+        });
         expect(result.current).toBe(0);
     });
     it('should clear timer on unmount', () => {
-        const { unmount } = renderHook(() => useTimer(true, 0));
+        const { unmount } = renderTimerHook(true, 0);
         const clearIntervalSpy = vi.spyOn(global, 'clearInterval');
         unmount();
         expect(clearIntervalSpy).toHaveBeenCalledOnce();
     });
     it('should preserve elapsedTime when isActive becomes false, and reset to 0 when it becomes active again', () => {
-        const { result, rerender } = renderHook(({ isActive, resetKey }) => useTimer(isActive, resetKey), { initialProps: { isActive: true, resetKey: 0 } });
+        const { result, rerender } = renderTimerHook(true, 0);
         act(() => {
             vi.advanceTimersByTime(3000); // Advance to 3 seconds
         });
         expect(result.current).toBe(3);
-        rerender({ isActive: false, resetKey: 0 });
+        act(() => {
+            rerender({ isActive: false, resetKey: 0 });
+        });
         expect(result.current).toBe(3); // Time should be preserved when timer becomes inactive
         // Now make it active again, it should reset to 0
-        rerender({ isActive: true, resetKey: 0 });
+        act(() => {
+            rerender({ isActive: true, resetKey: 0 });
+        });
         expect(result.current).toBe(0);
         act(() => {
             vi.advanceTimersByTime(1000);

package/dist/src/ui/hooks/useTimer.test.js.map

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

package/dist/src/ui/hooks/useToolScheduler.test.js

@@ -4,13 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { renderHook, act } from '@testing-library/react';
+import { act } from 'react';
+import { renderHook } from '../../test-utils/render.js';
 import { useReactToolScheduler, mapToDisplay, } from './useReactToolScheduler.js';
 import { DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES, DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD, ToolConfirmationOutcome, ApprovalMode, MockTool, } from '@google/gemini-cli-core';
 import { ToolCallStatus } from '../types.js';
 // Mocks
 vi.mock('@google/gemini-cli-core', async () => {
     const actual = await vi.importActual('@google/gemini-cli-core');
+    // Patch CoreToolScheduler to have cancelAll if it's missing in the test environment
+    if (actual.CoreToolScheduler &&
+        !actual.CoreToolScheduler.prototype.cancelAll) {
+        actual.CoreToolScheduler.prototype.cancelAll = vi.fn();
+    }
     return {
         ...actual,
         ToolRegistry: vi.fn(),
@@ -104,13 +110,13 @@ describe('useReactToolScheduler in YOLO Mode', () => {
             schedule(request, new AbortController().signal);
         });
         await act(async () => {
-            await vi.runAllTimersAsync(); // Process validation
+            await vi.advanceTimersByTimeAsync(0); // Process validation
         });
         await act(async () => {
-            await vi.runAllTimersAsync(); // Process scheduling
+            await vi.advanceTimersByTimeAsync(0); // Process scheduling
         });
         await act(async () => {
-            await vi.runAllTimersAsync(); // Process execution
+            await vi.advanceTimersByTimeAsync(0); // Process execution
         });
         // Check that execute WAS called
         expect(mockToolRequiresConfirmation.execute).toHaveBeenCalledWith(request.args);
@@ -181,17 +187,21 @@ describe('useReactToolScheduler', () => {
             name: 'mockTool',
             args: { param: 'value' },
         };
+        let completedToolCalls = [];
+        onComplete.mockImplementation((calls) => {
+            completedToolCalls = calls;
+        });
         act(() => {
             schedule(request, new AbortController().signal);
         });
         await act(async () => {
-            await vi.runAllTimersAsync();
+            await vi.advanceTimersByTimeAsync(0);
         });
         await act(async () => {
-            await vi.runAllTimersAsync();
+            await vi.advanceTimersByTimeAsync(0);
         });
         await act(async () => {
-            await vi.runAllTimersAsync();
+            await vi.advanceTimersByTimeAsync(0);
         });
         expect(mockTool.execute).toHaveBeenCalledWith(request.args);
         expect(onComplete).toHaveBeenCalledWith([
@@ -212,42 +222,123 @@ describe('useReactToolScheduler', () => {
                 }),
             }),
         ]);
-        expect(result.current[0]).toEqual([]);
+        expect(completedToolCalls).toHaveLength(1);
+        expect(completedToolCalls[0].status).toBe('success');
+        expect(completedToolCalls[0].request).toBe(request);
     });
-    it('should handle tool not found', async () => {
-        mockToolRegistry.getTool.mockReturnValue(undefined);
+    it('should clear previous tool calls when scheduling new ones', async () => {
+        mockToolRegistry.getTool.mockReturnValue(mockTool);
+        mockTool.execute.mockResolvedValue({
+            llmContent: 'Tool output',
+            returnDisplay: 'Formatted tool output',
+        });
+        const { result } = renderScheduler();
+        const schedule = result.current[1];
+        const setToolCallsForDisplay = result.current[3];
+        // Manually set a tool call in the display.
+        const oldToolCall = {
+            request: { callId: 'oldCall' },
+            status: 'success',
+        };
+        act(() => {
+            setToolCallsForDisplay([oldToolCall]);
+        });
+        expect(result.current[0]).toEqual([oldToolCall]);
+        const newRequest = {
+            callId: 'newCall',
+            name: 'mockTool',
+            args: {},
+        };
+        act(() => {
+            schedule(newRequest, new AbortController().signal);
+        });
+        // After scheduling, the old call should be gone,
+        // and the new one should be in the display in its initial state.
+        expect(result.current[0].length).toBe(1);
+        expect(result.current[0][0].request.callId).toBe('newCall');
+        expect(result.current[0][0].request.callId).not.toBe('oldCall');
+        // Let the new call finish.
+        await act(async () => {
+            await vi.advanceTimersByTimeAsync(0);
+        });
+        await act(async () => {
+            await vi.advanceTimersByTimeAsync(0);
+        });
+        await act(async () => {
+            await vi.advanceTimersByTimeAsync(0);
+        });
+        expect(onComplete).toHaveBeenCalled();
+    });
+    it('should cancel all running tool calls', async () => {
+        mockToolRegistry.getTool.mockReturnValue(mockTool);
+        let resolveExecute = () => { };
+        const executePromise = new Promise((resolve) => {
+            resolveExecute = resolve;
+        });
+        mockTool.execute.mockReturnValue(executePromise);
+        mockTool.shouldConfirmExecute.mockResolvedValue(null);
         const { result } = renderScheduler();
         const schedule = result.current[1];
+        const cancelAllToolCalls = result.current[4];
         const request = {
-            callId: 'call1',
-            name: 'nonexistentTool',
+            callId: 'cancelCall',
+            name: 'mockTool',
             args: {},
         };
         act(() => {
             schedule(request, new AbortController().signal);
         });
         await act(async () => {
-            await vi.runAllTimersAsync();
+            await vi.advanceTimersByTimeAsync(0);
+        }); // validation
+        await act(async () => {
+            await vi.advanceTimersByTimeAsync(0); // Process scheduling
+        });
+        // At this point, the tool is 'executing' and waiting on the promise.
+        expect(result.current[0][0].status).toBe('executing');
+        const cancelController = new AbortController();
+        act(() => {
+            cancelAllToolCalls(cancelController.signal);
         });
         await act(async () => {
-            await vi.runAllTimersAsync();
+            await vi.advanceTimersByTimeAsync(0);
         });
         expect(onComplete).toHaveBeenCalledWith([
             expect.objectContaining({
-                status: 'error',
+                status: 'cancelled',
                 request,
-                response: expect.objectContaining({
-                    error: expect.objectContaining({
-                        message: expect.stringMatching(/Tool "nonexistentTool" not found in registry/),
-                    }),
-                }),
             }),
         ]);
-        const errorMessage = onComplete.mock.calls[0][0][0].response.error.message;
-        expect(errorMessage).toContain('Did you mean one of:');
-        expect(errorMessage).toContain('"mockTool"');
-        expect(errorMessage).toContain('"anotherTool"');
-        expect(result.current[0]).toEqual([]);
+        // Clean up the pending promise to avoid open handles.
+        resolveExecute({ llmContent: 'output', returnDisplay: 'display' });
+    });
+    it('should handle tool not found', async () => {
+        mockToolRegistry.getTool.mockReturnValue(undefined);
+        const { result } = renderScheduler();
+        const schedule = result.current[1];
+        const request = {
+            callId: 'call1',
+            name: 'nonexistentTool',
+            args: {},
+        };
+        let completedToolCalls = [];
+        onComplete.mockImplementation((calls) => {
+            completedToolCalls = calls;
+        });
+        act(() => {
+            schedule(request, new AbortController().signal);
+        });
+        await act(async () => {
+            await vi.advanceTimersByTimeAsync(0);
+        });
+        await act(async () => {
+            await vi.advanceTimersByTimeAsync(0);
+        });
+        expect(completedToolCalls).toHaveLength(1);
+        expect(completedToolCalls[0].status).toBe('error');
+        expect(completedToolCalls[0].request).toBe(request);
+        expect(completedToolCalls[0].response.error.message).toContain('Tool "nonexistentTool" not found in registry');
+        expect(completedToolCalls[0].response.error.message).toContain('Did you mean one of:');
     });
     it('should handle error during shouldConfirmExecute', async () => {
         mockToolRegistry.getTool.mockReturnValue(mockTool);
@@ -260,25 +351,23 @@ describe('useReactToolScheduler', () => {
             name: 'mockTool',
             args: {},
         };
+        let completedToolCalls = [];
+        onComplete.mockImplementation((calls) => {
+            completedToolCalls = calls;
+        });
         act(() => {
             schedule(request, new AbortController().signal);
         });
         await act(async () => {
-            await vi.runAllTimersAsync();
+            await vi.advanceTimersByTimeAsync(0);
         });
         await act(async () => {
-            await vi.runAllTimersAsync();
+            await vi.advanceTimersByTimeAsync(0);
         });
-        expect(onComplete).toHaveBeenCalledWith([
-            expect.objectContaining({
-                status: 'error',
-                request,
-                response: expect.objectContaining({
-                    error: confirmError,
-                }),
-            }),
-        ]);
-        expect(result.current[0]).toEqual([]);
+        expect(completedToolCalls).toHaveLength(1);
+        expect(completedToolCalls[0].status).toBe('error');
+        expect(completedToolCalls[0].request).toBe(request);
+        expect(completedToolCalls[0].response.error).toBe(confirmError);
     });
     it('should handle error during execute', async () => {
         mockToolRegistry.getTool.mockReturnValue(mockTool);
@@ -292,28 +381,26 @@ describe('useReactToolScheduler', () => {
             name: 'mockTool',
             args: {},
         };
+        let completedToolCalls = [];
+        onComplete.mockImplementation((calls) => {
+            completedToolCalls = calls;
+        });
         act(() => {
             schedule(request, new AbortController().signal);
         });
         await act(async () => {
-            await vi.runAllTimersAsync();
+            await vi.advanceTimersByTimeAsync(0);
         });
         await act(async () => {
-            await vi.runAllTimersAsync();
+            await vi.advanceTimersByTimeAsync(0);
         });
         await act(async () => {
-            await vi.runAllTimersAsync();
+            await vi.advanceTimersByTimeAsync(0);
         });
-        expect(onComplete).toHaveBeenCalledWith([
-            expect.objectContaining({
-                status: 'error',
-                request,
-                response: expect.objectContaining({
-                    error: execError,
-                }),
-            }),
-        ]);
-        expect(result.current[0]).toEqual([]);
+        expect(completedToolCalls).toHaveLength(1);
+        expect(completedToolCalls[0].status).toBe('error');
+        expect(completedToolCalls[0].request).toBe(request);
+        expect(completedToolCalls[0].response.error).toBe(execError);
     });
     it('should handle tool requiring confirmation - approved', async () => {
         mockToolRegistry.getTool.mockReturnValue(mockToolRequiresConfirmation);
@@ -333,7 +420,7 @@ describe('useReactToolScheduler', () => {
             schedule(request, new AbortController().signal);
         });
         await act(async () => {
-            await vi.runAllTimersAsync();
+            await vi.advanceTimersByTimeAsync(0);
         });
         const waitingCall = result.current[0][0];
         expect(waitingCall.status).toBe('awaiting_approval');
@@ -343,13 +430,13 @@ describe('useReactToolScheduler', () => {
             await capturedOnConfirmForTest?.(ToolConfirmationOutcome.ProceedOnce);
         });
         await act(async () => {
-            await vi.runAllTimersAsync();
+            await vi.advanceTimersByTimeAsync(0);
         });
         await act(async () => {
-            await vi.runAllTimersAsync();
+            await vi.advanceTimersByTimeAsync(0);
         });
         await act(async () => {
-            await vi.runAllTimersAsync();
+            await vi.advanceTimersByTimeAsync(0);
         });
         expect(mockOnUserConfirmForToolConfirmation).toHaveBeenCalledWith(ToolConfirmationOutcome.ProceedOnce);
         expect(mockToolRequiresConfirmation.execute).toHaveBeenCalled();
@@ -383,7 +470,7 @@ describe('useReactToolScheduler', () => {
             schedule(request, new AbortController().signal);
         });
         await act(async () => {
-            await vi.runAllTimersAsync();
+            await vi.advanceTimersByTimeAsync(0);
         });
         const waitingCall = result.current[0][0];
         expect(waitingCall.status).toBe('awaiting_approval');
@@ -393,10 +480,10 @@ describe('useReactToolScheduler', () => {
             await capturedOnConfirmForTest?.(ToolConfirmationOutcome.Cancel);
         });
         await act(async () => {
-            await vi.runAllTimersAsync();
+            await vi.advanceTimersByTimeAsync(0);
         });
         await act(async () => {
-            await vi.runAllTimersAsync();
+            await vi.advanceTimersByTimeAsync(0);
         });
         expect(mockOnUserConfirmForToolConfirmation).toHaveBeenCalledWith(ToolConfirmationOutcome.Cancel);
         expect(onComplete).toHaveBeenCalledWith([
@@ -408,7 +495,7 @@ describe('useReactToolScheduler', () => {
                         expect.objectContaining({
                             functionResponse: expect.objectContaining({
                                 response: expect.objectContaining({
-                                    error: '[Operation Cancelled] Reason: User did not allow tool call',
+                                    error: '[Operation Cancelled] Reason: User cancelled the operation.',
                                 }),
                             }),
                         }),
@@ -440,7 +527,7 @@ describe('useReactToolScheduler', () => {
             schedule(request, new AbortController().signal);
         });
         await act(async () => {
-            await vi.runAllTimersAsync();
+            await vi.advanceTimersByTimeAsync(0);
         });
         expect(liveUpdateFn).toBeDefined();
         expect(result.current[0][0].status).toBe('executing');
@@ -448,13 +535,13 @@ describe('useReactToolScheduler', () => {
             liveUpdateFn?.('Live output 1');
         });
         await act(async () => {
-            await vi.runAllTimersAsync();
+            await vi.advanceTimersByTimeAsync(0);
         });
         await act(async () => {
             liveUpdateFn?.('Live output 2');
         });
         await act(async () => {
-            await vi.runAllTimersAsync();
+            await vi.advanceTimersByTimeAsync(0);
         });
         act(() => {
             resolveExecutePromise({
@@ -463,10 +550,10 @@ describe('useReactToolScheduler', () => {
             });
         });
         await act(async () => {
-            await vi.runAllTimersAsync();
+            await vi.advanceTimersByTimeAsync(0);
         });
         await act(async () => {
-            await vi.runAllTimersAsync();
+            await vi.advanceTimersByTimeAsync(0);
         });
         expect(onComplete).toHaveBeenCalledWith([
             expect.objectContaining({
@@ -520,16 +607,16 @@ describe('useReactToolScheduler', () => {
             schedule(requests, new AbortController().signal);
         });
         await act(async () => {
-            await vi.runAllTimersAsync();
+            await vi.advanceTimersByTimeAsync(0);
         });
         await act(async () => {
-            await vi.runAllTimersAsync();
+            await vi.advanceTimersByTimeAsync(0);
         });
         await act(async () => {
-            await vi.runAllTimersAsync();
+            await vi.advanceTimersByTimeAsync(0);
         });
         await act(async () => {
-            await vi.runAllTimersAsync();
+            await vi.advanceTimersByTimeAsync(0);
         });
         expect(onComplete).toHaveBeenCalledTimes(1);
         const completedCalls = onComplete.mock.calls[0][0];
@@ -568,7 +655,8 @@ describe('useReactToolScheduler', () => {
                 ],
             }),
         });
-        expect(result.current[0]).toEqual([]);
+        expect(completedCalls).toHaveLength(2);
+        expect(completedCalls.every((t) => t.status === 'success')).toBe(true);
     });
     it('should queue if scheduling while already running', async () => {
         mockToolRegistry.getTool.mockReturnValue(mockTool);
@@ -594,14 +682,14 @@ describe('useReactToolScheduler', () => {
             schedule(request1, new AbortController().signal);
         });
         await act(async () => {
-            await vi.runAllTimersAsync();
+            await vi.advanceTimersByTimeAsync(0);
         });
         schedule(request2, new AbortController().signal);
         await act(async () => {
             await vi.advanceTimersByTimeAsync(50);
-            await vi.runAllTimersAsync();
+            await vi.advanceTimersByTimeAsync(0);
             await act(async () => {
-                await vi.runAllTimersAsync();
+                await vi.advanceTimersByTimeAsync(0);
             });
         });
         expect(onComplete).toHaveBeenCalledWith([
@@ -614,9 +702,9 @@ describe('useReactToolScheduler', () => {
         // Wait for request2 to complete
         await act(async () => {
             await vi.advanceTimersByTimeAsync(50);
-            await vi.runAllTimersAsync();
+            await vi.advanceTimersByTimeAsync(0);
             await act(async () => {
-                await vi.runAllTimersAsync();
+                await vi.advanceTimersByTimeAsync(0);
             });
         });
         expect(onComplete).toHaveBeenCalledWith([
@@ -626,7 +714,8 @@ describe('useReactToolScheduler', () => {
                 response: expect.objectContaining({ resultDisplay: 'done display' }),
             }),
         ]);
-        expect(result.current[0]).toEqual([]);
+        const toolCalls = result.current[0];
+        expect(toolCalls).toHaveLength(0);
     });
 });
 describe('mapToDisplay', () => {