@google/gemini-cli 0.1.21 → 0.1.22

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

@@ -0,0 +1,191 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach, } from 'vitest';
+import { renderHook, act } from '@testing-library/react';
+import { useAutoAcceptIndicator } from './useAutoAcceptIndicator.js';
+import { Config, ApprovalMode, } from '@google/gemini-cli-core';
+import { useKeypress } from './useKeypress.js';
+vi.mock('./useKeypress.js');
+vi.mock('@google/gemini-cli-core', async () => {
+    const actualServerModule = (await vi.importActual('@google/gemini-cli-core'));
+    return {
+        ...actualServerModule,
+        Config: vi.fn(),
+    };
+});
+describe('useAutoAcceptIndicator', () => {
+    let mockConfigInstance;
+    let capturedUseKeypressHandler;
+    let mockedUseKeypress;
+    beforeEach(() => {
+        vi.resetAllMocks();
+        Config.mockImplementation(() => {
+            const instanceGetApprovalModeMock = vi.fn();
+            const instanceSetApprovalModeMock = vi.fn();
+            const instance = {
+                getApprovalMode: instanceGetApprovalModeMock,
+                setApprovalMode: instanceSetApprovalModeMock,
+                getCoreTools: vi.fn().mockReturnValue([]),
+                getToolDiscoveryCommand: vi.fn().mockReturnValue(undefined),
+                getTargetDir: vi.fn().mockReturnValue('.'),
+                getApiKey: vi.fn().mockReturnValue('test-api-key'),
+                getModel: vi.fn().mockReturnValue('test-model'),
+                getSandbox: vi.fn().mockReturnValue(false),
+                getDebugMode: vi.fn().mockReturnValue(false),
+                getQuestion: vi.fn().mockReturnValue(undefined),
+                getFullContext: vi.fn().mockReturnValue(false),
+                getUserAgent: vi.fn().mockReturnValue('test-user-agent'),
+                getUserMemory: vi.fn().mockReturnValue(''),
+                getGeminiMdFileCount: vi.fn().mockReturnValue(0),
+                getToolRegistry: vi
+                    .fn()
+                    .mockReturnValue({ discoverTools: vi.fn() }),
+            };
+            instanceSetApprovalModeMock.mockImplementation((value) => {
+                instanceGetApprovalModeMock.mockReturnValue(value);
+            });
+            return instance;
+        });
+        mockedUseKeypress = useKeypress;
+        mockedUseKeypress.mockImplementation((handler, _options) => {
+            capturedUseKeypressHandler = handler;
+        });
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        mockConfigInstance = new Config();
+    });
+    it('should initialize with ApprovalMode.AUTO_EDIT if config.getApprovalMode returns ApprovalMode.AUTO_EDIT', () => {
+        mockConfigInstance.getApprovalMode.mockReturnValue(ApprovalMode.AUTO_EDIT);
+        const { result } = renderHook(() => useAutoAcceptIndicator({
+            config: mockConfigInstance,
+        }));
+        expect(result.current).toBe(ApprovalMode.AUTO_EDIT);
+        expect(mockConfigInstance.getApprovalMode).toHaveBeenCalledTimes(1);
+    });
+    it('should initialize with ApprovalMode.DEFAULT if config.getApprovalMode returns ApprovalMode.DEFAULT', () => {
+        mockConfigInstance.getApprovalMode.mockReturnValue(ApprovalMode.DEFAULT);
+        const { result } = renderHook(() => useAutoAcceptIndicator({
+            config: mockConfigInstance,
+        }));
+        expect(result.current).toBe(ApprovalMode.DEFAULT);
+        expect(mockConfigInstance.getApprovalMode).toHaveBeenCalledTimes(1);
+    });
+    it('should initialize with ApprovalMode.YOLO if config.getApprovalMode returns ApprovalMode.YOLO', () => {
+        mockConfigInstance.getApprovalMode.mockReturnValue(ApprovalMode.YOLO);
+        const { result } = renderHook(() => useAutoAcceptIndicator({
+            config: mockConfigInstance,
+        }));
+        expect(result.current).toBe(ApprovalMode.YOLO);
+        expect(mockConfigInstance.getApprovalMode).toHaveBeenCalledTimes(1);
+    });
+    it('should toggle the indicator and update config when Shift+Tab or Ctrl+Y is pressed', () => {
+        mockConfigInstance.getApprovalMode.mockReturnValue(ApprovalMode.DEFAULT);
+        const { result } = renderHook(() => useAutoAcceptIndicator({
+            config: mockConfigInstance,
+        }));
+        expect(result.current).toBe(ApprovalMode.DEFAULT);
+        act(() => {
+            capturedUseKeypressHandler({
+                name: 'tab',
+                shift: true,
+            });
+        });
+        expect(mockConfigInstance.setApprovalMode).toHaveBeenCalledWith(ApprovalMode.AUTO_EDIT);
+        expect(result.current).toBe(ApprovalMode.AUTO_EDIT);
+        act(() => {
+            capturedUseKeypressHandler({ name: 'y', ctrl: true });
+        });
+        expect(mockConfigInstance.setApprovalMode).toHaveBeenCalledWith(ApprovalMode.YOLO);
+        expect(result.current).toBe(ApprovalMode.YOLO);
+        act(() => {
+            capturedUseKeypressHandler({ name: 'y', ctrl: true });
+        });
+        expect(mockConfigInstance.setApprovalMode).toHaveBeenCalledWith(ApprovalMode.DEFAULT);
+        expect(result.current).toBe(ApprovalMode.DEFAULT);
+        act(() => {
+            capturedUseKeypressHandler({ name: 'y', ctrl: true });
+        });
+        expect(mockConfigInstance.setApprovalMode).toHaveBeenCalledWith(ApprovalMode.YOLO);
+        expect(result.current).toBe(ApprovalMode.YOLO);
+        act(() => {
+            capturedUseKeypressHandler({
+                name: 'tab',
+                shift: true,
+            });
+        });
+        expect(mockConfigInstance.setApprovalMode).toHaveBeenCalledWith(ApprovalMode.AUTO_EDIT);
+        expect(result.current).toBe(ApprovalMode.AUTO_EDIT);
+        act(() => {
+            capturedUseKeypressHandler({
+                name: 'tab',
+                shift: true,
+            });
+        });
+        expect(mockConfigInstance.setApprovalMode).toHaveBeenCalledWith(ApprovalMode.DEFAULT);
+        expect(result.current).toBe(ApprovalMode.DEFAULT);
+    });
+    it('should not toggle if only one key or other keys combinations are pressed', () => {
+        mockConfigInstance.getApprovalMode.mockReturnValue(ApprovalMode.DEFAULT);
+        renderHook(() => useAutoAcceptIndicator({
+            config: mockConfigInstance,
+        }));
+        act(() => {
+            capturedUseKeypressHandler({
+                name: 'tab',
+                shift: false,
+            });
+        });
+        expect(mockConfigInstance.setApprovalMode).not.toHaveBeenCalled();
+        act(() => {
+            capturedUseKeypressHandler({
+                name: 'unknown',
+                shift: true,
+            });
+        });
+        expect(mockConfigInstance.setApprovalMode).not.toHaveBeenCalled();
+        act(() => {
+            capturedUseKeypressHandler({
+                name: 'a',
+                shift: false,
+                ctrl: false,
+            });
+        });
+        expect(mockConfigInstance.setApprovalMode).not.toHaveBeenCalled();
+        act(() => {
+            capturedUseKeypressHandler({ name: 'y', ctrl: false });
+        });
+        expect(mockConfigInstance.setApprovalMode).not.toHaveBeenCalled();
+        act(() => {
+            capturedUseKeypressHandler({ name: 'a', ctrl: true });
+        });
+        expect(mockConfigInstance.setApprovalMode).not.toHaveBeenCalled();
+        act(() => {
+            capturedUseKeypressHandler({ name: 'y', shift: true });
+        });
+        expect(mockConfigInstance.setApprovalMode).not.toHaveBeenCalled();
+        act(() => {
+            capturedUseKeypressHandler({
+                name: 'a',
+                ctrl: true,
+                shift: true,
+            });
+        });
+        expect(mockConfigInstance.setApprovalMode).not.toHaveBeenCalled();
+    });
+    it('should update indicator when config value changes externally (useEffect dependency)', () => {
+        mockConfigInstance.getApprovalMode.mockReturnValue(ApprovalMode.DEFAULT);
+        const { result, rerender } = renderHook((props) => useAutoAcceptIndicator(props), {
+            initialProps: {
+                config: mockConfigInstance,
+            },
+        });
+        expect(result.current).toBe(ApprovalMode.DEFAULT);
+        mockConfigInstance.getApprovalMode.mockReturnValue(ApprovalMode.AUTO_EDIT);
+        rerender({ config: mockConfigInstance });
+        expect(result.current).toBe(ApprovalMode.AUTO_EDIT);
+        expect(mockConfigInstance.getApprovalMode).toHaveBeenCalledTimes(3);
+    });
+});
+//# sourceMappingURL=useAutoAcceptIndicator.test.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useAutoAcceptIndicator.test.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useAutoAcceptIndicator.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,QAAQ,EACR,EAAE,EACF,MAAM,EACN,EAAE,EACF,UAAU,GAGX,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAErE,OAAO,EACL,MAAM,EAEN,YAAY,GACb,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,WAAW,EAAO,MAAM,kBAAkB,CAAC;AAEpD,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;AAE5B,EAAE,CAAC,IAAI,CAAC,yBAAyB,EAAE,KAAK,IAAI,EAAE;IAC5C,MAAM,kBAAkB,GAAG,CAAC,MAAM,EAAE,CAAC,YAAY,CAC/C,yBAAyB,CAC1B,CAA4B,CAAC;IAC9B,OAAO;QACL,GAAG,kBAAkB;QACrB,MAAM,EAAE,EAAE,CAAC,EAAE,EAAE;KAChB,CAAC;AACJ,CAAC,CAAC,CAAC;AAsBH,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;IACtC,IAAI,kBAA2C,CAAC;IAChD,IAAI,0BAA8C,CAAC;IACnD,IAAI,iBAAqD,CAAC;IAE1D,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;QAGjB,MACD,CAAC,kBAAkB,CAAC,GAAG,EAAE;YACxB,MAAM,2BAA2B,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;YAC5C,MAAM,2BAA2B,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;YAE5C,MAAM,QAAQ,GAA4B;gBACxC,eAAe,EAAE,2BAEhB;gBACD,eAAe,EAAE,2BAEhB;gBACD,YAAY,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,EAAE,CAAyB;gBACjE,uBAAuB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,SAAS,CAEzD;gBACD,YAAY,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,GAAG,CAAuB;gBAChE,SAAS,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,cAAc,CAEhD;gBACD,QAAQ,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,YAAY,CAAuB;gBACrE,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,CAExC;gBACD,YAAY,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,CAAwB;gBACnE,WAAW,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,SAAS,CAE7C;gBACD,cAAc,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,CAAwB;gBACrE,YAAY,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,iBAAiB,CAEtD;gBACD,aAAa,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,EAAE,CAAuB;gBAChE,oBAAoB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,CAAC,CAAuB;gBACtE,eAAe,EAAE,EAAE;qBAChB,EAAE,EAAE;qBACJ,eAAe,CAAC,EAAE,aAAa,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAE5C;aACF,CAAC;YACF,2BAA2B,CAAC,kBAAkB,CAAC,CAAC,KAAmB,EAAE,EAAE;gBACrE,2BAA2B,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;YACrD,CAAC,CAAC,CAAC;YACH,OAAO,QAAQ,CAAC;QAClB,CAAC,CAAC,CAAC;QAEH,iBAAiB,GAAG,WAAiD,CAAC;QACtE,iBAAiB,CAAC,kBAAkB,CAClC,CAAC,OAA2B,EAAE,QAAQ,EAAE,EAAE;YACxC,0BAA0B,GAAG,OAAO,CAAC;QACvC,CAAC,CACF,CAAC;QAEF,8DAA8D;QAC9D,kBAAkB,GAAG,IAAK,MAAc,EAA6B,CAAC;IACxE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wGAAwG,EAAE,GAAG,EAAE;QAChH,kBAAkB,CAAC,eAAe,CAAC,eAAe,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QAC3E,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,GAAG,EAAE,CACjC,sBAAsB,CAAC;YACrB,MAAM,EAAE,kBAAiD;SAC1D,CAAC,CACH,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QACpD,MAAM,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IACtE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oGAAoG,EAAE,GAAG,EAAE;QAC5G,kBAAkB,CAAC,eAAe,CAAC,eAAe,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACzE,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,GAAG,EAAE,CACjC,sBAAsB,CAAC;YACrB,MAAM,EAAE,kBAAiD;SAC1D,CAAC,CACH,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAClD,MAAM,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IACtE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8FAA8F,EAAE,GAAG,EAAE;QACtG,kBAAkB,CAAC,eAAe,CAAC,eAAe,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QACtE,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,GAAG,EAAE,CACjC,sBAAsB,CAAC;YACrB,MAAM,EAAE,kBAAiD;SAC1D,CAAC,CACH,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IACtE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mFAAmF,EAAE,GAAG,EAAE;QAC3F,kBAAkB,CAAC,eAAe,CAAC,eAAe,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACzE,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,GAAG,EAAE,CACjC,sBAAsB,CAAC;YACrB,MAAM,EAAE,kBAAiD;SAC1D,CAAC,CACH,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAElD,GAAG,CAAC,GAAG,EAAE;YACP,0BAA0B,CAAC;gBACzB,IAAI,EAAE,KAAK;gBACX,KAAK,EAAE,IAAI;aACL,CAAC,CAAC;QACZ,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC,oBAAoB,CAC7D,YAAY,CAAC,SAAS,CACvB,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QAEpD,GAAG,CAAC,GAAG,EAAE;YACP,0BAA0B,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAS,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC,oBAAoB,CAC7D,YAAY,CAAC,IAAI,CAClB,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAE/C,GAAG,CAAC,GAAG,EAAE;YACP,0BAA0B,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAS,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC,oBAAoB,CAC7D,YAAY,CAAC,OAAO,CACrB,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAElD,GAAG,CAAC,GAAG,EAAE;YACP,0BAA0B,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAS,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC,oBAAoB,CAC7D,YAAY,CAAC,IAAI,CAClB,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAE/C,GAAG,CAAC,GAAG,EAAE;YACP,0BAA0B,CAAC;gBACzB,IAAI,EAAE,KAAK;gBACX,KAAK,EAAE,IAAI;aACL,CAAC,CAAC;QACZ,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC,oBAAoB,CAC7D,YAAY,CAAC,SAAS,CACvB,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QAEpD,GAAG,CAAC,GAAG,EAAE;YACP,0BAA0B,CAAC;gBACzB,IAAI,EAAE,KAAK;gBACX,KAAK,EAAE,IAAI;aACL,CAAC,CAAC;QACZ,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC,oBAAoB,CAC7D,YAAY,CAAC,OAAO,CACrB,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0EAA0E,EAAE,GAAG,EAAE;QAClF,kBAAkB,CAAC,eAAe,CAAC,eAAe,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACzE,UAAU,CAAC,GAAG,EAAE,CACd,sBAAsB,CAAC;YACrB,MAAM,EAAE,kBAAiD;SAC1D,CAAC,CACH,CAAC;QAEF,GAAG,CAAC,GAAG,EAAE;YACP,0BAA0B,CAAC;gBACzB,IAAI,EAAE,KAAK;gBACX,KAAK,EAAE,KAAK;aACN,CAAC,CAAC;QACZ,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QAElE,GAAG,CAAC,GAAG,EAAE;YACP,0BAA0B,CAAC;gBACzB,IAAI,EAAE,SAAS;gBACf,KAAK,EAAE,IAAI;aACL,CAAC,CAAC;QACZ,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QAElE,GAAG,CAAC,GAAG,EAAE;YACP,0BAA0B,CAAC;gBACzB,IAAI,EAAE,GAAG;gBACT,KAAK,EAAE,KAAK;gBACZ,IAAI,EAAE,KAAK;aACL,CAAC,CAAC;QACZ,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QAElE,GAAG,CAAC,GAAG,EAAE;YACP,0BAA0B,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAS,CAAC,CAAC;QAChE,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QAElE,GAAG,CAAC,GAAG,EAAE;YACP,0BAA0B,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAS,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QAElE,GAAG,CAAC,GAAG,EAAE;YACP,0BAA0B,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAS,CAAC,CAAC;QAChE,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QAElE,GAAG,CAAC,GAAG,EAAE;YACP,0BAA0B,CAAC;gBACzB,IAAI,EAAE,GAAG;gBACT,IAAI,EAAE,IAAI;gBACV,KAAK,EAAE,IAAI;aACL,CAAC,CAAC;QACZ,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;IACpE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qFAAqF,EAAE,GAAG,EAAE;QAC7F,kBAAkB,CAAC,eAAe,CAAC,eAAe,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACzE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,UAAU,CACrC,CAAC,KAAmC,EAAE,EAAE,CAAC,sBAAsB,CAAC,KAAK,CAAC,EACtE;YACE,YAAY,EAAE;gBACZ,MAAM,EAAE,kBAAiD;aAC1D;SACF,CACF,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAElD,kBAAkB,CAAC,eAAe,CAAC,eAAe,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QAE3E,QAAQ,CAAC,EAAE,MAAM,EAAE,kBAAiD,EAAE,CAAC,CAAC;QACxE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QACpD,MAAM,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IACtE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

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

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

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

@@ -0,0 +1,164 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { afterEach, beforeEach, describe, expect, it, vi, } from 'vitest';
+import { act } from 'react';
+import { renderHook } from '@testing-library/react';
+import { useEditorSettings } from './useEditorSettings.js';
+import { SettingScope } from '../../config/settings.js';
+import { MessageType } from '../types.js';
+import { checkHasEditorType, allowEditorTypeInSandbox, } from '@google/gemini-cli-core';
+vi.mock('@google/gemini-cli-core', async () => {
+    const actual = await vi.importActual('@google/gemini-cli-core');
+    return {
+        ...actual,
+        checkHasEditorType: vi.fn(() => true),
+        allowEditorTypeInSandbox: vi.fn(() => true),
+    };
+});
+const mockCheckHasEditorType = vi.mocked(checkHasEditorType);
+const mockAllowEditorTypeInSandbox = vi.mocked(allowEditorTypeInSandbox);
+describe('useEditorSettings', () => {
+    let mockLoadedSettings;
+    let mockSetEditorError;
+    let mockAddItem;
+    beforeEach(() => {
+        vi.resetAllMocks();
+        mockLoadedSettings = {
+            setValue: vi.fn(),
+        };
+        mockSetEditorError = vi.fn();
+        mockAddItem = vi.fn();
+        // Reset mock implementations to default
+        mockCheckHasEditorType.mockReturnValue(true);
+        mockAllowEditorTypeInSandbox.mockReturnValue(true);
+    });
+    afterEach(() => {
+        vi.restoreAllMocks();
+    });
+    it('should initialize with dialog closed', () => {
+        const { result } = renderHook(() => useEditorSettings(mockLoadedSettings, mockSetEditorError, mockAddItem));
+        expect(result.current.isEditorDialogOpen).toBe(false);
+    });
+    it('should open editor dialog when openEditorDialog is called', () => {
+        const { result } = renderHook(() => useEditorSettings(mockLoadedSettings, mockSetEditorError, mockAddItem));
+        act(() => {
+            result.current.openEditorDialog();
+        });
+        expect(result.current.isEditorDialogOpen).toBe(true);
+    });
+    it('should close editor dialog when exitEditorDialog is called', () => {
+        const { result } = renderHook(() => useEditorSettings(mockLoadedSettings, mockSetEditorError, mockAddItem));
+        act(() => {
+            result.current.openEditorDialog();
+            result.current.exitEditorDialog();
+        });
+        expect(result.current.isEditorDialogOpen).toBe(false);
+    });
+    it('should handle editor selection successfully', () => {
+        const { result } = renderHook(() => useEditorSettings(mockLoadedSettings, mockSetEditorError, mockAddItem));
+        const editorType = 'vscode';
+        const scope = SettingScope.User;
+        act(() => {
+            result.current.openEditorDialog();
+            result.current.handleEditorSelect(editorType, scope);
+        });
+        expect(mockLoadedSettings.setValue).toHaveBeenCalledWith(scope, 'preferredEditor', editorType);
+        expect(mockAddItem).toHaveBeenCalledWith({
+            type: MessageType.INFO,
+            text: 'Editor preference set to "vscode" in User settings.',
+        }, expect.any(Number));
+        expect(mockSetEditorError).toHaveBeenCalledWith(null);
+        expect(result.current.isEditorDialogOpen).toBe(false);
+    });
+    it('should handle clearing editor preference (undefined editor)', () => {
+        const { result } = renderHook(() => useEditorSettings(mockLoadedSettings, mockSetEditorError, mockAddItem));
+        const scope = SettingScope.Workspace;
+        act(() => {
+            result.current.openEditorDialog();
+            result.current.handleEditorSelect(undefined, scope);
+        });
+        expect(mockLoadedSettings.setValue).toHaveBeenCalledWith(scope, 'preferredEditor', undefined);
+        expect(mockAddItem).toHaveBeenCalledWith({
+            type: MessageType.INFO,
+            text: 'Editor preference cleared in Workspace settings.',
+        }, expect.any(Number));
+        expect(mockSetEditorError).toHaveBeenCalledWith(null);
+        expect(result.current.isEditorDialogOpen).toBe(false);
+    });
+    it('should handle different editor types', () => {
+        const { result } = renderHook(() => useEditorSettings(mockLoadedSettings, mockSetEditorError, mockAddItem));
+        const editorTypes = ['cursor', 'windsurf', 'vim'];
+        const scope = SettingScope.User;
+        editorTypes.forEach((editorType) => {
+            act(() => {
+                result.current.handleEditorSelect(editorType, scope);
+            });
+            expect(mockLoadedSettings.setValue).toHaveBeenCalledWith(scope, 'preferredEditor', editorType);
+            expect(mockAddItem).toHaveBeenCalledWith({
+                type: MessageType.INFO,
+                text: `Editor preference set to "${editorType}" in User settings.`,
+            }, expect.any(Number));
+        });
+    });
+    it('should handle different setting scopes', () => {
+        const { result } = renderHook(() => useEditorSettings(mockLoadedSettings, mockSetEditorError, mockAddItem));
+        const editorType = 'vscode';
+        const scopes = [SettingScope.User, SettingScope.Workspace];
+        scopes.forEach((scope) => {
+            act(() => {
+                result.current.handleEditorSelect(editorType, scope);
+            });
+            expect(mockLoadedSettings.setValue).toHaveBeenCalledWith(scope, 'preferredEditor', editorType);
+            expect(mockAddItem).toHaveBeenCalledWith({
+                type: MessageType.INFO,
+                text: `Editor preference set to "vscode" in ${scope} settings.`,
+            }, expect.any(Number));
+        });
+    });
+    it('should not set preference for unavailable editors', () => {
+        const { result } = renderHook(() => useEditorSettings(mockLoadedSettings, mockSetEditorError, mockAddItem));
+        mockCheckHasEditorType.mockReturnValue(false);
+        const editorType = 'vscode';
+        const scope = SettingScope.User;
+        act(() => {
+            result.current.openEditorDialog();
+            result.current.handleEditorSelect(editorType, scope);
+        });
+        expect(mockLoadedSettings.setValue).not.toHaveBeenCalled();
+        expect(mockAddItem).not.toHaveBeenCalled();
+        expect(result.current.isEditorDialogOpen).toBe(true);
+    });
+    it('should not set preference for editors not allowed in sandbox', () => {
+        const { result } = renderHook(() => useEditorSettings(mockLoadedSettings, mockSetEditorError, mockAddItem));
+        mockAllowEditorTypeInSandbox.mockReturnValue(false);
+        const editorType = 'vscode';
+        const scope = SettingScope.User;
+        act(() => {
+            result.current.openEditorDialog();
+            result.current.handleEditorSelect(editorType, scope);
+        });
+        expect(mockLoadedSettings.setValue).not.toHaveBeenCalled();
+        expect(mockAddItem).not.toHaveBeenCalled();
+        expect(result.current.isEditorDialogOpen).toBe(true);
+    });
+    it('should handle errors during editor selection', () => {
+        const { result } = renderHook(() => useEditorSettings(mockLoadedSettings, mockSetEditorError, mockAddItem));
+        const errorMessage = 'Failed to save settings';
+        mockLoadedSettings.setValue.mockImplementation(() => {
+            throw new Error(errorMessage);
+        });
+        const editorType = 'vscode';
+        const scope = SettingScope.User;
+        act(() => {
+            result.current.openEditorDialog();
+            result.current.handleEditorSelect(editorType, scope);
+        });
+        expect(mockSetEditorError).toHaveBeenCalledWith(`Failed to set editor preference: Error: ${errorMessage}`);
+        expect(mockAddItem).not.toHaveBeenCalled();
+        expect(result.current.isEditorDialogOpen).toBe(true);
+    });
+});
+//# sourceMappingURL=useEditorSettings.test.js.map

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

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

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

@@ -3,10 +3,10 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { type Config } from '@google/gemini-cli-core';
 import { LoadedSettings } from '../../config/settings.js';
 import { FolderTrustChoice } from '../components/FolderTrustDialog.js';
-export declare const useFolderTrust: (settings: LoadedSettings, config: Config) => {
+export declare const useFolderTrust: (settings: LoadedSettings, onTrustChange: (isTrusted: boolean | undefined) => void) => {
+    isTrusted: boolean | undefined;
     isFolderTrustDialogOpen: boolean;
     handleFolderTrustSelect: (choice: FolderTrustChoice) => void;
 };

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

@@ -3,12 +3,23 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { useState, useCallback } from 'react';
+import { useState, useCallback, useEffect } from 'react';
 import { FolderTrustChoice } from '../components/FolderTrustDialog.js';
-import { loadTrustedFolders, TrustLevel } from '../../config/trustedFolders.js';
+import { loadTrustedFolders, TrustLevel, isWorkspaceTrusted, } from '../../config/trustedFolders.js';
 import * as process from 'process';
-export const useFolderTrust = (settings, config) => {
-    const [isFolderTrustDialogOpen, setIsFolderTrustDialogOpen] = useState(config.isTrustedFolder() === undefined);
+export const useFolderTrust = (settings, onTrustChange) => {
+    const [isTrusted, setIsTrusted] = useState(undefined);
+    const [isFolderTrustDialogOpen, setIsFolderTrustDialogOpen] = useState(false);
+    const { folderTrust, folderTrustFeature } = settings.merged;
+    useEffect(() => {
+        const trusted = isWorkspaceTrusted({
+            folderTrust,
+            folderTrustFeature,
+        });
+        setIsTrusted(trusted);
+        setIsFolderTrustDialogOpen(trusted === undefined);
+        onTrustChange(trusted);
+    }, [onTrustChange, folderTrust, folderTrustFeature]);
     const handleFolderTrustSelect = useCallback((choice) => {
         const trustedFolders = loadTrustedFolders();
         const cwd = process.cwd();
@@ -27,9 +38,16 @@ export const useFolderTrust = (settings, config) => {
                 return;
         }
         trustedFolders.setValue(cwd, trustLevel);
+        const trusted = isWorkspaceTrusted({
+            folderTrust,
+            folderTrustFeature,
+        });
+        setIsTrusted(trusted);
         setIsFolderTrustDialogOpen(false);
-    }, []);
+        onTrustChange(trusted);
+    }, [onTrustChange, folderTrust, folderTrustFeature]);
     return {
+        isTrusted,
         isFolderTrustDialogOpen,
         handleFolderTrustSelect,
     };

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

@@ -1 +1 @@
-{"version":3,"file":"useFolderTrust.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useFolderTrust.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAG9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAChF,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAEnC,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,QAAwB,EAAE,MAAc,EAAE,EAAE;IACzE,MAAM,CAAC,uBAAuB,EAAE,0BAA0B,CAAC,GAAG,QAAQ,CACpE,MAAM,CAAC,eAAe,EAAE,KAAK,SAAS,CACvC,CAAC;IAEF,MAAM,uBAAuB,GAAG,WAAW,CAAC,CAAC,MAAyB,EAAE,EAAE;QACxE,MAAM,cAAc,GAAG,kBAAkB,EAAE,CAAC;QAC5C,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QAC1B,IAAI,UAAsB,CAAC;QAE3B,QAAQ,MAAM,EAAE,CAAC;YACf,KAAK,iBAAiB,CAAC,YAAY;gBACjC,UAAU,GAAG,UAAU,CAAC,YAAY,CAAC;gBACrC,MAAM;YACR,KAAK,iBAAiB,CAAC,YAAY;gBACjC,UAAU,GAAG,UAAU,CAAC,YAAY,CAAC;gBACrC,MAAM;YACR,KAAK,iBAAiB,CAAC,YAAY;gBACjC,UAAU,GAAG,UAAU,CAAC,YAAY,CAAC;gBACrC,MAAM;YACR;gBACE,OAAO;QACX,CAAC;QAED,cAAc,CAAC,QAAQ,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QACzC,0BAA0B,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO;QACL,uBAAuB;QACvB,uBAAuB;KACxB,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"useFolderTrust.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useFolderTrust.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EACL,kBAAkB,EAClB,UAAU,EACV,kBAAkB,GACnB,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAEnC,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,QAAwB,EACxB,aAAuD,EACvD,EAAE;IACF,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAsB,SAAS,CAAC,CAAC;IAC3E,MAAM,CAAC,uBAAuB,EAAE,0BAA0B,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAE9E,MAAM,EAAE,WAAW,EAAE,kBAAkB,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC;IAC5D,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,OAAO,GAAG,kBAAkB,CAAC;YACjC,WAAW;YACX,kBAAkB;SACP,CAAC,CAAC;QACf,YAAY,CAAC,OAAO,CAAC,CAAC;QACtB,0BAA0B,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC;QAClD,aAAa,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC,EAAE,CAAC,aAAa,EAAE,WAAW,EAAE,kBAAkB,CAAC,CAAC,CAAC;IAErD,MAAM,uBAAuB,GAAG,WAAW,CACzC,CAAC,MAAyB,EAAE,EAAE;QAC5B,MAAM,cAAc,GAAG,kBAAkB,EAAE,CAAC;QAC5C,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QAC1B,IAAI,UAAsB,CAAC;QAE3B,QAAQ,MAAM,EAAE,CAAC;YACf,KAAK,iBAAiB,CAAC,YAAY;gBACjC,UAAU,GAAG,UAAU,CAAC,YAAY,CAAC;gBACrC,MAAM;YACR,KAAK,iBAAiB,CAAC,YAAY;gBACjC,UAAU,GAAG,UAAU,CAAC,YAAY,CAAC;gBACrC,MAAM;YACR,KAAK,iBAAiB,CAAC,YAAY;gBACjC,UAAU,GAAG,UAAU,CAAC,YAAY,CAAC;gBACrC,MAAM;YACR;gBACE,OAAO;QACX,CAAC;QAED,cAAc,CAAC,QAAQ,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QACzC,MAAM,OAAO,GAAG,kBAAkB,CAAC;YACjC,WAAW;YACX,kBAAkB;SACP,CAAC,CAAC;QACf,YAAY,CAAC,OAAO,CAAC,CAAC;QACtB,0BAA0B,CAAC,KAAK,CAAC,CAAC;QAClC,aAAa,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC,EACD,CAAC,aAAa,EAAE,WAAW,EAAE,kBAAkB,CAAC,CACjD,CAAC;IAEF,OAAO;QACL,SAAS;QACT,uBAAuB;QACvB,uBAAuB;KACxB,CAAC;AACJ,CAAC,CAAC"}

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

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

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

@@ -0,0 +1,175 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { afterEach, beforeEach, describe, expect, it, vi, } from 'vitest';
+import { act } from 'react';
+import { renderHook } from '@testing-library/react';
+import { useGitBranchName } from './useGitBranchName.js';
+import { fs, vol } from 'memfs'; // For mocking fs
+import { EventEmitter } from 'node:events';
+import { exec as mockExec } from 'node:child_process';
+// Mock child_process
+vi.mock('child_process');
+// Mock fs and fs/promises
+vi.mock('node:fs', async () => {
+    const memfs = await vi.importActual('memfs');
+    return memfs.fs;
+});
+vi.mock('node:fs/promises', async () => {
+    const memfs = await vi.importActual('memfs');
+    return memfs.fs.promises;
+});
+const CWD = '/test/project';
+const GIT_HEAD_PATH = `${CWD}/.git/HEAD`;
+describe('useGitBranchName', () => {
+    beforeEach(() => {
+        vol.reset(); // Reset in-memory filesystem
+        vol.fromJSON({
+            [GIT_HEAD_PATH]: 'ref: refs/heads/main',
+        });
+        vi.useFakeTimers(); // Use fake timers for async operations
+    });
+    afterEach(() => {
+        vi.restoreAllMocks();
+        vi.clearAllTimers();
+    });
+    it('should return branch name', async () => {
+        mockExec.mockImplementation((_command, _options, callback) => {
+            callback?.(null, 'main\n', '');
+            return new EventEmitter();
+        });
+        const { result, rerender } = renderHook(() => useGitBranchName(CWD));
+        await act(async () => {
+            vi.runAllTimers(); // Advance timers to trigger useEffect and exec callback
+            rerender(); // Rerender to get the updated state
+        });
+        expect(result.current).toBe('main');
+    });
+    it('should return undefined if git command fails', async () => {
+        mockExec.mockImplementation((_command, _options, callback) => {
+            callback?.(new Error('Git error'), '', 'error output');
+            return new EventEmitter();
+        });
+        const { result, rerender } = renderHook(() => useGitBranchName(CWD));
+        expect(result.current).toBeUndefined();
+        await act(async () => {
+            vi.runAllTimers();
+            rerender();
+        });
+        expect(result.current).toBeUndefined();
+    });
+    it('should return short commit hash if branch is HEAD (detached state)', async () => {
+        mockExec.mockImplementation((command, _options, callback) => {
+            if (command === 'git rev-parse --abbrev-ref HEAD') {
+                callback?.(null, 'HEAD\n', '');
+            }
+            else if (command === 'git rev-parse --short HEAD') {
+                callback?.(null, 'a1b2c3d\n', '');
+            }
+            return new EventEmitter();
+        });
+        const { result, rerender } = renderHook(() => useGitBranchName(CWD));
+        await act(async () => {
+            vi.runAllTimers();
+            rerender();
+        });
+        expect(result.current).toBe('a1b2c3d');
+    });
+    it('should return undefined if branch is HEAD and getting commit hash fails', async () => {
+        mockExec.mockImplementation((command, _options, callback) => {
+            if (command === 'git rev-parse --abbrev-ref HEAD') {
+                callback?.(null, 'HEAD\n', '');
+            }
+            else if (command === 'git rev-parse --short HEAD') {
+                callback?.(new Error('Git error'), '', 'error output');
+            }
+            return new EventEmitter();
+        });
+        const { result, rerender } = renderHook(() => useGitBranchName(CWD));
+        await act(async () => {
+            vi.runAllTimers();
+            rerender();
+        });
+        expect(result.current).toBeUndefined();
+    });
+    it('should update branch name when .git/HEAD changes', async ({ skip }) => {
+        skip(); // TODO: fix
+        mockExec.mockImplementationOnce((_command, _options, callback) => {
+            callback?.(null, 'main\n', '');
+            return new EventEmitter();
+        });
+        const { result, rerender } = renderHook(() => useGitBranchName(CWD));
+        await act(async () => {
+            vi.runAllTimers();
+            rerender();
+        });
+        expect(result.current).toBe('main');
+        // Simulate a branch change
+        mockExec.mockImplementationOnce((_command, _options, callback) => {
+            callback?.(null, 'develop\n', '');
+            return new EventEmitter();
+        });
+        // Simulate file change event
+        // Ensure the watcher is set up before triggering the change
+        await act(async () => {
+            fs.writeFileSync(GIT_HEAD_PATH, 'ref: refs/heads/develop'); // Trigger watcher
+            vi.runAllTimers(); // Process timers for watcher and exec
+            rerender();
+        });
+        expect(result.current).toBe('develop');
+    });
+    it('should handle watcher setup error silently', async () => {
+        // Remove .git/HEAD to cause an error in fs.watch setup
+        vol.unlinkSync(GIT_HEAD_PATH);
+        mockExec.mockImplementation((_command, _options, callback) => {
+            callback?.(null, 'main\n', '');
+            return new EventEmitter();
+        });
+        const { result, rerender } = renderHook(() => useGitBranchName(CWD));
+        await act(async () => {
+            vi.runAllTimers();
+            rerender();
+        });
+        expect(result.current).toBe('main'); // Branch name should still be fetched initially
+        // Try to trigger a change that would normally be caught by the watcher
+        mockExec.mockImplementationOnce((_command, _options, callback) => {
+            callback?.(null, 'develop\n', '');
+            return new EventEmitter();
+        });
+        // This write would trigger the watcher if it was set up
+        // but since it failed, the branch name should not update
+        // We need to create the file again for writeFileSync to not throw
+        vol.fromJSON({
+            [GIT_HEAD_PATH]: 'ref: refs/heads/develop',
+        });
+        await act(async () => {
+            fs.writeFileSync(GIT_HEAD_PATH, 'ref: refs/heads/develop');
+            vi.runAllTimers();
+            rerender();
+        });
+        // Branch name should not change because watcher setup failed
+        expect(result.current).toBe('main');
+    });
+    it('should cleanup watcher on unmount', async ({ skip }) => {
+        skip(); // TODO: fix
+        const closeMock = vi.fn();
+        const watchMock = vi.spyOn(fs, 'watch').mockReturnValue({
+            close: closeMock,
+        });
+        mockExec.mockImplementation((_command, _options, callback) => {
+            callback?.(null, 'main\n', '');
+            return new EventEmitter();
+        });
+        const { unmount, rerender } = renderHook(() => useGitBranchName(CWD));
+        await act(async () => {
+            vi.runAllTimers();
+            rerender();
+        });
+        unmount();
+        expect(watchMock).toHaveBeenCalledWith(GIT_HEAD_PATH, expect.any(Function));
+        expect(closeMock).toHaveBeenCalled();
+    });
+});
+//# sourceMappingURL=useGitBranchName.test.js.map