@google/gemini-cli 0.26.0-preview.0 → 0.27.0-nightly.20260122.61040d0eb

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

@@ -0,0 +1,296 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { act } from 'react';
+import { renderHook } from '../../test-utils/render.js';
+import { useToolExecutionScheduler } from './useToolExecutionScheduler.js';
+import { MessageBusType, ToolConfirmationOutcome, Scheduler, } from '@google/gemini-cli-core';
+import { createMockMessageBus } from '@google/gemini-cli-core/src/test-utils/mock-message-bus.js';
+// Mock Core Scheduler
+vi.mock('@google/gemini-cli-core', async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        Scheduler: vi.fn().mockImplementation(() => ({
+            schedule: vi.fn().mockResolvedValue([]),
+            cancelAll: vi.fn(),
+        })),
+    };
+});
+const createMockTool = (overrides = {}) => ({
+    name: 'test_tool',
+    displayName: 'Test Tool',
+    description: 'A test tool',
+    kind: 'function',
+    parameterSchema: {},
+    isOutputMarkdown: false,
+    build: vi.fn(),
+    ...overrides,
+});
+const createMockInvocation = (overrides = {}) => ({
+    getDescription: () => 'Executing test tool',
+    shouldConfirmExecute: vi.fn(),
+    execute: vi.fn(),
+    params: {},
+    toolLocations: [],
+    ...overrides,
+});
+describe('useToolExecutionScheduler', () => {
+    let mockConfig;
+    let mockMessageBus;
+    beforeEach(() => {
+        vi.clearAllMocks();
+        mockMessageBus = createMockMessageBus();
+        mockConfig = {
+            getMessageBus: () => mockMessageBus,
+        };
+    });
+    it('initializes with empty tool calls', () => {
+        const { result } = renderHook(() => useToolExecutionScheduler(vi.fn().mockResolvedValue(undefined), mockConfig, () => undefined));
+        const [toolCalls] = result.current;
+        expect(toolCalls).toEqual([]);
+    });
+    it('updates tool calls when MessageBus emits TOOL_CALLS_UPDATE', () => {
+        const { result } = renderHook(() => useToolExecutionScheduler(vi.fn().mockResolvedValue(undefined), mockConfig, () => undefined));
+        const mockToolCall = {
+            status: 'executing',
+            request: {
+                callId: 'call-1',
+                name: 'test_tool',
+                args: {},
+                isClientInitiated: false,
+                prompt_id: 'p1',
+            },
+            tool: createMockTool(),
+            invocation: createMockInvocation(),
+            liveOutput: 'Loading...',
+        };
+        act(() => {
+            void mockMessageBus.publish({
+                type: MessageBusType.TOOL_CALLS_UPDATE,
+                toolCalls: [mockToolCall],
+            });
+        });
+        const [toolCalls] = result.current;
+        expect(toolCalls).toHaveLength(1);
+        // Expect Core Object structure, not Display Object
+        expect(toolCalls[0]).toMatchObject({
+            request: { callId: 'call-1', name: 'test_tool' },
+            status: 'executing', // Core status
+            liveOutput: 'Loading...',
+            responseSubmittedToGemini: false,
+        });
+    });
+    it('injects onConfirm callback for awaiting_approval tools (Adapter Pattern)', async () => {
+        const { result } = renderHook(() => useToolExecutionScheduler(vi.fn().mockResolvedValue(undefined), mockConfig, () => undefined));
+        const mockToolCall = {
+            status: 'awaiting_approval',
+            request: {
+                callId: 'call-1',
+                name: 'test_tool',
+                args: {},
+                isClientInitiated: false,
+                prompt_id: 'p1',
+            },
+            tool: createMockTool(),
+            invocation: createMockInvocation({
+                getDescription: () => 'Confirming test tool',
+            }),
+            confirmationDetails: { type: 'info', title: 'Confirm', prompt: 'Sure?' },
+            correlationId: 'corr-123',
+        };
+        act(() => {
+            void mockMessageBus.publish({
+                type: MessageBusType.TOOL_CALLS_UPDATE,
+                toolCalls: [mockToolCall],
+            });
+        });
+        const [toolCalls] = result.current;
+        const call = toolCalls[0];
+        if (call.status !== 'awaiting_approval') {
+            throw new Error('Expected status to be awaiting_approval');
+        }
+        const confirmationDetails = call.confirmationDetails;
+        expect(confirmationDetails).toBeDefined();
+        expect(typeof confirmationDetails.onConfirm).toBe('function');
+        // Test that onConfirm publishes to MessageBus
+        const publishSpy = vi.spyOn(mockMessageBus, 'publish');
+        await confirmationDetails.onConfirm(ToolConfirmationOutcome.ProceedOnce);
+        expect(publishSpy).toHaveBeenCalledWith({
+            type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
+            correlationId: 'corr-123',
+            confirmed: true,
+            requiresUserConfirmation: false,
+            outcome: ToolConfirmationOutcome.ProceedOnce,
+            payload: undefined,
+        });
+    });
+    it('injects onConfirm with payload (Inline Edit support)', async () => {
+        const { result } = renderHook(() => useToolExecutionScheduler(vi.fn().mockResolvedValue(undefined), mockConfig, () => undefined));
+        const mockToolCall = {
+            status: 'awaiting_approval',
+            request: {
+                callId: 'call-1',
+                name: 'test_tool',
+                args: {},
+                isClientInitiated: false,
+                prompt_id: 'p1',
+            },
+            tool: createMockTool(),
+            invocation: createMockInvocation(),
+            confirmationDetails: { type: 'edit', title: 'Edit', filePath: 'test.ts' },
+            correlationId: 'corr-edit',
+        };
+        act(() => {
+            void mockMessageBus.publish({
+                type: MessageBusType.TOOL_CALLS_UPDATE,
+                toolCalls: [mockToolCall],
+            });
+        });
+        const [toolCalls] = result.current;
+        const call = toolCalls[0];
+        if (call.status !== 'awaiting_approval') {
+            throw new Error('Expected awaiting_approval');
+        }
+        const confirmationDetails = call.confirmationDetails;
+        const publishSpy = vi.spyOn(mockMessageBus, 'publish');
+        const mockPayload = { newContent: 'updated code' };
+        await confirmationDetails.onConfirm(ToolConfirmationOutcome.ProceedOnce, mockPayload);
+        expect(publishSpy).toHaveBeenCalledWith({
+            type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
+            correlationId: 'corr-edit',
+            confirmed: true,
+            requiresUserConfirmation: false,
+            outcome: ToolConfirmationOutcome.ProceedOnce,
+            payload: mockPayload,
+        });
+    });
+    it('preserves responseSubmittedToGemini flag across updates', () => {
+        const { result } = renderHook(() => useToolExecutionScheduler(vi.fn().mockResolvedValue(undefined), mockConfig, () => undefined));
+        const mockToolCall = {
+            status: 'success',
+            request: {
+                callId: 'call-1',
+                name: 'test',
+                args: {},
+                isClientInitiated: false,
+                prompt_id: 'p1',
+            },
+            tool: createMockTool(),
+            invocation: createMockInvocation(),
+            response: {
+                callId: 'call-1',
+                resultDisplay: 'OK',
+                responseParts: [],
+                error: undefined,
+                errorType: undefined,
+            },
+        };
+        // 1. Initial success
+        act(() => {
+            void mockMessageBus.publish({
+                type: MessageBusType.TOOL_CALLS_UPDATE,
+                toolCalls: [mockToolCall],
+            });
+        });
+        // 2. Mark as submitted
+        act(() => {
+            const [, , markAsSubmitted] = result.current;
+            markAsSubmitted(['call-1']);
+        });
+        expect(result.current[0][0].responseSubmittedToGemini).toBe(true);
+        // 3. Receive another update (should preserve the true flag)
+        act(() => {
+            void mockMessageBus.publish({
+                type: MessageBusType.TOOL_CALLS_UPDATE,
+                toolCalls: [mockToolCall],
+            });
+        });
+        expect(result.current[0][0].responseSubmittedToGemini).toBe(true);
+    });
+    it('updates lastToolOutputTime when tools are executing', () => {
+        vi.useFakeTimers();
+        const { result } = renderHook(() => useToolExecutionScheduler(vi.fn().mockResolvedValue(undefined), mockConfig, () => undefined));
+        const startTime = Date.now();
+        vi.advanceTimersByTime(1000);
+        act(() => {
+            void mockMessageBus.publish({
+                type: MessageBusType.TOOL_CALLS_UPDATE,
+                toolCalls: [
+                    {
+                        status: 'executing',
+                        request: {
+                            callId: 'call-1',
+                            name: 'test',
+                            args: {},
+                            isClientInitiated: false,
+                            prompt_id: 'p1',
+                        },
+                        tool: createMockTool(),
+                        invocation: createMockInvocation(),
+                    },
+                ],
+            });
+        });
+        const [, , , , , lastOutputTime] = result.current;
+        expect(lastOutputTime).toBeGreaterThan(startTime);
+        vi.useRealTimers();
+    });
+    it('delegates cancelAll to the Core Scheduler', () => {
+        const { result } = renderHook(() => useToolExecutionScheduler(vi.fn().mockResolvedValue(undefined), mockConfig, () => undefined));
+        const [, , , , cancelAll] = result.current;
+        const signal = new AbortController().signal;
+        // We need to find the mock instance of Scheduler
+        // Since we used vi.mock at top level, we can get it from vi.mocked(Scheduler)
+        const schedulerInstance = vi.mocked(Scheduler).mock.results[0].value;
+        cancelAll(signal);
+        expect(schedulerInstance.cancelAll).toHaveBeenCalled();
+    });
+    it('resolves the schedule promise when scheduler resolves', async () => {
+        const onComplete = vi.fn().mockResolvedValue(undefined);
+        const completedToolCall = {
+            status: 'success',
+            request: {
+                callId: 'call-1',
+                name: 'test',
+                args: {},
+                isClientInitiated: false,
+                prompt_id: 'p1',
+            },
+            tool: createMockTool(),
+            invocation: createMockInvocation(),
+            response: {
+                callId: 'call-1',
+                responseParts: [],
+                resultDisplay: 'Success',
+                error: undefined,
+                errorType: undefined,
+            },
+        };
+        // Mock the specific return value for this test
+        const { Scheduler } = await import('@google/gemini-cli-core');
+        vi.mocked(Scheduler).mockImplementation(() => ({
+            schedule: vi.fn().mockResolvedValue([completedToolCall]),
+            cancelAll: vi.fn(),
+        }));
+        const { result } = renderHook(() => useToolExecutionScheduler(onComplete, mockConfig, () => undefined));
+        const [, schedule] = result.current;
+        const signal = new AbortController().signal;
+        let completedResult = [];
+        await act(async () => {
+            completedResult = await schedule({
+                callId: 'call-1',
+                name: 'test',
+                args: {},
+                isClientInitiated: false,
+                prompt_id: 'p1',
+            }, signal);
+        });
+        expect(completedResult).toEqual([completedToolCall]);
+        expect(onComplete).toHaveBeenCalledWith([completedToolCall]);
+    });
+});
+//# sourceMappingURL=useToolExecutionScheduler.test.js.map

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

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

package/dist/src/ui/hooks/useToolScheduler.d.ts

@@ -0,0 +1,29 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { Config, EditorType, CompletedToolCall, ToolCallRequestInfo } from '@google/gemini-cli-core';
+import { type TrackedToolCall as LegacyTrackedToolCall, type TrackedScheduledToolCall, type TrackedValidatingToolCall, type TrackedWaitingToolCall, type TrackedExecutingToolCall, type TrackedCompletedToolCall, type TrackedCancelledToolCall, type MarkToolsAsSubmittedFn, type CancelAllFn } from './useReactToolScheduler.js';
+import { type TrackedToolCall as NewTrackedToolCall } from './useToolExecutionScheduler.js';
+export type { TrackedScheduledToolCall, TrackedValidatingToolCall, TrackedWaitingToolCall, TrackedExecutingToolCall, TrackedCompletedToolCall, TrackedCancelledToolCall, };
+export type TrackedToolCall = LegacyTrackedToolCall | NewTrackedToolCall;
+export type ScheduleFn = (request: ToolCallRequestInfo | ToolCallRequestInfo[], signal: AbortSignal) => Promise<void | CompletedToolCall[]>;
+export type UseToolSchedulerReturn = [
+    TrackedToolCall[],
+    ScheduleFn,
+    MarkToolsAsSubmittedFn,
+    React.Dispatch<React.SetStateAction<TrackedToolCall[]>>,
+    CancelAllFn,
+    number
+];
+/**
+ * Facade hook that switches between the Legacy and Event-Driven schedulers
+ * based on configuration.
+ *
+ * Note: This conditionally calls hooks, which technically violates the standard
+ * Rules of Hooks linting. However, this is safe here because
+ * `config.isEventDrivenSchedulerEnabled()` is static for the lifetime of the
+ * application session (it essentially acts as a compile-time feature flag).
+ */
+export declare function useToolScheduler(onComplete: (tools: CompletedToolCall[]) => Promise<void>, config: Config, getPreferredEditor: () => EditorType | undefined): UseToolSchedulerReturn;

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

@@ -0,0 +1,30 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { useReactToolScheduler, } from './useReactToolScheduler.js';
+import { useToolExecutionScheduler, } from './useToolExecutionScheduler.js';
+/**
+ * Facade hook that switches between the Legacy and Event-Driven schedulers
+ * based on configuration.
+ *
+ * Note: This conditionally calls hooks, which technically violates the standard
+ * Rules of Hooks linting. However, this is safe here because
+ * `config.isEventDrivenSchedulerEnabled()` is static for the lifetime of the
+ * application session (it essentially acts as a compile-time feature flag).
+ */
+export function useToolScheduler(onComplete, config, getPreferredEditor) {
+    const isEventDriven = config.isEventDrivenSchedulerEnabled();
+    // Note: We return the hooks directly without casting. They return compatible
+    // tuple structures, but use explicit tuple signatures rather than the
+    // UseToolSchedulerReturn named type to avoid circular dependencies back to
+    // this facade.
+    if (isEventDriven) {
+        // eslint-disable-next-line react-hooks/rules-of-hooks
+        return useToolExecutionScheduler(onComplete, config, getPreferredEditor);
+    }
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    return useReactToolScheduler(onComplete, config, getPreferredEditor);
+}
+//# sourceMappingURL=useToolScheduler.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useToolScheduler.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useToolScheduler.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAQH,OAAO,EACL,qBAAqB,GAUtB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,yBAAyB,GAE1B,MAAM,gCAAgC,CAAC;AA+BxC;;;;;;;;GAQG;AACH,MAAM,UAAU,gBAAgB,CAC9B,UAAyD,EACzD,MAAc,EACd,kBAAgD;IAEhD,MAAM,aAAa,GAAG,MAAM,CAAC,6BAA6B,EAAE,CAAC;IAE7D,6EAA6E;IAC7E,sEAAsE;IACtE,2EAA2E;IAC3E,eAAe;IACf,IAAI,aAAa,EAAE,CAAC;QAClB,sDAAsD;QACtD,OAAO,yBAAyB,CAAC,UAAU,EAAE,MAAM,EAAE,kBAAkB,CAAC,CAAC;IAC3E,CAAC;IAED,sDAAsD;IACtD,OAAO,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,kBAAkB,CAAC,CAAC;AACvE,CAAC"}

package/dist/src/ui/hooks/useToolSchedulerFacade.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};

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

@@ -0,0 +1,45 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { renderHook } from '../../test-utils/render.js';
+import { useToolScheduler } from './useToolScheduler.js';
+import { useReactToolScheduler } from './useReactToolScheduler.js';
+import { useToolExecutionScheduler } from './useToolExecutionScheduler.js';
+vi.mock('./useReactToolScheduler.js', () => ({
+    useReactToolScheduler: vi.fn().mockReturnValue(['legacy']),
+}));
+vi.mock('./useToolExecutionScheduler.js', () => ({
+    useToolExecutionScheduler: vi.fn().mockReturnValue(['modern']),
+}));
+describe('useToolScheduler (Facade)', () => {
+    let mockConfig;
+    beforeEach(() => {
+        vi.clearAllMocks();
+    });
+    it('delegates to useReactToolScheduler when event-driven scheduler is disabled', () => {
+        mockConfig = {
+            isEventDrivenSchedulerEnabled: () => false,
+        };
+        const onComplete = vi.fn();
+        const getPreferredEditor = vi.fn();
+        const { result } = renderHook(() => useToolScheduler(onComplete, mockConfig, getPreferredEditor));
+        expect(result.current).toEqual(['legacy']);
+        expect(useReactToolScheduler).toHaveBeenCalledWith(onComplete, mockConfig, getPreferredEditor);
+        expect(useToolExecutionScheduler).not.toHaveBeenCalled();
+    });
+    it('delegates to useToolExecutionScheduler when event-driven scheduler is enabled', () => {
+        mockConfig = {
+            isEventDrivenSchedulerEnabled: () => true,
+        };
+        const onComplete = vi.fn();
+        const getPreferredEditor = vi.fn();
+        const { result } = renderHook(() => useToolScheduler(onComplete, mockConfig, getPreferredEditor));
+        expect(result.current).toEqual(['modern']);
+        expect(useToolExecutionScheduler).toHaveBeenCalledWith(onComplete, mockConfig, getPreferredEditor);
+        expect(useReactToolScheduler).not.toHaveBeenCalled();
+    });
+});
+//# sourceMappingURL=useToolSchedulerFacade.test.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useToolSchedulerFacade.test.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useToolSchedulerFacade.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAG3E,EAAE,CAAC,IAAI,CAAC,4BAA4B,EAAE,GAAG,EAAE,CAAC,CAAC;IAC3C,qBAAqB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,CAAC;CAC3D,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,gCAAgC,EAAE,GAAG,EAAE,CAAC,CAAC;IAC/C,yBAAyB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,CAAC;CAC/D,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;IACzC,IAAI,UAAkB,CAAC;IAEvB,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4EAA4E,EAAE,GAAG,EAAE;QACpF,UAAU,GAAG;YACX,6BAA6B,EAAE,GAAG,EAAE,CAAC,KAAK;SACtB,CAAC;QAEvB,MAAM,UAAU,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3B,MAAM,kBAAkB,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;QAEnC,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,GAAG,EAAE,CACjC,gBAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,kBAAkB,CAAC,CAC7D,CAAC;QAEF,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC3C,MAAM,CAAC,qBAAqB,CAAC,CAAC,oBAAoB,CAChD,UAAU,EACV,UAAU,EACV,kBAAkB,CACnB,CAAC;QACF,MAAM,CAAC,yBAAyB,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;IAC3D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+EAA+E,EAAE,GAAG,EAAE;QACvF,UAAU,GAAG;YACX,6BAA6B,EAAE,GAAG,EAAE,CAAC,IAAI;SACrB,CAAC;QAEvB,MAAM,UAAU,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3B,MAAM,kBAAkB,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;QAEnC,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,GAAG,EAAE,CACjC,gBAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,kBAAkB,CAAC,CAC7D,CAAC;QAEF,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC3C,MAAM,CAAC,yBAAyB,CAAC,CAAC,oBAAoB,CACpD,UAAU,EACV,UAAU,EACV,kBAAkB,CACnB,CAAC;QACF,MAAM,CAAC,qBAAqB,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;IACvD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/src/ui/hooks/useTurnActivityMonitor.d.ts

@@ -0,0 +1,16 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { StreamingState } from '../types.js';
+import { type TrackedToolCall } from './useReactToolScheduler.js';
+export interface TurnActivityStatus {
+    operationStartTime: number;
+    isRedirectionActive: boolean;
+}
+/**
+ * Monitors the activity of a Gemini turn to detect when a new operation starts
+ * and whether it involves shell redirections that should suppress inactivity prompts.
+ */
+export declare const useTurnActivityMonitor: (streamingState: StreamingState, activePtyId: number | string | null | undefined, pendingToolCalls?: TrackedToolCall[]) => TurnActivityStatus;

package/dist/src/ui/hooks/useTurnActivityMonitor.js

@@ -0,0 +1,49 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { useState, useEffect, useRef, useMemo } from 'react';
+import { StreamingState } from '../types.js';
+import { hasRedirection } from '@google/gemini-cli-core';
+import {} from './useReactToolScheduler.js';
+/**
+ * Monitors the activity of a Gemini turn to detect when a new operation starts
+ * and whether it involves shell redirections that should suppress inactivity prompts.
+ */
+export const useTurnActivityMonitor = (streamingState, activePtyId, pendingToolCalls = []) => {
+    const [operationStartTime, setOperationStartTime] = useState(0);
+    // Reset operation start time whenever a new operation begins.
+    // We consider an operation to have started when we enter Responding state,
+    // OR when the active PTY changes (meaning a new command started within the turn).
+    const prevPtyIdRef = useRef(undefined);
+    const prevStreamingStateRef = useRef(undefined);
+    useEffect(() => {
+        const isNowResponding = streamingState === StreamingState.Responding;
+        const wasResponding = prevStreamingStateRef.current === StreamingState.Responding;
+        const ptyChanged = activePtyId !== prevPtyIdRef.current;
+        if (isNowResponding && (!wasResponding || ptyChanged)) {
+            setOperationStartTime(Date.now());
+        }
+        else if (!isNowResponding && wasResponding) {
+            setOperationStartTime(0);
+        }
+        prevPtyIdRef.current = activePtyId;
+        prevStreamingStateRef.current = streamingState;
+    }, [streamingState, activePtyId]);
+    // Detect redirection in the current query or tool calls.
+    // We derive this directly during render to ensure it's accurate from the first frame.
+    const isRedirectionActive = useMemo(() => 
+    // Check active tool calls for run_shell_command
+    pendingToolCalls.some((tc) => {
+        if (tc.request.name !== 'run_shell_command')
+            return false;
+        const command = tc.request.args?.command || '';
+        return hasRedirection(command);
+    }), [pendingToolCalls]);
+    return {
+        operationStartTime,
+        isRedirectionActive,
+    };
+};
+//# sourceMappingURL=useTurnActivityMonitor.js.map

package/dist/src/ui/hooks/useTurnActivityMonitor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useTurnActivityMonitor.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useTurnActivityMonitor.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAwB,MAAM,4BAA4B,CAAC;AAOlE;;;GAGG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,cAA8B,EAC9B,WAA+C,EAC/C,mBAAsC,EAAE,EACpB,EAAE;IACtB,MAAM,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAEhE,8DAA8D;IAC9D,2EAA2E;IAC3E,kFAAkF;IAClF,MAAM,YAAY,GAAG,MAAM,CAAqC,SAAS,CAAC,CAAC;IAC3E,MAAM,qBAAqB,GAAG,MAAM,CAA6B,SAAS,CAAC,CAAC;IAE5E,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,eAAe,GAAG,cAAc,KAAK,cAAc,CAAC,UAAU,CAAC;QACrE,MAAM,aAAa,GACjB,qBAAqB,CAAC,OAAO,KAAK,cAAc,CAAC,UAAU,CAAC;QAC9D,MAAM,UAAU,GAAG,WAAW,KAAK,YAAY,CAAC,OAAO,CAAC;QAExD,IAAI,eAAe,IAAI,CAAC,CAAC,aAAa,IAAI,UAAU,CAAC,EAAE,CAAC;YACtD,qBAAqB,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;QACpC,CAAC;aAAM,IAAI,CAAC,eAAe,IAAI,aAAa,EAAE,CAAC;YAC7C,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC3B,CAAC;QAED,YAAY,CAAC,OAAO,GAAG,WAAW,CAAC;QACnC,qBAAqB,CAAC,OAAO,GAAG,cAAc,CAAC;IACjD,CAAC,EAAE,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC,CAAC;IAElC,yDAAyD;IACzD,sFAAsF;IACtF,MAAM,mBAAmB,GAAG,OAAO,CACjC,GAAG,EAAE;IACH,gDAAgD;IAChD,gBAAgB,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE;QAC3B,IAAI,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,mBAAmB;YAAE,OAAO,KAAK,CAAC;QAE1D,MAAM,OAAO,GACV,EAAE,CAAC,OAAO,CAAC,IAA6B,EAAE,OAAO,IAAI,EAAE,CAAC;QAC3D,OAAO,cAAc,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC,CAAC,EACJ,CAAC,gBAAgB,CAAC,CACnB,CAAC;IAEF,OAAO;QACL,kBAAkB;QAClB,mBAAmB;KACpB,CAAC;AACJ,CAAC,CAAC"}

package/dist/src/ui/hooks/useTurnActivityMonitor.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};

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

@@ -0,0 +1,97 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { renderHook } from '../../test-utils/render.js';
+import { useTurnActivityMonitor } from './useTurnActivityMonitor.js';
+import { StreamingState } from '../types.js';
+import { hasRedirection } from '@google/gemini-cli-core';
+import {} from './useReactToolScheduler.js';
+vi.mock('@google/gemini-cli-core', async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        hasRedirection: vi.fn(),
+    };
+});
+describe('useTurnActivityMonitor', () => {
+    beforeEach(() => {
+        vi.useFakeTimers();
+        vi.setSystemTime(1000);
+        vi.mocked(hasRedirection).mockImplementation((query) => query.includes('>') || query.includes('>>'));
+    });
+    afterEach(() => {
+        vi.clearAllMocks();
+        vi.useRealTimers();
+    });
+    it('should set operationStartTime when entering Responding state', () => {
+        const { result, rerender } = renderHook(({ state }) => useTurnActivityMonitor(state, null, []), {
+            initialProps: { state: StreamingState.Idle },
+        });
+        expect(result.current.operationStartTime).toBe(0);
+        rerender({ state: StreamingState.Responding });
+        expect(result.current.operationStartTime).toBe(1000);
+    });
+    it('should reset operationStartTime when PTY ID changes while responding', () => {
+        const { result, rerender } = renderHook(({ state, ptyId }) => useTurnActivityMonitor(state, ptyId, []), {
+            initialProps: {
+                state: StreamingState.Responding,
+                ptyId: 'pty-1',
+            },
+        });
+        expect(result.current.operationStartTime).toBe(1000);
+        vi.setSystemTime(2000);
+        rerender({ state: StreamingState.Responding, ptyId: 'pty-2' });
+        expect(result.current.operationStartTime).toBe(2000);
+    });
+    it('should detect redirection from tool calls', () => {
+        // Force mock implementation to ensure it's active
+        vi.mocked(hasRedirection).mockImplementation((q) => q.includes('>'));
+        const { result, rerender } = renderHook(({ state, pendingToolCalls }) => useTurnActivityMonitor(state, null, pendingToolCalls), {
+            initialProps: {
+                state: StreamingState.Responding,
+                pendingToolCalls: [],
+            },
+        });
+        expect(result.current.isRedirectionActive).toBe(false);
+        // Test non-redirected tool call
+        rerender({
+            state: StreamingState.Responding,
+            pendingToolCalls: [
+                {
+                    request: {
+                        name: 'run_shell_command',
+                        args: { command: 'ls -la' },
+                    },
+                    status: 'executing',
+                },
+            ],
+        });
+        expect(result.current.isRedirectionActive).toBe(false);
+        // Test tool call redirection
+        rerender({
+            state: StreamingState.Responding,
+            pendingToolCalls: [
+                {
+                    request: {
+                        name: 'run_shell_command',
+                        args: { command: 'ls > tool_out.txt' },
+                    },
+                    status: 'executing',
+                },
+            ],
+        });
+        expect(result.current.isRedirectionActive).toBe(true);
+    });
+    it('should reset everything when idle', () => {
+        const { result, rerender } = renderHook(({ state }) => useTurnActivityMonitor(state, 'pty-1', []), {
+            initialProps: { state: StreamingState.Responding },
+        });
+        expect(result.current.operationStartTime).toBe(1000);
+        rerender({ state: StreamingState.Idle });
+        expect(result.current.operationStartTime).toBe(0);
+    });
+});
+//# sourceMappingURL=useTurnActivityMonitor.test.js.map

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

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

package/dist/src/ui/hooks/vim.js

@@ -206,8 +206,9 @@ export function useVim(buffer, onSubmit) {
         }
         // Special handling for Enter key to allow command submission (lower priority than completion)
         if (normalizedKey.name === 'return' &&
+            !normalizedKey.alt &&
             !normalizedKey.ctrl &&
-            !normalizedKey.meta) {
+            !normalizedKey.cmd) {
             if (buffer.text.trim() && onSubmit) {
                 // Handle command submission directly
                 const submittedValue = buffer.text;
@@ -229,9 +230,10 @@ export function useVim(buffer, onSubmit) {
     const normalizeKey = useCallback((key) => ({
         name: key.name || '',
         sequence: key.sequence || '',
-        ctrl: key.ctrl || false,
-        meta: key.meta || false,
         shift: key.shift || false,
+        alt: key.alt || false,
+        ctrl: key.ctrl || false,
+        cmd: key.cmd || false,
         insertable: key.insertable || false,
     }), []);
     /**