@google/gemini-cli 0.10.0-preview.2 → 0.11.0-nightly.20251020.a96f0659

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

@@ -0,0 +1,351 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import { tmpdir } from 'node:os';
+import { Config, DEFAULT_FILE_FILTERING_OPTIONS, } from '@google/gemini-cli-core';
+import { http, HttpResponse } from 'msw';
+import { setupServer } from 'msw/node';
+export const server = setupServer();
+// TODO(richieforeman): Consider moving this to test setup globally.
+beforeAll(() => {
+    server.listen({});
+});
+afterEach(() => {
+    server.resetHandlers();
+});
+afterAll(() => {
+    server.close();
+});
+const CLEARCUT_URL = 'https://play.googleapis.com/log';
+// Mock file discovery service and tool registry
+vi.mock('@google/gemini-cli-core', async () => {
+    const actual = await vi.importActual('@google/gemini-cli-core');
+    return {
+        ...actual,
+        FileDiscoveryService: vi.fn().mockImplementation(() => ({
+            initialize: vi.fn(),
+        })),
+        createToolRegistry: vi.fn().mockResolvedValue({}),
+    };
+});
+describe('Configuration Integration Tests', () => {
+    let tempDir;
+    beforeEach(() => {
+        server.resetHandlers(http.post(CLEARCUT_URL, () => HttpResponse.text()));
+        tempDir = fs.mkdtempSync(path.join(tmpdir(), 'gemini-cli-test-'));
+        vi.stubEnv('GEMINI_API_KEY', 'test-api-key');
+        vi.clearAllMocks();
+    });
+    afterEach(() => {
+        vi.unstubAllEnvs();
+        if (fs.existsSync(tempDir)) {
+            fs.rmSync(tempDir, { recursive: true });
+        }
+    });
+    describe('File Filtering Configuration', () => {
+        it('should load default file filtering settings', async () => {
+            const configParams = {
+                sessionId: 'test-session',
+                cwd: '/tmp',
+                model: 'test-model',
+                embeddingModel: 'test-embedding-model',
+                sandbox: undefined,
+                targetDir: tempDir,
+                debugMode: false,
+            };
+            const config = new Config(configParams);
+            expect(config.getFileFilteringRespectGitIgnore()).toBe(DEFAULT_FILE_FILTERING_OPTIONS.respectGitIgnore);
+        });
+        it('should load custom file filtering settings from configuration', async () => {
+            const configParams = {
+                sessionId: 'test-session',
+                cwd: '/tmp',
+                model: 'test-model',
+                embeddingModel: 'test-embedding-model',
+                sandbox: undefined,
+                targetDir: tempDir,
+                debugMode: false,
+                fileFiltering: {
+                    respectGitIgnore: false,
+                },
+            };
+            const config = new Config(configParams);
+            expect(config.getFileFilteringRespectGitIgnore()).toBe(false);
+        });
+        it('should merge user and workspace file filtering settings', async () => {
+            const configParams = {
+                sessionId: 'test-session',
+                cwd: '/tmp',
+                model: 'test-model',
+                embeddingModel: 'test-embedding-model',
+                sandbox: undefined,
+                targetDir: tempDir,
+                debugMode: false,
+                fileFiltering: {
+                    respectGitIgnore: true,
+                },
+            };
+            const config = new Config(configParams);
+            expect(config.getFileFilteringRespectGitIgnore()).toBe(true);
+        });
+    });
+    describe('Configuration Integration', () => {
+        it('should handle partial configuration objects gracefully', async () => {
+            const configParams = {
+                sessionId: 'test-session',
+                cwd: '/tmp',
+                model: 'test-model',
+                embeddingModel: 'test-embedding-model',
+                sandbox: undefined,
+                targetDir: tempDir,
+                debugMode: false,
+                fileFiltering: {
+                    respectGitIgnore: false,
+                },
+            };
+            const config = new Config(configParams);
+            // Specified settings should be applied
+            expect(config.getFileFilteringRespectGitIgnore()).toBe(false);
+        });
+        it('should handle empty configuration objects gracefully', async () => {
+            const configParams = {
+                sessionId: 'test-session',
+                cwd: '/tmp',
+                model: 'test-model',
+                embeddingModel: 'test-embedding-model',
+                sandbox: undefined,
+                targetDir: tempDir,
+                debugMode: false,
+                fileFiltering: {},
+            };
+            const config = new Config(configParams);
+            // All settings should use defaults
+            expect(config.getFileFilteringRespectGitIgnore()).toBe(DEFAULT_FILE_FILTERING_OPTIONS.respectGitIgnore);
+        });
+        it('should handle missing configuration sections gracefully', async () => {
+            const configParams = {
+                sessionId: 'test-session',
+                cwd: '/tmp',
+                model: 'test-model',
+                embeddingModel: 'test-embedding-model',
+                sandbox: undefined,
+                targetDir: tempDir,
+                debugMode: false,
+                // Missing fileFiltering configuration
+            };
+            const config = new Config(configParams);
+            // All git-aware settings should use defaults
+            expect(config.getFileFilteringRespectGitIgnore()).toBe(DEFAULT_FILE_FILTERING_OPTIONS.respectGitIgnore);
+        });
+    });
+    describe('Real-world Configuration Scenarios', () => {
+        it('should handle a security-focused configuration', async () => {
+            const configParams = {
+                sessionId: 'test-session',
+                cwd: '/tmp',
+                model: 'test-model',
+                embeddingModel: 'test-embedding-model',
+                sandbox: undefined,
+                targetDir: tempDir,
+                debugMode: false,
+                fileFiltering: {
+                    respectGitIgnore: true,
+                },
+            };
+            const config = new Config(configParams);
+            expect(config.getFileFilteringRespectGitIgnore()).toBe(true);
+        });
+        it('should handle a CI/CD environment configuration', async () => {
+            const configParams = {
+                sessionId: 'test-session',
+                cwd: '/tmp',
+                model: 'test-model',
+                embeddingModel: 'test-embedding-model',
+                sandbox: undefined,
+                targetDir: tempDir,
+                debugMode: false,
+                fileFiltering: {
+                    respectGitIgnore: false,
+                }, // CI might need to see all files
+            };
+            const config = new Config(configParams);
+            expect(config.getFileFilteringRespectGitIgnore()).toBe(false);
+        });
+    });
+    describe('Checkpointing Configuration', () => {
+        it('should enable checkpointing when the setting is true', async () => {
+            const configParams = {
+                sessionId: 'test-session',
+                cwd: '/tmp',
+                model: 'test-model',
+                embeddingModel: 'test-embedding-model',
+                sandbox: undefined,
+                targetDir: tempDir,
+                debugMode: false,
+                checkpointing: true,
+            };
+            const config = new Config(configParams);
+            expect(config.getCheckpointingEnabled()).toBe(true);
+        });
+    });
+    describe('Extension Context Files', () => {
+        it('should have an empty array for extension context files by default', () => {
+            const configParams = {
+                sessionId: 'test-session',
+                cwd: '/tmp',
+                model: 'test-model',
+                embeddingModel: 'test-embedding-model',
+                sandbox: undefined,
+                targetDir: tempDir,
+                debugMode: false,
+            };
+            const config = new Config(configParams);
+            expect(config.getExtensionContextFilePaths()).toEqual([]);
+        });
+        it('should correctly store and return extension context file paths', () => {
+            const contextFiles = ['/path/to/file1.txt', '/path/to/file2.js'];
+            const configParams = {
+                sessionId: 'test-session',
+                cwd: '/tmp',
+                model: 'test-model',
+                embeddingModel: 'test-embedding-model',
+                sandbox: undefined,
+                targetDir: tempDir,
+                debugMode: false,
+                extensionContextFilePaths: contextFiles,
+            };
+            const config = new Config(configParams);
+            expect(config.getExtensionContextFilePaths()).toEqual(contextFiles);
+        });
+    });
+    describe('Approval Mode Integration Tests', () => {
+        let parseArguments;
+        beforeEach(async () => {
+            // Import the argument parsing function for integration testing
+            const { parseArguments: parseArgs } = await import('./config.js');
+            parseArguments = parseArgs;
+        });
+        it('should parse --approval-mode=auto_edit correctly through the full argument parsing flow', async () => {
+            const originalArgv = process.argv;
+            try {
+                process.argv = [
+                    'node',
+                    'script.js',
+                    '--approval-mode',
+                    'auto_edit',
+                    '-p',
+                    'test',
+                ];
+                const argv = await parseArguments({});
+                // Verify that the argument was parsed correctly
+                expect(argv.approvalMode).toBe('auto_edit');
+                expect(argv.prompt).toBe('test');
+                expect(argv.yolo).toBe(false);
+            }
+            finally {
+                process.argv = originalArgv;
+            }
+        });
+        it('should parse --approval-mode=yolo correctly through the full argument parsing flow', async () => {
+            const originalArgv = process.argv;
+            try {
+                process.argv = [
+                    'node',
+                    'script.js',
+                    '--approval-mode',
+                    'yolo',
+                    '-p',
+                    'test',
+                ];
+                const argv = await parseArguments({});
+                expect(argv.approvalMode).toBe('yolo');
+                expect(argv.prompt).toBe('test');
+                expect(argv.yolo).toBe(false); // Should NOT be set when using --approval-mode
+            }
+            finally {
+                process.argv = originalArgv;
+            }
+        });
+        it('should parse --approval-mode=default correctly through the full argument parsing flow', async () => {
+            const originalArgv = process.argv;
+            try {
+                process.argv = [
+                    'node',
+                    'script.js',
+                    '--approval-mode',
+                    'default',
+                    '-p',
+                    'test',
+                ];
+                const argv = await parseArguments({});
+                expect(argv.approvalMode).toBe('default');
+                expect(argv.prompt).toBe('test');
+                expect(argv.yolo).toBe(false);
+            }
+            finally {
+                process.argv = originalArgv;
+            }
+        });
+        it('should parse legacy --yolo flag correctly', async () => {
+            const originalArgv = process.argv;
+            try {
+                process.argv = ['node', 'script.js', '--yolo', '-p', 'test'];
+                const argv = await parseArguments({});
+                expect(argv.yolo).toBe(true);
+                expect(argv.approvalMode).toBeUndefined(); // Should NOT be set when using --yolo
+                expect(argv.prompt).toBe('test');
+            }
+            finally {
+                process.argv = originalArgv;
+            }
+        });
+        it('should reject invalid approval mode values during argument parsing', async () => {
+            const originalArgv = process.argv;
+            try {
+                process.argv = ['node', 'script.js', '--approval-mode', 'invalid_mode'];
+                // Should throw during argument parsing due to yargs validation
+                await expect(parseArguments({})).rejects.toThrow();
+            }
+            finally {
+                process.argv = originalArgv;
+            }
+        });
+        it('should reject conflicting --yolo and --approval-mode flags', async () => {
+            const originalArgv = process.argv;
+            try {
+                process.argv = [
+                    'node',
+                    'script.js',
+                    '--yolo',
+                    '--approval-mode',
+                    'default',
+                ];
+                // Should throw during argument parsing due to conflict validation
+                await expect(parseArguments({})).rejects.toThrow();
+            }
+            finally {
+                process.argv = originalArgv;
+            }
+        });
+        it('should handle backward compatibility with mixed scenarios', async () => {
+            const originalArgv = process.argv;
+            try {
+                // Test that no approval mode arguments defaults to no flags set
+                process.argv = ['node', 'script.js', '-p', 'test'];
+                const argv = await parseArguments({});
+                expect(argv.approvalMode).toBeUndefined();
+                expect(argv.yolo).toBe(false);
+                expect(argv.prompt).toBe('test');
+            }
+            finally {
+                process.argv = originalArgv;
+            }
+        });
+    });
+});
+//# sourceMappingURL=config.integration.test.js.map

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

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

package/dist/src/config/config.js

@@ -11,7 +11,7 @@ import { hideBin } from 'yargs/helpers';
 import process from 'node:process';
 import { mcpCommand } from '../commands/mcp.js';
 import { extensionsCommand } from '../commands/extensions.js';
-import { Config, loadServerHierarchicalMemory, setGeminiMdFilename as setServerGeminiMdFilename, getCurrentGeminiMdFilename, ApprovalMode, DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_MODEL_AUTO, DEFAULT_GEMINI_EMBEDDING_MODEL, DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, FileDiscoveryService, ShellTool, EditTool, WRITE_FILE_TOOL_NAME, SHELL_TOOL_NAMES, resolveTelemetrySettings, FatalConfigError, getPty, } from '@google/gemini-cli-core';
+import { Config, loadServerHierarchicalMemory, setGeminiMdFilename as setServerGeminiMdFilename, getCurrentGeminiMdFilename, ApprovalMode, DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_MODEL_AUTO, DEFAULT_GEMINI_EMBEDDING_MODEL, DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, FileDiscoveryService, WRITE_FILE_TOOL_NAME, SHELL_TOOL_NAMES, SHELL_TOOL_NAME, resolveTelemetrySettings, FatalConfigError, getPty, EDIT_TOOL_NAME, } from '@google/gemini-cli-core';
 import { annotateActiveExtensions } from './extension.js';
 import { getCliVersion } from '../utils/version.js';
 import { loadSandboxConfig } from './sandboxConfig.js';
@@ -34,49 +34,12 @@ export async function parseArguments(settings) {
         .locale('en')
         .scriptName('gemini')
         .usage('Usage: gemini [options] [command]\n\nGemini CLI - Launch an interactive CLI, use -p/--prompt for non-interactive mode')
-        .option('telemetry', {
-        type: 'boolean',
-        description: 'Enable telemetry? This flag specifically controls if telemetry is sent. Other --telemetry-* flags set specific values but do not enable telemetry on their own.',
-    })
-        .option('telemetry-target', {
-        type: 'string',
-        choices: ['local', 'gcp'],
-        description: 'Set the telemetry target (local or gcp). Overrides settings files.',
-    })
-        .option('telemetry-otlp-endpoint', {
-        type: 'string',
-        description: 'Set the OTLP endpoint for telemetry. Overrides environment variables and settings files.',
-    })
-        .option('telemetry-otlp-protocol', {
-        type: 'string',
-        choices: ['grpc', 'http'],
-        description: 'Set the OTLP protocol for telemetry (grpc or http). Overrides settings files.',
-    })
-        .option('telemetry-log-prompts', {
-        type: 'boolean',
-        description: 'Enable or disable logging of user prompts for telemetry. Overrides settings files.',
-    })
-        .option('telemetry-outfile', {
-        type: 'string',
-        description: 'Redirect all telemetry output to the specified file.',
-    })
-        .deprecateOption('telemetry', 'Use the "telemetry.enabled" setting in settings.json instead. This flag will be removed in a future version.')
-        .deprecateOption('telemetry-target', 'Use the "telemetry.target" setting in settings.json instead. This flag will be removed in a future version.')
-        .deprecateOption('telemetry-otlp-endpoint', 'Use the "telemetry.otlpEndpoint" setting in settings.json instead. This flag will be removed in a future version.')
-        .deprecateOption('telemetry-otlp-protocol', 'Use the "telemetry.otlpProtocol" setting in settings.json instead. This flag will be removed in a future version.')
-        .deprecateOption('telemetry-log-prompts', 'Use the "telemetry.logPrompts" setting in settings.json instead. This flag will be removed in a future version.')
-        .deprecateOption('telemetry-outfile', 'Use the "telemetry.outfile" setting in settings.json instead. This flag will be removed in a future version.')
         .option('debug', {
         alias: 'd',
         type: 'boolean',
         description: 'Run in debug mode?',
         default: false,
     })
-        .option('proxy', {
-        type: 'string',
-        description: 'Proxy for gemini client, like schema://user:password@host:port',
-    })
-        .deprecateOption('proxy', 'Use the "proxy" setting in settings.json instead. This flag will be removed in a future version.')
         .command('$0 [query..]', 'Launch Gemini CLI', (yargsInstance) => yargsInstance
         .positional('query', {
         description: 'Positional prompt. Defaults to one-shot; use -i/--prompt-interactive for interactive.',
@@ -84,37 +47,25 @@ export async function parseArguments(settings) {
         .option('model', {
         alias: 'm',
         type: 'string',
+        nargs: 1,
         description: `Model`,
     })
         .option('prompt', {
         alias: 'p',
         type: 'string',
+        nargs: 1,
         description: 'Prompt. Appended to input on stdin (if any).',
     })
         .option('prompt-interactive', {
         alias: 'i',
         type: 'string',
+        nargs: 1,
         description: 'Execute the provided prompt and continue in interactive mode',
     })
         .option('sandbox', {
         alias: 's',
         type: 'boolean',
         description: 'Run in sandbox?',
-    })
-        .option('sandbox-image', {
-        type: 'string',
-        description: 'Sandbox image URI.',
-    })
-        .option('all-files', {
-        alias: ['a'],
-        type: 'boolean',
-        description: 'Include ALL files in context?',
-        default: false,
-    })
-        .option('show-memory-usage', {
-        type: 'boolean',
-        description: 'Show memory usage in status bar',
-        default: false,
     })
         .option('yolo', {
         alias: 'y',
@@ -124,14 +75,9 @@ export async function parseArguments(settings) {
     })
         .option('approval-mode', {
         type: 'string',
+        nargs: 1,
         choices: ['default', 'auto_edit', 'yolo'],
         description: 'Set the approval mode: default (prompt for approval), auto_edit (auto-approve edit tools), yolo (auto-approve all tools)',
-    })
-        .option('checkpointing', {
-        alias: 'c',
-        type: 'boolean',
-        description: 'Enables checkpointing of file edits',
-        default: false,
     })
         .option('experimental-acp', {
         type: 'boolean',
@@ -140,6 +86,7 @@ export async function parseArguments(settings) {
         .option('allowed-mcp-server-names', {
         type: 'array',
         string: true,
+        nargs: 1,
         description: 'Allowed MCP server names',
         coerce: (mcpServerNames) => 
         // Handle comma-separated values
@@ -148,6 +95,7 @@ export async function parseArguments(settings) {
         .option('allowed-tools', {
         type: 'array',
         string: true,
+        nargs: 1,
         description: 'Tools that are allowed to run without confirmation',
         coerce: (tools) => 
         // Handle comma-separated values
@@ -171,6 +119,7 @@ export async function parseArguments(settings) {
         .option('include-directories', {
         type: 'array',
         string: true,
+        nargs: 1,
         description: 'Additional directories to include in the workspace (comma-separated or multiple --include-directories)',
         coerce: (dirs) => 
         // Handle comma-separated values
@@ -183,13 +132,10 @@ export async function parseArguments(settings) {
         .option('output-format', {
         alias: 'o',
         type: 'string',
+        nargs: 1,
         description: 'The format of the CLI output.',
-        choices: ['text', 'json'],
+        choices: ['text', 'json', 'stream-json'],
     })
-        .deprecateOption('show-memory-usage', 'Use the "ui.showMemoryUsage" setting in settings.json instead. This flag will be removed in a future version.')
-        .deprecateOption('sandbox-image', 'Use the "tools.sandbox" setting in settings.json instead. This flag will be removed in a future version.')
-        .deprecateOption('checkpointing', 'Use the "general.checkpointing.enabled" setting in settings.json instead. This flag will be removed in a future version.')
-        .deprecateOption('all-files', 'Use @ includes in the application instead. This flag will be removed in a future version.')
         .deprecateOption('prompt', 'Use the positional prompt instead. This flag will be removed in a future version.')
         // Ensure validation flows through .fail() for clean UX
         .fail((msg, err, yargs) => {
@@ -292,7 +238,7 @@ export async function loadHierarchicalGeminiMemory(currentWorkingDirectory, incl
  */
 function createToolExclusionFilter(allowedTools, allowedToolsSet) {
     return (tool) => {
-        if (tool === ShellTool.Name) {
+        if (tool === SHELL_TOOL_NAME) {
             // If any of the allowed tools is ShellTool (even with subcommands), don't exclude it.
             return !allowedTools.some((allowed) => SHELL_TOOL_NAMES.some((shellName) => allowed.startsWith(shellName)));
         }
@@ -368,7 +314,6 @@ export async function loadCliConfig(settings, extensions, extensionEnablementMan
     let telemetrySettings;
     try {
         telemetrySettings = await resolveTelemetrySettings({
-            argv,
             env: process.env,
             settings: settings.telemetry,
         });
@@ -390,11 +335,11 @@ export async function loadCliConfig(settings, extensions, extensionEnablementMan
     const extraExcludes = [];
     if (!interactive && !argv.experimentalAcp) {
         const defaultExcludes = [
-            ShellTool.Name,
-            EditTool.Name,
+            SHELL_TOOL_NAME,
+            EDIT_TOOL_NAME,
             WRITE_FILE_TOOL_NAME,
         ];
-        const autoEditExcludes = [ShellTool.Name];
+        const autoEditExcludes = [SHELL_TOOL_NAME];
         const toolExclusionFilter = createToolExclusionFilter(allowedTools, allowedToolsSet);
         switch (approvalMode) {
             case ApprovalMode.DEFAULT:
@@ -451,7 +396,6 @@ export async function loadCliConfig(settings, extensions, extensionEnablementMan
         loadMemoryFromIncludeDirectories: settings.context?.loadMemoryFromIncludeDirectories || false,
         debugMode,
         question,
-        fullContext: argv.allFiles || false,
         coreTools: settings.tools?.core || undefined,
         allowedTools: allowedTools.length > 0 ? allowedTools : undefined,
         policyEngineConfig,
@@ -464,7 +408,7 @@ export async function loadCliConfig(settings, extensions, extensionEnablementMan
         geminiMdFileCount: fileCount,
         geminiMdFilePaths: filePaths,
         approvalMode,
-        showMemoryUsage: argv.showMemoryUsage || settings.ui?.showMemoryUsage || false,
+        showMemoryUsage: settings.ui?.showMemoryUsage || false,
         accessibility: {
             ...settings.ui?.accessibility,
             screenReader,
@@ -472,9 +416,8 @@ export async function loadCliConfig(settings, extensions, extensionEnablementMan
         telemetry: telemetrySettings,
         usageStatisticsEnabled: settings.privacy?.usageStatisticsEnabled ?? true,
         fileFiltering,
-        checkpointing: argv.checkpointing || settings.general?.checkpointing?.enabled,
-        proxy: argv.proxy ||
-            process.env['HTTPS_PROXY'] ||
+        checkpointing: settings.general?.checkpointing?.enabled,
+        proxy: process.env['HTTPS_PROXY'] ||
             process.env['https_proxy'] ||
             process.env['HTTP_PROXY'] ||
             process.env['http_proxy'],