@quantum-ai/gemini-cli 0.45.3 → 0.45.4

package/dist/src/ui/utils/directoryUtils.test.js

@@ -0,0 +1,239 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { vi, describe, it, expect, beforeEach } from 'vitest';
+import { expandHomeDir, getDirectorySuggestions } from './directoryUtils.js';
+import * as path from 'node:path';
+import * as fs from 'node:fs';
+import * as fsPromises from 'node:fs/promises';
+vi.mock('@google/gemini-cli-core', async (importOriginal) => {
+    const original = await importOriginal();
+    return {
+        ...original,
+        homedir: () => mockHomeDir,
+    };
+});
+const mockHomeDir = process.platform === 'win32' ? 'C:\\Users\\testuser' : '/home/testuser';
+vi.mock('node:os', async (importOriginal) => {
+    const original = await importOriginal();
+    return {
+        ...original,
+        homedir: vi.fn(() => mockHomeDir),
+    };
+});
+vi.mock('node:fs', async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        existsSync: vi.fn(),
+        statSync: vi.fn(),
+    };
+});
+vi.mock('node:fs/promises', () => ({
+    opendir: vi.fn(),
+}));
+function createMockDir(entries) {
+    let index = 0;
+    const iterator = {
+        async next() {
+            if (index < entries.length) {
+                return { value: entries[index++], done: false };
+            }
+            return { value: undefined, done: true };
+        },
+        [Symbol.asyncIterator]() {
+            return this;
+        },
+    };
+    return {
+        [Symbol.asyncIterator]() {
+            return iterator;
+        },
+        close: vi.fn().mockResolvedValue(undefined),
+    };
+}
+describe('directoryUtils', () => {
+    beforeEach(() => {
+        vi.clearAllMocks();
+    });
+    describe('expandHomeDir', () => {
+        it('should expand ~ to the home directory', () => {
+            expect(expandHomeDir('~')).toBe(mockHomeDir);
+        });
+        it('should expand ~/path to the home directory path', () => {
+            const expected = path.join(mockHomeDir, 'Documents');
+            expect(expandHomeDir('~/Documents')).toBe(expected);
+        });
+        it('should expand %userprofile% on Windows', () => {
+            if (process.platform === 'win32') {
+                const expected = path.join(mockHomeDir, 'Desktop');
+                expect(expandHomeDir('%userprofile%\\Desktop')).toBe(expected);
+            }
+        });
+        it('should not change a path that does not need expansion', () => {
+            const regularPath = path.join('usr', 'local', 'bin');
+            expect(expandHomeDir(regularPath)).toBe(regularPath);
+        });
+        it('should return an empty string if input is empty', () => {
+            expect(expandHomeDir('')).toBe('');
+        });
+    });
+    describe('getDirectorySuggestions', () => {
+        it('should return suggestions for an empty path', async () => {
+            vi.mocked(fs.existsSync).mockReturnValue(true);
+            vi.mocked(fs.statSync).mockReturnValue({
+                isDirectory: () => true,
+            });
+            vi.mocked(fsPromises.opendir).mockResolvedValue(createMockDir([
+                { name: 'docs', isDirectory: () => true },
+                { name: 'src', isDirectory: () => true },
+                { name: 'file.txt', isDirectory: () => false },
+            ]));
+            const suggestions = await getDirectorySuggestions('');
+            expect(suggestions).toEqual([`docs${path.sep}`, `src${path.sep}`]);
+        });
+        it('should return suggestions for a partial path', async () => {
+            vi.mocked(fs.existsSync).mockReturnValue(true);
+            vi.mocked(fs.statSync).mockReturnValue({
+                isDirectory: () => true,
+            });
+            vi.mocked(fsPromises.opendir).mockResolvedValue(createMockDir([
+                { name: 'docs', isDirectory: () => true },
+                { name: 'src', isDirectory: () => true },
+            ]));
+            const suggestions = await getDirectorySuggestions('d');
+            expect(suggestions).toEqual([`docs${path.sep}`]);
+        });
+        it('should return suggestions for a path with trailing slash', async () => {
+            vi.mocked(fs.existsSync).mockReturnValue(true);
+            vi.mocked(fs.statSync).mockReturnValue({
+                isDirectory: () => true,
+            });
+            vi.mocked(fsPromises.opendir).mockResolvedValue(createMockDir([
+                { name: 'sub', isDirectory: () => true },
+            ]));
+            const suggestions = await getDirectorySuggestions('docs/');
+            expect(suggestions).toEqual(['docs/sub/']);
+        });
+        it('should return suggestions for a path with ~', async () => {
+            vi.mocked(fs.existsSync).mockReturnValue(true);
+            vi.mocked(fs.statSync).mockReturnValue({
+                isDirectory: () => true,
+            });
+            vi.mocked(fsPromises.opendir).mockResolvedValue(createMockDir([
+                { name: 'Downloads', isDirectory: () => true },
+            ]));
+            const suggestions = await getDirectorySuggestions('~/');
+            expect(suggestions).toEqual(['~/Downloads/']);
+        });
+        it('should return suggestions for a partial path with ~', async () => {
+            vi.mocked(fs.existsSync).mockReturnValue(true);
+            vi.mocked(fs.statSync).mockReturnValue({
+                isDirectory: () => true,
+            });
+            vi.mocked(fsPromises.opendir).mockResolvedValue(createMockDir([
+                { name: 'Downloads', isDirectory: () => true },
+            ]));
+            const suggestions = await getDirectorySuggestions('~/Down');
+            expect(suggestions).toEqual(['~/Downloads/']);
+        });
+        it('should return suggestions for ../', async () => {
+            vi.mocked(fs.existsSync).mockReturnValue(true);
+            vi.mocked(fs.statSync).mockReturnValue({
+                isDirectory: () => true,
+            });
+            vi.mocked(fsPromises.opendir).mockResolvedValue(createMockDir([
+                { name: 'other-project', isDirectory: () => true },
+            ]));
+            const suggestions = await getDirectorySuggestions('../');
+            expect(suggestions).toEqual(['../other-project/']);
+        });
+        it('should ignore hidden directories', async () => {
+            vi.mocked(fs.existsSync).mockReturnValue(true);
+            vi.mocked(fs.statSync).mockReturnValue({
+                isDirectory: () => true,
+            });
+            vi.mocked(fsPromises.opendir).mockResolvedValue(createMockDir([
+                { name: '.git', isDirectory: () => true },
+                { name: 'src', isDirectory: () => true },
+            ]));
+            const suggestions = await getDirectorySuggestions('');
+            expect(suggestions).toEqual([`src${path.sep}`]);
+        });
+        it('should show hidden directories when filter starts with .', async () => {
+            vi.mocked(fs.existsSync).mockReturnValue(true);
+            vi.mocked(fs.statSync).mockReturnValue({
+                isDirectory: () => true,
+            });
+            vi.mocked(fsPromises.opendir).mockResolvedValue(createMockDir([
+                { name: '.git', isDirectory: () => true },
+                { name: '.github', isDirectory: () => true },
+                { name: '.vscode', isDirectory: () => true },
+                { name: 'src', isDirectory: () => true },
+            ]));
+            const suggestions = await getDirectorySuggestions('.g');
+            expect(suggestions).toEqual([`.git${path.sep}`, `.github${path.sep}`]);
+        });
+        it('should return empty array if directory does not exist', async () => {
+            vi.mocked(fs.existsSync).mockReturnValue(false);
+            const suggestions = await getDirectorySuggestions('nonexistent/');
+            expect(suggestions).toEqual([]);
+        });
+        it('should limit results to 50 suggestions', async () => {
+            vi.mocked(fs.existsSync).mockReturnValue(true);
+            vi.mocked(fs.statSync).mockReturnValue({
+                isDirectory: () => true,
+            });
+            // Create 200 directories
+            const manyDirs = Array.from({ length: 200 }, (_, i) => ({
+                name: `dir${String(i).padStart(3, '0')}`,
+                isDirectory: () => true,
+            }));
+            vi.mocked(fsPromises.opendir).mockResolvedValue(createMockDir(manyDirs));
+            const suggestions = await getDirectorySuggestions('');
+            expect(suggestions).toHaveLength(50);
+        });
+        it('should terminate early after 150 matches for performance', async () => {
+            vi.mocked(fs.existsSync).mockReturnValue(true);
+            vi.mocked(fs.statSync).mockReturnValue({
+                isDirectory: () => true,
+            });
+            // Create 200 directories
+            const manyDirs = Array.from({ length: 200 }, (_, i) => ({
+                name: `dir${String(i).padStart(3, '0')}`,
+                isDirectory: () => true,
+            }));
+            const mockDir = createMockDir(manyDirs);
+            vi.mocked(fsPromises.opendir).mockResolvedValue(mockDir);
+            await getDirectorySuggestions('');
+            // The close method should be called, indicating early termination
+            expect(mockDir.close).toHaveBeenCalled();
+        });
+    });
+    describe.skipIf(process.platform !== 'win32')('getDirectorySuggestions (Windows)', () => {
+        it('should handle %userprofile% expansion', async () => {
+            vi.mocked(fs.existsSync).mockReturnValue(true);
+            vi.mocked(fs.statSync).mockReturnValue({
+                isDirectory: () => true,
+            });
+            vi.mocked(fsPromises.opendir).mockResolvedValue(createMockDir([
+                { name: 'Documents', isDirectory: () => true },
+                { name: 'Downloads', isDirectory: () => true },
+            ]));
+            expect(await getDirectorySuggestions('%userprofile%\\')).toEqual([
+                `%userprofile%\\Documents${path.sep}`,
+                `%userprofile%\\Downloads${path.sep}`,
+            ]);
+            vi.mocked(fsPromises.opendir).mockResolvedValue(createMockDir([
+                { name: 'Documents', isDirectory: () => true },
+                { name: 'Downloads', isDirectory: () => true },
+            ]));
+            expect(await getDirectorySuggestions('%userprofile%\\Doc')).toEqual([
+                `%userprofile%\\Documents${path.sep}`,
+            ]);
+        });
+    });
+});
+//# sourceMappingURL=directoryUtils.test.js.map

package/dist/src/ui/utils/directoryUtils.test.js.map

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

package/dist/src/ui/utils/editorUtils.d.ts

@@ -0,0 +1,18 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { ReadStream } from 'node:tty';
+import { type EditorType } from '@google/gemini-cli-core';
+/**
+ * Opens a file in an external editor and waits for it to close.
+ * Handles raw mode switching to ensure the editor can interact with the terminal.
+ *
+ * @param filePath Path to the file to open
+ * @param stdin The stdin stream from Ink/Node
+ * @param setRawMode Function to toggle raw mode
+ * @param preferredEditorType The user's preferred editor from config
+ * @param openInNewWindow Whether to open VS Code-family editors in a new window
+ */
+export declare function openFileInEditor(filePath: string, stdin: ReadStream | null | undefined, setRawMode: ((mode: boolean) => void) | undefined, preferredEditorType?: EditorType, openInNewWindow?: boolean): Promise<void>;

package/dist/src/ui/utils/editorUtils.js

@@ -0,0 +1,151 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { spawn, spawnSync } from 'node:child_process';
+import { ALL_EDITORS, CoreEvent, coreEvents, getEditorCommand, getEditorExtraArgs, getEditorWaitFlag, isGuiEditor, isTerminalEditor, isValidEditorType, resolveEditorTypeFromCommand, } from '@google/gemini-cli-core';
+/**
+ * Command name substrings used to guess whether an unknown $VISUAL/$EDITOR
+ * value is a GUI editor. This is a fallback for editors not in the registry;
+ * registered editors are detected via resolveEditorTypeFromCommand instead.
+ */
+const HEURISTIC_GUI_COMMANDS = [
+    'code',
+    'cursor',
+    'subl',
+    'zed',
+    'atom',
+    'agy',
+];
+/**
+ * Opens a file in an external editor and waits for it to close.
+ * Handles raw mode switching to ensure the editor can interact with the terminal.
+ *
+ * @param filePath Path to the file to open
+ * @param stdin The stdin stream from Ink/Node
+ * @param setRawMode Function to toggle raw mode
+ * @param preferredEditorType The user's preferred editor from config
+ * @param openInNewWindow Whether to open VS Code-family editors in a new window
+ */
+export async function openFileInEditor(filePath, stdin, setRawMode, preferredEditorType, openInNewWindow) {
+    let command = undefined;
+    const args = [filePath];
+    // Extra args that come before the file path (e.g. -nw for emacsclient)
+    const extraArgs = [];
+    if (preferredEditorType) {
+        if (!isValidEditorType(preferredEditorType)) {
+            coreEvents.emitFeedback('error', `Editor '${preferredEditorType}' is not a recognized editor identifier. ` +
+                `Supported editors: ${ALL_EDITORS.join(', ')}. ` +
+                `Use /editor to select one, or set the $VISUAL or $EDITOR environment variable.`);
+            return;
+        }
+        command = getEditorCommand(preferredEditorType);
+        if (isGuiEditor(preferredEditorType)) {
+            args.unshift(getEditorWaitFlag(preferredEditorType));
+        }
+        extraArgs.push(...getEditorExtraArgs(preferredEditorType, {
+            newWindow: openInNewWindow,
+        }));
+    }
+    if (!command) {
+        const envCommand = process.env['VISUAL'] ?? process.env['EDITOR'];
+        if (envCommand) {
+            command = envCommand;
+            const [envExecutable = ''] = envCommand.split(' ');
+            const resolvedType = resolveEditorTypeFromCommand(envExecutable);
+            if (resolvedType) {
+                if (isGuiEditor(resolvedType) &&
+                    !envCommand.includes('--wait') &&
+                    !envCommand.includes('-w')) {
+                    args.unshift(getEditorWaitFlag(resolvedType));
+                }
+                extraArgs.push(...getEditorExtraArgs(resolvedType, { newWindow: openInNewWindow }));
+            }
+            else {
+                // Heuristic fallback for commands not in the registry
+                const lower = envCommand.toLowerCase();
+                const isGui = HEURISTIC_GUI_COMMANDS.some((g) => lower.includes(g));
+                if (isGui && !lower.includes('--wait') && !lower.includes('-w')) {
+                    args.unshift(lower.includes('subl') ? '-w' : '--wait');
+                }
+            }
+        }
+    }
+    if (!command) {
+        command = process.platform === 'win32' ? 'notepad' : 'vi';
+    }
+    const [executable = '', ...initialArgs] = command.split(' ');
+    // Determine if we should use sync or async based on the command/editor type.
+    // If we have a preferredEditorType, we can check if it's a terminal editor.
+    // Otherwise, we guess based on the command name.
+    const terminalEditors = [
+        'vi',
+        'vim',
+        'nvim',
+        'emacs',
+        'emacsclient',
+        'hx',
+        'nano',
+        'micro',
+    ];
+    const isTerminal = preferredEditorType
+        ? isTerminalEditor(preferredEditorType)
+        : terminalEditors.some((te) => executable.toLowerCase().includes(te));
+    if (isTerminal &&
+        (executable.includes('vi') ||
+            executable.includes('vim') ||
+            executable.includes('nvim'))) {
+        // Pass -i NONE to prevent E138 'Can't write viminfo file' errors in restricted environments.
+        args.unshift('-i', 'NONE');
+    }
+    const wasRaw = stdin?.isRaw ?? false;
+    setRawMode?.(false);
+    try {
+        if (isTerminal) {
+            const result = spawnSync(executable, [...initialArgs, ...extraArgs, ...args], {
+                stdio: 'inherit',
+                shell: process.platform === 'win32',
+            });
+            if (result.error) {
+                const spawnErr = result.error;
+                coreEvents.emitFeedback('error', spawnErr.code === 'ENOENT'
+                    ? `Editor command '${executable}' was not found in PATH. Install it or use /editor to choose another editor.`
+                    : (spawnErr.message ?? String(spawnErr)));
+                return;
+            }
+            if (typeof result.status === 'number' && result.status !== 0) {
+                coreEvents.emitFeedback('error', `External editor exited with status ${result.status}`);
+                return;
+            }
+        }
+        else {
+            await new Promise((resolve) => {
+                const child = spawn(executable, [...initialArgs, ...extraArgs, ...args], {
+                    stdio: 'inherit',
+                    shell: process.platform === 'win32',
+                });
+                child.on('error', (err) => {
+                    const spawnErr = err;
+                    resolve();
+                    coreEvents.emitFeedback('error', spawnErr.code === 'ENOENT'
+                        ? `Editor command '${executable}' was not found in PATH. Install it or use /editor to choose another editor.`
+                        : (spawnErr.message ?? String(spawnErr)));
+                });
+                child.on('close', (status) => {
+                    resolve();
+                    if (typeof status === 'number' && status !== 0) {
+                        coreEvents.emitFeedback('error', `External editor exited with status ${status}`);
+                    }
+                });
+            });
+        }
+    }
+    finally {
+        if (wasRaw) {
+            setRawMode?.(true);
+        }
+        coreEvents.emit(CoreEvent.ExternalEditorClosed);
+    }
+}
+//# sourceMappingURL=editorUtils.js.map

package/dist/src/ui/utils/editorUtils.js.map

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

package/dist/src/ui/utils/formatters.js

@@ -0,0 +1,127 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { REFERENCE_CONTENT_START, REFERENCE_CONTENT_END, } from '@google/gemini-cli-core';
+export const formatBytes = (bytes) => {
+    const gb = bytes / (1024 * 1024 * 1024);
+    if (bytes < 1024 * 1024) {
+        return `${(bytes / 1024).toFixed(1)} KB`;
+    }
+    if (bytes < 1024 * 1024 * 1024) {
+        return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
+    }
+    return `${gb.toFixed(2)} GB`;
+};
+/**
+ * Formats a duration in milliseconds into a concise, human-readable string (e.g., "1h 5s").
+ * It omits any time units that are zero.
+ * @param milliseconds The duration in milliseconds.
+ * @returns A formatted string representing the duration.
+ */
+export const formatDuration = (milliseconds) => {
+    if (milliseconds <= 0) {
+        return '0s';
+    }
+    if (milliseconds < 1000) {
+        return `${Math.round(milliseconds)}ms`;
+    }
+    const totalSeconds = milliseconds / 1000;
+    if (totalSeconds < 60) {
+        return `${totalSeconds.toFixed(1)}s`;
+    }
+    const hours = Math.floor(totalSeconds / 3600);
+    const minutes = Math.floor((totalSeconds % 3600) / 60);
+    const seconds = Math.floor(totalSeconds % 60);
+    const parts = [];
+    if (hours > 0) {
+        parts.push(`${hours}h`);
+    }
+    if (minutes > 0) {
+        parts.push(`${minutes}m`);
+    }
+    if (seconds > 0) {
+        parts.push(`${seconds}s`);
+    }
+    // If all parts are zero (e.g., exactly 1 hour), return the largest unit.
+    if (parts.length === 0) {
+        if (hours > 0)
+            return `${hours}h`;
+        if (minutes > 0)
+            return `${minutes}m`;
+        return `${seconds}s`;
+    }
+    return parts.join(' ');
+};
+export const formatTimeAgo = (date) => {
+    const past = new Date(date);
+    if (isNaN(past.getTime())) {
+        return 'invalid date';
+    }
+    const now = new Date();
+    const diffMs = now.getTime() - past.getTime();
+    if (diffMs < 60000) {
+        return 'just now';
+    }
+    return `${formatDuration(diffMs)} ago`;
+};
+/**
+ * Removes content bounded by reference content markers from the given text.
+ * The markers are "${REFERENCE_CONTENT_START}" and "${REFERENCE_CONTENT_END}".
+ *
+ * @param text The input text containing potential reference blocks.
+ * @returns The text with reference blocks removed and trimmed.
+ */
+export function stripReferenceContent(text) {
+    // Match optional newline, the start marker, content (non-greedy), and the end marker
+    const pattern = new RegExp(`\\n?${REFERENCE_CONTENT_START}[\\s\\S]*?${REFERENCE_CONTENT_END}`, 'g');
+    return text.replace(pattern, '').trim();
+}
+export const formatResetTime = (resetTime, format = 'full') => {
+    if (!resetTime)
+        return '';
+    const resetDate = new Date(resetTime);
+    if (isNaN(resetDate.getTime()))
+        return '';
+    const diff = resetDate.getTime() - Date.now();
+    if (diff <= 0)
+        return '';
+    const totalMinutes = Math.ceil(diff / (1000 * 60));
+    const hours = Math.floor(totalMinutes / 60);
+    const minutes = totalMinutes % 60;
+    const isTerse = format === 'terse';
+    const isColumn = format === 'column';
+    if (isTerse || isColumn) {
+        const hoursStr = hours > 0 ? `${hours}h` : '';
+        const minutesStr = minutes > 0 ? `${minutes}m` : '';
+        const duration = hoursStr && minutesStr
+            ? `${hoursStr} ${minutesStr}`
+            : hoursStr || minutesStr;
+        if (isColumn) {
+            const timeStr = new Intl.DateTimeFormat('en-US', {
+                hour: 'numeric',
+                minute: 'numeric',
+            }).format(resetDate);
+            return duration ? `${timeStr} (${duration})` : timeStr;
+        }
+        return duration;
+    }
+    let duration = '';
+    if (hours > 0) {
+        duration = `${hours} hour${hours > 1 ? 's' : ''}`;
+        if (minutes > 0) {
+            duration += ` ${minutes} minute${minutes > 1 ? 's' : ''}`;
+        }
+    }
+    else {
+        duration = `${minutes} minute${minutes > 1 ? 's' : ''}`;
+    }
+    const timeStr = new Intl.DateTimeFormat('en-US', {
+        hour: 'numeric',
+        minute: 'numeric',
+        timeZoneName: 'short',
+    }).format(resetDate);
+    return `${duration} at ${timeStr}`;
+};
+//# sourceMappingURL=formatters.js.map

package/dist/src/ui/utils/formatters.js.map

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

package/dist/src/ui/utils/historyUtils.d.ts

@@ -0,0 +1,15 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { type ToolVisibilityContext } from '@google/gemini-cli-core';
+import type { HistoryItem, HistoryItemWithoutId, IndividualToolCallDisplay } from '../types.js';
+/**
+ * Maps an IndividualToolCallDisplay from the CLI to a ToolVisibilityContext for core logic.
+ */
+export declare function buildToolVisibilityContextFromDisplay(tool: IndividualToolCallDisplay): ToolVisibilityContext;
+export declare function getLastTurnToolCallIds(history: HistoryItem[], pendingHistoryItems: HistoryItemWithoutId[]): string[];
+export declare function isToolExecuting(pendingHistoryItems: HistoryItemWithoutId[]): boolean;
+export declare function isToolAwaitingConfirmation(pendingHistoryItems: HistoryItemWithoutId[]): boolean;
+export declare function getAllToolCalls(historyItems: HistoryItemWithoutId[]): IndividualToolCallDisplay[];