@google/gemini-cli 0.9.0-nightly.20250926.1487841d → 0.9.0-nightly.20251001.33269bdb

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

@@ -7,30 +7,15 @@ import { vi } from 'vitest';
 import * as fs from 'node:fs';
 import * as os from 'node:os';
 import * as path from 'node:path';
-import { EXTENSIONS_CONFIG_FILENAME, annotateActiveExtensions, loadExtension, } from '../../config/extension.js';
+import { ExtensionStorage, annotateActiveExtensions, loadExtension, } from '../../config/extension.js';
 import { createExtension } from '../../test-utils/createExtension.js';
 import { useExtensionUpdates } from './useExtensionUpdates.js';
 import { GEMINI_DIR } from '@google/gemini-cli-core';
-import { isWorkspaceTrusted } from '../../config/trustedFolders.js';
 import { renderHook, waitFor } from '@testing-library/react';
 import { MessageType } from '../types.js';
-const mockGit = {
-    clone: vi.fn(),
-    getRemotes: vi.fn(),
-    fetch: vi.fn(),
-    checkout: vi.fn(),
-    listRemote: vi.fn(),
-    revparse: vi.fn(),
-    // Not a part of the actual API, but we need to use this to do the correct
-    // file system interactions.
-    path: vi.fn(),
-};
-vi.mock('simple-git', () => ({
-    simpleGit: vi.fn((path) => {
-        mockGit.path.mockReturnValue(path);
-        return mockGit;
-    }),
-}));
+import { ExtensionEnablementManager } from '../../config/extensions/extensionEnablement.js';
+import { checkForAllExtensionUpdates, updateExtension, } from '../../config/extensions/update.js';
+import { ExtensionUpdateState } from '../state/extensions.js';
 vi.mock('os', async (importOriginal) => {
     const mockedOs = await importOriginal();
     return {
@@ -38,39 +23,9 @@ vi.mock('os', async (importOriginal) => {
         homedir: vi.fn(),
     };
 });
-vi.mock('../../config/trustedFolders.js', async (importOriginal) => {
-    const actual = await importOriginal();
-    return {
-        ...actual,
-        isWorkspaceTrusted: vi.fn(),
-    };
-});
-const mockLogExtensionInstallEvent = vi.hoisted(() => vi.fn());
-const mockLogExtensionUninstall = vi.hoisted(() => vi.fn());
-vi.mock('@google/gemini-cli-core', async (importOriginal) => {
-    const actual = await importOriginal();
-    return {
-        ...actual,
-        logExtensionInstallEvent: mockLogExtensionInstallEvent,
-        logExtensionUninstall: mockLogExtensionUninstall,
-        ExtensionInstallEvent: vi.fn(),
-        ExtensionUninstallEvent: vi.fn(),
-    };
-});
-vi.mock('child_process', async (importOriginal) => {
-    const actual = await importOriginal();
-    return {
-        ...actual,
-        execSync: vi.fn(),
-    };
-});
-const mockQuestion = vi.hoisted(() => vi.fn());
-const mockClose = vi.hoisted(() => vi.fn());
-vi.mock('node:readline', () => ({
-    createInterface: vi.fn(() => ({
-        question: mockQuestion,
-        close: mockClose,
-    })),
+vi.mock('../../config/extensions/update.js', () => ({
+    checkForAllExtensionUpdates: vi.fn(),
+    updateExtension: vi.fn(),
 }));
 describe('useExtensionUpdates', () => {
     let tempHomeDir;
@@ -80,7 +35,8 @@ describe('useExtensionUpdates', () => {
         vi.mocked(os.homedir).mockReturnValue(tempHomeDir);
         userExtensionsDir = path.join(tempHomeDir, GEMINI_DIR, 'extensions');
         fs.mkdirSync(userExtensionsDir, { recursive: true });
-        Object.values(mockGit).forEach((fn) => fn.mockReset());
+        vi.mocked(checkForAllExtensionUpdates).mockReset();
+        vi.mocked(updateExtension).mockReset();
     });
     afterEach(() => {
         fs.rmSync(tempHomeDir, { recursive: true, force: true });
@@ -102,16 +58,15 @@ describe('useExtensionUpdates', () => {
         ];
         const addItem = vi.fn();
         const cwd = '/test/cwd';
-        mockGit.getRemotes.mockResolvedValue([
-            {
-                name: 'origin',
-                refs: {
-                    fetch: 'https://github.com/google/gemini-cli.git',
+        vi.mocked(checkForAllExtensionUpdates).mockImplementation(async (extensions, dispatch) => {
+            dispatch({
+                type: 'SET_STATE',
+                payload: {
+                    name: 'test-extension',
+                    state: ExtensionUpdateState.UPDATE_AVAILABLE,
                 },
-            },
-        ]);
-        mockGit.revparse.mockResolvedValue('local-hash');
-        mockGit.listRemote.mockResolvedValue('remote-hash\tHEAD');
+            });
+        });
         renderHook(() => useExtensionUpdates(extensions, addItem, cwd));
         await waitFor(() => {
             expect(addItem).toHaveBeenCalledWith({
@@ -131,27 +86,21 @@ describe('useExtensionUpdates', () => {
                 autoUpdate: true,
             },
         });
-        const extension = annotateActiveExtensions([loadExtension({ extensionDir, workspaceDir: tempHomeDir })], [], tempHomeDir)[0];
+        const extension = annotateActiveExtensions([loadExtension({ extensionDir, workspaceDir: tempHomeDir })], tempHomeDir, new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()))[0];
         const addItem = vi.fn();
-        mockGit.getRemotes.mockResolvedValue([
-            {
-                name: 'origin',
-                refs: {
-                    fetch: 'https://github.com/google/gemini-cli.git',
+        vi.mocked(checkForAllExtensionUpdates).mockImplementation(async (extensions, dispatch) => {
+            dispatch({
+                type: 'SET_STATE',
+                payload: {
+                    name: 'test-extension',
+                    state: ExtensionUpdateState.UPDATE_AVAILABLE,
                 },
-            },
-        ]);
-        mockGit.revparse.mockResolvedValue('local-hash');
-        mockGit.listRemote.mockResolvedValue('remote-hash\tHEAD');
-        mockGit.clone.mockImplementation(async (_, destination) => {
-            fs.mkdirSync(path.join(mockGit.path(), destination), {
-                recursive: true,
             });
-            fs.writeFileSync(path.join(mockGit.path(), destination, EXTENSIONS_CONFIG_FILENAME), JSON.stringify({ name: 'test-extension', version: '1.1.0' }));
         });
-        vi.mocked(isWorkspaceTrusted).mockReturnValue({
-            isTrusted: true,
-            source: 'file',
+        vi.mocked(updateExtension).mockResolvedValue({
+            originalVersion: '1.0.0',
+            updatedVersion: '1.1.0',
+            name: '',
         });
         renderHook(() => useExtensionUpdates([extension], addItem, tempHomeDir));
         await waitFor(() => {
@@ -159,7 +108,136 @@ describe('useExtensionUpdates', () => {
                 type: MessageType.INFO,
                 text: 'Extension "test-extension" successfully updated: 1.0.0 → 1.1.0.',
             }, expect.any(Number));
-        }, { timeout: 2000 });
+        }, { timeout: 4000 });
+    });
+    it('should batch update notifications for multiple extensions', async () => {
+        const extensionDir1 = createExtension({
+            extensionsDir: userExtensionsDir,
+            name: 'test-extension-1',
+            version: '1.0.0',
+            installMetadata: {
+                source: 'https://some.git/repo1',
+                type: 'git',
+                autoUpdate: true,
+            },
+        });
+        const extensionDir2 = createExtension({
+            extensionsDir: userExtensionsDir,
+            name: 'test-extension-2',
+            version: '2.0.0',
+            installMetadata: {
+                source: 'https://some.git/repo2',
+                type: 'git',
+                autoUpdate: true,
+            },
+        });
+        const extensions = annotateActiveExtensions([
+            loadExtension({
+                extensionDir: extensionDir1,
+                workspaceDir: tempHomeDir,
+            }),
+            loadExtension({
+                extensionDir: extensionDir2,
+                workspaceDir: tempHomeDir,
+            }),
+        ], tempHomeDir, new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()));
+        const addItem = vi.fn();
+        vi.mocked(checkForAllExtensionUpdates).mockImplementation(async (extensions, dispatch) => {
+            dispatch({
+                type: 'SET_STATE',
+                payload: {
+                    name: 'test-extension-1',
+                    state: ExtensionUpdateState.UPDATE_AVAILABLE,
+                },
+            });
+            dispatch({
+                type: 'SET_STATE',
+                payload: {
+                    name: 'test-extension-2',
+                    state: ExtensionUpdateState.UPDATE_AVAILABLE,
+                },
+            });
+        });
+        vi.mocked(updateExtension)
+            .mockResolvedValueOnce({
+            originalVersion: '1.0.0',
+            updatedVersion: '1.1.0',
+            name: '',
+        })
+            .mockResolvedValueOnce({
+            originalVersion: '2.0.0',
+            updatedVersion: '2.1.0',
+            name: '',
+        });
+        renderHook(() => useExtensionUpdates(extensions, addItem, tempHomeDir));
+        await waitFor(() => {
+            expect(addItem).toHaveBeenCalledTimes(2);
+            expect(addItem).toHaveBeenCalledWith({
+                type: MessageType.INFO,
+                text: 'Extension "test-extension-1" successfully updated: 1.0.0 → 1.1.0.',
+            }, expect.any(Number));
+            expect(addItem).toHaveBeenCalledWith({
+                type: MessageType.INFO,
+                text: 'Extension "test-extension-2" successfully updated: 2.0.0 → 2.1.0.',
+            }, expect.any(Number));
+        }, { timeout: 4000 });
+    });
+    it('should batch update notifications for multiple extensions with autoUpdate: false', async () => {
+        const extensions = [
+            {
+                name: 'test-extension-1',
+                type: 'git',
+                version: '1.0.0',
+                path: '/some/path1',
+                isActive: true,
+                installMetadata: {
+                    type: 'git',
+                    source: 'https://some/repo1',
+                    autoUpdate: false,
+                },
+            },
+            {
+                name: 'test-extension-2',
+                type: 'git',
+                version: '2.0.0',
+                path: '/some/path2',
+                isActive: true,
+                installMetadata: {
+                    type: 'git',
+                    source: 'https://some/repo2',
+                    autoUpdate: false,
+                },
+            },
+        ];
+        const addItem = vi.fn();
+        const cwd = '/test/cwd';
+        vi.mocked(checkForAllExtensionUpdates).mockImplementation(async (extensions, dispatch) => {
+            dispatch({ type: 'BATCH_CHECK_START' });
+            dispatch({
+                type: 'SET_STATE',
+                payload: {
+                    name: 'test-extension-1',
+                    state: ExtensionUpdateState.UPDATE_AVAILABLE,
+                },
+            });
+            await new Promise((r) => setTimeout(r, 50));
+            dispatch({
+                type: 'SET_STATE',
+                payload: {
+                    name: 'test-extension-2',
+                    state: ExtensionUpdateState.UPDATE_AVAILABLE,
+                },
+            });
+            dispatch({ type: 'BATCH_CHECK_END' });
+        });
+        renderHook(() => useExtensionUpdates(extensions, addItem, cwd));
+        await waitFor(() => {
+            expect(addItem).toHaveBeenCalledTimes(1);
+            expect(addItem).toHaveBeenCalledWith({
+                type: MessageType.INFO,
+                text: 'You have 2 extensions with an update available, run "/extensions list" for more information.',
+            }, expect.any(Number));
+        });
     });
 });
 //# sourceMappingURL=useExtensionUpdates.test.js.map

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

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

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

@@ -3,12 +3,14 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+export type RestartReason = 'NONE' | 'CONNECTION_CHANGE' | 'TRUST_CHANGE';
 /**
  * This hook listens for trust status updates from the IDE companion extension.
- * It provides the current trust status from the IDE and a flag indicating
- * if a restart is needed because the trust state has changed.
+ * It provides the current trust status from the IDE and a reason if a restart
+ * is needed because the trust state has changed.
  */
 export declare function useIdeTrustListener(): {
     isIdeTrusted: boolean | undefined;
     needsRestart: boolean;
+    restartReason: RestartReason;
 };

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

@@ -3,37 +3,63 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { useCallback, useEffect, useState, useSyncExternalStore } from 'react';
-import { IdeClient, ideContextStore } from '@google/gemini-cli-core';
+import { useCallback, useEffect, useState, useSyncExternalStore, useRef, } from 'react';
+import { IdeClient, IDEConnectionStatus, ideContextStore, } from '@google/gemini-cli-core';
+import { useSettings } from '../contexts/SettingsContext.js';
+import { isWorkspaceTrusted } from '../../config/trustedFolders.js';
 /**
  * This hook listens for trust status updates from the IDE companion extension.
- * It provides the current trust status from the IDE and a flag indicating
- * if a restart is needed because the trust state has changed.
+ * It provides the current trust status from the IDE and a reason if a restart
+ * is needed because the trust state has changed.
  */
 export function useIdeTrustListener() {
+    const settings = useSettings();
+    const [connectionStatus, setConnectionStatus] = useState(IDEConnectionStatus.Disconnected);
+    const previousTrust = useRef(undefined);
+    const [restartReason, setRestartReason] = useState('NONE');
+    const [needsRestart, setNeedsRestart] = useState(false);
     const subscribe = useCallback((onStoreChange) => {
+        const handleStatusChange = (state) => {
+            setConnectionStatus(state.status);
+            setRestartReason('CONNECTION_CHANGE');
+            // Also notify useSyncExternalStore that the data has changed
+            onStoreChange();
+        };
+        const handleTrustChange = () => {
+            setRestartReason('TRUST_CHANGE');
+            onStoreChange();
+        };
         (async () => {
             const ideClient = await IdeClient.getInstance();
-            ideClient.addTrustChangeListener(onStoreChange);
+            ideClient.addTrustChangeListener(handleTrustChange);
+            ideClient.addStatusChangeListener(handleStatusChange);
+            setConnectionStatus(ideClient.getConnectionStatus().status);
         })();
         return () => {
             (async () => {
                 const ideClient = await IdeClient.getInstance();
-                ideClient.removeTrustChangeListener(onStoreChange);
+                ideClient.removeTrustChangeListener(handleTrustChange);
+                ideClient.removeStatusChangeListener(handleStatusChange);
             })();
         };
     }, []);
-    const getSnapshot = () => ideContextStore.get()?.workspaceState?.isTrusted;
+    const getSnapshot = () => {
+        if (connectionStatus !== IDEConnectionStatus.Connected) {
+            return undefined;
+        }
+        return ideContextStore.get()?.workspaceState?.isTrusted;
+    };
     const isIdeTrusted = useSyncExternalStore(subscribe, getSnapshot);
-    const [needsRestart, setNeedsRestart] = useState(false);
-    const [initialTrustValue] = useState(isIdeTrusted);
     useEffect(() => {
-        if (!needsRestart &&
-            initialTrustValue !== undefined &&
-            initialTrustValue !== isIdeTrusted) {
+        const currentTrust = isWorkspaceTrusted(settings.merged).isTrusted;
+        // Trigger a restart if the overall trust status for the CLI has changed,
+        // but not on the initial trust value.
+        if (previousTrust.current !== undefined &&
+            previousTrust.current !== currentTrust) {
             setNeedsRestart(true);
         }
-    }, [isIdeTrusted, initialTrustValue, needsRestart]);
-    return { isIdeTrusted, needsRestart };
+        previousTrust.current = currentTrust;
+    }, [isIdeTrusted, settings.merged]);
+    return { isIdeTrusted, needsRestart, restartReason };
 }
 //# sourceMappingURL=useIdeTrustListener.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useIdeTrustListener.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useIdeTrustListener.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,oBAAoB,EAAE,MAAM,OAAO,CAAC;AAC/E,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAErE;;;;GAIG;AACH,MAAM,UAAU,mBAAmB;IACjC,MAAM,SAAS,GAAG,WAAW,CAAC,CAAC,aAAyB,EAAE,EAAE;QAC1D,CAAC,KAAK,IAAI,EAAE;YACV,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,WAAW,EAAE,CAAC;YAChD,SAAS,CAAC,sBAAsB,CAAC,aAAa,CAAC,CAAC;QAClD,CAAC,CAAC,EAAE,CAAC;QACL,OAAO,GAAG,EAAE;YACV,CAAC,KAAK,IAAI,EAAE;gBACV,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,WAAW,EAAE,CAAC;gBAChD,SAAS,CAAC,yBAAyB,CAAC,aAAa,CAAC,CAAC;YACrD,CAAC,CAAC,EAAE,CAAC;QACP,CAAC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,WAAW,GAAG,GAAG,EAAE,CAAC,eAAe,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,SAAS,CAAC;IAE3E,MAAM,YAAY,GAAG,oBAAoB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IAElE,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IACxD,MAAM,CAAC,iBAAiB,CAAC,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC;IAEnD,SAAS,CAAC,GAAG,EAAE;QACb,IACE,CAAC,YAAY;YACb,iBAAiB,KAAK,SAAS;YAC/B,iBAAiB,KAAK,YAAY,EAClC,CAAC;YACD,eAAe,CAAC,IAAI,CAAC,CAAC;QACxB,CAAC;IACH,CAAC,EAAE,CAAC,YAAY,EAAE,iBAAiB,EAAE,YAAY,CAAC,CAAC,CAAC;IAEpD,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC;AACxC,CAAC"}
+{"version":3,"file":"useIdeTrustListener.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useIdeTrustListener.ts"],"names":[],"mappings":"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"}

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

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

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

@@ -0,0 +1,183 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/** @vitest-environment jsdom */
+import { renderHook, act } from '@testing-library/react';
+import { vi, describe, it, expect, beforeEach } from 'vitest';
+import { IdeClient, IDEConnectionStatus, ideContextStore, } from '@google/gemini-cli-core';
+import { useIdeTrustListener } from './useIdeTrustListener.js';
+import * as trustedFolders from '../../config/trustedFolders.js';
+import { useSettings } from '../contexts/SettingsContext.js';
+// Mock dependencies
+vi.mock('@google/gemini-cli-core', async (importOriginal) => {
+    const original = await importOriginal();
+    const ideClientInstance = {
+        addTrustChangeListener: vi.fn(),
+        removeTrustChangeListener: vi.fn(),
+        addStatusChangeListener: vi.fn(),
+        removeStatusChangeListener: vi.fn(),
+        getConnectionStatus: vi.fn(() => ({
+            status: IDEConnectionStatus.Disconnected,
+        })),
+    };
+    return {
+        ...original,
+        IdeClient: {
+            getInstance: vi.fn().mockResolvedValue(ideClientInstance),
+        },
+        ideContextStore: {
+            get: vi.fn(),
+            subscribe: vi.fn(),
+        },
+    };
+});
+vi.mock('../../config/trustedFolders.js');
+vi.mock('../contexts/SettingsContext.js');
+describe('useIdeTrustListener', () => {
+    let mockSettings;
+    let mockIdeClient;
+    let trustChangeCallback;
+    let statusChangeCallback;
+    beforeEach(async () => {
+        vi.clearAllMocks();
+        mockIdeClient = await IdeClient.getInstance();
+        mockSettings = {
+            merged: {
+                security: {
+                    folderTrust: {
+                        enabled: true,
+                    },
+                },
+            },
+        };
+        vi.mocked(useSettings).mockReturnValue(mockSettings);
+        vi.mocked(mockIdeClient.addTrustChangeListener).mockImplementation((cb) => {
+            trustChangeCallback = cb;
+        });
+        vi.mocked(mockIdeClient.addStatusChangeListener).mockImplementation((cb) => {
+            statusChangeCallback = cb;
+        });
+    });
+    it('should initialize correctly with no trust information', () => {
+        vi.mocked(trustedFolders.isWorkspaceTrusted).mockReturnValue({
+            isTrusted: undefined,
+            source: undefined,
+        });
+        const { result } = renderHook(() => useIdeTrustListener());
+        expect(result.current.isIdeTrusted).toBe(undefined);
+        expect(result.current.needsRestart).toBe(false);
+        expect(result.current.restartReason).toBe('NONE');
+    });
+    it('should NOT set needsRestart when connecting for the first time', async () => {
+        vi.mocked(mockIdeClient.getConnectionStatus).mockReturnValue({
+            status: IDEConnectionStatus.Disconnected,
+        });
+        vi.mocked(trustedFolders.isWorkspaceTrusted).mockReturnValue({
+            isTrusted: true,
+            source: 'ide',
+        });
+        const { result } = renderHook(() => useIdeTrustListener());
+        // Manually trigger the initial connection state for the test setup
+        await act(async () => {
+            statusChangeCallback({ status: IDEConnectionStatus.Disconnected });
+        });
+        expect(result.current.isIdeTrusted).toBe(undefined);
+        expect(result.current.needsRestart).toBe(false);
+        await act(async () => {
+            vi.mocked(ideContextStore.get).mockReturnValue({
+                workspaceState: { isTrusted: true },
+            });
+            statusChangeCallback({ status: IDEConnectionStatus.Connected });
+        });
+        expect(result.current.isIdeTrusted).toBe(true);
+        expect(result.current.needsRestart).toBe(false);
+        expect(result.current.restartReason).toBe('CONNECTION_CHANGE');
+    });
+    it('should set needsRestart when IDE trust changes', async () => {
+        vi.mocked(mockIdeClient.getConnectionStatus).mockReturnValue({
+            status: IDEConnectionStatus.Connected,
+        });
+        vi.mocked(ideContextStore.get).mockReturnValue({
+            workspaceState: { isTrusted: true },
+        });
+        vi.mocked(trustedFolders.isWorkspaceTrusted).mockReturnValue({
+            isTrusted: true,
+            source: 'ide',
+        });
+        const { result } = renderHook(() => useIdeTrustListener());
+        // Manually trigger the initial connection state for the test setup
+        await act(async () => {
+            statusChangeCallback({ status: IDEConnectionStatus.Connected });
+        });
+        expect(result.current.isIdeTrusted).toBe(true);
+        expect(result.current.needsRestart).toBe(false);
+        await act(async () => {
+            vi.mocked(trustedFolders.isWorkspaceTrusted).mockReturnValue({
+                isTrusted: false,
+                source: 'ide',
+            });
+            vi.mocked(ideContextStore.get).mockReturnValue({
+                workspaceState: { isTrusted: false },
+            });
+            trustChangeCallback(false);
+        });
+        expect(result.current.isIdeTrusted).toBe(false);
+        expect(result.current.needsRestart).toBe(true);
+        expect(result.current.restartReason).toBe('TRUST_CHANGE');
+    });
+    it('should set needsRestart when IDE disconnects', async () => {
+        vi.mocked(mockIdeClient.getConnectionStatus).mockReturnValue({
+            status: IDEConnectionStatus.Connected,
+        });
+        vi.mocked(ideContextStore.get).mockReturnValue({
+            workspaceState: { isTrusted: true },
+        });
+        vi.mocked(trustedFolders.isWorkspaceTrusted).mockReturnValue({
+            isTrusted: true,
+            source: 'ide',
+        });
+        const { result } = renderHook(() => useIdeTrustListener());
+        // Manually trigger the initial connection state for the test setup
+        await act(async () => {
+            statusChangeCallback({ status: IDEConnectionStatus.Connected });
+        });
+        expect(result.current.isIdeTrusted).toBe(true);
+        expect(result.current.needsRestart).toBe(false);
+        await act(async () => {
+            vi.mocked(trustedFolders.isWorkspaceTrusted).mockReturnValue({
+                isTrusted: undefined,
+                source: undefined,
+            });
+            vi.mocked(ideContextStore.get).mockReturnValue(undefined);
+            statusChangeCallback({ status: IDEConnectionStatus.Disconnected });
+        });
+        expect(result.current.isIdeTrusted).toBe(undefined);
+        expect(result.current.needsRestart).toBe(true);
+        expect(result.current.restartReason).toBe('CONNECTION_CHANGE');
+    });
+    it('should NOT set needsRestart if trust value does not change', async () => {
+        vi.mocked(mockIdeClient.getConnectionStatus).mockReturnValue({
+            status: IDEConnectionStatus.Connected,
+        });
+        vi.mocked(ideContextStore.get).mockReturnValue({
+            workspaceState: { isTrusted: true },
+        });
+        vi.mocked(trustedFolders.isWorkspaceTrusted).mockReturnValue({
+            isTrusted: true,
+            source: 'ide',
+        });
+        const { result, rerender } = renderHook(() => useIdeTrustListener());
+        // Manually trigger the initial connection state for the test setup
+        await act(async () => {
+            statusChangeCallback({ status: IDEConnectionStatus.Connected });
+        });
+        expect(result.current.isIdeTrusted).toBe(true);
+        expect(result.current.needsRestart).toBe(false);
+        rerender();
+        expect(result.current.isIdeTrusted).toBe(true);
+        expect(result.current.needsRestart).toBe(false);
+    });
+});
+//# sourceMappingURL=useIdeTrustListener.test.js.map