@google/gemini-cli 0.7.0-nightly.20250912.68035591 → 0.7.0-preview.0

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

@@ -0,0 +1,28 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { useEffect } from 'react';
+import process from 'node:process';
+import { MessageType } from '../types.js';
+export const MEMORY_WARNING_THRESHOLD = 7 * 1024 * 1024 * 1024; // 7GB in bytes
+export const MEMORY_CHECK_INTERVAL = 60 * 1000; // one minute
+export const useMemoryMonitor = ({ addItem }) => {
+    useEffect(() => {
+        const intervalId = setInterval(() => {
+            const usage = process.memoryUsage().rss;
+            if (usage > MEMORY_WARNING_THRESHOLD) {
+                addItem({
+                    type: MessageType.WARNING,
+                    text: `High memory usage detected: ${(usage /
+                        (1024 * 1024 * 1024)).toFixed(2)} GB. ` +
+                        'If you experience a crash, please file a bug report by running `/bug`',
+                }, Date.now());
+                clearInterval(intervalId);
+            }
+        }, MEMORY_CHECK_INTERVAL);
+        return () => clearInterval(intervalId);
+    }, [addItem]);
+};
+//# sourceMappingURL=useMemoryMonitor.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useMemoryMonitor.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useMemoryMonitor.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAA6B,WAAW,EAAE,MAAM,aAAa,CAAC;AAErE,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC,eAAe;AAC/E,MAAM,CAAC,MAAM,qBAAqB,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,aAAa;AAM7D,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,EAAE,OAAO,EAAwB,EAAE,EAAE;IACpE,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,EAAE;YAClC,MAAM,KAAK,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC;YACxC,IAAI,KAAK,GAAG,wBAAwB,EAAE,CAAC;gBACrC,OAAO,CACL;oBACE,IAAI,EAAE,WAAW,CAAC,OAAO;oBACzB,IAAI,EACF,+BAA+B,CAC7B,KAAK;wBACL,CAAC,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC,CACrB,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO;wBACnB,uEAAuE;iBAC1E,EACD,IAAI,CAAC,GAAG,EAAE,CACX,CAAC;gBACF,aAAa,CAAC,UAAU,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC,EAAE,qBAAqB,CAAC,CAAC;QAE1B,OAAO,GAAG,EAAE,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IACzC,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;AAChB,CAAC,CAAC"}

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

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

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

@@ -0,0 +1,57 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { renderHook } from '@testing-library/react';
+import { vi } from 'vitest';
+import { useMemoryMonitor, MEMORY_CHECK_INTERVAL, MEMORY_WARNING_THRESHOLD, } from './useMemoryMonitor.js';
+import process from 'node:process';
+import { MessageType } from '../types.js';
+describe('useMemoryMonitor', () => {
+    const memoryUsageSpy = vi.spyOn(process, 'memoryUsage');
+    const addItem = vi.fn();
+    beforeEach(() => {
+        vi.useFakeTimers();
+        vi.clearAllMocks();
+    });
+    afterEach(() => {
+        vi.useRealTimers();
+    });
+    it('should not warn when memory usage is below threshold', () => {
+        memoryUsageSpy.mockReturnValue({
+            rss: MEMORY_WARNING_THRESHOLD / 2,
+        });
+        renderHook(() => useMemoryMonitor({ addItem }));
+        vi.advanceTimersByTime(10000);
+        expect(addItem).not.toHaveBeenCalled();
+    });
+    it('should warn when memory usage is above threshold', () => {
+        memoryUsageSpy.mockReturnValue({
+            rss: MEMORY_WARNING_THRESHOLD * 1.5,
+        });
+        renderHook(() => useMemoryMonitor({ addItem }));
+        vi.advanceTimersByTime(MEMORY_CHECK_INTERVAL);
+        expect(addItem).toHaveBeenCalledTimes(1);
+        expect(addItem).toHaveBeenCalledWith({
+            type: MessageType.WARNING,
+            text: 'High memory usage detected: 10.50 GB. If you experience a crash, please file a bug report by running `/bug`',
+        }, expect.any(Number));
+    });
+    it('should only warn once', () => {
+        memoryUsageSpy.mockReturnValue({
+            rss: MEMORY_WARNING_THRESHOLD * 1.5,
+        });
+        const { rerender } = renderHook(() => useMemoryMonitor({ addItem }));
+        vi.advanceTimersByTime(MEMORY_CHECK_INTERVAL);
+        expect(addItem).toHaveBeenCalledTimes(1);
+        // Rerender and advance timers, should not warn again
+        memoryUsageSpy.mockReturnValue({
+            rss: MEMORY_WARNING_THRESHOLD * 1.5,
+        });
+        rerender();
+        vi.advanceTimersByTime(MEMORY_CHECK_INTERVAL);
+        expect(addItem).toHaveBeenCalledTimes(1);
+    });
+});
+//# sourceMappingURL=useMemoryMonitor.test.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useMemoryMonitor.test.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useMemoryMonitor.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC5B,OAAO,EACL,gBAAgB,EAChB,qBAAqB,EACrB,wBAAwB,GACzB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAChC,MAAM,cAAc,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IACxD,MAAM,OAAO,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;IAExB,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;QACnB,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sDAAsD,EAAE,GAAG,EAAE;QAC9D,cAAc,CAAC,eAAe,CAAC;YAC7B,GAAG,EAAE,wBAAwB,GAAG,CAAC;SACZ,CAAC,CAAC;QACzB,UAAU,CAAC,GAAG,EAAE,CAAC,gBAAgB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;QAChD,EAAE,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;QAC9B,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;IACzC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;QAC1D,cAAc,CAAC,eAAe,CAAC;YAC7B,GAAG,EAAE,wBAAwB,GAAG,GAAG;SACd,CAAC,CAAC;QACzB,UAAU,CAAC,GAAG,EAAE,CAAC,gBAAgB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;QAChD,EAAE,CAAC,mBAAmB,CAAC,qBAAqB,CAAC,CAAC;QAC9C,MAAM,CAAC,OAAO,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QACzC,MAAM,CAAC,OAAO,CAAC,CAAC,oBAAoB,CAClC;YACE,IAAI,EAAE,WAAW,CAAC,OAAO;YACzB,IAAI,EAAE,6GAA6G;SACpH,EACD,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CACnB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uBAAuB,EAAE,GAAG,EAAE;QAC/B,cAAc,CAAC,eAAe,CAAC;YAC7B,GAAG,EAAE,wBAAwB,GAAG,GAAG;SACd,CAAC,CAAC;QACzB,MAAM,EAAE,QAAQ,EAAE,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,gBAAgB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;QACrE,EAAE,CAAC,mBAAmB,CAAC,qBAAqB,CAAC,CAAC;QAC9C,MAAM,CAAC,OAAO,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAEzC,qDAAqD;QACrD,cAAc,CAAC,eAAe,CAAC;YAC7B,GAAG,EAAE,wBAAwB,GAAG,GAAG;SACd,CAAC,CAAC;QACzB,QAAQ,EAAE,CAAC;QACX,EAAE,CAAC,mBAAmB,CAAC,qBAAqB,CAAC,CAAC;QAC9C,MAAM,CAAC,OAAO,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

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

@@ -0,0 +1,12 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+interface UseModelCommandReturn {
+    isModelDialogOpen: boolean;
+    openModelDialog: () => void;
+    closeModelDialog: () => void;
+}
+export declare const useModelCommand: () => UseModelCommandReturn;
+export {};

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

@@ -0,0 +1,21 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { useState, useCallback } from 'react';
+export const useModelCommand = () => {
+    const [isModelDialogOpen, setIsModelDialogOpen] = useState(false);
+    const openModelDialog = useCallback(() => {
+        setIsModelDialogOpen(true);
+    }, []);
+    const closeModelDialog = useCallback(() => {
+        setIsModelDialogOpen(false);
+    }, []);
+    return {
+        isModelDialogOpen,
+        openModelDialog,
+        closeModelDialog,
+    };
+};
+//# sourceMappingURL=useModelCommand.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useModelCommand.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useModelCommand.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAQ9C,MAAM,CAAC,MAAM,eAAe,GAAG,GAA0B,EAAE;IACzD,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAElE,MAAM,eAAe,GAAG,WAAW,CAAC,GAAG,EAAE;QACvC,oBAAoB,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,gBAAgB,GAAG,WAAW,CAAC,GAAG,EAAE;QACxC,oBAAoB,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO;QACL,iBAAiB;QACjB,eAAe;QACf,gBAAgB;KACjB,CAAC;AACJ,CAAC,CAAC"}

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

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

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

@@ -0,0 +1,35 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect } from 'vitest';
+import { renderHook, act } from '@testing-library/react';
+import { useModelCommand } from './useModelCommand.js';
+describe('useModelCommand', () => {
+    it('should initialize with the model dialog closed', () => {
+        const { result } = renderHook(() => useModelCommand());
+        expect(result.current.isModelDialogOpen).toBe(false);
+    });
+    it('should open the model dialog when openModelDialog is called', () => {
+        const { result } = renderHook(() => useModelCommand());
+        act(() => {
+            result.current.openModelDialog();
+        });
+        expect(result.current.isModelDialogOpen).toBe(true);
+    });
+    it('should close the model dialog when closeModelDialog is called', () => {
+        const { result } = renderHook(() => useModelCommand());
+        // Open it first
+        act(() => {
+            result.current.openModelDialog();
+        });
+        expect(result.current.isModelDialogOpen).toBe(true);
+        // Then close it
+        act(() => {
+            result.current.closeModelDialog();
+        });
+        expect(result.current.isModelDialogOpen).toBe(false);
+    });
+});
+//# sourceMappingURL=useModelCommand.test.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useModelCommand.test.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useModelCommand.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,EAAE,CAAC,gDAAgD,EAAE,GAAG,EAAE;QACxD,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,eAAe,EAAE,CAAC,CAAC;QACvD,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6DAA6D,EAAE,GAAG,EAAE;QACrE,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,eAAe,EAAE,CAAC,CAAC;QAEvD,GAAG,CAAC,GAAG,EAAE;YACP,MAAM,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;QACnC,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;QACvE,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,eAAe,EAAE,CAAC,CAAC;QAEvD,gBAAgB;QAChB,GAAG,CAAC,GAAG,EAAE;YACP,MAAM,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;QACnC,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEpD,gBAAgB;QAChB,GAAG,CAAC,GAAG,EAAE;YACP,MAAM,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC;QACpC,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

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

@@ -0,0 +1,17 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { TrustLevel } from '../../config/trustedFolders.js';
+import { type UseHistoryManagerReturn } from './useHistoryManager.js';
+export declare const usePermissionsModifyTrust: (onExit: () => void, addItem: UseHistoryManagerReturn["addItem"]) => {
+    cwd: string;
+    currentTrustLevel: TrustLevel | undefined;
+    isInheritedTrustFromParent: boolean;
+    isInheritedTrustFromIde: boolean;
+    needsRestart: boolean;
+    updateTrustLevel: (trustLevel: TrustLevel) => void;
+    commitTrustLevelChange: () => void;
+    isFolderTrustEnabled: boolean;
+};

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

@@ -0,0 +1,78 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { useState, useCallback } from 'react';
+import * as process from 'node:process';
+import { loadTrustedFolders, TrustLevel, isWorkspaceTrusted, } from '../../config/trustedFolders.js';
+import { useSettings } from '../contexts/SettingsContext.js';
+import { MessageType } from '../types.js';
+import {} from './useHistoryManager.js';
+function getInitialTrustState(settings, cwd) {
+    const folders = loadTrustedFolders();
+    const explicitTrustLevel = folders.user.config[cwd];
+    const { isTrusted, source } = isWorkspaceTrusted(settings.merged);
+    const isInheritedTrust = isTrusted &&
+        (!explicitTrustLevel || explicitTrustLevel === TrustLevel.DO_NOT_TRUST);
+    return {
+        currentTrustLevel: explicitTrustLevel,
+        isInheritedTrustFromParent: !!(source === 'file' && isInheritedTrust),
+        isInheritedTrustFromIde: !!(source === 'ide' && isInheritedTrust),
+    };
+}
+export const usePermissionsModifyTrust = (onExit, addItem) => {
+    const settings = useSettings();
+    const cwd = process.cwd();
+    const [initialState] = useState(() => getInitialTrustState(settings, cwd));
+    const [currentTrustLevel] = useState(initialState.currentTrustLevel);
+    const [pendingTrustLevel, setPendingTrustLevel] = useState();
+    const [isInheritedTrustFromParent] = useState(initialState.isInheritedTrustFromParent);
+    const [isInheritedTrustFromIde] = useState(initialState.isInheritedTrustFromIde);
+    const [needsRestart, setNeedsRestart] = useState(false);
+    const isFolderTrustEnabled = !!settings.merged.security?.folderTrust?.enabled;
+    const updateTrustLevel = useCallback((trustLevel) => {
+        const wasTrusted = isWorkspaceTrusted(settings.merged).isTrusted;
+        // Create a temporary config to check the new trust status without writing
+        const currentConfig = loadTrustedFolders().user.config;
+        const newConfig = { ...currentConfig, [cwd]: trustLevel };
+        const { isTrusted, source } = isWorkspaceTrusted(settings.merged, newConfig);
+        if (trustLevel === TrustLevel.DO_NOT_TRUST && isTrusted) {
+            let message = 'Note: This folder is still trusted because the connected IDE workspace is trusted.';
+            if (source === 'file') {
+                message =
+                    'Note: This folder is still trusted because a parent folder is trusted.';
+            }
+            addItem({
+                type: MessageType.WARNING,
+                text: message,
+            }, Date.now());
+        }
+        if (wasTrusted !== isTrusted) {
+            setPendingTrustLevel(trustLevel);
+            setNeedsRestart(true);
+        }
+        else {
+            const folders = loadTrustedFolders();
+            folders.setValue(cwd, trustLevel);
+            onExit();
+        }
+    }, [cwd, settings.merged, onExit, addItem]);
+    const commitTrustLevelChange = useCallback(() => {
+        if (pendingTrustLevel) {
+            const folders = loadTrustedFolders();
+            folders.setValue(cwd, pendingTrustLevel);
+        }
+    }, [cwd, pendingTrustLevel]);
+    return {
+        cwd,
+        currentTrustLevel,
+        isInheritedTrustFromParent,
+        isInheritedTrustFromIde,
+        needsRestart,
+        updateTrustLevel,
+        commitTrustLevelChange,
+        isFolderTrustEnabled,
+    };
+};
+//# sourceMappingURL=usePermissionsModifyTrust.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"usePermissionsModifyTrust.js","sourceRoot":"","sources":["../../../../src/ui/hooks/usePermissionsModifyTrust.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAC9C,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,EACL,kBAAkB,EAClB,UAAU,EACV,kBAAkB,GACnB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAE7D,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAgC,MAAM,wBAAwB,CAAC;AAStE,SAAS,oBAAoB,CAC3B,QAAwB,EACxB,GAAW;IAEX,MAAM,OAAO,GAAG,kBAAkB,EAAE,CAAC;IACrC,MAAM,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACpD,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,kBAAkB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAElE,MAAM,gBAAgB,GACpB,SAAS;QACT,CAAC,CAAC,kBAAkB,IAAI,kBAAkB,KAAK,UAAU,CAAC,YAAY,CAAC,CAAC;IAE1E,OAAO;QACL,iBAAiB,EAAE,kBAAkB;QACrC,0BAA0B,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,MAAM,IAAI,gBAAgB,CAAC;QACrE,uBAAuB,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,KAAK,IAAI,gBAAgB,CAAC;KAClE,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,yBAAyB,GAAG,CACvC,MAAkB,EAClB,OAA2C,EAC3C,EAAE;IACF,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAE1B,MAAM,CAAC,YAAY,CAAC,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,oBAAoB,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;IAE3E,MAAM,CAAC,iBAAiB,CAAC,GAAG,QAAQ,CAClC,YAAY,CAAC,iBAAiB,CAC/B,CAAC;IACF,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAAG,QAAQ,EAEvD,CAAC;IACJ,MAAM,CAAC,0BAA0B,CAAC,GAAG,QAAQ,CAC3C,YAAY,CAAC,0BAA0B,CACxC,CAAC;IACF,MAAM,CAAC,uBAAuB,CAAC,GAAG,QAAQ,CACxC,YAAY,CAAC,uBAAuB,CACrC,CAAC;IACF,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAExD,MAAM,oBAAoB,GAAG,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,WAAW,EAAE,OAAO,CAAC;IAE9E,MAAM,gBAAgB,GAAG,WAAW,CAClC,CAAC,UAAsB,EAAE,EAAE;QACzB,MAAM,UAAU,GAAG,kBAAkB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC;QAEjE,0EAA0E;QAC1E,MAAM,aAAa,GAAG,kBAAkB,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC;QACvD,MAAM,SAAS,GAAG,EAAE,GAAG,aAAa,EAAE,CAAC,GAAG,CAAC,EAAE,UAAU,EAAE,CAAC;QAE1D,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,kBAAkB,CAC9C,QAAQ,CAAC,MAAM,EACf,SAAS,CACV,CAAC;QAEF,IAAI,UAAU,KAAK,UAAU,CAAC,YAAY,IAAI,SAAS,EAAE,CAAC;YACxD,IAAI,OAAO,GACT,oFAAoF,CAAC;YACvF,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;gBACtB,OAAO;oBACL,wEAAwE,CAAC;YAC7E,CAAC;YACD,OAAO,CACL;gBACE,IAAI,EAAE,WAAW,CAAC,OAAO;gBACzB,IAAI,EAAE,OAAO;aACd,EACD,IAAI,CAAC,GAAG,EAAE,CACX,CAAC;QACJ,CAAC;QAED,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC7B,oBAAoB,CAAC,UAAU,CAAC,CAAC;YACjC,eAAe,CAAC,IAAI,CAAC,CAAC;QACxB,CAAC;aAAM,CAAC;YACN,MAAM,OAAO,GAAG,kBAAkB,EAAE,CAAC;YACrC,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;YAClC,MAAM,EAAE,CAAC;QACX,CAAC;IACH,CAAC,EACD,CAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CACxC,CAAC;IAEF,MAAM,sBAAsB,GAAG,WAAW,CAAC,GAAG,EAAE;QAC9C,IAAI,iBAAiB,EAAE,CAAC;YACtB,MAAM,OAAO,GAAG,kBAAkB,EAAE,CAAC;YACrC,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC,EAAE,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC,CAAC;IAE7B,OAAO;QACL,GAAG;QACH,iBAAiB;QACjB,0BAA0B;QAC1B,uBAAuB;QACvB,YAAY;QACZ,gBAAgB;QAChB,sBAAsB;QACtB,oBAAoB;KACrB,CAAC;AACJ,CAAC,CAAC"}

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

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

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

@@ -0,0 +1,182 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/// <reference types="vitest/globals" />
+import { describe, it, expect, vi, beforeEach, afterEach, } from 'vitest';
+import { renderHook, act } from '@testing-library/react';
+import { usePermissionsModifyTrust } from './usePermissionsModifyTrust.js';
+import { TrustLevel } from '../../config/trustedFolders.js';
+// Hoist mocks
+const mockedCwd = vi.hoisted(() => vi.fn());
+const mockedLoadTrustedFolders = vi.hoisted(() => vi.fn());
+const mockedIsWorkspaceTrusted = vi.hoisted(() => vi.fn());
+const mockedUseSettings = vi.hoisted(() => vi.fn());
+// Mock modules
+vi.mock('node:process', () => ({
+    cwd: mockedCwd,
+}));
+vi.mock('../../config/trustedFolders.js', () => ({
+    loadTrustedFolders: mockedLoadTrustedFolders,
+    isWorkspaceTrusted: mockedIsWorkspaceTrusted,
+    TrustLevel: {
+        TRUST_FOLDER: 'TRUST_FOLDER',
+        TRUST_PARENT: 'TRUST_PARENT',
+        DO_NOT_TRUST: 'DO_NOT_TRUST',
+    },
+}));
+vi.mock('../contexts/SettingsContext.js', () => ({
+    useSettings: mockedUseSettings,
+}));
+describe('usePermissionsModifyTrust', () => {
+    let mockOnExit;
+    let mockAddItem;
+    beforeEach(() => {
+        mockAddItem = vi.fn();
+        mockOnExit = vi.fn();
+        mockedCwd.mockReturnValue('/test/dir');
+        mockedUseSettings.mockReturnValue({
+            merged: {
+                security: {
+                    folderTrust: {
+                        enabled: true,
+                    },
+                },
+            },
+        });
+        mockedIsWorkspaceTrusted.mockReturnValue({
+            isTrusted: undefined,
+            source: undefined,
+        });
+    });
+    afterEach(() => {
+        vi.resetAllMocks();
+    });
+    it('should initialize with the correct trust level', () => {
+        mockedLoadTrustedFolders.mockReturnValue({
+            user: { config: { '/test/dir': TrustLevel.TRUST_FOLDER } },
+        });
+        mockedIsWorkspaceTrusted.mockReturnValue({
+            isTrusted: true,
+            source: 'file',
+        });
+        const { result } = renderHook(() => usePermissionsModifyTrust(mockOnExit, mockAddItem));
+        expect(result.current.currentTrustLevel).toBe(TrustLevel.TRUST_FOLDER);
+    });
+    it('should detect inherited trust from parent', () => {
+        mockedLoadTrustedFolders.mockReturnValue({
+            user: { config: {} },
+            setValue: vi.fn(),
+        });
+        mockedIsWorkspaceTrusted.mockReturnValue({
+            isTrusted: true,
+            source: 'file',
+        });
+        const { result } = renderHook(() => usePermissionsModifyTrust(mockOnExit, mockAddItem));
+        expect(result.current.isInheritedTrustFromParent).toBe(true);
+        expect(result.current.isInheritedTrustFromIde).toBe(false);
+    });
+    it('should detect inherited trust from IDE', () => {
+        mockedLoadTrustedFolders.mockReturnValue({
+            user: { config: {} }, // No explicit trust
+        });
+        mockedIsWorkspaceTrusted.mockReturnValue({
+            isTrusted: true,
+            source: 'ide',
+        });
+        const { result } = renderHook(() => usePermissionsModifyTrust(mockOnExit, mockAddItem));
+        expect(result.current.isInheritedTrustFromIde).toBe(true);
+        expect(result.current.isInheritedTrustFromParent).toBe(false);
+    });
+    it('should set needsRestart but not save when trust changes', () => {
+        const mockSetValue = vi.fn();
+        mockedLoadTrustedFolders.mockReturnValue({
+            user: { config: {} },
+            setValue: mockSetValue,
+        });
+        mockedIsWorkspaceTrusted
+            .mockReturnValueOnce({ isTrusted: false, source: 'file' })
+            .mockReturnValueOnce({ isTrusted: true, source: 'file' });
+        const { result } = renderHook(() => usePermissionsModifyTrust(mockOnExit, mockAddItem));
+        act(() => {
+            result.current.updateTrustLevel(TrustLevel.TRUST_FOLDER);
+        });
+        expect(result.current.needsRestart).toBe(true);
+        expect(mockSetValue).not.toHaveBeenCalled();
+    });
+    it('should save immediately if trust does not change', () => {
+        const mockSetValue = vi.fn();
+        mockedLoadTrustedFolders.mockReturnValue({
+            user: { config: {} },
+            setValue: mockSetValue,
+        });
+        mockedIsWorkspaceTrusted.mockReturnValue({
+            isTrusted: true,
+            source: 'file',
+        });
+        const { result } = renderHook(() => usePermissionsModifyTrust(mockOnExit, mockAddItem));
+        act(() => {
+            result.current.updateTrustLevel(TrustLevel.TRUST_PARENT);
+        });
+        expect(result.current.needsRestart).toBe(false);
+        expect(mockSetValue).toHaveBeenCalledWith('/test/dir', TrustLevel.TRUST_PARENT);
+        expect(mockOnExit).toHaveBeenCalled();
+    });
+    it('should commit the pending trust level change', () => {
+        const mockSetValue = vi.fn();
+        mockedLoadTrustedFolders.mockReturnValue({
+            user: { config: {} },
+            setValue: mockSetValue,
+        });
+        mockedIsWorkspaceTrusted
+            .mockReturnValueOnce({ isTrusted: false, source: 'file' })
+            .mockReturnValueOnce({ isTrusted: true, source: 'file' });
+        const { result } = renderHook(() => usePermissionsModifyTrust(mockOnExit, mockAddItem));
+        act(() => {
+            result.current.updateTrustLevel(TrustLevel.TRUST_FOLDER);
+        });
+        expect(result.current.needsRestart).toBe(true);
+        act(() => {
+            result.current.commitTrustLevelChange();
+        });
+        expect(mockSetValue).toHaveBeenCalledWith('/test/dir', TrustLevel.TRUST_FOLDER);
+    });
+    it('should add warning when setting DO_NOT_TRUST but still trusted by parent', () => {
+        mockedLoadTrustedFolders.mockReturnValue({
+            user: { config: {} },
+            setValue: vi.fn(),
+        });
+        mockedIsWorkspaceTrusted.mockReturnValue({
+            isTrusted: true,
+            source: 'file',
+        });
+        const { result } = renderHook(() => usePermissionsModifyTrust(mockOnExit, mockAddItem));
+        act(() => {
+            result.current.updateTrustLevel(TrustLevel.DO_NOT_TRUST);
+        });
+        expect(mockAddItem).toHaveBeenCalledWith({
+            type: 'warning',
+            text: 'Note: This folder is still trusted because a parent folder is trusted.',
+        }, expect.any(Number));
+    });
+    it('should add warning when setting DO_NOT_TRUST but still trusted by IDE', () => {
+        mockedLoadTrustedFolders.mockReturnValue({
+            user: { config: {} },
+            setValue: vi.fn(),
+        });
+        mockedIsWorkspaceTrusted.mockReturnValue({
+            isTrusted: true,
+            source: 'ide',
+        });
+        const { result } = renderHook(() => usePermissionsModifyTrust(mockOnExit, mockAddItem));
+        act(() => {
+            result.current.updateTrustLevel(TrustLevel.DO_NOT_TRUST);
+        });
+        expect(mockAddItem).toHaveBeenCalledWith({
+            type: 'warning',
+            text: 'Note: This folder is still trusted because the connected IDE workspace is trusted.',
+        }, expect.any(Number));
+    });
+});
+//# sourceMappingURL=usePermissionsModifyTrust.test.js.map

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

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

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

@@ -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)

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

@@ -1 +1 @@
-{"version":3,"file":"useReverseSearchCompletion.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useReverseSearchCompletion.tsx"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAgBnD,MAAM,UAAU,0BAA0B,CACxC,MAAkB,EAClB,YAA+B,EAC/B,mBAA4B;IAE5B,MAAM,EACJ,WAAW,EACX,qBAAqB,EACrB,iBAAiB,EACjB,eAAe,EACf,oBAAoB,EAEpB,cAAc,EACd,kBAAkB,EAClB,wBAAwB,EACxB,oBAAoB,EACpB,UAAU,EACV,YAAY,GACb,GAAG,aAAa,EAAE,CAAC;IAEpB,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,mBAAmB,EAAE,CAAC;YACzB,oBAAoB,EAAE,CAAC;QACzB,CAAC;IACH,CAAC,EAAE,CAAC,mBAAmB,EAAE,oBAAoB,CAAC,CAAC,CAAC;IAEhD,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,mBAAmB,EAAE,CAAC;YACzB,OAAO;QACT,CAAC;QAED,MAAM,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;QACpC,MAAM,OAAO,GAAG,YAAY,CAAC,MAAM,CAAe,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YAC7D,MAAM,GAAG,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YACzC,IAAI,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC;gBACf,GAAG,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC,CAAC;YAC1D,CAAC;YACD,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAAE,CAAC,CAAC;QAEP,cAAc,CAAC,OAAO,CAAC,CAAC;QACxB,kBAAkB,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACvC,wBAAwB,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACxD,CAAC,EAAE;QACD,MAAM,CAAC,IAAI;QACX,YAAY;QACZ,mBAAmB;QACnB,wBAAwB;QACxB,kBAAkB;QAClB,cAAc;KACf,CAAC,CAAC;IAEH,MAAM,kBAAkB,GAAG,WAAW,CACpC,CAAC,CAAS,EAAE,EAAE;QACZ,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,MAAM;YAAE,OAAO;QAC7C,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QACrC,oBAAoB,EAAE,CAAC;IACzB,CAAC,EACD,CAAC,MAAM,EAAE,WAAW,EAAE,oBAAoB,CAAC,CAC5C,CAAC;IAEF,OAAO;QACL,WAAW;QACX,qBAAqB;QACrB,iBAAiB;QACjB,eAAe;QACf,oBAAoB;QACpB,UAAU;QACV,YAAY;QACZ,kBAAkB;QAClB,oBAAoB;KACrB,CAAC;AACJ,CAAC"}
+{"version":3,"file":"useReverseSearchCompletion.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useReverseSearchCompletion.tsx"],"names":[],"mappings":"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"}