@machina.ai/cell-cli 1.18.4-rc1 → 1.19.4-rc1

package/dist/src/config/config.test.js

@@ -6,7 +6,7 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import * as os from 'node:os';
 import * as path from 'node:path';
-import { DEFAULT_FILE_FILTERING_OPTIONS, DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_MODEL_AUTO, OutputFormat, SHELL_TOOL_NAME, WRITE_FILE_TOOL_NAME, EDIT_TOOL_NAME, debugLogger, } from '@google/gemini-cli-core';
+import { DEFAULT_GEMINI_MODEL_AUTO, DEFAULT_FILE_FILTERING_OPTIONS, OutputFormat, SHELL_TOOL_NAME, WRITE_FILE_TOOL_NAME, EDIT_TOOL_NAME, debugLogger, } from '@google/gemini-cli-core';
 import { loadCliConfig, parseArguments } from './config.js';
 import * as ServerConfig from '@google/gemini-cli-core';
 import { isWorkspaceTrusted } from './trustedFolders.js';
@@ -111,241 +111,223 @@ afterEach(() => {
     }
 });
 describe('parseArguments', () => {
-    it('should throw an error when both --prompt and --prompt-interactive are used together', async () => {
-        process.argv = [
-            'node',
-            'script.js',
-            '--prompt',
-            'test prompt',
-            '--prompt-interactive',
-            'interactive prompt',
-        ];
-        const mockExit = vi.spyOn(process, 'exit').mockImplementation(() => {
-            throw new Error('process.exit called');
-        });
-        const mockConsoleError = vi
-            .spyOn(console, 'error')
-            .mockImplementation(() => { });
-        const debugErrorSpy = vi
-            .spyOn(debugLogger, 'error')
-            .mockImplementation(() => { });
-        await expect(parseArguments({})).rejects.toThrow('process.exit called');
-        expect(debugErrorSpy).toHaveBeenCalledWith(expect.stringContaining('Cannot use both --prompt (-p) and --prompt-interactive (-i) together'));
-        // yargs.showHelp() calls console.error
-        expect(mockConsoleError).toHaveBeenCalled();
-        mockExit.mockRestore();
-        mockConsoleError.mockRestore();
-        debugErrorSpy.mockRestore();
-    });
-    it('should throw an error when using short flags -p and -i together', async () => {
-        process.argv = [
-            'node',
-            'script.js',
-            '-p',
-            'test prompt',
-            '-i',
-            'interactive prompt',
-        ];
+    it.each([
+        {
+            description: 'long flags',
+            argv: [
+                'node',
+                'script.js',
+                '--prompt',
+                'test prompt',
+                '--prompt-interactive',
+                'interactive prompt',
+            ],
+        },
+        {
+            description: 'short flags',
+            argv: [
+                'node',
+                'script.js',
+                '-p',
+                'test prompt',
+                '-i',
+                'interactive prompt',
+            ],
+        },
+    ])('should throw an error when using conflicting prompt flags ($description)', async ({ argv }) => {
+        process.argv = argv;
         const mockExit = vi.spyOn(process, 'exit').mockImplementation(() => {
             throw new Error('process.exit called');
         });
         const mockConsoleError = vi
             .spyOn(console, 'error')
             .mockImplementation(() => { });
-        const debugErrorSpy = vi
-            .spyOn(debugLogger, 'error')
-            .mockImplementation(() => { });
         await expect(parseArguments({})).rejects.toThrow('process.exit called');
-        expect(debugErrorSpy).toHaveBeenCalledWith(expect.stringContaining('Cannot use both --prompt (-p) and --prompt-interactive (-i) together'));
-        expect(mockConsoleError).toHaveBeenCalled();
+        expect(mockConsoleError).toHaveBeenCalledWith(expect.stringContaining('Cannot use both --prompt (-p) and --prompt-interactive (-i) together'));
         mockExit.mockRestore();
         mockConsoleError.mockRestore();
-        debugErrorSpy.mockRestore();
     });
-    it('should allow --prompt without --prompt-interactive', async () => {
-        process.argv = ['node', 'script.js', '--prompt', 'test prompt'];
-        const argv = await parseArguments({});
-        expect(argv.prompt).toBe('test prompt');
-        expect(argv.promptInteractive).toBeUndefined();
-    });
-    it('should allow --prompt-interactive without --prompt', async () => {
-        process.argv = [
-            'node',
-            'script.js',
-            '--prompt-interactive',
-            'interactive prompt',
-        ];
-        const argv = await parseArguments({});
-        expect(argv.promptInteractive).toBe('interactive prompt');
-        expect(argv.prompt).toBeUndefined();
-    });
-    it('should allow -i flag as alias for --prompt-interactive', async () => {
-        process.argv = ['node', 'script.js', '-i', 'interactive prompt'];
-        const argv = await parseArguments({});
-        expect(argv.promptInteractive).toBe('interactive prompt');
-        expect(argv.prompt).toBeUndefined();
-    });
-    it('should convert positional query argument to prompt by default', async () => {
-        process.argv = ['node', 'script.js', 'Hi Gemini'];
-        const argv = await parseArguments({});
-        expect(argv.query).toBe('Hi Gemini');
-        expect(argv.prompt).toBe('Hi Gemini');
-        expect(argv.promptInteractive).toBeUndefined();
-    });
-    it('should map @path to prompt (one-shot) when it starts with @', async () => {
-        process.argv = ['node', 'script.js', '@path ./file.md'];
-        const argv = await parseArguments({});
-        expect(argv.query).toBe('@path ./file.md');
-        expect(argv.prompt).toBe('@path ./file.md');
-        expect(argv.promptInteractive).toBeUndefined();
-    });
-    it('should map @path to prompt even when config flags are present', async () => {
-        // @path queries should now go to one-shot mode regardless of other flags
-        process.argv = [
-            'node',
-            'script.js',
-            '@path',
-            './file.md',
-            '--model',
-            'gemini-2.5-pro',
-        ];
-        const argv = await parseArguments({});
-        expect(argv.query).toBe('@path ./file.md');
-        expect(argv.prompt).toBe('@path ./file.md'); // Should map to one-shot
-        expect(argv.promptInteractive).toBeUndefined();
-        expect(argv.model).toBe('gemini-2.5-pro');
-    });
-    it('maps unquoted positional @path + arg to prompt (one-shot)', async () => {
-        // Simulate: gemini @path ./file.md
-        process.argv = ['node', 'script.js', '@path', './file.md'];
-        const argv = await parseArguments({});
-        // After normalization, query is a single string
-        expect(argv.query).toBe('@path ./file.md');
-        // And it's mapped to one-shot prompt when no -p/-i flags are set
-        expect(argv.prompt).toBe('@path ./file.md');
-        expect(argv.promptInteractive).toBeUndefined();
-    });
-    it('should handle multiple @path arguments in a single command (one-shot)', async () => {
-        // Simulate: gemini @path ./file1.md @path ./file2.md
-        process.argv = [
-            'node',
-            'script.js',
-            '@path',
-            './file1.md',
-            '@path',
-            './file2.md',
-        ];
-        const argv = await parseArguments({});
-        // After normalization, all arguments are joined with spaces
-        expect(argv.query).toBe('@path ./file1.md @path ./file2.md');
-        // And it's mapped to one-shot prompt
-        expect(argv.prompt).toBe('@path ./file1.md @path ./file2.md');
-        expect(argv.promptInteractive).toBeUndefined();
-    });
-    it('should handle mixed quoted and unquoted @path arguments (one-shot)', async () => {
-        // Simulate: gemini "@path ./file1.md" @path ./file2.md "additional text"
-        process.argv = [
-            'node',
-            'script.js',
-            '@path ./file1.md',
-            '@path',
-            './file2.md',
-            'additional text',
-        ];
-        const argv = await parseArguments({});
-        // After normalization, all arguments are joined with spaces
-        expect(argv.query).toBe('@path ./file1.md @path ./file2.md additional text');
-        // And it's mapped to one-shot prompt
-        expect(argv.prompt).toBe('@path ./file1.md @path ./file2.md additional text');
-        expect(argv.promptInteractive).toBeUndefined();
-    });
-    it('should map @path to prompt with ambient flags (debug)', async () => {
-        // Ambient flags like debug should NOT affect routing
-        process.argv = ['node', 'script.js', '@path', './file.md', '--debug'];
-        const argv = await parseArguments({});
-        expect(argv.query).toBe('@path ./file.md');
-        expect(argv.prompt).toBe('@path ./file.md'); // Should map to one-shot
-        expect(argv.promptInteractive).toBeUndefined();
-        expect(argv.debug).toBe(true);
-    });
-    it('should map any @command to prompt (one-shot)', async () => {
-        // Test that all @commands now go to one-shot mode
-        const testCases = [
-            '@path ./file.md',
-            '@include src/',
-            '@search pattern',
-            '@web query',
-            '@git status',
-        ];
-        for (const testQuery of testCases) {
-            process.argv = ['node', 'script.js', testQuery];
-            const argv = await parseArguments({});
-            expect(argv.query).toBe(testQuery);
-            expect(argv.prompt).toBe(testQuery);
-            expect(argv.promptInteractive).toBeUndefined();
-        }
-    });
-    it('should handle @command with leading whitespace', async () => {
-        // Test that trim() + routing handles leading whitespace correctly
-        process.argv = ['node', 'script.js', '  @path ./file.md'];
-        const argv = await parseArguments({});
-        expect(argv.query).toBe('  @path ./file.md');
-        expect(argv.prompt).toBe('  @path ./file.md');
-        expect(argv.promptInteractive).toBeUndefined();
-    });
-    it('should throw an error when both --yolo and --approval-mode are used together', async () => {
-        process.argv = [
-            'node',
-            'script.js',
-            '--yolo',
-            '--approval-mode',
-            'default',
-        ];
-        const mockExit = vi.spyOn(process, 'exit').mockImplementation(() => {
-            throw new Error('process.exit called');
+    it.each([
+        {
+            description: 'should allow --prompt without --prompt-interactive',
+            argv: ['node', 'script.js', '--prompt', 'test prompt'],
+            expected: { prompt: 'test prompt', promptInteractive: undefined },
+        },
+        {
+            description: 'should allow --prompt-interactive without --prompt',
+            argv: ['node', 'script.js', '--prompt-interactive', 'interactive prompt'],
+            expected: { prompt: undefined, promptInteractive: 'interactive prompt' },
+        },
+        {
+            description: 'should allow -i flag as alias for --prompt-interactive',
+            argv: ['node', 'script.js', '-i', 'interactive prompt'],
+            expected: { prompt: undefined, promptInteractive: 'interactive prompt' },
+        },
+    ])('$description', async ({ argv, expected }) => {
+        process.argv = argv;
+        const parsedArgs = await parseArguments({});
+        expect(parsedArgs.prompt).toBe(expected.prompt);
+        expect(parsedArgs.promptInteractive).toBe(expected.promptInteractive);
+    });
+    describe('positional arguments and @commands', () => {
+        it.each([
+            {
+                description: 'should convert positional query argument to prompt by default',
+                argv: ['node', 'script.js', 'Hi Gemini'],
+                expectedQuery: 'Hi Gemini',
+                expectedModel: undefined,
+                debug: false,
+            },
+            {
+                description: 'should map @path to prompt (one-shot) when it starts with @',
+                argv: ['node', 'script.js', '@path ./file.md'],
+                expectedQuery: '@path ./file.md',
+                expectedModel: undefined,
+                debug: false,
+            },
+            {
+                description: 'should map @path to prompt even when config flags are present',
+                argv: [
+                    'node',
+                    'script.js',
+                    '@path',
+                    './file.md',
+                    '--model',
+                    'gemini-2.5-pro',
+                ],
+                expectedQuery: '@path ./file.md',
+                expectedModel: 'gemini-2.5-pro',
+                debug: false,
+            },
+            {
+                description: 'maps unquoted positional @path + arg to prompt (one-shot)',
+                argv: ['node', 'script.js', '@path', './file.md'],
+                expectedQuery: '@path ./file.md',
+                expectedModel: undefined,
+                debug: false,
+            },
+            {
+                description: 'should handle multiple @path arguments in a single command (one-shot)',
+                argv: [
+                    'node',
+                    'script.js',
+                    '@path',
+                    './file1.md',
+                    '@path',
+                    './file2.md',
+                ],
+                expectedQuery: '@path ./file1.md @path ./file2.md',
+                expectedModel: undefined,
+                debug: false,
+            },
+            {
+                description: 'should handle mixed quoted and unquoted @path arguments (one-shot)',
+                argv: [
+                    'node',
+                    'script.js',
+                    '@path ./file1.md',
+                    '@path',
+                    './file2.md',
+                    'additional text',
+                ],
+                expectedQuery: '@path ./file1.md @path ./file2.md additional text',
+                expectedModel: undefined,
+                debug: false,
+            },
+            {
+                description: 'should map @path to prompt with ambient flags (debug)',
+                argv: ['node', 'script.js', '@path', './file.md', '--debug'],
+                expectedQuery: '@path ./file.md',
+                expectedModel: undefined,
+                debug: true,
+            },
+            {
+                description: 'should map @include to prompt (one-shot)',
+                argv: ['node', 'script.js', '@include src/'],
+                expectedQuery: '@include src/',
+                expectedModel: undefined,
+                debug: false,
+            },
+            {
+                description: 'should map @search to prompt (one-shot)',
+                argv: ['node', 'script.js', '@search pattern'],
+                expectedQuery: '@search pattern',
+                expectedModel: undefined,
+                debug: false,
+            },
+            {
+                description: 'should map @web to prompt (one-shot)',
+                argv: ['node', 'script.js', '@web query'],
+                expectedQuery: '@web query',
+                expectedModel: undefined,
+                debug: false,
+            },
+            {
+                description: 'should map @git to prompt (one-shot)',
+                argv: ['node', 'script.js', '@git status'],
+                expectedQuery: '@git status',
+                expectedModel: undefined,
+                debug: false,
+            },
+            {
+                description: 'should handle @command with leading whitespace',
+                argv: ['node', 'script.js', '  @path ./file.md'],
+                expectedQuery: '  @path ./file.md',
+                expectedModel: undefined,
+                debug: false,
+            },
+        ])('$description', async ({ argv, expectedQuery, expectedModel, debug }) => {
+            process.argv = argv;
+            const parsedArgs = await parseArguments({});
+            expect(parsedArgs.query).toBe(expectedQuery);
+            expect(parsedArgs.prompt).toBe(expectedQuery);
+            expect(parsedArgs.promptInteractive).toBeUndefined();
+            if (expectedModel) {
+                expect(parsedArgs.model).toBe(expectedModel);
+            }
+            if (debug) {
+                expect(parsedArgs.debug).toBe(true);
+            }
         });
-        const mockConsoleError = vi
-            .spyOn(console, 'error')
-            .mockImplementation(() => { });
-        const debugErrorSpy = vi
-            .spyOn(debugLogger, 'error')
-            .mockImplementation(() => { });
-        await expect(parseArguments({})).rejects.toThrow('process.exit called');
-        expect(debugErrorSpy).toHaveBeenCalledWith(expect.stringContaining('Cannot use both --yolo (-y) and --approval-mode together. Use --approval-mode=yolo instead.'));
-        expect(mockConsoleError).toHaveBeenCalled();
-        mockExit.mockRestore();
-        mockConsoleError.mockRestore();
-        debugErrorSpy.mockRestore();
     });
-    it('should throw an error when using short flags -y and --approval-mode together', async () => {
-        process.argv = ['node', 'script.js', '-y', '--approval-mode', 'yolo'];
+    it.each([
+        {
+            description: 'long flags',
+            argv: ['node', 'script.js', '--yolo', '--approval-mode', 'default'],
+        },
+        {
+            description: 'short flags',
+            argv: ['node', 'script.js', '-y', '--approval-mode', 'yolo'],
+        },
+    ])('should throw an error when using conflicting yolo/approval-mode flags ($description)', async ({ argv }) => {
+        process.argv = argv;
         const mockExit = vi.spyOn(process, 'exit').mockImplementation(() => {
             throw new Error('process.exit called');
         });
         const mockConsoleError = vi
             .spyOn(console, 'error')
             .mockImplementation(() => { });
-        const debugErrorSpy = vi
-            .spyOn(debugLogger, 'error')
-            .mockImplementation(() => { });
         await expect(parseArguments({})).rejects.toThrow('process.exit called');
-        expect(debugErrorSpy).toHaveBeenCalledWith(expect.stringContaining('Cannot use both --yolo (-y) and --approval-mode together. Use --approval-mode=yolo instead.'));
-        expect(mockConsoleError).toHaveBeenCalled();
+        expect(mockConsoleError).toHaveBeenCalledWith(expect.stringContaining('Cannot use both --yolo (-y) and --approval-mode together. Use --approval-mode=yolo instead.'));
         mockExit.mockRestore();
         mockConsoleError.mockRestore();
-        debugErrorSpy.mockRestore();
-    });
-    it('should allow --approval-mode without --yolo', async () => {
-        process.argv = ['node', 'script.js', '--approval-mode', 'auto_edit'];
-        const argv = await parseArguments({});
-        expect(argv.approvalMode).toBe('auto_edit');
-        expect(argv.yolo).toBe(false);
     });
-    it('should allow --yolo without --approval-mode', async () => {
-        process.argv = ['node', 'script.js', '--yolo'];
-        const argv = await parseArguments({});
-        expect(argv.yolo).toBe(true);
-        expect(argv.approvalMode).toBeUndefined();
+    it.each([
+        {
+            description: 'should allow --approval-mode without --yolo',
+            argv: ['node', 'script.js', '--approval-mode', 'auto_edit'],
+            expected: { approvalMode: 'auto_edit', yolo: false },
+        },
+        {
+            description: 'should allow --yolo without --approval-mode',
+            argv: ['node', 'script.js', '--yolo'],
+            expected: { approvalMode: undefined, yolo: true },
+        },
+    ])('$description', async ({ argv, expected }) => {
+        process.argv = argv;
+        const parsedArgs = await parseArguments({});
+        expect(parsedArgs.approvalMode).toBe(expected.approvalMode);
+        expect(parsedArgs.yolo).toBe(expected.yolo);
     });
     it('should reject invalid --approval-mode values', async () => {
         process.argv = ['node', 'script.js', '--approval-mode', 'invalid'];
@@ -365,28 +347,15 @@ describe('parseArguments', () => {
         mockConsoleError.mockRestore();
         debugErrorSpy.mockRestore();
     });
-    it('should throw an error when resuming a session without prompt in non-interactive mode', async () => {
+    it('should allow resuming a session without prompt argument in non-interactive mode (expecting stdin)', async () => {
         const originalIsTTY = process.stdin.isTTY;
         process.stdin.isTTY = false;
         process.argv = ['node', 'script.js', '--resume', 'session-id'];
-        const mockExit = vi.spyOn(process, 'exit').mockImplementation(() => {
-            throw new Error('process.exit called');
-        });
-        const mockConsoleError = vi
-            .spyOn(console, 'error')
-            .mockImplementation(() => { });
-        const debugErrorSpy = vi
-            .spyOn(debugLogger, 'error')
-            .mockImplementation(() => { });
         try {
-            await expect(parseArguments({})).rejects.toThrow('process.exit called');
-            expect(debugErrorSpy).toHaveBeenCalledWith(expect.stringContaining('When resuming a session, you must provide a message via --prompt (-p) or stdin'));
-            expect(mockConsoleError).toHaveBeenCalled();
+            const argv = await parseArguments({});
+            expect(argv.resume).toBe('session-id');
         }
         finally {
-            mockExit.mockRestore();
-            mockConsoleError.mockRestore();
-            debugErrorSpy.mockRestore();
             process.stdin.isTTY = originalIsTTY;
         }
     });
@@ -1106,7 +1075,7 @@ describe('loadCliConfig model selection', () => {
         const config = await loadCliConfig({
         // No model set.
         }, 'test-session', argv);
-        expect(config.getModel()).toBe(DEFAULT_GEMINI_MODEL);
+        expect(config.getModel()).toBe(DEFAULT_GEMINI_MODEL_AUTO);
     });
     it('always prefers model from argv', async () => {
         process.argv = ['node', 'script.js', '--model', 'gemini-2.5-flash-preview'];
@@ -1127,68 +1096,6 @@ describe('loadCliConfig model selection', () => {
         expect(config.getModel()).toBe('gemini-2.5-flash-preview');
     });
 });
-describe('loadCliConfig model selection with model router', () => {
-    beforeEach(() => {
-        vi.spyOn(ExtensionManager.prototype, 'getExtensions').mockReturnValue([]);
-    });
-    afterEach(() => {
-        vi.resetAllMocks();
-    });
-    it('should use auto model when useModelRouter is true and no model is provided', async () => {
-        process.argv = ['node', 'script.js'];
-        const argv = await parseArguments({});
-        const config = await loadCliConfig({
-            experimental: {
-                useModelRouter: true,
-            },
-        }, 'test-session', argv);
-        expect(config.getModel()).toBe(DEFAULT_GEMINI_MODEL_AUTO);
-    });
-    it('should use default model when useModelRouter is false and no model is provided', async () => {
-        process.argv = ['node', 'script.js'];
-        const argv = await parseArguments({});
-        const config = await loadCliConfig({
-            experimental: {
-                useModelRouter: false,
-            },
-        }, 'test-session', argv);
-        expect(config.getModel()).toBe(DEFAULT_GEMINI_MODEL);
-    });
-    it('should prioritize argv over useModelRouter', async () => {
-        process.argv = ['node', 'script.js', '--model', 'gemini-from-argv'];
-        const argv = await parseArguments({});
-        const config = await loadCliConfig({
-            experimental: {
-                useModelRouter: true,
-            },
-        }, 'test-session', argv);
-        expect(config.getModel()).toBe('gemini-from-argv');
-    });
-    it('should prioritize settings over useModelRouter', async () => {
-        process.argv = ['node', 'script.js'];
-        const argv = await parseArguments({});
-        const config = await loadCliConfig({
-            experimental: {
-                useModelRouter: true,
-            },
-            model: {
-                name: 'gemini-from-settings',
-            },
-        }, 'test-session', argv);
-        expect(config.getModel()).toBe('gemini-from-settings');
-    });
-    it('should prioritize environment variable over useModelRouter', async () => {
-        process.argv = ['node', 'script.js'];
-        vi.stubEnv('GEMINI_MODEL', 'gemini-from-env');
-        const argv = await parseArguments({});
-        const config = await loadCliConfig({
-            experimental: {
-                useModelRouter: true,
-            },
-        }, 'test-session', argv);
-        expect(config.getModel()).toBe('gemini-from-env');
-    });
-});
 describe('loadCliConfig folderTrust', () => {
     beforeEach(() => {
         vi.resetAllMocks();
@@ -1340,29 +1247,6 @@ describe('loadCliConfig useRipgrep', () => {
         const config = await loadCliConfig(settings, 'test-session', argv);
         expect(config.getUseRipgrep()).toBe(true);
     });
-    describe('loadCliConfig useModelRouter', () => {
-        it('should be false by default when useModelRouter is not set in settings', async () => {
-            process.argv = ['node', 'script.js'];
-            const _argv = await parseArguments({});
-            const settings = {};
-            const config = await loadCliConfig(settings, 'test-session', _argv);
-            expect(config.getUseModelRouter()).toBe(false);
-        });
-        it('should be true when useModelRouter is set to true in settings', async () => {
-            process.argv = ['node', 'script.js'];
-            const argv = await parseArguments({});
-            const settings = { experimental: { useModelRouter: true } };
-            const config = await loadCliConfig(settings, 'test-session', argv);
-            expect(config.getUseModelRouter()).toBe(true);
-        });
-        it('should be false when useModelRouter is explicitly set to false in settings', async () => {
-            process.argv = ['node', 'script.js'];
-            const argv = await parseArguments({});
-            const settings = { experimental: { useModelRouter: false } };
-            const config = await loadCliConfig(settings, 'test-session', argv);
-            expect(config.getUseModelRouter()).toBe(false);
-        });
-    });
 });
 describe('screenReader configuration', () => {
     beforeEach(() => {