@machina.ai/cell-cli 1.16.0-rc2 → 1.19.4-rc1

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

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { AuthType } from '@google/gemini-cli-core';
-import { vi } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { validateAuthMethod } from './auth.js';
 vi.mock('./settings.js', () => ({
     loadEnvironment: vi.fn(),
@@ -14,7 +14,6 @@ vi.mock('./settings.js', () => ({
 }));
 describe('validateAuthMethod', () => {
     beforeEach(() => {
-        vi.resetModules();
         vi.stubEnv('GEMINI_API_KEY', undefined);
         vi.stubEnv('GOOGLE_CLOUD_PROJECT', undefined);
         vi.stubEnv('GOOGLE_CLOUD_LOCATION', undefined);

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

@@ -1 +1 @@
-{"version":3,"file":"auth.test.js","sourceRoot":"","sources":["../../../src/config/auth.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAE/C,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE,GAAG,EAAE,CAAC,CAAC;IAC9B,eAAe,EAAE,EAAE,CAAC,EAAE,EAAE;IACxB,YAAY,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC;QACpC,MAAM,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC;KACpC,CAAC;CACH,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,YAAY,EAAE,CAAC;QAClB,EAAE,CAAC,OAAO,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;QACxC,EAAE,CAAC,OAAO,CAAC,sBAAsB,EAAE,SAAS,CAAC,CAAC;QAC9C,EAAE,CAAC,OAAO,CAAC,uBAAuB,EAAE,SAAS,CAAC,CAAC;QAC/C,EAAE,CAAC,OAAO,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iCAAiC,EAAE,GAAG,EAAE;QACzC,MAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC3D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2DAA2D,EAAE,GAAG,EAAE;QACnE,MAAM,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAC/C,+BAA+B,CAChC,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"auth.test.js","sourceRoot":"","sources":["../../../src/config/auth.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAE/C,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE,GAAG,EAAE,CAAC,CAAC;IAC9B,eAAe,EAAE,EAAE,CAAC,EAAE,EAAE;IACxB,YAAY,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC;QACpC,MAAM,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC;KACpC,CAAC;CACH,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,OAAO,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;QACxC,EAAE,CAAC,OAAO,CAAC,sBAAsB,EAAE,SAAS,CAAC,CAAC;QAC9C,EAAE,CAAC,OAAO,CAAC,uBAAuB,EAAE,SAAS,CAAC,CAAC;QAC/C,EAAE,CAAC,OAAO,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iCAAiC,EAAE,GAAG,EAAE;QACzC,MAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC3D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2DAA2D,EAAE,GAAG,EAAE;QACnE,MAAM,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAC/C,+BAA+B,CAChC,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

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

@@ -5,6 +5,7 @@
  */
 import { Config } from '@google/gemini-cli-core';
 import type { Settings } from './settings.js';
+import { RESUME_LATEST } from '../utils/sessionUtils.js';
 export interface CliArgs {
     query: string | undefined;
     model: string | undefined;
@@ -19,7 +20,7 @@ export interface CliArgs {
     experimentalAcp: boolean | undefined;
     extensions: string[] | undefined;
     listExtensions: boolean | undefined;
-    resume: string | 'latest' | undefined;
+    resume: string | typeof RESUME_LATEST | undefined;
     listSessions: boolean | undefined;
     deleteSession: string | undefined;
     includeDirectories: string[] | undefined;

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

@@ -3,7 +3,7 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
+import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi, } from 'vitest';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import { tmpdir } from 'node:os';
@@ -47,87 +47,29 @@ describe('Configuration Integration Tests', () => {
             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,
+    describe('File Filtering and Configuration', () => {
+        it.each([
+            {
+                description: 'should load default file filtering settings when fileFiltering is missing',
+                fileFiltering: undefined,
+                expected: DEFAULT_FILE_FILTERING_OPTIONS.respectGitIgnore,
+            },
+            {
+                description: 'should load custom file filtering settings from configuration',
+                fileFiltering: { respectGitIgnore: false },
+                expected: false,
+            },
+            {
+                description: 'should respect file filtering settings from configuration',
+                fileFiltering: { respectGitIgnore: true },
+                expected: true,
+            },
+            {
+                description: 'should handle empty fileFiltering object gracefully and use defaults',
                 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 () => {
+                expected: DEFAULT_FILE_FILTERING_OPTIONS.respectGitIgnore,
+            },
+        ])('$description', async ({ fileFiltering, expected }) => {
             const configParams = {
                 sessionId: 'test-session',
                 cwd: '/tmp',
@@ -136,15 +78,23 @@ describe('Configuration Integration Tests', () => {
                 sandbox: undefined,
                 targetDir: tempDir,
                 debugMode: false,
-                // Missing fileFiltering configuration
+                fileFiltering,
             };
             const config = new Config(configParams);
-            // All git-aware settings should use defaults
-            expect(config.getFileFilteringRespectGitIgnore()).toBe(DEFAULT_FILE_FILTERING_OPTIONS.respectGitIgnore);
+            expect(config.getFileFilteringRespectGitIgnore()).toBe(expected);
         });
     });
     describe('Real-world Configuration Scenarios', () => {
-        it('should handle a security-focused configuration', async () => {
+        it.each([
+            {
+                description: 'should handle a security-focused configuration',
+                respectGitIgnore: true,
+            },
+            {
+                description: 'should handle a CI/CD environment configuration',
+                respectGitIgnore: false,
+            },
+        ])('$description', async ({ respectGitIgnore }) => {
             const configParams = {
                 sessionId: 'test-session',
                 cwd: '/tmp',
@@ -154,27 +104,11 @@ describe('Configuration Integration Tests', () => {
                 targetDir: tempDir,
                 debugMode: false,
                 fileFiltering: {
-                    respectGitIgnore: true,
+                    respectGitIgnore,
                 },
             };
             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);
+            expect(config.getFileFilteringRespectGitIgnore()).toBe(respectGitIgnore);
         });
     });
     describe('Checkpointing Configuration', () => {
@@ -200,122 +134,71 @@ describe('Configuration Integration Tests', () => {
             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 = [
+        it.each([
+            {
+                description: 'should parse --approval-mode=auto_edit correctly',
+                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 () => {
+                ],
+                expected: { approvalMode: 'auto_edit', prompt: 'test', yolo: false },
+            },
+            {
+                description: 'should parse --approval-mode=yolo correctly',
+                argv: ['node', 'script.js', '--approval-mode', 'yolo', '-p', 'test'],
+                expected: { approvalMode: 'yolo', prompt: 'test', yolo: false },
+            },
+            {
+                description: 'should parse --approval-mode=default correctly',
+                argv: ['node', 'script.js', '--approval-mode', 'default', '-p', 'test'],
+                expected: { approvalMode: 'default', prompt: 'test', yolo: false },
+            },
+            {
+                description: 'should parse legacy --yolo flag correctly',
+                argv: ['node', 'script.js', '--yolo', '-p', 'test'],
+                expected: { yolo: true, approvalMode: undefined, prompt: 'test' },
+            },
+            {
+                description: 'should handle no approval mode arguments',
+                argv: ['node', 'script.js', '-p', 'test'],
+                expected: { approvalMode: undefined, yolo: false, prompt: 'test' },
+            },
+        ])('$description', async ({ argv, expected }) => {
             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
+                process.argv = argv;
+                const parsedArgs = await parseArguments({});
+                expect(parsedArgs.approvalMode).toBe(expected.approvalMode);
+                expect(parsedArgs.prompt).toBe(expected.prompt);
+                expect(parsedArgs.yolo).toBe(expected.yolo);
             }
             finally {
                 process.argv = originalArgv;
             }
         });
-        it('should parse --approval-mode=default correctly through the full argument parsing flow', async () => {
+        it.each([
+            {
+                description: 'should reject invalid approval mode values',
+                argv: ['node', 'script.js', '--approval-mode', 'invalid_mode'],
+            },
+            {
+                description: 'should reject conflicting --yolo and --approval-mode flags',
+                argv: ['node', 'script.js', '--yolo', '--approval-mode', 'default'],
+            },
+        ])('$description', async ({ argv }) => {
             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
+                process.argv = argv;
                 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

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

@@ -8,17 +8,19 @@ import { hideBin } from 'yargs/helpers';
 import process from 'node:process';
 import { mcpCommand } from '../commands/mcp.js';
 import { extensionsCommand } from '../commands/extensions.js';
-import { Config, setGeminiMdFilename as setServerGeminiMdFilename, getCurrentGeminiMdFilename, ApprovalMode, DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_MODEL_AUTO, DEFAULT_GEMINI_EMBEDDING_MODEL, DEFAULT_FILE_FILTERING_OPTIONS, DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, FileDiscoveryService, WRITE_FILE_TOOL_NAME, SHELL_TOOL_NAMES, SHELL_TOOL_NAME, resolveTelemetrySettings, FatalConfigError, getPty, EDIT_TOOL_NAME, debugLogger, loadServerHierarchicalMemory, } from '@google/gemini-cli-core';
+import { Config, setGeminiMdFilename as setServerGeminiMdFilename, getCurrentGeminiMdFilename, ApprovalMode, DEFAULT_GEMINI_MODEL_AUTO, DEFAULT_GEMINI_EMBEDDING_MODEL, DEFAULT_FILE_FILTERING_OPTIONS, DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, FileDiscoveryService, WRITE_FILE_TOOL_NAME, SHELL_TOOL_NAMES, SHELL_TOOL_NAME, resolveTelemetrySettings, FatalConfigError, getPty, EDIT_TOOL_NAME, debugLogger, loadServerHierarchicalMemory, } from '@google/gemini-cli-core';
 import { AuthProviderKeycloak } from '@machina.ai/auth-keycloak';
 import { getCliVersion } from '../utils/version.js';
 import { loadSandboxConfig } from './sandboxConfig.js';
 import { resolvePath } from '../utils/resolvePath.js';
 import { appEvents } from '../utils/events.js';
+import { RESUME_LATEST } from '../utils/sessionUtils.js';
 import { isWorkspaceTrusted } from './trustedFolders.js';
 import { createPolicyEngineConfig } from './policy.js';
 import { ExtensionManager } from './extension-manager.js';
 import { requestConsentNonInteractive } from './extensions/consent.js';
 import { promptForSetting } from './extensions/extensionSettings.js';
+import { runExitCleanup } from '../utils/cleanup.js';
 export async function parseArguments(settings) {
     const rawArgv = hideBin(process.argv);
     const yargsInstance = yargs(rawArgv)
@@ -120,7 +122,7 @@ export async function parseArguments(settings) {
             // When --resume not passed at all: this `coerce` function is not called at all, and
             //   `yargsInstance.argv.resume` is undefined.
             if (value === '') {
-                return 'latest';
+                return RESUME_LATEST;
             }
             return value;
         },
@@ -167,12 +169,14 @@ export async function parseArguments(settings) {
         description: 'Path to a file to record model responses for testing.',
         hidden: true,
     })
-        .deprecateOption('prompt', 'Use the positional prompt 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.'))
+        // Register MCP subcommands
+        .command(mcpCommand)
         // Ensure validation flows through .fail() for clean UX
-        .fail((msg, err, yargs) => {
-        debugLogger.error(msg || err?.message || 'Unknown error');
-        yargs.showHelp();
-        process.exit(1);
+        .fail((msg, err) => {
+        if (err)
+            throw err;
+        throw new Error(msg);
     })
         .check((argv) => {
         // The 'query' positional can be a string (for one arg) or string[] (for multiple).
@@ -187,16 +191,15 @@ export async function parseArguments(settings) {
         if (argv['prompt'] && argv['promptInteractive']) {
             return 'Cannot use both --prompt (-p) and --prompt-interactive (-i) together';
         }
-        if (argv.resume && !argv.prompt && !process.stdin.isTTY) {
-            throw new Error('When resuming a session, you must provide a message via --prompt (-p) or stdin');
-        }
-        if (argv.yolo && argv['approvalMode']) {
+        if (argv['yolo'] && argv['approvalMode']) {
             return 'Cannot use both --yolo (-y) and --approval-mode together. Use --approval-mode=yolo instead.';
         }
+        if (argv['outputFormat'] &&
+            !['text', 'json', 'stream-json'].includes(argv['outputFormat'])) {
+            return `Invalid values:\n  Argument: output-format, Given: "${argv['outputFormat']}", Choices: "text", "json", "stream-json"`;
+        }
         return true;
-    }))
-        // Register MCP subcommands
-        .command(mcpCommand);
+    });
     if (settings?.experimental?.extensionManagement ?? true) {
         yargsInstance.command(extensionsCommand);
     }
@@ -206,15 +209,23 @@ export async function parseArguments(settings) {
         .help()
         .alias('h', 'help')
         .strict()
-        .demandCommand(0, 0); // Allow base command to run with no subcommands
+        .demandCommand(0, 0) // Allow base command to run with no subcommands
+        .exitProcess(false);
     yargsInstance.wrap(yargsInstance.terminalWidth());
-    const result = await yargsInstance.parse();
-    // If yargs handled --help/--version it will have exited; nothing to do here.
-    // Handle case where MCP subcommands are executed - they should exit the process
-    // and not return to main CLI logic
-    if (result._.length > 0 &&
-        (result._[0] === 'mcp' || result._[0] === 'extensions')) {
-        // MCP commands handle their own execution and process exit
+    let result;
+    try {
+        result = await yargsInstance.parse();
+    }
+    catch (e) {
+        const msg = e instanceof Error ? e.message : String(e);
+        debugLogger.error(msg);
+        yargsInstance.showHelp();
+        await runExitCleanup();
+        process.exit(1);
+    }
+    // Handle help and version flags manually since we disabled exitProcess
+    if (result['help'] || result['version']) {
+        await runExitCleanup();
         process.exit(0);
     }
     // Normalize query args: handle both quoted "@path file" and unquoted @path file
@@ -320,9 +331,7 @@ export async function loadCliConfig(settings, sessionId, argv, cwd = process.cwd
     });
     await extensionManager.loadExtensions();
     // Call the (now wrapper) loadHierarchicalGeminiMemory which calls the server's version
-    const { memoryContent, fileCount, filePaths } = await loadServerHierarchicalMemory(cwd, settings.context?.loadMemoryFromIncludeDirectories
-        ? includeDirectories
-        : [], debugMode, fileService, extensionManager, trustedFolder, memoryImportFormat, memoryFileFiltering, settings.context?.discoveryMaxDirs);
+    const { memoryContent, fileCount, filePaths } = await loadServerHierarchicalMemory(cwd, [], debugMode, fileService, extensionManager, trustedFolder, memoryImportFormat, memoryFileFiltering, settings.context?.discoveryMaxDirs);
     const question = argv.promptInteractive || argv.prompt || '';
     // Determine approval mode with backward compatibility
     let approvalMode;
@@ -383,10 +392,11 @@ export async function loadCliConfig(settings, sessionId, argv, cwd = process.cwd
     // Interactive mode: explicit -i flag or (TTY + no args + no -p flag)
     const hasQuery = !!argv.query;
     const interactive = !!argv.promptInteractive ||
+        !!argv.experimentalAcp ||
         (process.stdin.isTTY && !hasQuery && !argv.prompt);
     // In non-interactive mode, exclude tools that require a prompt.
     const extraExcludes = [];
-    if (!interactive && !argv.experimentalAcp) {
+    if (!interactive) {
         const defaultExcludes = [
             SHELL_TOOL_NAME,
             EDIT_TOOL_NAME,
@@ -412,10 +422,7 @@ export async function loadCliConfig(settings, sessionId, argv, cwd = process.cwd
         }
     }
     const excludeTools = mergeExcludeTools(settings, extraExcludes.length > 0 ? extraExcludes : undefined);
-    const useModelRouter = settings.experimental?.useModelRouter ?? false;
-    const defaultModel = useModelRouter
-        ? DEFAULT_GEMINI_MODEL_AUTO
-        : DEFAULT_GEMINI_MODEL;
+    const defaultModel = DEFAULT_GEMINI_MODEL_AUTO;
     const resolvedModel = argv.model ||
         process.env['GEMINI_MODEL'] ||
         settings.model?.name ||
@@ -481,6 +488,7 @@ export async function loadCliConfig(settings, sessionId, argv, cwd = process.cwd
         enabledExtensions: argv.extensions,
         extensionLoader: extensionManager,
         enableExtensionReloading: settings.experimental?.extensionReloading,
+        enableModelAvailabilityService: settings.experimental?.isModelAvailabilityServiceEnabled,
         noBrowser: !!process.env['NO_BROWSER'],
         summarizeToolOutput: settings.model?.summarizeToolOutput,
         ideMode,
@@ -501,7 +509,6 @@ export async function loadCliConfig(settings, sessionId, argv, cwd = process.cwd
         output: {
             format: (argv.outputFormat ?? settings.output?.format),
         },
-        useModelRouter,
         enableMessageBusIntegration,
         codebaseInvestigatorSettings: settings.experimental?.codebaseInvestigatorSettings,
         fakeResponses: argv.fakeResponses,