@machina.ai/cell-cli 1.10.0-rc1 → 1.13.0-rc1

package/dist/src/commands/mcp/remove.test.js

@@ -0,0 +1,175 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { vi, describe, it, expect, beforeEach, afterEach, } from 'vitest';
+import yargs, {} from 'yargs';
+import { SettingScope } from '../../config/settings.js';
+import { removeCommand } from './remove.js';
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import * as os from 'node:os';
+import { CELL_DIR } from '@google/gemini-cli-core';
+vi.mock('fs/promises', () => ({
+    readFile: vi.fn(),
+    writeFile: vi.fn(),
+}));
+describe('mcp remove command', () => {
+    describe('unit tests with mocks', () => {
+        let parser;
+        let mockSetValue;
+        let mockSettings;
+        beforeEach(async () => {
+            vi.resetAllMocks();
+            mockSetValue = vi.fn();
+            mockSettings = {
+                mcpServers: {
+                    'test-server': {
+                        command: 'echo "hello"',
+                    },
+                },
+            };
+            vi.spyOn(await import('../../config/settings.js'), 'loadSettings').mockReturnValue({
+                forScope: () => ({ settings: mockSettings }),
+                setValue: mockSetValue,
+                workspace: { path: '/path/to/project' },
+                user: { path: '/home/user' },
+            });
+            const yargsInstance = yargs([]).command(removeCommand);
+            parser = yargsInstance;
+        });
+        it('should remove a server from project settings', async () => {
+            await parser.parseAsync('remove test-server');
+            expect(mockSetValue).toHaveBeenCalledWith(SettingScope.Workspace, 'mcpServers', {});
+        });
+        it('should show a message if server not found', async () => {
+            const consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
+            await parser.parseAsync('remove non-existent-server');
+            expect(mockSetValue).not.toHaveBeenCalled();
+            expect(consoleSpy).toHaveBeenCalledWith('Server "non-existent-server" not found in project settings.');
+        });
+    });
+    describe('integration tests with real file I/O', () => {
+        let tempDir;
+        let settingsDir;
+        let settingsPath;
+        let parser;
+        let cwdSpy;
+        beforeEach(() => {
+            vi.resetAllMocks();
+            vi.restoreAllMocks();
+            tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'mcp-remove-test-'));
+            settingsDir = path.join(tempDir, CELL_DIR);
+            settingsPath = path.join(settingsDir, 'settings.json');
+            fs.mkdirSync(settingsDir, { recursive: true });
+            cwdSpy = vi.spyOn(process, 'cwd').mockReturnValue(tempDir);
+            parser = yargs([]).command(removeCommand);
+        });
+        afterEach(() => {
+            cwdSpy.mockRestore();
+            if (fs.existsSync(tempDir)) {
+                fs.rmSync(tempDir, { recursive: true, force: true });
+            }
+        });
+        it('should actually remove a server from the settings file', async () => {
+            const originalContent = `{
+        "mcpServers": {
+          "server-to-keep": {
+            "command": "node",
+            "args": ["keep.js"]
+          },
+          "server-to-remove": {
+            "command": "node",
+            "args": ["remove.js"]
+          }
+        }
+      }`;
+            fs.writeFileSync(settingsPath, originalContent, 'utf-8');
+            const consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
+            await parser.parseAsync('remove server-to-remove');
+            const updatedContent = fs.readFileSync(settingsPath, 'utf-8');
+            expect(updatedContent).toContain('"server-to-keep"');
+            expect(updatedContent).not.toContain('"server-to-remove"');
+            expect(consoleSpy).toHaveBeenCalledWith('Server "server-to-remove" removed from project settings.');
+            consoleSpy.mockRestore();
+        });
+        it('should preserve comments when removing a server', async () => {
+            const originalContent = `{
+        "mcpServers": {
+          // Server to keep
+          "context7": {
+            "command": "node",
+            "args": ["server.js"]
+          },
+          // Server to remove
+          "oldServer": {
+            "command": "old",
+            "args": ["old.js"]
+          }
+        }
+      }`;
+            fs.writeFileSync(settingsPath, originalContent, 'utf-8');
+            const consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
+            await parser.parseAsync('remove oldServer');
+            const updatedContent = fs.readFileSync(settingsPath, 'utf-8');
+            expect(updatedContent).toContain('// Server to keep');
+            expect(updatedContent).toContain('"context7"');
+            expect(updatedContent).not.toContain('"oldServer"');
+            expect(updatedContent).toContain('// Server to remove');
+            consoleSpy.mockRestore();
+        });
+        it('should handle removing the only server', async () => {
+            const originalContent = `{
+        "mcpServers": {
+          "only-server": {
+            "command": "node",
+            "args": ["server.js"]
+          }
+        }
+      }`;
+            fs.writeFileSync(settingsPath, originalContent, 'utf-8');
+            const consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
+            await parser.parseAsync('remove only-server');
+            const updatedContent = fs.readFileSync(settingsPath, 'utf-8');
+            expect(updatedContent).toContain('"mcpServers"');
+            expect(updatedContent).not.toContain('"only-server"');
+            expect(updatedContent).toMatch(/"mcpServers"\s*:\s*\{\s*\}/);
+            consoleSpy.mockRestore();
+        });
+        it('should preserve other settings when removing a server', async () => {
+            // Create settings file with other settings
+            // Note: "model" will be migrated to "model": { "name": ... } format
+            const originalContent = `{
+        "model": {
+          "name": "gemini-2.5-pro"
+        },
+        "mcpServers": {
+          "server1": {
+            "command": "node",
+            "args": ["s1.js"]
+          },
+          "server2": {
+            "command": "node",
+            "args": ["s2.js"]
+          }
+        },
+        "ui": {
+          "theme": "dark"
+        }
+      }`;
+            fs.writeFileSync(settingsPath, originalContent, 'utf-8');
+            const consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
+            await parser.parseAsync('remove server1');
+            const updatedContent = fs.readFileSync(settingsPath, 'utf-8');
+            expect(updatedContent).toContain('"model"');
+            expect(updatedContent).toContain('"gemini-2.5-pro"');
+            expect(updatedContent).toContain('"server2"');
+            expect(updatedContent).toContain('"ui"');
+            expect(updatedContent).toContain('"theme": "dark"');
+            expect(updatedContent).not.toContain('"server1"');
+            consoleSpy.mockRestore();
+        });
+    });
+});
+//# sourceMappingURL=remove.test.js.map

package/dist/src/commands/mcp/remove.test.js.map

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

package/dist/src/commands/mcp.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};

package/dist/src/commands/mcp.test.js

@@ -0,0 +1,62 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi } from 'vitest';
+import { mcpCommand } from './mcp.js';
+import {} from 'yargs';
+import yargs from 'yargs';
+describe('mcp command', () => {
+    it('should have correct command definition', () => {
+        expect(mcpCommand.command).toBe('mcp');
+        expect(mcpCommand.describe).toBe('Manage MCP servers');
+        expect(typeof mcpCommand.builder).toBe('function');
+        expect(typeof mcpCommand.handler).toBe('function');
+    });
+    it('should show help when no subcommand is provided', async () => {
+        const yargsInstance = yargs();
+        mcpCommand.builder(yargsInstance);
+        const parser = yargsInstance.command(mcpCommand).help();
+        // Mock console.log and console.error to catch help output
+        const consoleLogMock = vi
+            .spyOn(console, 'log')
+            .mockImplementation(() => { });
+        const consoleErrorMock = vi
+            .spyOn(console, 'error')
+            .mockImplementation(() => { });
+        try {
+            await parser.parse('mcp');
+        }
+        catch (_error) {
+            // yargs might throw an error when demandCommand is not met
+        }
+        // Check if help output is shown
+        const helpOutput = consoleLogMock.mock.calls.join('\n') +
+            consoleErrorMock.mock.calls.join('\n');
+        expect(helpOutput).toContain('Manage MCP servers');
+        expect(helpOutput).toContain('Commands:');
+        expect(helpOutput).toContain('add');
+        expect(helpOutput).toContain('remove');
+        expect(helpOutput).toContain('list');
+        consoleLogMock.mockRestore();
+        consoleErrorMock.mockRestore();
+    });
+    it('should register add, remove, and list subcommands', () => {
+        const mockYargs = {
+            command: vi.fn().mockReturnThis(),
+            demandCommand: vi.fn().mockReturnThis(),
+            version: vi.fn().mockReturnThis(),
+        };
+        mcpCommand.builder(mockYargs);
+        expect(mockYargs.command).toHaveBeenCalledTimes(3);
+        // Verify that the specific subcommands are registered
+        const commandCalls = mockYargs.command.mock.calls;
+        const commandNames = commandCalls.map((call) => call[0].command);
+        expect(commandNames).toContain('add <name> <commandOrUrl> [args...]');
+        expect(commandNames).toContain('remove <name>');
+        expect(commandNames).toContain('list');
+        expect(mockYargs.demandCommand).toHaveBeenCalledWith(1, 'You need at least one command before continuing.');
+    });
+});
+//# sourceMappingURL=mcp.test.js.map

package/dist/src/commands/mcp.test.js.map

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

package/dist/src/config/auth.js

@@ -11,9 +11,6 @@ export const validateAuthMethod = (authMethod) => {
         return null;
     }
     if (authMethod === AuthType.USE_GEMINI) {
-        if (!process.env['GEMINI_API_KEY']) {
-            return 'GEMINI_API_KEY environment variable not found. Add that to your environment and try again (no reload needed if using .env)!';
-        }
         return null;
     }
     return 'Invalid auth method selected.';

package/dist/src/config/auth.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/config/auth.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE9D,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,UAAkB,EAAiB,EAAE;IACtE,eAAe,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;IACpD,IAAI,UAAU,KAAK,QAAQ,CAAC,QAAQ,EAAE,CAAC;QACrC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,UAAU,KAAK,QAAQ,CAAC,UAAU,EAAE,CAAC;QACvC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,CAAC;YACnC,OAAO,6HAA6H,CAAC;QACvI,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,+BAA+B,CAAC;AACzC,CAAC,CAAC"}
+{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/config/auth.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE9D,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,UAAkB,EAAiB,EAAE;IACtE,eAAe,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;IACpD,IAAI,UAAU,KAAK,QAAQ,CAAC,QAAQ,EAAE,CAAC;QACrC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,UAAU,KAAK,QAAQ,CAAC,UAAU,EAAE,CAAC;QACvC,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,+BAA+B,CAAC;AACzC,CAAC,CAAC"}

package/dist/src/config/config.d.ts

@@ -3,35 +3,24 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import type { FileFilteringOptions, GeminiCLIExtension } from '@google/gemini-cli-core';
+import type { FileFilteringOptions } from '@google/gemini-cli-core';
 import { Config, FileDiscoveryService } from '@google/gemini-cli-core';
 import type { Settings } from './settings.js';
-import type { ExtensionEnablementManager } from './extensions/extensionEnablement.js';
+import type { ExtensionLoader } from '@google/gemini-cli-core/src/utils/extensionLoader.js';
 export interface CliArgs {
     query: string | undefined;
     model: string | undefined;
     sandbox: boolean | string | undefined;
-    sandboxImage: string | undefined;
     debug: boolean | undefined;
     prompt: string | undefined;
     promptInteractive: string | undefined;
-    allFiles: boolean | undefined;
-    showMemoryUsage: boolean | undefined;
     yolo: boolean | undefined;
     approvalMode: string | undefined;
-    telemetry: boolean | undefined;
-    checkpointing: boolean | undefined;
-    telemetryTarget: string | undefined;
-    telemetryOtlpEndpoint: string | undefined;
-    telemetryOtlpProtocol: string | undefined;
-    telemetryLogPrompts: boolean | undefined;
-    telemetryOutfile: string | undefined;
     allowedMcpServerNames: string[] | undefined;
     allowedTools: string[] | undefined;
     experimentalAcp: boolean | undefined;
     extensions: string[] | undefined;
     listExtensions: boolean | undefined;
-    proxy: string | undefined;
     includeDirectories: string[] | undefined;
     logout: boolean | undefined;
     screenReader: boolean | undefined;
@@ -39,12 +28,14 @@ export interface CliArgs {
     useWriteTodos: boolean | undefined;
     outputFormat: string | undefined;
     sessionSummary?: string;
+    fakeResponses: string | undefined;
+    recordResponses: string | undefined;
 }
 export declare function parseArguments(settings: Settings): Promise<CliArgs>;
-export declare function loadHierarchicalGeminiMemory(currentWorkingDirectory: string, includeDirectoriesToReadGemini: readonly string[] | undefined, debugMode: boolean, fileService: FileDiscoveryService, settings: Settings, extensionContextFilePaths: string[] | undefined, folderTrust: boolean, memoryImportFormat?: 'flat' | 'tree', fileFilteringOptions?: FileFilteringOptions): Promise<{
+export declare function loadHierarchicalGeminiMemory(currentWorkingDirectory: string, includeDirectoriesToReadGemini: readonly string[] | undefined, debugMode: boolean, fileService: FileDiscoveryService, settings: Settings, extensionLoader: ExtensionLoader, folderTrust: boolean, memoryImportFormat?: 'flat' | 'tree', fileFilteringOptions?: FileFilteringOptions): Promise<{
     memoryContent: string;
     fileCount: number;
     filePaths: string[];
 }>;
 export declare function isDebugMode(argv: CliArgs): boolean;
-export declare function loadCliConfig(settings: Settings, extensions: GeminiCLIExtension[], extensionEnablementManager: ExtensionEnablementManager, sessionId: string, argv: CliArgs, cwd?: string): Promise<Config>;
+export declare function loadCliConfig(settings: Settings, sessionId: string, argv: CliArgs, cwd?: string): Promise<Config>;

package/dist/src/config/config.integration.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export declare const server: import("msw/node").SetupServerApi;

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

@@ -0,0 +1,321 @@
+/**
+ * @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('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