@umsai/ums-code 0.0.14-v1 → 0.1.4-v2

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

@@ -0,0 +1,292 @@
+/**
+ * @license
+ * Copyright 2025 Qwen
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { renderHook, act } from '@testing-library/react';
+import { useQwenAuth } from './useQwenAuth.js';
+import { AuthType, qwenOAuth2Events, QwenOAuth2Event, } from '@umsai/ums-code-core';
+// Mock the qwenOAuth2Events
+vi.mock('@umsai/ums-code-core', async () => {
+    const actual = await vi.importActual('@umsai/ums-code-core');
+    const mockEmitter = {
+        on: vi.fn().mockReturnThis(),
+        off: vi.fn().mockReturnThis(),
+        emit: vi.fn().mockReturnThis(),
+    };
+    return {
+        ...actual,
+        qwenOAuth2Events: mockEmitter,
+        QwenOAuth2Event: {
+            AuthUri: 'authUri',
+            AuthProgress: 'authProgress',
+        },
+    };
+});
+const mockQwenOAuth2Events = vi.mocked(qwenOAuth2Events);
+describe('useQwenAuth', () => {
+    const mockDeviceAuth = {
+        verification_uri: 'https://oauth.qwen.com/device',
+        verification_uri_complete: 'https://oauth.qwen.com/device?user_code=ABC123',
+        user_code: 'ABC123',
+        expires_in: 1800,
+    };
+    const createMockSettings = (authType) => ({
+        merged: {
+            security: {
+                auth: {
+                    selectedType: authType,
+                },
+            },
+        },
+    });
+    beforeEach(() => {
+        vi.clearAllMocks();
+    });
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+    it('should initialize with default state when not Qwen auth', () => {
+        const settings = createMockSettings(AuthType.USE_GEMINI);
+        const { result } = renderHook(() => useQwenAuth(settings, false));
+        expect(result.current).toEqual({
+            isQwenAuthenticating: false,
+            deviceAuth: null,
+            authStatus: 'idle',
+            authMessage: null,
+            isQwenAuth: false,
+            cancelQwenAuth: expect.any(Function),
+        });
+    });
+    it('should initialize with default state when Qwen auth but not authenticating', () => {
+        const settings = createMockSettings(AuthType.QWEN_OAUTH);
+        const { result } = renderHook(() => useQwenAuth(settings, false));
+        expect(result.current).toEqual({
+            isQwenAuthenticating: false,
+            deviceAuth: null,
+            authStatus: 'idle',
+            authMessage: null,
+            isQwenAuth: true,
+            cancelQwenAuth: expect.any(Function),
+        });
+    });
+    it('should set up event listeners when Qwen auth and authenticating', () => {
+        const settings = createMockSettings(AuthType.QWEN_OAUTH);
+        renderHook(() => useQwenAuth(settings, true));
+        expect(mockQwenOAuth2Events.on).toHaveBeenCalledWith(QwenOAuth2Event.AuthUri, expect.any(Function));
+        expect(mockQwenOAuth2Events.on).toHaveBeenCalledWith(QwenOAuth2Event.AuthProgress, expect.any(Function));
+    });
+    it('should handle device auth event', () => {
+        const settings = createMockSettings(AuthType.QWEN_OAUTH);
+        let handleDeviceAuth;
+        mockQwenOAuth2Events.on.mockImplementation((event, handler) => {
+            if (event === QwenOAuth2Event.AuthUri) {
+                handleDeviceAuth = handler;
+            }
+            return mockQwenOAuth2Events;
+        });
+        const { result } = renderHook(() => useQwenAuth(settings, true));
+        act(() => {
+            handleDeviceAuth(mockDeviceAuth);
+        });
+        expect(result.current.deviceAuth).toEqual(mockDeviceAuth);
+        expect(result.current.authStatus).toBe('polling');
+        expect(result.current.isQwenAuthenticating).toBe(true);
+    });
+    it('should handle auth progress event - success', () => {
+        const settings = createMockSettings(AuthType.QWEN_OAUTH);
+        let handleAuthProgress;
+        mockQwenOAuth2Events.on.mockImplementation((event, handler) => {
+            if (event === QwenOAuth2Event.AuthProgress) {
+                handleAuthProgress = handler;
+            }
+            return mockQwenOAuth2Events;
+        });
+        const { result } = renderHook(() => useQwenAuth(settings, true));
+        act(() => {
+            handleAuthProgress('success', 'Authentication successful!');
+        });
+        expect(result.current.authStatus).toBe('success');
+        expect(result.current.authMessage).toBe('Authentication successful!');
+    });
+    it('should handle auth progress event - error', () => {
+        const settings = createMockSettings(AuthType.QWEN_OAUTH);
+        let handleAuthProgress;
+        mockQwenOAuth2Events.on.mockImplementation((event, handler) => {
+            if (event === QwenOAuth2Event.AuthProgress) {
+                handleAuthProgress = handler;
+            }
+            return mockQwenOAuth2Events;
+        });
+        const { result } = renderHook(() => useQwenAuth(settings, true));
+        act(() => {
+            handleAuthProgress('error', 'Authentication failed');
+        });
+        expect(result.current.authStatus).toBe('error');
+        expect(result.current.authMessage).toBe('Authentication failed');
+    });
+    it('should handle auth progress event - polling', () => {
+        const settings = createMockSettings(AuthType.QWEN_OAUTH);
+        let handleAuthProgress;
+        mockQwenOAuth2Events.on.mockImplementation((event, handler) => {
+            if (event === QwenOAuth2Event.AuthProgress) {
+                handleAuthProgress = handler;
+            }
+            return mockQwenOAuth2Events;
+        });
+        const { result } = renderHook(() => useQwenAuth(settings, true));
+        act(() => {
+            handleAuthProgress('polling', 'Waiting for user authorization...');
+        });
+        expect(result.current.authStatus).toBe('polling');
+        expect(result.current.authMessage).toBe('Waiting for user authorization...');
+    });
+    it('should handle auth progress event - rate_limit', () => {
+        const settings = createMockSettings(AuthType.QWEN_OAUTH);
+        let handleAuthProgress;
+        mockQwenOAuth2Events.on.mockImplementation((event, handler) => {
+            if (event === QwenOAuth2Event.AuthProgress) {
+                handleAuthProgress = handler;
+            }
+            return mockQwenOAuth2Events;
+        });
+        const { result } = renderHook(() => useQwenAuth(settings, true));
+        act(() => {
+            handleAuthProgress('rate_limit', 'Too many requests. The server is rate limiting our requests. Please select a different authentication method or try again later.');
+        });
+        expect(result.current.authStatus).toBe('rate_limit');
+        expect(result.current.authMessage).toBe('Too many requests. The server is rate limiting our requests. Please select a different authentication method or try again later.');
+    });
+    it('should handle auth progress event without message', () => {
+        const settings = createMockSettings(AuthType.QWEN_OAUTH);
+        let handleAuthProgress;
+        mockQwenOAuth2Events.on.mockImplementation((event, handler) => {
+            if (event === QwenOAuth2Event.AuthProgress) {
+                handleAuthProgress = handler;
+            }
+            return mockQwenOAuth2Events;
+        });
+        const { result } = renderHook(() => useQwenAuth(settings, true));
+        act(() => {
+            handleAuthProgress('success');
+        });
+        expect(result.current.authStatus).toBe('success');
+        expect(result.current.authMessage).toBe(null);
+    });
+    it('should clean up event listeners when auth type changes', () => {
+        const qwenSettings = createMockSettings(AuthType.QWEN_OAUTH);
+        const { rerender } = renderHook(({ settings, isAuthenticating }) => useQwenAuth(settings, isAuthenticating), { initialProps: { settings: qwenSettings, isAuthenticating: true } });
+        // Change to non-Qwen auth
+        const geminiSettings = createMockSettings(AuthType.USE_GEMINI);
+        rerender({ settings: geminiSettings, isAuthenticating: true });
+        expect(mockQwenOAuth2Events.off).toHaveBeenCalledWith(QwenOAuth2Event.AuthUri, expect.any(Function));
+        expect(mockQwenOAuth2Events.off).toHaveBeenCalledWith(QwenOAuth2Event.AuthProgress, expect.any(Function));
+    });
+    it('should clean up event listeners when authentication stops', () => {
+        const settings = createMockSettings(AuthType.QWEN_OAUTH);
+        const { rerender } = renderHook(({ isAuthenticating }) => useQwenAuth(settings, isAuthenticating), { initialProps: { isAuthenticating: true } });
+        // Stop authentication
+        rerender({ isAuthenticating: false });
+        expect(mockQwenOAuth2Events.off).toHaveBeenCalledWith(QwenOAuth2Event.AuthUri, expect.any(Function));
+        expect(mockQwenOAuth2Events.off).toHaveBeenCalledWith(QwenOAuth2Event.AuthProgress, expect.any(Function));
+    });
+    it('should clean up event listeners on unmount', () => {
+        const settings = createMockSettings(AuthType.QWEN_OAUTH);
+        const { unmount } = renderHook(() => useQwenAuth(settings, true));
+        unmount();
+        expect(mockQwenOAuth2Events.off).toHaveBeenCalledWith(QwenOAuth2Event.AuthUri, expect.any(Function));
+        expect(mockQwenOAuth2Events.off).toHaveBeenCalledWith(QwenOAuth2Event.AuthProgress, expect.any(Function));
+    });
+    it('should reset state when switching from Qwen auth to another auth type', () => {
+        const qwenSettings = createMockSettings(AuthType.QWEN_OAUTH);
+        let handleDeviceAuth;
+        mockQwenOAuth2Events.on.mockImplementation((event, handler) => {
+            if (event === QwenOAuth2Event.AuthUri) {
+                handleDeviceAuth = handler;
+            }
+            return mockQwenOAuth2Events;
+        });
+        const { result, rerender } = renderHook(({ settings, isAuthenticating }) => useQwenAuth(settings, isAuthenticating), { initialProps: { settings: qwenSettings, isAuthenticating: true } });
+        // Simulate device auth
+        act(() => {
+            handleDeviceAuth(mockDeviceAuth);
+        });
+        expect(result.current.deviceAuth).toEqual(mockDeviceAuth);
+        expect(result.current.authStatus).toBe('polling');
+        // Switch to different auth type
+        const geminiSettings = createMockSettings(AuthType.USE_GEMINI);
+        rerender({ settings: geminiSettings, isAuthenticating: true });
+        expect(result.current.isQwenAuthenticating).toBe(false);
+        expect(result.current.deviceAuth).toBe(null);
+        expect(result.current.authStatus).toBe('idle');
+        expect(result.current.authMessage).toBe(null);
+    });
+    it('should reset state when authentication stops', () => {
+        const settings = createMockSettings(AuthType.QWEN_OAUTH);
+        let handleDeviceAuth;
+        mockQwenOAuth2Events.on.mockImplementation((event, handler) => {
+            if (event === QwenOAuth2Event.AuthUri) {
+                handleDeviceAuth = handler;
+            }
+            return mockQwenOAuth2Events;
+        });
+        const { result, rerender } = renderHook(({ isAuthenticating }) => useQwenAuth(settings, isAuthenticating), { initialProps: { isAuthenticating: true } });
+        // Simulate device auth
+        act(() => {
+            handleDeviceAuth(mockDeviceAuth);
+        });
+        expect(result.current.deviceAuth).toEqual(mockDeviceAuth);
+        expect(result.current.authStatus).toBe('polling');
+        // Stop authentication
+        rerender({ isAuthenticating: false });
+        expect(result.current.isQwenAuthenticating).toBe(false);
+        expect(result.current.deviceAuth).toBe(null);
+        expect(result.current.authStatus).toBe('idle');
+        expect(result.current.authMessage).toBe(null);
+    });
+    it('should handle cancelQwenAuth function', () => {
+        const settings = createMockSettings(AuthType.QWEN_OAUTH);
+        let handleDeviceAuth;
+        mockQwenOAuth2Events.on.mockImplementation((event, handler) => {
+            if (event === QwenOAuth2Event.AuthUri) {
+                handleDeviceAuth = handler;
+            }
+            return mockQwenOAuth2Events;
+        });
+        const { result } = renderHook(() => useQwenAuth(settings, true));
+        // Set up some state
+        act(() => {
+            handleDeviceAuth(mockDeviceAuth);
+        });
+        expect(result.current.deviceAuth).toEqual(mockDeviceAuth);
+        // Cancel auth
+        act(() => {
+            result.current.cancelQwenAuth();
+        });
+        expect(result.current.isQwenAuthenticating).toBe(false);
+        expect(result.current.deviceAuth).toBe(null);
+        expect(result.current.authStatus).toBe('idle');
+        expect(result.current.authMessage).toBe(null);
+    });
+    it('should maintain isQwenAuth flag correctly', () => {
+        // Test with Qwen OAuth
+        const qwenSettings = createMockSettings(AuthType.QWEN_OAUTH);
+        const { result: qwenResult } = renderHook(() => useQwenAuth(qwenSettings, false));
+        expect(qwenResult.current.isQwenAuth).toBe(true);
+        // Test with other auth types
+        const geminiSettings = createMockSettings(AuthType.USE_GEMINI);
+        const { result: geminiResult } = renderHook(() => useQwenAuth(geminiSettings, false));
+        expect(geminiResult.current.isQwenAuth).toBe(false);
+        const oauthSettings = createMockSettings(AuthType.LOGIN_WITH_GOOGLE);
+        const { result: oauthResult } = renderHook(() => useQwenAuth(oauthSettings, false));
+        expect(oauthResult.current.isQwenAuth).toBe(false);
+    });
+    it('should set isQwenAuthenticating to true when starting authentication with Qwen auth', () => {
+        const settings = createMockSettings(AuthType.QWEN_OAUTH);
+        const { result } = renderHook(() => useQwenAuth(settings, true));
+        expect(result.current.isQwenAuthenticating).toBe(true);
+        expect(result.current.authStatus).toBe('idle');
+    });
+});
+//# sourceMappingURL=useQwenAuth.test.js.map

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

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

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

@@ -3,8 +3,8 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Config, ToolCallRequestInfo, ExecutingToolCall, ScheduledToolCall, ValidatingToolCall, WaitingToolCall, CompletedToolCall, CancelledToolCall, EditorType } from '@umsai/ums-code-core';
-import { HistoryItemToolGroup, HistoryItemWithoutId } from '../types.js';
+import type { Config, ToolCallRequestInfo, ExecutingToolCall, ScheduledToolCall, ValidatingToolCall, WaitingToolCall, CompletedToolCall, CancelledToolCall, EditorType } from '@umsai/ums-code-core';
+import type { HistoryItemToolGroup } from '../types.js';
 export type ScheduleFn = (request: ToolCallRequestInfo | ToolCallRequestInfo[], signal: AbortSignal) => void;
 export type MarkToolsAsSubmittedFn = (callIds: string[]) => void;
 export type TrackedScheduledToolCall = ScheduledToolCall & {
@@ -18,6 +18,7 @@ export type TrackedWaitingToolCall = WaitingToolCall & {
 };
 export type TrackedExecutingToolCall = ExecutingToolCall & {
     responseSubmittedToGemini?: boolean;
+    pid?: number;
 };
 export type TrackedCompletedToolCall = CompletedToolCall & {
     responseSubmittedToGemini?: boolean;
@@ -26,7 +27,7 @@ export type TrackedCancelledToolCall = CancelledToolCall & {
     responseSubmittedToGemini?: boolean;
 };
 export type TrackedToolCall = TrackedScheduledToolCall | TrackedValidatingToolCall | TrackedWaitingToolCall | TrackedExecutingToolCall | TrackedCompletedToolCall | TrackedCancelledToolCall;
-export declare function useReactToolScheduler(onComplete: (tools: CompletedToolCall[]) => void, config: Config, setPendingHistoryItem: React.Dispatch<React.SetStateAction<HistoryItemWithoutId | null>>, getPreferredEditor: () => EditorType | undefined, onEditorClose: () => void): [TrackedToolCall[], ScheduleFn, MarkToolsAsSubmittedFn];
+export declare function useReactToolScheduler(onComplete: (tools: CompletedToolCall[]) => Promise<void>, config: Config, getPreferredEditor: () => EditorType | undefined, onEditorClose: () => void): [TrackedToolCall[], ScheduleFn, MarkToolsAsSubmittedFn];
 /**
  * Transforms `TrackedToolCall` objects into `HistoryItemToolGroup` objects for UI display.
  */

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

@@ -3,24 +3,12 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { CoreToolScheduler, } from '@umsai/ums-code-core';
+import { CoreToolScheduler } from '@umsai/ums-code-core';
 import { useCallback, useState, useMemo } from 'react';
-import { ToolCallStatus, } from '../types.js';
-export function useReactToolScheduler(onComplete, config, setPendingHistoryItem, getPreferredEditor, onEditorClose) {
+import { ToolCallStatus } from '../types.js';
+export function useReactToolScheduler(onComplete, config, getPreferredEditor, onEditorClose) {
     const [toolCallsForDisplay, setToolCallsForDisplay] = useState([]);
     const outputUpdateHandler = useCallback((toolCallId, outputChunk) => {
-        setPendingHistoryItem((prevItem) => {
-            if (prevItem?.type === 'tool_group') {
-                return {
-                    ...prevItem,
-                    tools: prevItem.tools.map((toolDisplay) => toolDisplay.callId === toolCallId &&
-                        toolDisplay.status === ToolCallStatus.Executing
-                        ? { ...toolDisplay, resultDisplay: outputChunk }
-                        : toolDisplay),
-                };
-            }
-            return prevItem;
-        });
         setToolCallsForDisplay((prevCalls) => prevCalls.map((tc) => {
             if (tc.request.callId === toolCallId && tc.status === 'executing') {
                 const executingTc = tc;
@@ -28,28 +16,43 @@ export function useReactToolScheduler(onComplete, config, setPendingHistoryItem,
             }
             return tc;
         }));
-    }, [setPendingHistoryItem]);
-    const allToolCallsCompleteHandler = useCallback((completedToolCalls) => {
-        onComplete(completedToolCalls);
+    }, []);
+    const allToolCallsCompleteHandler = useCallback(async (completedToolCalls) => {
+        await onComplete(completedToolCalls);
     }, [onComplete]);
     const toolCallsUpdateHandler = useCallback((updatedCoreToolCalls) => {
         setToolCallsForDisplay((prevTrackedCalls) => updatedCoreToolCalls.map((coreTc) => {
             const existingTrackedCall = prevTrackedCalls.find((ptc) => ptc.request.callId === coreTc.request.callId);
-            const newTrackedCall = {
+            // Start with the new core state, then layer on the existing UI state
+            // to ensure UI-only properties like pid are preserved.
+            const responseSubmittedToGemini = existingTrackedCall?.responseSubmittedToGemini ?? false;
+            if (coreTc.status === 'executing') {
+                return {
+                    ...coreTc,
+                    responseSubmittedToGemini,
+                    liveOutput: existingTrackedCall
+                        ?.liveOutput,
+                    pid: coreTc.pid,
+                };
+            }
+            // For other statuses, explicitly set liveOutput and pid to undefined
+            // to ensure they are not carried over from a previous executing state.
+            return {
                 ...coreTc,
-                responseSubmittedToGemini: existingTrackedCall?.responseSubmittedToGemini ?? false,
+                responseSubmittedToGemini,
+                liveOutput: undefined,
+                pid: undefined,
             };
-            return newTrackedCall;
         }));
     }, [setToolCallsForDisplay]);
     const scheduler = useMemo(() => new CoreToolScheduler({
-        toolRegistry: config.getToolRegistry(),
         outputUpdateHandler,
         onAllToolCallsComplete: allToolCallsCompleteHandler,
         onToolCallsUpdate: toolCallsUpdateHandler,
         getPreferredEditor,
         config,
         onEditorClose,
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
     }), [
         config,
         outputUpdateHandler,
@@ -59,7 +62,7 @@ export function useReactToolScheduler(onComplete, config, setPendingHistoryItem,
         onEditorClose,
     ]);
     const schedule = useCallback((request, signal) => {
-        scheduler.schedule(request, signal);
+        void scheduler.schedule(request, signal);
     }, [scheduler]);
     const markToolsAsSubmitted = useCallback((callIdsToMark) => {
         setToolCallsForDisplay((prevCalls) => prevCalls.map((tc) => callIdsToMark.includes(tc.request.callId)
@@ -100,20 +103,21 @@ function mapCoreStatusToDisplayStatus(coreStatus) {
 export function mapToDisplay(toolOrTools) {
     const toolCalls = Array.isArray(toolOrTools) ? toolOrTools : [toolOrTools];
     const toolDisplays = toolCalls.map((trackedCall) => {
-        let displayName = trackedCall.request.name;
-        let description = '';
+        let displayName;
+        let description;
         let renderOutputAsMarkdown = false;
-        const currentToolInstance = 'tool' in trackedCall && trackedCall.tool
-            ? trackedCall.tool
-            : undefined;
-        if (currentToolInstance) {
-            displayName = currentToolInstance.displayName;
-            description = currentToolInstance.getDescription(trackedCall.request.args);
-            renderOutputAsMarkdown = currentToolInstance.isOutputMarkdown;
-        }
-        else if ('request' in trackedCall && 'args' in trackedCall.request) {
+        if (trackedCall.status === 'error') {
+            displayName =
+                trackedCall.tool === undefined
+                    ? trackedCall.request.name
+                    : trackedCall.tool.displayName;
             description = JSON.stringify(trackedCall.request.args);
         }
+        else {
+            displayName = trackedCall.tool.displayName;
+            description = trackedCall.invocation.getDescription();
+            renderOutputAsMarkdown = trackedCall.tool.isOutputMarkdown;
+        }
         const baseDisplayProperties = {
             callId: trackedCall.request.callId,
             name: displayName,
@@ -127,11 +131,11 @@ export function mapToDisplay(toolOrTools) {
                     status: mapCoreStatusToDisplayStatus(trackedCall.status),
                     resultDisplay: trackedCall.response.resultDisplay,
                     confirmationDetails: undefined,
+                    outputFile: trackedCall.response.outputFile,
                 };
             case 'error':
                 return {
                     ...baseDisplayProperties,
-                    name: currentToolInstance?.displayName ?? trackedCall.request.name,
                     status: mapCoreStatusToDisplayStatus(trackedCall.status),
                     resultDisplay: trackedCall.response.resultDisplay,
                     confirmationDetails: undefined,
@@ -156,6 +160,7 @@ export function mapToDisplay(toolOrTools) {
                     status: mapCoreStatusToDisplayStatus(trackedCall.status),
                     resultDisplay: trackedCall.liveOutput ?? undefined,
                     confirmationDetails: undefined,
+                    ptyId: trackedCall.pid,
                 };
             case 'validating': // Fallthrough
             case 'scheduled':

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

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

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

@@ -3,8 +3,8 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { TextBuffer } from '../components/shared/text-buffer.js';
-import { Suggestion } from '../components/SuggestionsDisplay.js';
+import type { TextBuffer } from '../components/shared/text-buffer.js';
+import type { Suggestion } from '../components/SuggestionsDisplay.js';
 export interface UseReverseSearchCompletionReturn {
     suggestions: Suggestion[];
     activeSuggestionIndex: number;
@@ -16,4 +16,4 @@ export interface UseReverseSearchCompletionReturn {
     handleAutocomplete: (i: number) => void;
     resetCompletionState: () => void;
 }
-export declare function useReverseSearchCompletion(buffer: TextBuffer, shellHistory: readonly string[], reverseSearchActive: boolean): UseReverseSearchCompletionReturn;
+export declare function useReverseSearchCompletion(buffer: TextBuffer, history: readonly string[], reverseSearchActive: boolean): UseReverseSearchCompletionReturn;

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

@@ -3,37 +3,84 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { useEffect, useCallback } from 'react';
+import { useState, useEffect, useMemo, useCallback, useRef } from 'react';
 import { useCompletion } from './useCompletion.js';
-export function useReverseSearchCompletion(buffer, shellHistory, reverseSearchActive) {
-    const { suggestions, activeSuggestionIndex, visibleStartIndex, showSuggestions, isLoadingSuggestions, setSuggestions, setShowSuggestions, setActiveSuggestionIndex, resetCompletionState, navigateUp, navigateDown, } = useCompletion();
+function useDebouncedValue(value, delay = 200) {
+    const [debounced, setDebounced] = useState(value);
     useEffect(() => {
-        if (!reverseSearchActive) {
-            resetCompletionState();
+        const handle = setTimeout(() => setDebounced(value), delay);
+        return () => clearTimeout(handle);
+    }, [value, delay]);
+    return debounced;
+}
+export function useReverseSearchCompletion(buffer, history, reverseSearchActive) {
+    const { suggestions, activeSuggestionIndex, visibleStartIndex, showSuggestions, isLoadingSuggestions, setSuggestions, setShowSuggestions, setActiveSuggestionIndex, resetCompletionState, navigateUp, navigateDown, setVisibleStartIndex, } = useCompletion();
+    const debouncedQuery = useDebouncedValue(buffer.text, 100);
+    // incremental search
+    const prevQueryRef = useRef('');
+    const prevMatchesRef = useRef([]);
+    // Clear incremental cache when activating reverse search
+    useEffect(() => {
+        if (reverseSearchActive) {
+            prevQueryRef.current = '';
+            prevMatchesRef.current = [];
+        }
+    }, [reverseSearchActive]);
+    // Also clear cache when history changes so new items are considered
+    useEffect(() => {
+        prevQueryRef.current = '';
+        prevMatchesRef.current = [];
+    }, [history]);
+    const searchHistory = useCallback((query, items) => {
+        const out = [];
+        for (let i = 0; i < items.length; i++) {
+            const cmd = items[i];
+            const idx = cmd.toLowerCase().indexOf(query);
+            if (idx !== -1) {
+                out.push({ label: cmd, value: cmd, matchedIndex: idx });
+            }
         }
-    }, [reverseSearchActive, resetCompletionState]);
+        return out;
+    }, []);
+    const matches = useMemo(() => {
+        if (!reverseSearchActive)
+            return [];
+        if (debouncedQuery.length === 0)
+            return history.map((cmd) => ({
+                label: cmd,
+                value: cmd,
+                matchedIndex: -1,
+            }));
+        const query = debouncedQuery.toLowerCase();
+        const canUseCache = prevQueryRef.current &&
+            query.startsWith(prevQueryRef.current) &&
+            prevMatchesRef.current.length > 0;
+        const source = canUseCache
+            ? prevMatchesRef.current.map((m) => m.value)
+            : history;
+        return searchHistory(query, source);
+    }, [debouncedQuery, history, reverseSearchActive, searchHistory]);
     useEffect(() => {
         if (!reverseSearchActive) {
+            resetCompletionState();
             return;
         }
-        const q = buffer.text.toLowerCase();
-        const matches = shellHistory.reduce((acc, cmd) => {
-            const idx = cmd.toLowerCase().indexOf(q);
-            if (idx !== -1) {
-                acc.push({ label: cmd, value: cmd, matchedIndex: idx });
-            }
-            return acc;
-        }, []);
         setSuggestions(matches);
-        setShowSuggestions(matches.length > 0);
-        setActiveSuggestionIndex(matches.length > 0 ? 0 : -1);
+        const hasAny = matches.length > 0;
+        setShowSuggestions(hasAny);
+        setActiveSuggestionIndex(hasAny ? 0 : -1);
+        setVisibleStartIndex(0);
+        prevQueryRef.current = debouncedQuery.toLowerCase();
+        prevMatchesRef.current = matches;
     }, [
-        buffer.text,
-        shellHistory,
+        debouncedQuery,
+        matches,
         reverseSearchActive,
-        setActiveSuggestionIndex,
-        setShowSuggestions,
         setSuggestions,
+        setShowSuggestions,
+        setActiveSuggestionIndex,
+        setVisibleStartIndex,
+        resetCompletionState,
     ]);
     const handleAutocomplete = useCallback((i) => {
         if (i < 0 || i >= suggestions.length)