@machina.ai/cell-cli 1.4.0-rc2 → 1.6.1-rc1

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

@@ -0,0 +1,162 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { vi } from 'vitest';
+import * as fs from 'node:fs';
+import * as os from 'node:os';
+import * as path from 'node:path';
+import { EXTENSIONS_CONFIG_FILENAME, annotateActiveExtensions, loadExtension, } from '../../config/extension.js';
+import { createExtension } from '../../test-utils/createExtension.js';
+import { useExtensionUpdates } from './useExtensionUpdates.js';
+import { CELL_DIR } from '@google/gemini-cli-core';
+import { isWorkspaceTrusted } from '../../config/trustedFolders.js';
+import { renderHook, waitFor } from '@testing-library/react';
+import { MessageType } from '../types.js';
+const mockGit = {
+    clone: vi.fn(),
+    getRemotes: vi.fn(),
+    fetch: vi.fn(),
+    checkout: vi.fn(),
+    listRemote: vi.fn(),
+    revparse: vi.fn(),
+    // Not a part of the actual API, but we need to use this to do the correct
+    // file system interactions.
+    path: vi.fn(),
+};
+vi.mock('simple-git', () => ({
+    simpleGit: vi.fn((path) => {
+        mockGit.path.mockReturnValue(path);
+        return mockGit;
+    }),
+}));
+vi.mock('os', async (importOriginal) => {
+    const mockedOs = await importOriginal();
+    return {
+        ...mockedOs,
+        homedir: vi.fn(),
+    };
+});
+vi.mock('../../config/trustedFolders.js', async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        isWorkspaceTrusted: vi.fn(),
+    };
+});
+const mockLogExtensionInstallEvent = vi.hoisted(() => vi.fn());
+const mockLogExtensionUninstall = vi.hoisted(() => vi.fn());
+vi.mock('@google/gemini-cli-core', async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        logExtensionInstallEvent: mockLogExtensionInstallEvent,
+        logExtensionUninstall: mockLogExtensionUninstall,
+        ExtensionInstallEvent: vi.fn(),
+        ExtensionUninstallEvent: vi.fn(),
+    };
+});
+vi.mock('child_process', async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        execSync: vi.fn(),
+    };
+});
+const mockQuestion = vi.hoisted(() => vi.fn());
+const mockClose = vi.hoisted(() => vi.fn());
+vi.mock('node:readline', () => ({
+    createInterface: vi.fn(() => ({
+        question: mockQuestion,
+        close: mockClose,
+    })),
+}));
+describe('useExtensionUpdates', () => {
+    let tempHomeDir;
+    let userExtensionsDir;
+    beforeEach(() => {
+        tempHomeDir = fs.mkdtempSync(path.join(os.tmpdir(), 'cell-cli-test-home-'));
+        vi.mocked(os.homedir).mockReturnValue(tempHomeDir);
+        userExtensionsDir = path.join(tempHomeDir, CELL_DIR, 'extensions');
+        fs.mkdirSync(userExtensionsDir, { recursive: true });
+        Object.values(mockGit).forEach((fn) => fn.mockReset());
+    });
+    afterEach(() => {
+        fs.rmSync(tempHomeDir, { recursive: true, force: true });
+    });
+    it('should check for updates and log a message if an update is available', async () => {
+        const extensions = [
+            {
+                name: 'test-extension',
+                type: 'git',
+                version: '1.0.0',
+                path: '/some/path',
+                isActive: true,
+                installMetadata: {
+                    type: 'git',
+                    source: 'https://some/repo',
+                    autoUpdate: false,
+                },
+            },
+        ];
+        const addItem = vi.fn();
+        const cwd = '/test/cwd';
+        mockGit.getRemotes.mockResolvedValue([
+            {
+                name: 'origin',
+                refs: {
+                    fetch: 'https://github.com/google/gemini-cli.git',
+                },
+            },
+        ]);
+        mockGit.revparse.mockResolvedValue('local-hash');
+        mockGit.listRemote.mockResolvedValue('remote-hash\tHEAD');
+        renderHook(() => useExtensionUpdates(extensions, addItem, cwd));
+        await waitFor(() => {
+            expect(addItem).toHaveBeenCalledWith({
+                type: MessageType.INFO,
+                text: 'Extension test-extension has an update available, run "/extensions update test-extension" to install it.',
+            }, expect.any(Number));
+        });
+    });
+    it('should check for updates and automatically update if autoUpdate is true', async () => {
+        const extensionDir = createExtension({
+            extensionsDir: userExtensionsDir,
+            name: 'test-extension',
+            version: '1.0.0',
+            installMetadata: {
+                source: 'https://some.git/repo',
+                type: 'git',
+                autoUpdate: true,
+            },
+        });
+        const extension = annotateActiveExtensions([loadExtension({ extensionDir, workspaceDir: tempHomeDir })], [], tempHomeDir)[0];
+        const addItem = vi.fn();
+        mockGit.getRemotes.mockResolvedValue([
+            {
+                name: 'origin',
+                refs: {
+                    fetch: 'https://github.com/google/gemini-cli.git',
+                },
+            },
+        ]);
+        mockGit.revparse.mockResolvedValue('local-hash');
+        mockGit.listRemote.mockResolvedValue('remote-hash\tHEAD');
+        mockGit.clone.mockImplementation(async (_, destination) => {
+            fs.mkdirSync(path.join(mockGit.path(), destination), {
+                recursive: true,
+            });
+            fs.writeFileSync(path.join(mockGit.path(), destination, EXTENSIONS_CONFIG_FILENAME), JSON.stringify({ name: 'test-extension', version: '1.1.0' }));
+        });
+        vi.mocked(isWorkspaceTrusted).mockReturnValue(true);
+        renderHook(() => useExtensionUpdates([extension], addItem, tempHomeDir));
+        await waitFor(() => {
+            expect(addItem).toHaveBeenCalledWith({
+                type: MessageType.INFO,
+                text: 'Extension "test-extension" successfully updated: 1.0.0 → 1.1.0.',
+            }, expect.any(Number));
+        }, { timeout: 2000 });
+    });
+});
+//# sourceMappingURL=useExtensionUpdates.test.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useExtensionUpdates.test.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useExtensionUpdates.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC5B,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EACL,0BAA0B,EAC1B,wBAAwB,EACxB,aAAa,GACd,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAA2B,MAAM,yBAAyB,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,MAAM,OAAO,GAAG;IACd,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE;IACd,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE;IACnB,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE;IACd,QAAQ,EAAE,EAAE,CAAC,EAAE,EAAE;IACjB,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE;IACnB,QAAQ,EAAE,EAAE,CAAC,EAAE,EAAE;IACjB,0EAA0E;IAC1E,4BAA4B;IAC5B,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE;CACd,CAAC;AAEF,EAAE,CAAC,IAAI,CAAC,YAAY,EAAE,GAAG,EAAE,CAAC,CAAC;IAC3B,SAAS,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,IAAY,EAAE,EAAE;QAChC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QACnC,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC;CACH,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE;IACrC,MAAM,QAAQ,GAAG,MAAM,cAAc,EAAa,CAAC;IACnD,OAAO;QACL,GAAG,QAAQ;QACX,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE;KACjB,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,IAAI,CAAC,gCAAgC,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE;IACjE,MAAM,MAAM,GACV,MAAM,cAAc,EAAmD,CAAC;IAC1E,OAAO;QACL,GAAG,MAAM;QACT,kBAAkB,EAAE,EAAE,CAAC,EAAE,EAAE;KAC5B,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,4BAA4B,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;AAC/D,MAAM,yBAAyB,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;AAE5D,EAAE,CAAC,IAAI,CAAC,yBAAyB,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE;IAC1D,MAAM,MAAM,GACV,MAAM,cAAc,EAA4C,CAAC;IACnE,OAAO;QACL,GAAG,MAAM;QACT,wBAAwB,EAAE,4BAA4B;QACtD,qBAAqB,EAAE,yBAAyB;QAChD,qBAAqB,EAAE,EAAE,CAAC,EAAE,EAAE;QAC9B,uBAAuB,EAAE,EAAE,CAAC,EAAE,EAAE;KACjC,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE;IAChD,MAAM,MAAM,GAAG,MAAM,cAAc,EAAkC,CAAC;IACtE,OAAO;QACL,GAAG,MAAM;QACT,QAAQ,EAAE,EAAE,CAAC,EAAE,EAAE;KAClB,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,YAAY,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;AAC/C,MAAM,SAAS,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;AAC5C,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE,GAAG,EAAE,CAAC,CAAC;IAC9B,eAAe,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;QAC5B,QAAQ,EAAE,YAAY;QACtB,KAAK,EAAE,SAAS;KACjB,CAAC,CAAC;CACJ,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACnC,IAAI,WAAmB,CAAC;IACxB,IAAI,iBAAyB,CAAC;IAE9B,UAAU,CAAC,GAAG,EAAE;QACd,WAAW,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,qBAAqB,CAAC,CAAC,CAAC;QAC5E,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;QACnD,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC;QACnE,EAAE,CAAC,SAAS,CAAC,iBAAiB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACrD,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sEAAsE,EAAE,KAAK,IAAI,EAAE;QACpF,MAAM,UAAU,GAAG;YACjB;gBACE,IAAI,EAAE,gBAAgB;gBACtB,IAAI,EAAE,KAAK;gBACX,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,YAAY;gBAClB,QAAQ,EAAE,IAAI;gBACd,eAAe,EAAE;oBACf,IAAI,EAAE,KAAK;oBACX,MAAM,EAAE,mBAAmB;oBAC3B,UAAU,EAAE,KAAK;iBAClB;aACF;SACF,CAAC;QACF,MAAM,OAAO,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;QACxB,MAAM,GAAG,GAAG,WAAW,CAAC;QAExB,OAAO,CAAC,UAAU,CAAC,iBAAiB,CAAC;YACnC;gBACE,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE;oBACJ,KAAK,EAAE,0CAA0C;iBAClD;aACF;SACF,CAAC,CAAC;QACH,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;QACjD,OAAO,CAAC,UAAU,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,CAAC;QAE1D,UAAU,CAAC,GAAG,EAAE,CACd,mBAAmB,CAAC,UAAkC,EAAE,OAAO,EAAE,GAAG,CAAC,CACtE,CAAC;QAEF,MAAM,OAAO,CAAC,GAAG,EAAE;YACjB,MAAM,CAAC,OAAO,CAAC,CAAC,oBAAoB,CAClC;gBACE,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,IAAI,EAAE,0GAA0G;aACjH,EACD,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CACnB,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yEAAyE,EAAE,KAAK,IAAI,EAAE;QACvF,MAAM,YAAY,GAAG,eAAe,CAAC;YACnC,aAAa,EAAE,iBAAiB;YAChC,IAAI,EAAE,gBAAgB;YACtB,OAAO,EAAE,OAAO;YAChB,eAAe,EAAE;gBACf,MAAM,EAAE,uBAAuB;gBAC/B,IAAI,EAAE,KAAK;gBACX,UAAU,EAAE,IAAI;aACjB;SACF,CAAC,CAAC;QACH,MAAM,SAAS,GAAG,wBAAwB,CACxC,CAAC,aAAa,CAAC,EAAE,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,CAAE,CAAC,EAC7D,EAAE,EACF,WAAW,CACZ,CAAC,CAAC,CAAC,CAAC;QAEL,MAAM,OAAO,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;QACxB,OAAO,CAAC,UAAU,CAAC,iBAAiB,CAAC;YACnC;gBACE,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE;oBACJ,KAAK,EAAE,0CAA0C;iBAClD;aACF;SACF,CAAC,CAAC;QACH,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;QACjD,OAAO,CAAC,UAAU,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,CAAC;QAC1D,OAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,KAAK,EAAE,CAAC,EAAE,WAAW,EAAE,EAAE;YACxD,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,WAAW,CAAC,EAAE;gBACnD,SAAS,EAAE,IAAI;aAChB,CAAC,CAAC;YACH,EAAE,CAAC,aAAa,CACd,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,0BAA0B,CAAC,EAClE,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAC7D,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAEpD,UAAU,CAAC,GAAG,EAAE,CAAC,mBAAmB,CAAC,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC;QAEzE,MAAM,OAAO,CACX,GAAG,EAAE;YACH,MAAM,CAAC,OAAO,CAAC,CAAC,oBAAoB,CAClC;gBACE,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,IAAI,EAAE,iEAAiE;aACxE,EACD,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CACnB,CAAC;QACJ,CAAC,EACD,EAAE,OAAO,EAAE,IAAI,EAAE,CAClB,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

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

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

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

@@ -7,23 +7,22 @@ import { useState, useCallback, useEffect } 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) => {
+export const useFolderTrust = (settings, onTrustChange, refreshStatic) => {
     const [isTrusted, setIsTrusted] = useState(undefined);
     const [isFolderTrustDialogOpen, setIsFolderTrustDialogOpen] = useState(false);
     const [isRestarting, setIsRestarting] = useState(false);
     const folderTrust = settings.merged.security?.folderTrust?.enabled;
     useEffect(() => {
-        const trusted = isWorkspaceTrusted({
-            security: {
-                folderTrust: {
-                    enabled: folderTrust,
-                },
-            },
-        });
+        const trusted = isWorkspaceTrusted(settings.merged);
         setIsTrusted(trusted);
         setIsFolderTrustDialogOpen(trusted === undefined);
         onTrustChange(trusted);
-    }, [onTrustChange, folderTrust]);
+    }, [folderTrust, onTrustChange, settings.merged]);
+    useEffect(() => {
+        // When the folder trust dialog is about to open/close, we need to force a refresh
+        // of the static content to ensure the Tips are hidden/shown correctly.
+        refreshStatic();
+    }, [isFolderTrustDialogOpen, refreshStatic]);
     const handleFolderTrustSelect = useCallback((choice) => {
         const trustedFolders = loadTrustedFolders();
         const cwd = process.cwd();
@@ -43,11 +42,11 @@ export const useFolderTrust = (settings, onTrustChange) => {
                 return;
         }
         trustedFolders.setValue(cwd, trustLevel);
-        const newIsTrusted = trustLevel === TrustLevel.TRUST_FOLDER ||
+        const currentIsTrusted = trustLevel === TrustLevel.TRUST_FOLDER ||
             trustLevel === TrustLevel.TRUST_PARENT;
-        setIsTrusted(newIsTrusted);
-        onTrustChange(newIsTrusted);
-        const needsRestart = wasTrusted !== newIsTrusted;
+        setIsTrusted(currentIsTrusted);
+        onTrustChange(currentIsTrusted);
+        const needsRestart = wasTrusted !== currentIsTrusted;
         if (needsRestart) {
             setIsRestarting(true);
             setIsFolderTrustDialogOpen(true);

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,OAAO,GAAG,kBAAkB,CAAC;YACjC,QAAQ,EAAE;gBACR,WAAW,EAAE;oBACX,OAAO,EAAE,WAAW;iBACrB;aACF;SACU,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,CAAC,CAAC,CAAC;IAEjC,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,YAAY,GAChB,UAAU,KAAK,UAAU,CAAC,YAAY;YACtC,UAAU,KAAK,UAAU,CAAC,YAAY,CAAC;QACzC,YAAY,CAAC,YAAY,CAAC,CAAC;QAC3B,aAAa,CAAC,YAAY,CAAC,CAAC;QAE5B,MAAM,YAAY,GAAG,UAAU,KAAK,YAAY,CAAC;QACjD,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,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,aAAyB,EACzB,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,OAAO,GAAG,kBAAkB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACpD,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,SAAS,CAAC,GAAG,EAAE;QACb,kFAAkF;QAClF,uEAAuE;QACvE,aAAa,EAAE,CAAC;IAClB,CAAC,EAAE,CAAC,uBAAuB,EAAE,aAAa,CAAC,CAAC,CAAC;IAE7C,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/useGeminiStream.d.ts

@@ -4,16 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import type { Config, EditorType, GeminiClient, ThoughtSummary } from '@google/gemini-cli-core';
+import { ApprovalMode } from '@google/gemini-cli-core';
 import { type PartListUnion } from '@google/genai';
 import type { HistoryItem, HistoryItemWithoutId, SlashCommandProcessorResult } from '../types.js';
 import { StreamingState } from '../types.js';
 import type { UseHistoryManagerReturn } from './useHistoryManager.js';
+import { type TrackedToolCall } from './useReactToolScheduler.js';
 import type { LoadedSettings } from '../../config/settings.js';
 /**
  * Manages the Gemini stream, including user input, command processing,
  * API interaction, and tool call lifecycle.
  */
-export declare const useGeminiStream: (geminiClient: GeminiClient, history: HistoryItem[], addItem: UseHistoryManagerReturn["addItem"], config: Config, settings: LoadedSettings, onDebugMessage: (message: string) => void, handleSlashCommand: (cmd: PartListUnion) => Promise<SlashCommandProcessorResult | false>, shellModeActive: boolean, getPreferredEditor: () => EditorType | undefined, onAuthError: () => void, performMemoryRefresh: () => Promise<void>, modelSwitchedFromQuotaError: boolean, setModelSwitchedFromQuotaError: React.Dispatch<React.SetStateAction<boolean>>, onEditorClose: () => void, onCancelSubmit: () => void) => {
+export declare const useGeminiStream: (geminiClient: GeminiClient, history: HistoryItem[], addItem: UseHistoryManagerReturn["addItem"], config: Config, settings: LoadedSettings, onDebugMessage: (message: string) => void, handleSlashCommand: (cmd: PartListUnion) => Promise<SlashCommandProcessorResult | false>, shellModeActive: boolean, getPreferredEditor: () => EditorType | undefined, onAuthError: (error: string) => void, performMemoryRefresh: () => Promise<void>, modelSwitchedFromQuotaError: boolean, setModelSwitchedFromQuotaError: React.Dispatch<React.SetStateAction<boolean>>, onEditorClose: () => void, onCancelSubmit: () => void, setShellInputFocused: (value: boolean) => void, terminalWidth: number, terminalHeight: number, isShellFocused?: boolean) => {
     streamingState: StreamingState;
     submitQuery: (query: PartListUnion, options?: {
         isContinuation: boolean;
@@ -22,4 +24,12 @@ export declare const useGeminiStream: (geminiClient: GeminiClient, history: Hist
     pendingHistoryItems: HistoryItemWithoutId[];
     thought: ThoughtSummary | null;
     cancelOngoingRequest: () => void;
+    pendingToolCalls: TrackedToolCall[];
+    handleApprovalModeChange: (newApprovalMode: ApprovalMode) => Promise<void>;
+    activePtyId: number | undefined;
+    loopDetectionConfirmationRequest: {
+        onComplete: (result: {
+            userSelection: "disable" | "keep";
+        }) => void;
+    } | null;
 };

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, getCodeAssistServer, UserTierId, } 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, } from '@google/gemini-cli-core';
 import { FinishReason } from '@google/genai';
 import { StreamingState, MessageType, ToolCallStatus } from '../types.js';
 import { isAtCommand, isSlashCommand } from '../utils/commandUtils.js';
@@ -13,9 +13,9 @@ import { handleAtCommand } from './atCommandProcessor.js';
 import { findLastSafeSplitPoint } from '../utils/markdownUtilities.js';
 import { useStateAndRef } from './useStateAndRef.js';
 import { useLogger } from './useLogger.js';
+import { useReactToolScheduler, mapToDisplay as mapTrackedToolCallsToDisplay, } from './useReactToolScheduler.js';
 import { promises as fs } from 'node:fs';
 import path from 'node:path';
-import { useReactToolScheduler, mapToDisplay as mapTrackedToolCallsToDisplay, } from './useReactToolScheduler.js';
 import { useSessionStats } from '../contexts/SessionContext.js';
 import { useKeypress } from './useKeypress.js';
 var StreamProcessingStatus;
@@ -24,19 +24,19 @@ var StreamProcessingStatus;
     StreamProcessingStatus[StreamProcessingStatus["UserCancelled"] = 1] = "UserCancelled";
     StreamProcessingStatus[StreamProcessingStatus["Error"] = 2] = "Error";
 })(StreamProcessingStatus || (StreamProcessingStatus = {}));
-function showCitations(settings, config) {
+const EDIT_TOOL_NAMES = new Set(['replace', 'write_file']);
+function showCitations(settings) {
     const enabled = settings?.merged?.ui?.showCitations;
     if (enabled !== undefined) {
         return enabled;
     }
-    const server = getCodeAssistServer(config);
-    return (server && server.userTier !== UserTierId.FREE) ?? false;
+    return true;
 }
 /**
  * Manages the Gemini stream, including user input, command processing,
  * API interaction, and tool call lifecycle.
  */
-export const useGeminiStream = (geminiClient, history, addItem, config, settings, onDebugMessage, handleSlashCommand, shellModeActive, getPreferredEditor, onAuthError, performMemoryRefresh, modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError, onEditorClose, onCancelSubmit) => {
+export const useGeminiStream = (geminiClient, history, addItem, config, settings, onDebugMessage, handleSlashCommand, shellModeActive, getPreferredEditor, onAuthError, performMemoryRefresh, modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError, onEditorClose, onCancelSubmit, setShellInputFocused, terminalWidth, terminalHeight, isShellFocused) => {
     const [initError, setInitError] = useState(null);
     const abortControllerRef = useRef(null);
     const turnCancelledRef = useRef(false);
@@ -61,15 +61,29 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
             // Handle tool response submission immediately when tools complete
             await handleCompletedTools(completedToolCallsFromScheduler);
         }
-    }, config, setPendingHistoryItem, getPreferredEditor, onEditorClose);
+    }, config, getPreferredEditor, onEditorClose);
     const pendingToolCallGroupDisplay = useMemo(() => toolCalls.length ? mapTrackedToolCallsToDisplay(toolCalls) : undefined, [toolCalls]);
+    const activeToolPtyId = useMemo(() => {
+        const executingShellTool = toolCalls?.find((tc) => tc.status === 'executing' && tc.request.name === 'run_shell_command');
+        if (executingShellTool) {
+            return executingShellTool.pid;
+        }
+        return undefined;
+    }, [toolCalls]);
     const loopDetectedRef = useRef(false);
+    const [loopDetectionConfirmationRequest, setLoopDetectionConfirmationRequest,] = useState(null);
     const onExec = useCallback(async (done) => {
         setIsResponding(true);
         await done;
         setIsResponding(false);
     }, []);
-    const { handleShellCommand } = useShellCommandProcessor(addItem, setPendingHistoryItem, onExec, onDebugMessage, config, geminiClient);
+    const { handleShellCommand, activeShellPtyId } = useShellCommandProcessor(addItem, setPendingHistoryItem, onExec, onDebugMessage, config, geminiClient, setShellInputFocused, terminalWidth, terminalHeight);
+    const activePtyId = activeShellPtyId || activeToolPtyId;
+    useEffect(() => {
+        if (!activePtyId) {
+            setShellInputFocused(false);
+        }
+    }, [activePtyId, setShellInputFocused]);
     const streamingState = useMemo(() => {
         if (toolCalls.some((tc) => tc.status === 'awaiting_approval')) {
             return StreamingState.WaitingForConfirmation;
@@ -116,15 +130,17 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
         setPendingHistoryItem(null);
         onCancelSubmit();
         setIsResponding(false);
+        setShellInputFocused(false);
     }, [
         streamingState,
         addItem,
         setPendingHistoryItem,
         onCancelSubmit,
         pendingHistoryItemRef,
+        setShellInputFocused,
     ]);
     useKeypress((key) => {
-        if (key.name === 'escape') {
+        if (key.name === 'escape' && !isShellFocused) {
             cancelOngoingRequest();
         }
     }, { isActive: streamingState === StreamingState.Responding });
@@ -303,7 +319,7 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
         setThought(null); // Reset thought when there's an error
     }, [addItem, pendingHistoryItemRef, setPendingHistoryItem, config, setThought]);
     const handleCitationEvent = useCallback((text, userMessageTimestamp) => {
-        if (!showCitations(settings, config)) {
+        if (!showCitations(settings)) {
             return;
         }
         if (pendingHistoryItemRef.current) {
@@ -311,7 +327,7 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
             setPendingHistoryItem(null);
         }
         addItem({ type: MessageType.INFO, text }, userMessageTimestamp);
-    }, [addItem, pendingHistoryItemRef, setPendingHistoryItem, settings, config]);
+    }, [addItem, pendingHistoryItemRef, setPendingHistoryItem, settings]);
     const handleFinishedEvent = useCallback((event, userMessageTimestamp) => {
         const finishReason = event.value.reason;
         if (!finishReason) {
@@ -340,24 +356,46 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
             }, userMessageTimestamp);
         }
     }, [addItem]);
-    const handleChatCompressionEvent = useCallback((eventValue) => addItem({
-        type: 'info',
-        text: `IMPORTANT: This conversation approached the input token limit for ${config.getModel()}. ` +
-            `A compressed context will be sent for future messages (compressed from: ` +
-            `${eventValue?.originalTokenCount ?? 'unknown'} to ` +
-            `${eventValue?.newTokenCount ?? 'unknown'} tokens).`,
-    }, Date.now()), [addItem, config]);
+    const handleChatCompressionEvent = useCallback((eventValue, userMessageTimestamp) => {
+        if (pendingHistoryItemRef.current) {
+            addItem(pendingHistoryItemRef.current, userMessageTimestamp);
+            setPendingHistoryItem(null);
+        }
+        return addItem({
+            type: 'info',
+            text: `IMPORTANT: This conversation approached the input token limit for ${config.getModel()}. ` +
+                `A compressed context will be sent for future messages (compressed from: ` +
+                `${eventValue?.originalTokenCount ?? 'unknown'} to ` +
+                `${eventValue?.newTokenCount ?? 'unknown'} tokens).`,
+        }, Date.now());
+    }, [addItem, config, pendingHistoryItemRef, setPendingHistoryItem]);
     const handleMaxSessionTurnsEvent = useCallback(() => addItem({
         type: 'info',
         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());
+        }
+        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(() => {
-        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());
-    }, [addItem]);
+        // Show the confirmation dialog to choose whether to disable loop detection
+        setLoopDetectionConfirmationRequest({
+            onComplete: handleLoopDetectionConfirmation,
+        });
+    }, [handleLoopDetectionConfirmation]);
     const processGeminiStreamEvents = useCallback(async (stream, userMessageTimestamp, signal) => {
         let geminiMessageBuffer = '';
         const toolCallRequests = [];
@@ -379,7 +417,7 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
                     handleErrorEvent(event.value, userMessageTimestamp);
                     break;
                 case ServerGeminiEventType.ChatCompressed:
-                    handleChatCompressionEvent(event.value);
+                    handleChatCompressionEvent(event.value, userMessageTimestamp);
                     break;
                 case ServerGeminiEventType.ToolCallConfirmation:
                 case ServerGeminiEventType.ToolCallResponse:
@@ -440,45 +478,47 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
         if (!prompt_id) {
             prompt_id = config.getSessionId() + '########' + getPromptCount();
         }
-        const { queryToSend, shouldProceed } = await prepareQueryForGemini(query, userMessageTimestamp, abortSignal, prompt_id);
-        if (!shouldProceed || queryToSend === null) {
-            return;
-        }
-        if (!options?.isContinuation) {
-            startNewPrompt();
-            setThought(null); // Reset thought when starting a new prompt
-        }
-        setIsResponding(true);
-        setInitError(null);
-        try {
-            const stream = geminiClient.sendMessageStream(queryToSend, abortSignal, prompt_id);
-            const processingStatus = await processGeminiStreamEvents(stream, userMessageTimestamp, abortSignal);
-            if (processingStatus === StreamProcessingStatus.UserCancelled) {
+        return promptIdContext.run(prompt_id, async () => {
+            const { queryToSend, shouldProceed } = await prepareQueryForGemini(query, userMessageTimestamp, abortSignal, prompt_id);
+            if (!shouldProceed || queryToSend === null) {
                 return;
             }
-            if (pendingHistoryItemRef.current) {
-                addItem(pendingHistoryItemRef.current, userMessageTimestamp);
-                setPendingHistoryItem(null);
+            if (!options?.isContinuation) {
+                startNewPrompt();
+                setThought(null); // Reset thought when starting a new prompt
             }
-            if (loopDetectedRef.current) {
-                loopDetectedRef.current = false;
-                handleLoopDetectedEvent();
+            setIsResponding(true);
+            setInitError(null);
+            try {
+                const stream = geminiClient.sendMessageStream(queryToSend, abortSignal, prompt_id);
+                const processingStatus = await processGeminiStreamEvents(stream, userMessageTimestamp, abortSignal);
+                if (processingStatus === StreamProcessingStatus.UserCancelled) {
+                    return;
+                }
+                if (pendingHistoryItemRef.current) {
+                    addItem(pendingHistoryItemRef.current, userMessageTimestamp);
+                    setPendingHistoryItem(null);
+                }
+                if (loopDetectedRef.current) {
+                    loopDetectedRef.current = false;
+                    handleLoopDetectedEvent();
+                }
             }
-        }
-        catch (error) {
-            if (error instanceof UnauthorizedError) {
-                onAuthError();
+            catch (error) {
+                if (error instanceof UnauthorizedError) {
+                    onAuthError('Session expired or is unauthorized.');
+                }
+                else if (!isNodeError(error) || error.name !== 'AbortError') {
+                    addItem({
+                        type: MessageType.ERROR,
+                        text: parseAndFormatApiError(getErrorMessage(error) || 'Unknown error', config.getContentGeneratorConfig()?.authType, undefined, config.getModel(), DEFAULT_GEMINI_FLASH_MODEL),
+                    }, userMessageTimestamp);
+                }
             }
-            else if (!isNodeError(error) || error.name !== 'AbortError') {
-                addItem({
-                    type: MessageType.ERROR,
-                    text: parseAndFormatApiError(getErrorMessage(error) || 'Unknown error', config.getContentGeneratorConfig()?.authType, undefined, config.getModel(), DEFAULT_GEMINI_FLASH_MODEL),
-                }, userMessageTimestamp);
+            finally {
+                setIsResponding(false);
             }
-        }
-        finally {
-            setIsResponding(false);
-        }
+        });
     }, [
         streamingState,
         setModelSwitchedFromQuotaError,
@@ -495,6 +535,28 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
         getPromptCount,
         handleLoopDetectedEvent,
     ]);
+    const handleApprovalModeChange = useCallback(async (newApprovalMode) => {
+        // Auto-approve pending tool calls when switching to auto-approval modes
+        if (newApprovalMode === ApprovalMode.YOLO ||
+            newApprovalMode === ApprovalMode.AUTO_EDIT) {
+            let awaitingApprovalCalls = toolCalls.filter((call) => call.status === 'awaiting_approval');
+            // For AUTO_EDIT mode, only approve edit tools (replace, write_file)
+            if (newApprovalMode === ApprovalMode.AUTO_EDIT) {
+                awaitingApprovalCalls = awaitingApprovalCalls.filter((call) => EDIT_TOOL_NAMES.has(call.request.name));
+            }
+            // Process pending tool calls sequentially to reduce UI chaos
+            for (const call of awaitingApprovalCalls) {
+                if (call.confirmationDetails?.onConfirm) {
+                    try {
+                        await call.confirmationDetails.onConfirm(ToolConfirmationOutcome.ProceedOnce);
+                    }
+                    catch (error) {
+                        console.error(`Failed to auto-approve tool call ${call.request.callId}:`, error);
+                    }
+                }
+            }
+        }
+    }, [toolCalls]);
     const handleCompletedTools = useCallback(async (completedToolCallsFromScheduler) => {
         if (isResponding) {
             return;
@@ -572,8 +634,7 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
             if (!config.getCheckpointingEnabled()) {
                 return;
             }
-            const restorableToolCalls = toolCalls.filter((toolCall) => (toolCall.request.name === 'replace' ||
-                toolCall.request.name === 'write_file') &&
+            const restorableToolCalls = toolCalls.filter((toolCall) => EDIT_TOOL_NAMES.has(toolCall.request.name) &&
                 toolCall.status === 'awaiting_approval');
             if (restorableToolCalls.length > 0) {
                 const checkpointDir = storage.getProjectTempCheckpointsDir();
@@ -657,6 +718,10 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
         pendingHistoryItems,
         thought,
         cancelOngoingRequest,
+        pendingToolCalls: toolCalls,
+        handleApprovalModeChange,
+        activePtyId,
+        loopDetectionConfirmationRequest,
     };
 };
 //# sourceMappingURL=useGeminiStream.js.map