@machina.ai/cell-cli 1.8.2-rc1 → 1.11.0-rc1

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

@@ -0,0 +1,115 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { renderHook, act } from '@testing-library/react';
+import { EventEmitter } from 'node:events';
+import { useFocus } from './useFocus.js';
+import { vi } from 'vitest';
+import { useStdin, useStdout } from 'ink';
+import { KeypressProvider } from '../contexts/KeypressContext.js';
+import React from 'react';
+// Mock the ink hooks
+vi.mock('ink', async (importOriginal) => {
+    const original = await importOriginal();
+    return {
+        ...original,
+        useStdin: vi.fn(),
+        useStdout: vi.fn(),
+    };
+});
+const mockedUseStdin = vi.mocked(useStdin);
+const mockedUseStdout = vi.mocked(useStdout);
+const wrapper = ({ children }) => React.createElement(KeypressProvider, null, children);
+describe('useFocus', () => {
+    let stdin;
+    let stdout;
+    beforeEach(() => {
+        stdin = Object.assign(new EventEmitter(), {
+            resume: vi.fn(),
+            pause: vi.fn(),
+        });
+        stdout = { write: vi.fn() };
+        mockedUseStdin.mockReturnValue({ stdin });
+        mockedUseStdout.mockReturnValue({ stdout });
+    });
+    afterEach(() => {
+        vi.clearAllMocks();
+        stdin.removeAllListeners();
+    });
+    it('should initialize with focus and enable focus reporting', () => {
+        const { result } = renderHook(() => useFocus(), { wrapper });
+        expect(result.current).toBe(true);
+        expect(stdout.write).toHaveBeenCalledWith('\x1b[?1004h');
+    });
+    it('should set isFocused to false when a focus-out event is received', () => {
+        const { result } = renderHook(() => useFocus(), { wrapper });
+        // Initial state is focused
+        expect(result.current).toBe(true);
+        // Simulate focus-out event
+        act(() => {
+            stdin.emit('data', Buffer.from('\x1b[O'));
+        });
+        // State should now be unfocused
+        expect(result.current).toBe(false);
+    });
+    it('should set isFocused to true when a focus-in event is received', () => {
+        const { result } = renderHook(() => useFocus(), { wrapper });
+        // Simulate focus-out to set initial state to false
+        act(() => {
+            stdin.emit('data', Buffer.from('\x1b[O'));
+        });
+        expect(result.current).toBe(false);
+        // Simulate focus-in event
+        act(() => {
+            stdin.emit('data', Buffer.from('\x1b[I'));
+        });
+        // State should now be focused
+        expect(result.current).toBe(true);
+    });
+    it('should clean up and disable focus reporting on unmount', () => {
+        const { unmount } = renderHook(() => useFocus(), { wrapper });
+        // At this point we should have listeners from both KeypressProvider and useFocus
+        const listenerCountAfterMount = stdin.listenerCount('data');
+        expect(listenerCountAfterMount).toBeGreaterThanOrEqual(1);
+        unmount();
+        // Assert that the cleanup function was called
+        expect(stdout.write).toHaveBeenCalledWith('\x1b[?1004l');
+        // Ensure useFocus listener was removed (but KeypressProvider listeners may remain)
+        expect(stdin.listenerCount('data')).toBeLessThan(listenerCountAfterMount);
+    });
+    it('should handle multiple focus events correctly', () => {
+        const { result } = renderHook(() => useFocus(), { wrapper });
+        act(() => {
+            stdin.emit('data', Buffer.from('\x1b[O'));
+        });
+        expect(result.current).toBe(false);
+        act(() => {
+            stdin.emit('data', Buffer.from('\x1b[O'));
+        });
+        expect(result.current).toBe(false);
+        act(() => {
+            stdin.emit('data', Buffer.from('\x1b[I'));
+        });
+        expect(result.current).toBe(true);
+        act(() => {
+            stdin.emit('data', Buffer.from('\x1b[I'));
+        });
+        expect(result.current).toBe(true);
+    });
+    it('restores focus on keypress after focus is lost', () => {
+        const { result } = renderHook(() => useFocus(), { wrapper });
+        // Simulate focus-out event
+        act(() => {
+            stdin.emit('data', Buffer.from('\x1b[O'));
+        });
+        expect(result.current).toBe(false);
+        // Simulate a keypress
+        act(() => {
+            stdin.emit('data', Buffer.from('a'));
+        });
+        expect(result.current).toBe(true);
+    });
+});
+//# sourceMappingURL=useFocus.test.js.map

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

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

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

@@ -5,7 +5,8 @@
  */
 import type { LoadedSettings } from '../../config/settings.js';
 import { FolderTrustChoice } from '../components/FolderTrustDialog.js';
-export declare const useFolderTrust: (settings: LoadedSettings, onTrustChange: (isTrusted: boolean | undefined) => void) => {
+import { type HistoryItemWithoutId } from '../types.js';
+export declare const useFolderTrust: (settings: LoadedSettings, onTrustChange: (isTrusted: boolean | undefined) => void, addItem: (item: HistoryItemWithoutId, timestamp: number) => number) => {
     isTrusted: boolean | undefined;
     isFolderTrustDialogOpen: boolean;
     handleFolderTrustSelect: (choice: FolderTrustChoice) => void;

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

@@ -3,21 +3,30 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { useState, useCallback, useEffect } from 'react';
+import { useState, useCallback, useEffect, useRef } from 'react';
 import { FolderTrustChoice } from '../components/FolderTrustDialog.js';
 import { loadTrustedFolders, TrustLevel, isWorkspaceTrusted, } from '../../config/trustedFolders.js';
 import * as process from 'node:process';
-export const useFolderTrust = (settings, onTrustChange) => {
+import { MessageType } from '../types.js';
+export const useFolderTrust = (settings, onTrustChange, addItem) => {
     const [isTrusted, setIsTrusted] = useState(undefined);
     const [isFolderTrustDialogOpen, setIsFolderTrustDialogOpen] = useState(false);
     const [isRestarting, setIsRestarting] = useState(false);
+    const startupMessageSent = useRef(false);
     const folderTrust = settings.merged.security?.folderTrust?.enabled;
     useEffect(() => {
         const { isTrusted: trusted } = isWorkspaceTrusted(settings.merged);
         setIsTrusted(trusted);
         setIsFolderTrustDialogOpen(trusted === undefined);
         onTrustChange(trusted);
-    }, [folderTrust, onTrustChange, settings.merged]);
+        if (trusted === false && !startupMessageSent.current) {
+            addItem({
+                type: MessageType.INFO,
+                text: 'This folder is not trusted. Some features may be disabled. Use the `/permissions` command to change the trust level.',
+            }, Date.now());
+            startupMessageSent.current = true;
+        }
+    }, [folderTrust, onTrustChange, settings.merged, addItem]);
     const handleFolderTrustSelect = useCallback((choice) => {
         const trustedFolders = loadTrustedFolders();
         const cwd = process.cwd();

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,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,cAAc,CAAC;AAExC,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;IAC9E,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAExD,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,WAAW,EAAE,OAAO,CAAC;IAEnE,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,kBAAkB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACnE,YAAY,CAAC,OAAO,CAAC,CAAC;QACtB,0BAA0B,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC;QAClD,aAAa,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC,EAAE,CAAC,WAAW,EAAE,aAAa,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IAElD,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,MAAM,UAAU,GAAG,SAAS,IAAI,IAAI,CAAC;QAErC,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,gBAAgB,GACpB,UAAU,KAAK,UAAU,CAAC,YAAY;YACtC,UAAU,KAAK,UAAU,CAAC,YAAY,CAAC;QACzC,YAAY,CAAC,gBAAgB,CAAC,CAAC;QAC/B,aAAa,CAAC,gBAAgB,CAAC,CAAC;QAEhC,MAAM,YAAY,GAAG,UAAU,KAAK,gBAAgB,CAAC;QACrD,IAAI,YAAY,EAAE,CAAC;YACjB,eAAe,CAAC,IAAI,CAAC,CAAC;YACtB,0BAA0B,CAAC,IAAI,CAAC,CAAC;QACnC,CAAC;aAAM,CAAC;YACN,0BAA0B,CAAC,KAAK,CAAC,CAAC;QACpC,CAAC;IACH,CAAC,EACD,CAAC,aAAa,EAAE,SAAS,CAAC,CAC3B,CAAC;IAEF,OAAO;QACL,SAAS;QACT,uBAAuB;QACvB,uBAAuB;QACvB,YAAY;KACb,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,EAAE,MAAM,OAAO,CAAC;AAEjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EACL,kBAAkB,EAClB,UAAU,EACV,kBAAkB,GACnB,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,EAA6B,WAAW,EAAE,MAAM,aAAa,CAAC;AAErE,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,QAAwB,EACxB,aAAuD,EACvD,OAAkE,EAClE,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;IAC9E,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IACxD,MAAM,kBAAkB,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAEzC,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,WAAW,EAAE,OAAO,CAAC;IAEnE,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,kBAAkB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACnE,YAAY,CAAC,OAAO,CAAC,CAAC;QACtB,0BAA0B,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC;QAClD,aAAa,CAAC,OAAO,CAAC,CAAC;QAEvB,IAAI,OAAO,KAAK,KAAK,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,CAAC;YACrD,OAAO,CACL;gBACE,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,IAAI,EAAE,sHAAsH;aAC7H,EACD,IAAI,CAAC,GAAG,EAAE,CACX,CAAC;YACF,kBAAkB,CAAC,OAAO,GAAG,IAAI,CAAC;QACpC,CAAC;IACH,CAAC,EAAE,CAAC,WAAW,EAAE,aAAa,EAAE,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAE3D,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,MAAM,UAAU,GAAG,SAAS,IAAI,IAAI,CAAC;QAErC,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,gBAAgB,GACpB,UAAU,KAAK,UAAU,CAAC,YAAY;YACtC,UAAU,KAAK,UAAU,CAAC,YAAY,CAAC;QACzC,YAAY,CAAC,gBAAgB,CAAC,CAAC;QAC/B,aAAa,CAAC,gBAAgB,CAAC,CAAC;QAEhC,MAAM,YAAY,GAAG,UAAU,KAAK,gBAAgB,CAAC;QACrD,IAAI,YAAY,EAAE,CAAC;YACjB,eAAe,CAAC,IAAI,CAAC,CAAC;YACtB,0BAA0B,CAAC,IAAI,CAAC,CAAC;QACnC,CAAC;aAAM,CAAC;YACN,0BAA0B,CAAC,KAAK,CAAC,CAAC;QACpC,CAAC;IACH,CAAC,EACD,CAAC,aAAa,EAAE,SAAS,CAAC,CAC3B,CAAC;IAEF,OAAO;QACL,SAAS;QACT,uBAAuB;QACvB,uBAAuB;QACvB,YAAY;KACb,CAAC;AACJ,CAAC,CAAC"}

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

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

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

@@ -0,0 +1,164 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { vi } from 'vitest';
+import { renderHook, act } from '@testing-library/react';
+import { useFolderTrust } from './useFolderTrust.js';
+import { FolderTrustChoice } from '../components/FolderTrustDialog.js';
+import { TrustLevel } from '../../config/trustedFolders.js';
+import * as trustedFolders from '../../config/trustedFolders.js';
+const mockedCwd = vi.hoisted(() => vi.fn());
+vi.mock('node:process', async () => {
+    const actual = await vi.importActual('node:process');
+    return {
+        ...actual,
+        cwd: mockedCwd,
+        platform: 'linux',
+    };
+});
+describe('useFolderTrust', () => {
+    let mockSettings;
+    let mockTrustedFolders;
+    let loadTrustedFoldersSpy;
+    let isWorkspaceTrustedSpy;
+    let onTrustChange;
+    let addItem;
+    beforeEach(() => {
+        mockSettings = {
+            merged: {
+                security: {
+                    folderTrust: {
+                        enabled: true,
+                    },
+                },
+            },
+            setValue: vi.fn(),
+        };
+        mockTrustedFolders = {
+            setValue: vi.fn(),
+        };
+        loadTrustedFoldersSpy = vi
+            .spyOn(trustedFolders, 'loadTrustedFolders')
+            .mockReturnValue(mockTrustedFolders);
+        isWorkspaceTrustedSpy = vi.spyOn(trustedFolders, 'isWorkspaceTrusted');
+        mockedCwd.mockReturnValue('/test/path');
+        onTrustChange = vi.fn();
+        addItem = vi.fn();
+    });
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+    it('should not open dialog when folder is already trusted', () => {
+        isWorkspaceTrustedSpy.mockReturnValue({ isTrusted: true, source: 'file' });
+        const { result } = renderHook(() => useFolderTrust(mockSettings, onTrustChange, addItem));
+        expect(result.current.isFolderTrustDialogOpen).toBe(false);
+        expect(onTrustChange).toHaveBeenCalledWith(true);
+    });
+    it('should not open dialog when folder is already untrusted', () => {
+        isWorkspaceTrustedSpy.mockReturnValue({ isTrusted: false, source: 'file' });
+        const { result } = renderHook(() => useFolderTrust(mockSettings, onTrustChange, addItem));
+        expect(result.current.isFolderTrustDialogOpen).toBe(false);
+        expect(onTrustChange).toHaveBeenCalledWith(false);
+    });
+    it('should open dialog when folder trust is undefined', () => {
+        isWorkspaceTrustedSpy.mockReturnValue({
+            isTrusted: undefined,
+            source: undefined,
+        });
+        const { result } = renderHook(() => useFolderTrust(mockSettings, onTrustChange, addItem));
+        expect(result.current.isFolderTrustDialogOpen).toBe(true);
+        expect(onTrustChange).toHaveBeenCalledWith(undefined);
+    });
+    it('should send a message if the folder is untrusted', () => {
+        isWorkspaceTrustedSpy.mockReturnValue({ isTrusted: false, source: 'file' });
+        renderHook(() => useFolderTrust(mockSettings, onTrustChange, addItem));
+        expect(addItem).toHaveBeenCalledWith({
+            text: 'This folder is not trusted. Some features may be disabled. Use the `/permissions` command to change the trust level.',
+            type: 'info',
+        }, expect.any(Number));
+    });
+    it('should not send a message if the folder is trusted', () => {
+        isWorkspaceTrustedSpy.mockReturnValue({ isTrusted: true, source: 'file' });
+        renderHook(() => useFolderTrust(mockSettings, onTrustChange, addItem));
+        expect(addItem).not.toHaveBeenCalled();
+    });
+    it('should handle TRUST_FOLDER choice', () => {
+        isWorkspaceTrustedSpy.mockReturnValue({
+            isTrusted: undefined,
+            source: undefined,
+        });
+        const { result } = renderHook(() => useFolderTrust(mockSettings, onTrustChange, addItem));
+        act(() => {
+            result.current.handleFolderTrustSelect(FolderTrustChoice.TRUST_FOLDER);
+        });
+        expect(loadTrustedFoldersSpy).toHaveBeenCalled();
+        expect(mockTrustedFolders.setValue).toHaveBeenCalledWith('/test/path', TrustLevel.TRUST_FOLDER);
+        expect(result.current.isFolderTrustDialogOpen).toBe(false);
+        expect(onTrustChange).toHaveBeenLastCalledWith(true);
+    });
+    it('should handle TRUST_PARENT choice', () => {
+        isWorkspaceTrustedSpy.mockReturnValue({
+            isTrusted: undefined,
+            source: undefined,
+        });
+        const { result } = renderHook(() => useFolderTrust(mockSettings, onTrustChange, addItem));
+        act(() => {
+            result.current.handleFolderTrustSelect(FolderTrustChoice.TRUST_PARENT);
+        });
+        expect(mockTrustedFolders.setValue).toHaveBeenCalledWith('/test/path', TrustLevel.TRUST_PARENT);
+        expect(result.current.isFolderTrustDialogOpen).toBe(false);
+        expect(onTrustChange).toHaveBeenLastCalledWith(true);
+    });
+    it('should handle DO_NOT_TRUST choice and trigger restart', () => {
+        isWorkspaceTrustedSpy.mockReturnValue({
+            isTrusted: undefined,
+            source: undefined,
+        });
+        const { result } = renderHook(() => useFolderTrust(mockSettings, onTrustChange, addItem));
+        act(() => {
+            result.current.handleFolderTrustSelect(FolderTrustChoice.DO_NOT_TRUST);
+        });
+        expect(mockTrustedFolders.setValue).toHaveBeenCalledWith('/test/path', TrustLevel.DO_NOT_TRUST);
+        expect(onTrustChange).toHaveBeenLastCalledWith(false);
+        expect(result.current.isRestarting).toBe(true);
+        expect(result.current.isFolderTrustDialogOpen).toBe(true);
+    });
+    it('should do nothing for default choice', () => {
+        isWorkspaceTrustedSpy.mockReturnValue({
+            isTrusted: undefined,
+            source: undefined,
+        });
+        const { result } = renderHook(() => useFolderTrust(mockSettings, onTrustChange, addItem));
+        act(() => {
+            result.current.handleFolderTrustSelect('invalid_choice');
+        });
+        expect(mockTrustedFolders.setValue).not.toHaveBeenCalled();
+        expect(mockSettings.setValue).not.toHaveBeenCalled();
+        expect(result.current.isFolderTrustDialogOpen).toBe(true);
+        expect(onTrustChange).toHaveBeenCalledWith(undefined);
+    });
+    it('should set isRestarting to true when trust status changes from false to true', () => {
+        isWorkspaceTrustedSpy.mockReturnValue({ isTrusted: false, source: 'file' }); // Initially untrusted
+        const { result } = renderHook(() => useFolderTrust(mockSettings, onTrustChange, addItem));
+        act(() => {
+            result.current.handleFolderTrustSelect(FolderTrustChoice.TRUST_FOLDER);
+        });
+        expect(result.current.isRestarting).toBe(true);
+        expect(result.current.isFolderTrustDialogOpen).toBe(true); // Dialog should stay open
+    });
+    it('should not set isRestarting to true when trust status does not change', () => {
+        isWorkspaceTrustedSpy.mockReturnValue({
+            isTrusted: undefined,
+            source: undefined,
+        });
+        const { result } = renderHook(() => useFolderTrust(mockSettings, onTrustChange, addItem));
+        act(() => {
+            result.current.handleFolderTrustSelect(FolderTrustChoice.TRUST_FOLDER);
+        });
+        expect(result.current.isRestarting).toBe(false);
+        expect(result.current.isFolderTrustDialogOpen).toBe(false); // Dialog should close
+    });
+});
+//# sourceMappingURL=useFolderTrust.test.js.map

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

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

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

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { useState, useRef, useCallback, useEffect, useMemo } from 'react';
-import { GeminiEventType as ServerGeminiEventType, getErrorMessage, isNodeError, MessageSenderType, logUserPrompt, GitService, UnauthorizedError, UserPromptEvent, DEFAULT_GEMINI_FLASH_MODEL, logConversationFinishedEvent, ConversationFinishedEvent, ApprovalMode, parseAndFormatApiError, ToolConfirmationOutcome, promptIdContext, } from '@google/gemini-cli-core';
+import { GeminiEventType as ServerGeminiEventType, getErrorMessage, isNodeError, MessageSenderType, logUserPrompt, GitService, UnauthorizedError, UserPromptEvent, DEFAULT_GEMINI_FLASH_MODEL, logConversationFinishedEvent, ConversationFinishedEvent, ApprovalMode, parseAndFormatApiError, ToolConfirmationOutcome, promptIdContext, WRITE_FILE_TOOL_NAME, tokenLimit, } from '@google/gemini-cli-core';
 import { FinishReason } from '@google/genai';
 import { StreamingState, MessageType, ToolCallStatus } from '../types.js';
 import { isAtCommand, isSlashCommand } from '../utils/commandUtils.js';
@@ -24,7 +24,7 @@ var StreamProcessingStatus;
     StreamProcessingStatus[StreamProcessingStatus["UserCancelled"] = 1] = "UserCancelled";
     StreamProcessingStatus[StreamProcessingStatus["Error"] = 2] = "Error";
 })(StreamProcessingStatus || (StreamProcessingStatus = {}));
-const EDIT_TOOL_NAMES = new Set(['replace', 'write_file']);
+const EDIT_TOOL_NAMES = new Set(['replace', WRITE_FILE_TOOL_NAME]);
 function showCitations(settings) {
     const enabled = settings?.merged?.ui?.showCitations;
     if (enabled !== undefined) {
@@ -58,6 +58,18 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
         if (completedToolCallsFromScheduler.length > 0) {
             // Add the final state of these tools to the history for display.
             addItem(mapTrackedToolCallsToDisplay(completedToolCallsFromScheduler), Date.now());
+            // Record tool calls with full metadata before sending responses.
+            try {
+                const currentModel = config.getGeminiClient().getCurrentSequenceModel() ??
+                    config.getModel();
+                config
+                    .getGeminiClient()
+                    .getChat()
+                    .recordCompletedToolCalls(currentModel, completedToolCallsFromScheduler);
+            }
+            catch (error) {
+                console.error(`Error recording completed tool call information: ${error}`);
+            }
             // Handle tool response submission immediately when tools complete
             await handleCompletedTools(completedToolCallsFromScheduler);
         }
@@ -70,6 +82,8 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
         }
         return undefined;
     }, [toolCalls]);
+    const lastQueryRef = useRef(null);
+    const lastPromptIdRef = useRef(null);
     const loopDetectedRef = useRef(false);
     const [loopDetectionConfirmationRequest, setLoopDetectionConfirmationRequest,] = useState(null);
     const onExec = useCallback(async (done) => {
@@ -156,37 +170,39 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
             const trimmedQuery = query.trim();
             onDebugMessage(`User query: '${trimmedQuery}'`);
             await logger?.logMessage(MessageSenderType.USER, trimmedQuery);
-            // Handle UI-only commands first
-            const slashCommandResult = isSlashCommand(trimmedQuery)
-                ? await handleSlashCommand(trimmedQuery)
-                : false;
-            if (slashCommandResult) {
-                switch (slashCommandResult.type) {
-                    case 'schedule_tool': {
-                        const { toolName, toolArgs } = slashCommandResult;
-                        const toolCallRequest = {
-                            callId: `${toolName}-${Date.now()}-${Math.random().toString(16).slice(2)}`,
-                            name: toolName,
-                            args: toolArgs,
-                            isClientInitiated: true,
-                            prompt_id,
-                        };
-                        scheduleToolCalls([toolCallRequest], abortSignal);
-                        return { queryToSend: null, shouldProceed: false };
-                    }
-                    case 'submit_prompt': {
-                        localQueryToSendToGemini = slashCommandResult.content;
-                        return {
-                            queryToSend: localQueryToSendToGemini,
-                            shouldProceed: true,
-                        };
-                    }
-                    case 'handled': {
-                        return { queryToSend: null, shouldProceed: false };
-                    }
-                    default: {
-                        const unreachable = slashCommandResult;
-                        throw new Error(`Unhandled slash command result type: ${unreachable}`);
+            if (!shellModeActive) {
+                // Handle UI-only commands first
+                const slashCommandResult = isSlashCommand(trimmedQuery)
+                    ? await handleSlashCommand(trimmedQuery)
+                    : false;
+                if (slashCommandResult) {
+                    switch (slashCommandResult.type) {
+                        case 'schedule_tool': {
+                            const { toolName, toolArgs } = slashCommandResult;
+                            const toolCallRequest = {
+                                callId: `${toolName}-${Date.now()}-${Math.random().toString(16).slice(2)}`,
+                                name: toolName,
+                                args: toolArgs,
+                                isClientInitiated: true,
+                                prompt_id,
+                            };
+                            scheduleToolCalls([toolCallRequest], abortSignal);
+                            return { queryToSend: null, shouldProceed: false };
+                        }
+                        case 'submit_prompt': {
+                            localQueryToSendToGemini = slashCommandResult.content;
+                            return {
+                                queryToSend: localQueryToSendToGemini,
+                                shouldProceed: true,
+                            };
+                        }
+                        case 'handled': {
+                            return { queryToSend: null, shouldProceed: false };
+                        }
+                        default: {
+                            const unreachable = slashCommandResult;
+                            throw new Error(`Unhandled slash command result type: ${unreachable}`);
+                        }
                     }
                 }
             }
@@ -373,28 +389,20 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
         text: `The session has reached the maximum number of turns: ${config.getMaxSessionTurns()}. ` +
             `Please update this limit in your setting.json file.`,
     }, Date.now()), [addItem, config]);
-    const handleLoopDetectionConfirmation = useCallback((result) => {
-        setLoopDetectionConfirmationRequest(null);
-        if (result.userSelection === 'disable') {
-            config.getGeminiClient().getLoopDetectionService().disableForSession();
-            addItem({
-                type: 'info',
-                text: `Loop detection has been disabled for this session. Please try your request again.`,
-            }, Date.now());
+    const handleContextWindowWillOverflowEvent = useCallback((estimatedRequestTokenCount, remainingTokenCount) => {
+        onCancelSubmit();
+        const limit = tokenLimit(config.getModel());
+        const isLessThan75Percent = limit > 0 && remainingTokenCount < limit * 0.75;
+        let text = `Sending this message (${estimatedRequestTokenCount} tokens) might exceed the remaining context window limit (${remainingTokenCount} tokens).`;
+        if (isLessThan75Percent) {
+            text +=
+                ' Please try reducing the size of your message or use the `/compress` command to compress the chat history.';
         }
-        else {
-            addItem({
-                type: 'info',
-                text: `A potential loop was detected. This can happen due to repetitive tool calls or other model behavior. The request has been halted.`,
-            }, Date.now());
-        }
-    }, [config, addItem]);
-    const handleLoopDetectedEvent = useCallback(() => {
-        // Show the confirmation dialog to choose whether to disable loop detection
-        setLoopDetectionConfirmationRequest({
-            onComplete: handleLoopDetectionConfirmation,
-        });
-    }, [handleLoopDetectionConfirmation]);
+        addItem({
+            type: 'info',
+            text,
+        }, Date.now());
+    }, [addItem, onCancelSubmit, config]);
     const processGeminiStreamEvents = useCallback(async (stream, userMessageTimestamp, signal) => {
         let geminiMessageBuffer = '';
         const toolCallRequests = [];
@@ -425,6 +433,9 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
                 case ServerGeminiEventType.MaxSessionTurns:
                     handleMaxSessionTurnsEvent();
                     break;
+                case ServerGeminiEventType.ContextWindowWillOverflow:
+                    handleContextWindowWillOverflowEvent(event.value.estimatedRequestTokenCount, event.value.remainingTokenCount);
+                    break;
                 case ServerGeminiEventType.Finished:
                     handleFinishedEvent(event, userMessageTimestamp);
                     break;
@@ -437,6 +448,7 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
                     loopDetectedRef.current = true;
                     break;
                 case ServerGeminiEventType.Retry:
+                case ServerGeminiEventType.InvalidStream:
                     // Will add the missing logic later
                     break;
                 default: {
@@ -458,6 +470,7 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
         handleChatCompressionEvent,
         handleFinishedEvent,
         handleMaxSessionTurnsEvent,
+        handleContextWindowWillOverflowEvent,
         handleCitationEvent,
     ]);
     const submitQuery = useCallback(async (query, options, prompt_id) => {
@@ -493,6 +506,9 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
             }
             setIsResponding(true);
             setInitError(null);
+            // Store query and prompt_id for potential retry on loop detection
+            lastQueryRef.current = queryToSend;
+            lastPromptIdRef.current = prompt_id;
             try {
                 const stream = geminiClient.sendMessageStream(queryToSend, abortSignal, prompt_id);
                 const processingStatus = await processGeminiStreamEvents(stream, userMessageTimestamp, abortSignal);
@@ -505,7 +521,31 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
                 }
                 if (loopDetectedRef.current) {
                     loopDetectedRef.current = false;
-                    handleLoopDetectedEvent();
+                    // Show the confirmation dialog to choose whether to disable loop detection
+                    setLoopDetectionConfirmationRequest({
+                        onComplete: (result) => {
+                            setLoopDetectionConfirmationRequest(null);
+                            if (result.userSelection === 'disable') {
+                                config
+                                    .getGeminiClient()
+                                    .getLoopDetectionService()
+                                    .disableForSession();
+                                addItem({
+                                    type: 'info',
+                                    text: `Loop detection has been disabled for this session. Retrying request...`,
+                                }, Date.now());
+                                if (lastQueryRef.current && lastPromptIdRef.current) {
+                                    submitQuery(lastQueryRef.current, { isContinuation: true }, lastPromptIdRef.current);
+                                }
+                            }
+                            else {
+                                addItem({
+                                    type: 'info',
+                                    text: `A potential loop was detected. This can happen due to repetitive tool calls or other model behavior. The request has been halted.`,
+                                }, Date.now());
+                            }
+                        },
+                    });
                 }
             }
             catch (error) {
@@ -537,7 +577,6 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
         config,
         startNewPrompt,
         getPromptCount,
-        handleLoopDetectedEvent,
     ]);
     const handleApprovalModeChange = useCallback(async (newApprovalMode) => {
         // Auto-approve pending tool calls when switching to auto-approval modes