@google/gemini-cli 0.16.0-preview.4 → 0.17.0-nightly.20251116.e650a4ee5

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

@@ -0,0 +1,151 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { vi, describe, it, expect, beforeEach } from 'vitest';
+import { renderHook } from '../../test-utils/render.js';
+import { waitFor } from '../../test-utils/async.js';
+import { useIncludeDirsTrust } from './useIncludeDirsTrust.js';
+import * as trustedFolders from '../../config/trustedFolders.js';
+vi.mock('../utils/directoryUtils.js', () => ({
+    expandHomeDir: (p) => p, // Simple pass-through for testing
+    loadMemoryFromDirectories: vi.fn().mockResolvedValue({ fileCount: 1 }),
+}));
+vi.mock('../components/MultiFolderTrustDialog.js', () => ({
+    MultiFolderTrustDialog: (props) => (_jsx("div", { "data-testid": "mock-dialog", children: JSON.stringify(props.folders) })),
+}));
+describe('useIncludeDirsTrust', () => {
+    let mockConfig;
+    let mockHistoryManager;
+    let mockSetCustomDialog;
+    let mockWorkspaceContext;
+    beforeEach(() => {
+        vi.clearAllMocks();
+        mockWorkspaceContext = {
+            addDirectory: vi.fn(),
+            getDirectories: vi.fn().mockReturnValue([]),
+            onDirectoriesChangedListeners: new Set(),
+            onDirectoriesChanged: vi.fn(),
+            notifyDirectoriesChanged: vi.fn(),
+            resolveAndValidateDir: vi.fn(),
+            getInitialDirectories: vi.fn(),
+            setDirectories: vi.fn(),
+            isPathWithinWorkspace: vi.fn(),
+            fullyResolvedPath: vi.fn(),
+            isPathWithinRoot: vi.fn(),
+            isFileSymlink: vi.fn(),
+        };
+        mockConfig = {
+            getPendingIncludeDirectories: vi.fn().mockReturnValue([]),
+            clearPendingIncludeDirectories: vi.fn(),
+            getFolderTrust: vi.fn().mockReturnValue(true),
+            getWorkspaceContext: () => mockWorkspaceContext,
+            getGeminiClient: vi
+                .fn()
+                .mockReturnValue({ addDirectoryContext: vi.fn() }),
+        };
+        mockHistoryManager = {
+            addItem: vi.fn(),
+            history: [],
+            updateItem: vi.fn(),
+            clearItems: vi.fn(),
+            loadHistory: vi.fn(),
+        };
+        mockSetCustomDialog = vi.fn();
+    });
+    const renderTestHook = (isTrustedFolder) => {
+        renderHook(() => useIncludeDirsTrust(mockConfig, isTrustedFolder, mockHistoryManager, mockSetCustomDialog));
+    };
+    it('should do nothing if isTrustedFolder is undefined', () => {
+        vi.mocked(mockConfig.getPendingIncludeDirectories).mockReturnValue([
+            '/foo',
+        ]);
+        renderTestHook(undefined);
+        expect(mockConfig.clearPendingIncludeDirectories).not.toHaveBeenCalled();
+    });
+    it('should do nothing if there are no pending directories', () => {
+        renderTestHook(true);
+        expect(mockConfig.clearPendingIncludeDirectories).not.toHaveBeenCalled();
+    });
+    describe('when folder trust is disabled or workspace is untrusted', () => {
+        it.each([
+            { trustEnabled: false, isTrusted: true, scenario: 'trust is disabled' },
+            {
+                trustEnabled: true,
+                isTrusted: false,
+                scenario: 'workspace is untrusted',
+            },
+        ])('should add directories directly when $scenario', async ({ trustEnabled, isTrusted }) => {
+            vi.mocked(mockConfig.getFolderTrust).mockReturnValue(trustEnabled);
+            vi.mocked(mockConfig.getPendingIncludeDirectories).mockReturnValue([
+                '/dir1',
+                '/dir2',
+            ]);
+            vi.mocked(mockWorkspaceContext.addDirectory).mockImplementation((path) => {
+                if (path === '/dir2') {
+                    throw new Error('Test error');
+                }
+            });
+            renderTestHook(isTrusted);
+            await waitFor(() => {
+                expect(mockWorkspaceContext.addDirectory).toHaveBeenCalledWith('/dir1');
+                expect(mockWorkspaceContext.addDirectory).toHaveBeenCalledWith('/dir2');
+                expect(mockHistoryManager.addItem).toHaveBeenCalledWith(expect.objectContaining({
+                    text: expect.stringContaining("Error adding '/dir2': Test error"),
+                }), expect.any(Number));
+                expect(mockConfig.clearPendingIncludeDirectories).toHaveBeenCalledTimes(1);
+            });
+        });
+    });
+    describe('when folder trust is enabled and workspace is trusted', () => {
+        let mockIsPathTrusted;
+        beforeEach(() => {
+            vi.spyOn(mockConfig, 'getFolderTrust').mockReturnValue(true);
+            mockIsPathTrusted = vi.fn();
+            const mockLoadedFolders = {
+                isPathTrusted: mockIsPathTrusted,
+            };
+            vi.spyOn(trustedFolders, 'loadTrustedFolders').mockReturnValue(mockLoadedFolders);
+        });
+        afterEach(() => {
+            vi.restoreAllMocks();
+        });
+        it('should add trusted dirs, collect untrusted errors, and open dialog for undefined', async () => {
+            const pendingDirs = ['/trusted', '/untrusted', '/undefined'];
+            vi.mocked(mockConfig.getPendingIncludeDirectories).mockReturnValue(pendingDirs);
+            mockIsPathTrusted.mockImplementation((path) => {
+                if (path === '/trusted')
+                    return true;
+                if (path === '/untrusted')
+                    return false;
+                return undefined;
+            });
+            renderTestHook(true);
+            // Opens dialog for undefined trust dir
+            expect(mockSetCustomDialog).toHaveBeenCalledTimes(1);
+            const customDialogAction = mockSetCustomDialog.mock.calls[0][0];
+            expect(customDialogAction).toBeDefined();
+            const dialogProps = customDialogAction.props;
+            expect(dialogProps.folders).toEqual(['/undefined']);
+            expect(dialogProps.trustedDirs).toEqual(['/trusted']);
+            expect(dialogProps.errors).toEqual([
+                `The following directories are explicitly untrusted and cannot be added to a trusted workspace:\n- /untrusted\nPlease use the permissions command to modify their trust level.`,
+            ]);
+        });
+        it('should only add directories and clear pending if no dialog is needed', async () => {
+            const pendingDirs = ['/trusted1', '/trusted2'];
+            vi.mocked(mockConfig.getPendingIncludeDirectories).mockReturnValue(pendingDirs);
+            mockIsPathTrusted.mockReturnValue(true);
+            renderTestHook(true);
+            await waitFor(() => {
+                expect(mockWorkspaceContext.addDirectory).toHaveBeenCalledWith('/trusted1');
+                expect(mockWorkspaceContext.addDirectory).toHaveBeenCalledWith('/trusted2');
+                expect(mockSetCustomDialog).not.toHaveBeenCalled();
+                expect(mockConfig.clearPendingIncludeDirectories).toHaveBeenCalledTimes(1);
+            });
+        });
+    });
+});
+//# sourceMappingURL=useIncludeDirsTrust.test.js.map

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

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

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

@@ -5,13 +5,13 @@
  */
 import { TrustLevel } from '../../config/trustedFolders.js';
 import { type UseHistoryManagerReturn } from './useHistoryManager.js';
-export declare const usePermissionsModifyTrust: (onExit: () => void, addItem: UseHistoryManagerReturn["addItem"]) => {
+export declare const usePermissionsModifyTrust: (onExit: () => void, addItem: UseHistoryManagerReturn["addItem"], targetDirectory: string) => {
     cwd: string;
     currentTrustLevel: TrustLevel | undefined;
     isInheritedTrustFromParent: boolean;
     isInheritedTrustFromIde: boolean;
     needsRestart: boolean;
     updateTrustLevel: (trustLevel: TrustLevel) => void;
-    commitTrustLevelChange: () => void;
+    commitTrustLevelChange: () => boolean;
     isFolderTrustEnabled: boolean;
 };

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

@@ -5,13 +5,22 @@
  */
 import { useState, useCallback } from 'react';
 import * as process from 'node:process';
+import * as path from 'node:path';
 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) {
+import { coreEvents } from '@google/gemini-cli-core';
+function getInitialTrustState(settings, cwd, isCurrentWorkspace) {
     const folders = loadTrustedFolders();
     const explicitTrustLevel = folders.user.config[cwd];
+    if (!isCurrentWorkspace) {
+        return {
+            currentTrustLevel: explicitTrustLevel,
+            isInheritedTrustFromParent: false,
+            isInheritedTrustFromIde: false,
+        };
+    }
     const { isTrusted, source } = isWorkspaceTrusted(settings.merged);
     const isInheritedTrust = isTrusted &&
         (!explicitTrustLevel || explicitTrustLevel === TrustLevel.DO_NOT_TRUST);
@@ -21,10 +30,14 @@ function getInitialTrustState(settings, cwd) {
         isInheritedTrustFromIde: !!(source === 'ide' && isInheritedTrust),
     };
 }
-export const usePermissionsModifyTrust = (onExit, addItem) => {
+export const usePermissionsModifyTrust = (onExit, addItem, targetDirectory) => {
     const settings = useSettings();
-    const cwd = process.cwd();
-    const [initialState] = useState(() => getInitialTrustState(settings, cwd));
+    const cwd = targetDirectory;
+    // Normalize paths for case-insensitive file systems (macOS/Windows) to ensure
+    // accurate comparison between targetDirectory and process.cwd().
+    const isCurrentWorkspace = path.resolve(targetDirectory).toLowerCase() ===
+        path.resolve(process.cwd()).toLowerCase();
+    const [initialState] = useState(() => getInitialTrustState(settings, cwd, isCurrentWorkspace));
     const [currentTrustLevel] = useState(initialState.currentTrustLevel);
     const [pendingTrustLevel, setPendingTrustLevel] = useState();
     const [isInheritedTrustFromParent] = useState(initialState.isInheritedTrustFromParent);
@@ -32,6 +45,15 @@ export const usePermissionsModifyTrust = (onExit, addItem) => {
     const [needsRestart, setNeedsRestart] = useState(false);
     const isFolderTrustEnabled = !!settings.merged.security?.folderTrust?.enabled;
     const updateTrustLevel = useCallback((trustLevel) => {
+        // If we are not editing the current workspace, the logic is simple:
+        // just save the setting and exit. No restart or warnings are needed.
+        if (!isCurrentWorkspace) {
+            const folders = loadTrustedFolders();
+            folders.setValue(cwd, trustLevel);
+            onExit();
+            return;
+        }
+        // All logic below only applies when editing the current workspace.
         const wasTrusted = isWorkspaceTrusted(settings.merged).isTrusted;
         // Create a temporary config to check the new trust status without writing
         const currentConfig = loadTrustedFolders().user.config;
@@ -54,15 +76,30 @@ export const usePermissionsModifyTrust = (onExit, addItem) => {
         }
         else {
             const folders = loadTrustedFolders();
-            folders.setValue(cwd, trustLevel);
+            try {
+                folders.setValue(cwd, trustLevel);
+            }
+            catch (_e) {
+                coreEvents.emitFeedback('error', 'Failed to save trust settings. Your changes may not persist.');
+            }
             onExit();
         }
-    }, [cwd, settings.merged, onExit, addItem]);
+    }, [cwd, settings.merged, onExit, addItem, isCurrentWorkspace]);
     const commitTrustLevelChange = useCallback(() => {
         if (pendingTrustLevel) {
             const folders = loadTrustedFolders();
-            folders.setValue(cwd, pendingTrustLevel);
+            try {
+                folders.setValue(cwd, pendingTrustLevel);
+                return true;
+            }
+            catch (_e) {
+                coreEvents.emitFeedback('error', 'Failed to save trust settings. Your changes may not persist.');
+                setNeedsRestart(false);
+                setPendingTrustLevel(undefined);
+                return false;
+            }
         }
+        return true;
     }, [cwd, pendingTrustLevel]);
     return {
         cwd,

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

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

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

@@ -8,6 +8,7 @@ import { act } from 'react';
 import { renderHook } from '../../test-utils/render.js';
 import { usePermissionsModifyTrust } from './usePermissionsModifyTrust.js';
 import { TrustLevel } from '../../config/trustedFolders.js';
+import { coreEvents } from '@google/gemini-cli-core';
 // Hoist mocks
 const mockedCwd = vi.hoisted(() => vi.fn());
 const mockedLoadTrustedFolders = vi.hoisted(() => vi.fn());
@@ -17,6 +18,14 @@ const mockedUseSettings = vi.hoisted(() => vi.fn());
 vi.mock('node:process', () => ({
     cwd: mockedCwd,
 }));
+vi.mock('node:path', async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        ...(actual && typeof actual === 'object' ? actual : {}),
+        resolve: vi.fn((p) => p),
+        join: vi.fn((...args) => args.join('/')),
+    };
+});
 vi.mock('../../config/trustedFolders.js', () => ({
     loadTrustedFolders: mockedLoadTrustedFolders,
     isWorkspaceTrusted: mockedIsWorkspaceTrusted,
@@ -53,60 +62,185 @@ describe('usePermissionsModifyTrust', () => {
     afterEach(() => {
         vi.resetAllMocks();
     });
-    it('should initialize with the correct trust level', () => {
-        mockedLoadTrustedFolders.mockReturnValue({
-            user: { config: { '/test/dir': TrustLevel.TRUST_FOLDER } },
+    describe('when targetDirectory is the current workspace', () => {
+        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, mockedCwd()));
+            expect(result.current.currentTrustLevel).toBe(TrustLevel.TRUST_FOLDER);
         });
-        mockedIsWorkspaceTrusted.mockReturnValue({
-            isTrusted: true,
-            source: 'file',
+        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, mockedCwd()));
+            expect(result.current.isInheritedTrustFromParent).toBe(true);
+            expect(result.current.isInheritedTrustFromIde).toBe(false);
         });
-        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(),
+        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, mockedCwd()));
+            expect(result.current.isInheritedTrustFromIde).toBe(true);
+            expect(result.current.isInheritedTrustFromParent).toBe(false);
         });
-        mockedIsWorkspaceTrusted.mockReturnValue({
-            isTrusted: true,
-            source: 'file',
+        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, mockedCwd()));
+            act(() => {
+                result.current.updateTrustLevel(TrustLevel.TRUST_FOLDER);
+            });
+            expect(result.current.needsRestart).toBe(true);
+            expect(mockSetValue).not.toHaveBeenCalled();
         });
-        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
+        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, mockedCwd()));
+            act(() => {
+                result.current.updateTrustLevel(TrustLevel.TRUST_PARENT);
+            });
+            expect(result.current.needsRestart).toBe(false);
+            expect(mockSetValue).toHaveBeenCalledWith('/test/dir', TrustLevel.TRUST_PARENT);
+            expect(mockOnExit).toHaveBeenCalled();
         });
-        mockedIsWorkspaceTrusted.mockReturnValue({
-            isTrusted: true,
-            source: 'ide',
+        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, mockedCwd()));
+            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, mockedCwd()));
+            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, mockedCwd()));
+            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));
         });
-        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,
+    describe('when targetDirectory is not the current workspace', () => {
+        const otherDirectory = '/other/dir';
+        it('should not detect inherited trust', () => {
+            mockedLoadTrustedFolders.mockReturnValue({
+                user: { config: {} },
+            });
+            mockedIsWorkspaceTrusted.mockReturnValue({
+                isTrusted: true,
+                source: 'file',
+            });
+            const { result } = renderHook(() => usePermissionsModifyTrust(mockOnExit, mockAddItem, otherDirectory));
+            expect(result.current.isInheritedTrustFromParent).toBe(false);
+            expect(result.current.isInheritedTrustFromIde).toBe(false);
         });
-        mockedIsWorkspaceTrusted
-            .mockReturnValueOnce({ isTrusted: false, source: 'file' })
-            .mockReturnValueOnce({ isTrusted: true, source: 'file' });
-        const { result } = renderHook(() => usePermissionsModifyTrust(mockOnExit, mockAddItem));
-        act(() => {
-            result.current.updateTrustLevel(TrustLevel.TRUST_FOLDER);
+        it('should save immediately without needing a restart', () => {
+            const mockSetValue = vi.fn();
+            mockedLoadTrustedFolders.mockReturnValue({
+                user: { config: {} },
+                setValue: mockSetValue,
+            });
+            mockedIsWorkspaceTrusted.mockReturnValue({
+                isTrusted: false,
+                source: 'file',
+            });
+            const { result } = renderHook(() => usePermissionsModifyTrust(mockOnExit, mockAddItem, otherDirectory));
+            act(() => {
+                result.current.updateTrustLevel(TrustLevel.TRUST_FOLDER);
+            });
+            expect(result.current.needsRestart).toBe(false);
+            expect(mockSetValue).toHaveBeenCalledWith(otherDirectory, TrustLevel.TRUST_FOLDER);
+            expect(mockOnExit).toHaveBeenCalled();
+        });
+        it('should not add a warning when setting DO_NOT_TRUST', () => {
+            mockedLoadTrustedFolders.mockReturnValue({
+                user: { config: {} },
+                setValue: vi.fn(),
+            });
+            mockedIsWorkspaceTrusted.mockReturnValue({
+                isTrusted: true,
+                source: 'file',
+            });
+            const { result } = renderHook(() => usePermissionsModifyTrust(mockOnExit, mockAddItem, otherDirectory));
+            act(() => {
+                result.current.updateTrustLevel(TrustLevel.DO_NOT_TRUST);
+            });
+            expect(mockAddItem).not.toHaveBeenCalled();
         });
-        expect(result.current.needsRestart).toBe(true);
-        expect(mockSetValue).not.toHaveBeenCalled();
     });
-    it('should save immediately if trust does not change', () => {
-        const mockSetValue = vi.fn();
+    it('should emit feedback when setValue throws in updateTrustLevel', () => {
+        const mockSetValue = vi.fn().mockImplementation(() => {
+            throw new Error('test error');
+        });
         mockedLoadTrustedFolders.mockReturnValue({
             user: { config: {} },
             setValue: mockSetValue,
@@ -115,16 +249,18 @@ describe('usePermissionsModifyTrust', () => {
             isTrusted: true,
             source: 'file',
         });
-        const { result } = renderHook(() => usePermissionsModifyTrust(mockOnExit, mockAddItem));
+        const emitFeedbackSpy = vi.spyOn(coreEvents, 'emitFeedback');
+        const { result } = renderHook(() => usePermissionsModifyTrust(mockOnExit, mockAddItem, mockedCwd()));
         act(() => {
             result.current.updateTrustLevel(TrustLevel.TRUST_PARENT);
         });
-        expect(result.current.needsRestart).toBe(false);
-        expect(mockSetValue).toHaveBeenCalledWith('/test/dir', TrustLevel.TRUST_PARENT);
+        expect(emitFeedbackSpy).toHaveBeenCalledWith('error', 'Failed to save trust settings. Your changes may not persist.');
         expect(mockOnExit).toHaveBeenCalled();
     });
-    it('should commit the pending trust level change', () => {
-        const mockSetValue = vi.fn();
+    it('should emit feedback when setValue throws in commitTrustLevelChange', () => {
+        const mockSetValue = vi.fn().mockImplementation(() => {
+            throw new Error('test error');
+        });
         mockedLoadTrustedFolders.mockReturnValue({
             user: { config: {} },
             setValue: mockSetValue,
@@ -132,51 +268,17 @@ describe('usePermissionsModifyTrust', () => {
         mockedIsWorkspaceTrusted
             .mockReturnValueOnce({ isTrusted: false, source: 'file' })
             .mockReturnValueOnce({ isTrusted: true, source: 'file' });
-        const { result } = renderHook(() => usePermissionsModifyTrust(mockOnExit, mockAddItem));
+        const emitFeedbackSpy = vi.spyOn(coreEvents, 'emitFeedback');
+        const { result } = renderHook(() => usePermissionsModifyTrust(mockOnExit, mockAddItem, mockedCwd()));
         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);
+            const success = result.current.commitTrustLevelChange();
+            expect(success).toBe(false);
         });
-        expect(mockAddItem).toHaveBeenCalledWith({
-            type: 'warning',
-            text: 'Note: This folder is still trusted because the connected IDE workspace is trusted.',
-        }, expect.any(Number));
+        expect(emitFeedbackSpy).toHaveBeenCalledWith('error', 'Failed to save trust settings. Your changes may not persist.');
+        expect(result.current.needsRestart).toBe(false);
     });
 });
 //# sourceMappingURL=usePermissionsModifyTrust.test.js.map