@machina.ai/cell-cli 1.40.1-rc2 → 1.41.1-rc2

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, OutputFormat, SHELL_TOOL_NAME, WRITE_FILE_TOOL_NAME, EDIT_TOOL_NAME, WEB_FETCH_TOOL_NAME, ASK_USER_TOOL_NAME, debugLogger, ApprovalMode, Storage, generalistProfile, } from '@google/gemini-cli-core';
+import { DEFAULT_FILE_FILTERING_OPTIONS, OutputFormat, SHELL_TOOL_NAME, WRITE_FILE_TOOL_NAME, EDIT_TOOL_NAME, WEB_FETCH_TOOL_NAME, ASK_USER_TOOL_NAME, debugLogger, ApprovalMode, Storage, } from '@google/gemini-cli-core';
 import { loadCliConfig, parseArguments } from './config.js';
 import { createTestMergedSettings, } from './settings.js';
 import * as ServerConfig from '@google/gemini-cli-core';
@@ -171,6 +171,34 @@ afterEach(() => {
     });
 });
 describe('parseArguments', () => {
+    afterEach(() => {
+        vi.restoreAllMocks();
+    });
+    it('should fail if both --resume and --session-id are provided', async () => {
+        process.argv = [
+            'node',
+            'script.js',
+            '--resume',
+            '--session-id',
+            'test-uuid-1234',
+        ];
+        const mockConsoleError = vi
+            .spyOn(console, 'error')
+            .mockImplementation(() => { });
+        vi.spyOn(process, 'exit').mockImplementation(() => {
+            throw new Error('process.exit called');
+        });
+        await expect(parseArguments(createTestMergedSettings())).rejects.toThrow('process.exit called');
+        expect(mockConsoleError).toHaveBeenCalledWith(expect.stringContaining('Cannot use both --resume (-r) and --session-id together'));
+    });
+    it('should parse --session-id option correctly', async () => {
+        process.argv = ['node', 'script.js', '--session-id', 'test-uuid-1234'];
+        vi.spyOn(process, 'exit').mockImplementation(() => {
+            throw new Error('process.exit called');
+        });
+        const parsedArgs = await parseArguments(createTestMergedSettings());
+        expect(parsedArgs.sessionId).toBe('test-uuid-1234');
+    });
     describe('worktree', () => {
         it('should parse --worktree flag when provided with a name', async () => {
             process.argv = ['node', 'script.js', '--worktree', 'my-feature'];
@@ -192,7 +220,7 @@ describe('parseArguments', () => {
             process.argv = ['node', 'script.js', '--worktree', 'feature'];
             const settings = createTestMergedSettings();
             settings.experimental.worktrees = false;
-            const mockExit = vi.spyOn(process, 'exit').mockImplementation(() => {
+            vi.spyOn(process, 'exit').mockImplementation(() => {
                 throw new Error('process.exit called');
             });
             const mockConsoleError = vi
@@ -200,8 +228,6 @@ describe('parseArguments', () => {
                 .mockImplementation(() => { });
             await expect(parseArguments(settings)).rejects.toThrow('process.exit called');
             expect(mockConsoleError).toHaveBeenCalledWith(expect.stringContaining('The --worktree flag is only available when experimental.worktrees is enabled in your settings.'));
-            mockExit.mockRestore();
-            mockConsoleError.mockRestore();
         });
     });
     it.each([
@@ -229,7 +255,7 @@ describe('parseArguments', () => {
         },
     ])('should throw an error when using conflicting prompt flags ($description)', async ({ argv }) => {
         process.argv = argv;
-        const mockExit = vi.spyOn(process, 'exit').mockImplementation(() => {
+        vi.spyOn(process, 'exit').mockImplementation(() => {
             throw new Error('process.exit called');
         });
         const mockConsoleError = vi
@@ -237,8 +263,6 @@ describe('parseArguments', () => {
             .mockImplementation(() => { });
         await expect(parseArguments(createTestMergedSettings())).rejects.toThrow('process.exit called');
         expect(mockConsoleError).toHaveBeenCalledWith(expect.stringContaining('Cannot use both --prompt (-p) and --prompt-interactive (-i) together'));
-        mockExit.mockRestore();
-        mockConsoleError.mockRestore();
     });
     describe('isCommand middleware', () => {
         it.each([
@@ -451,7 +475,7 @@ describe('parseArguments', () => {
         },
     ])('should throw an error when using conflicting yolo/approval-mode flags ($description)', async ({ argv }) => {
         process.argv = argv;
-        const mockExit = vi.spyOn(process, 'exit').mockImplementation(() => {
+        vi.spyOn(process, 'exit').mockImplementation(() => {
             throw new Error('process.exit called');
         });
         const mockConsoleError = vi
@@ -459,8 +483,6 @@ describe('parseArguments', () => {
             .mockImplementation(() => { });
         await expect(parseArguments(createTestMergedSettings())).rejects.toThrow('process.exit called');
         expect(mockConsoleError).toHaveBeenCalledWith(expect.stringContaining('Cannot use both --yolo (-y) and --approval-mode together. Use --approval-mode=yolo instead.'));
-        mockExit.mockRestore();
-        mockConsoleError.mockRestore();
     });
     it.each([
         {
@@ -481,7 +503,7 @@ describe('parseArguments', () => {
     });
     it('should reject invalid --approval-mode values', async () => {
         process.argv = ['node', 'script.js', '--approval-mode', 'invalid'];
-        const mockExit = vi.spyOn(process, 'exit').mockImplementation(() => {
+        vi.spyOn(process, 'exit').mockImplementation(() => {
             throw new Error('process.exit called');
         });
         const mockConsoleError = vi
@@ -493,9 +515,6 @@ describe('parseArguments', () => {
         await expect(parseArguments(createTestMergedSettings())).rejects.toThrow('process.exit called');
         expect(debugErrorSpy).toHaveBeenCalledWith(expect.stringContaining('Invalid values:'));
         expect(mockConsoleError).toHaveBeenCalled();
-        mockExit.mockRestore();
-        mockConsoleError.mockRestore();
-        debugErrorSpy.mockRestore();
     });
     it('should allow resuming a session without prompt argument in non-interactive mode (expecting stdin)', async () => {
         const originalIsTTY = process.stdin.isTTY;
@@ -630,6 +649,84 @@ describe('loadCliConfig', () => {
         vi.unstubAllEnvs();
         vi.restoreAllMocks();
     });
+    describe('Model resolution', () => {
+        it('should handle multiple --model flags by taking the last one', async () => {
+            const argv = {
+                query: undefined,
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                model: ['gemini-1.5-pro', 'gemini-2.0-flash'],
+                sandbox: undefined,
+                debug: false,
+                prompt: undefined,
+                promptInteractive: undefined,
+                yolo: undefined,
+                approvalMode: undefined,
+                policy: undefined,
+                adminPolicy: undefined,
+                allowedMcpServerNames: undefined,
+                allowedTools: undefined,
+                extensions: undefined,
+                listExtensions: false,
+                listSessions: false,
+                deleteSession: undefined,
+                screenReader: undefined,
+                isCommand: false,
+                rawOutput: false,
+                acceptRawOutputRisk: false,
+                startupMessages: [],
+                resume: undefined,
+                includeDirectories: [],
+                useWriteTodos: false,
+                outputFormat: undefined,
+                fakeResponses: undefined,
+                recordResponses: undefined,
+                skipTrust: false,
+            };
+            const settings = createTestMergedSettings();
+            const config = await loadCliConfig(settings, 'test-session', argv, {
+                cwd: process.cwd(),
+            });
+            expect(config.getModel()).toBe('gemini-2.0-flash');
+        });
+        it('should handle non-string model flags by coercing to string', async () => {
+            const argv = {
+                query: undefined,
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                model: true,
+                sandbox: undefined,
+                debug: false,
+                prompt: undefined,
+                promptInteractive: undefined,
+                yolo: undefined,
+                approvalMode: undefined,
+                policy: undefined,
+                adminPolicy: undefined,
+                allowedMcpServerNames: undefined,
+                allowedTools: undefined,
+                extensions: undefined,
+                listExtensions: false,
+                listSessions: false,
+                deleteSession: undefined,
+                screenReader: undefined,
+                isCommand: false,
+                rawOutput: false,
+                acceptRawOutputRisk: false,
+                startupMessages: [],
+                resume: undefined,
+                includeDirectories: [],
+                useWriteTodos: false,
+                outputFormat: undefined,
+                fakeResponses: undefined,
+                recordResponses: undefined,
+                skipTrust: false,
+            };
+            const settings = createTestMergedSettings();
+            const config = await loadCliConfig(settings, 'test-session', argv, {
+                cwd: process.cwd(),
+            });
+            expect(config.getModel()).toBe('true');
+        });
+    });
     describe('Proxy configuration', () => {
         const originalProxyEnv = {};
         const proxyEnvVars = [
@@ -714,9 +811,7 @@ describe('loadCliConfig', () => {
         expect(dirs).toContain('/project/folderB');
     });
     it('should skip inaccessible workspace folders from CELL_CLI_IDE_WORKSPACE_PATH', async () => {
-        const resolveToRealPathSpy = vi
-            .spyOn(ServerConfig, 'resolveToRealPath')
-            .mockImplementation((p) => {
+        vi.spyOn(ServerConfig, 'resolveToRealPath').mockImplementation((p) => {
             if (p.toString().includes('restricted')) {
                 const err = new Error('EACCES: permission denied');
                 err.code = 'EACCES';
@@ -732,7 +827,6 @@ describe('loadCliConfig', () => {
         const dirs = config.getPendingIncludeDirectories();
         expect(dirs).toContain('/project/folderA');
         expect(dirs).not.toContain('/nonexistent/restricted/folder');
-        resolveToRealPathSpy.mockRestore();
     });
     it('should use default fileFilter options when unconfigured', async () => {
         process.argv = ['node', 'script.js'];
@@ -1843,48 +1937,6 @@ describe('loadCliConfig context management', () => {
             },
         });
         const config = await loadCliConfig(settings, 'test-session', argv);
-        expect(config.getContextManagementConfig()).toStrictEqual(generalistProfile);
-        expect(config.isContextManagementEnabled()).toBe(true);
-    });
-    it('should be true when contextManagement is set to true in settings', async () => {
-        process.argv = ['node', 'script.js'];
-        const argv = await parseArguments(createTestMergedSettings());
-        const contextManagementConfig = {
-            historyWindow: {
-                maxTokens: 100_000,
-                retainedTokens: 50_000,
-            },
-            messageLimits: {
-                normalMaxTokens: 1000,
-                retainedMaxTokens: 10_000,
-                normalizationHeadRatio: 0.25,
-            },
-            tools: {
-                distillation: {
-                    maxOutputTokens: 10_000,
-                    summarizationThresholdTokens: 15_000,
-                },
-                outputMasking: {
-                    protectionThresholdTokens: 30_000,
-                    minPrunableThresholdTokens: 10_000,
-                    protectLatestTurn: false,
-                },
-            },
-        };
-        const settings = createTestMergedSettings({
-            experimental: {
-                contextManagement: true,
-            },
-            // The type of numbers is being inferred strangely, and so we have to cast
-            // to `any` here.
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            contextManagement: contextManagementConfig,
-        });
-        const config = await loadCliConfig(settings, 'test-session', argv);
-        expect(config.getContextManagementConfig()).toStrictEqual({
-            enabled: true,
-            ...contextManagementConfig,
-        });
         expect(config.isContextManagementEnabled()).toBe(true);
     });
 });
@@ -2466,6 +2518,17 @@ describe('loadCliConfig gemmaModelRouter', () => {
         expect(gemmaSettings.classifier?.host).toBe('http://custom:1234');
         expect(gemmaSettings.classifier?.model).toBe('custom-gemma');
     });
+    it('should load experimental.gemma setting from merged settings', async () => {
+        process.argv = ['node', 'script.js'];
+        const argv = await parseArguments(createTestMergedSettings());
+        const settings = createTestMergedSettings({
+            experimental: {
+                gemma: true,
+            },
+        });
+        const config = await loadCliConfig(settings, 'test-session', argv);
+        expect(config.getExperimentalGemma()).toBe(true);
+    });
     it('should handle partial gemmaModelRouter settings', async () => {
         process.argv = ['node', 'script.js'];
         const argv = await parseArguments(createTestMergedSettings());
@@ -2585,7 +2648,7 @@ describe('Output format', () => {
     });
     it('should error on invalid --output-format argument', async () => {
         process.argv = ['node', 'script.js', '--output-format', 'invalid'];
-        const mockExit = vi.spyOn(process, 'exit').mockImplementation(() => {
+        vi.spyOn(process, 'exit').mockImplementation(() => {
             throw new Error('process.exit called');
         });
         const mockConsoleError = vi
@@ -2597,9 +2660,6 @@ describe('Output format', () => {
         await expect(parseArguments(createTestMergedSettings())).rejects.toThrow('process.exit called');
         expect(debugErrorSpy).toHaveBeenCalledWith(expect.stringContaining('Invalid values:'));
         expect(mockConsoleError).toHaveBeenCalled();
-        mockExit.mockRestore();
-        mockConsoleError.mockRestore();
-        debugErrorSpy.mockRestore();
     });
 });
 describe('parseArguments with positional prompt', () => {
@@ -2625,20 +2685,15 @@ describe('parseArguments with positional prompt', () => {
             '--prompt',
             'test prompt',
         ];
-        const mockExit = vi.spyOn(process, 'exit').mockImplementation(() => {
+        vi.spyOn(process, 'exit').mockImplementation(() => {
             throw new Error('process.exit called');
         });
-        const mockConsoleError = vi
-            .spyOn(console, 'error')
-            .mockImplementation(() => { });
+        vi.spyOn(console, 'error').mockImplementation(() => { });
         const debugErrorSpy = vi
             .spyOn(debugLogger, 'error')
             .mockImplementation(() => { });
         await expect(parseArguments(createTestMergedSettings())).rejects.toThrow('process.exit called');
         expect(debugErrorSpy).toHaveBeenCalledWith(expect.stringContaining('Cannot use both a positional prompt and the --prompt (-p) flag together'));
-        mockExit.mockRestore();
-        mockConsoleError.mockRestore();
-        debugErrorSpy.mockRestore();
     });
     it('should correctly parse a positional prompt to query field', async () => {
         process.argv = ['node', 'script.js', 'positional', 'prompt'];