@umsai/ums-code 0.0.14-v1 → 0.1.4-v2

package/dist/src/config/config.js

@@ -3,17 +3,20 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import * as fs from 'fs';
-import * as path from 'path';
-import { homedir } from 'node:os';
-import yargs from 'yargs/yargs';
+import { extensionsCommand } from '../commands/extensions.js';
+import { ApprovalMode, Config, DEFAULT_QWEN_EMBEDDING_MODEL, DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, EditTool, FileDiscoveryService, getCurrentGeminiMdFilename, loadServerHierarchicalMemory, setGeminiMdFilename as setServerGeminiMdFilename, ShellTool, WriteFileTool, resolveTelemetrySettings, FatalConfigError, } from '@umsai/ums-code-core';
+import yargs, {} from 'yargs';
 import { hideBin } from 'yargs/helpers';
-import process from 'node:process';
-import { Config, loadServerHierarchicalMemory, setGeminiMdFilename as setServerGeminiMdFilename, getCurrentGeminiMdFilename, ApprovalMode, DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_EMBEDDING_MODEL, DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, FileDiscoveryService, } from '@umsai/ums-code-core';
-import { annotateActiveExtensions } from './extension.js';
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import { homedir } from 'node:os';
+import { resolvePath } from '../utils/resolvePath.js';
 import { getCliVersion } from '../utils/version.js';
+import { annotateActiveExtensions } from './extension.js';
 import { loadSandboxConfig } from './sandboxConfig.js';
-import { resolvePath } from '../utils/resolvePath.js';
+import { appEvents } from '../utils/events.js';
+import { mcpCommand } from '../commands/mcp.js';
+import { isWorkspaceTrusted } from './trustedFolders.js';
 // Simple console logger for now - replace with actual logger if available
 const logger = {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -23,15 +26,89 @@ const logger = {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     error: (...args) => console.error('[ERROR]', ...args),
 };
-export async function parseArguments() {
-    const yargsInstance = yargs(hideBin(process.argv))
+const VALID_APPROVAL_MODE_VALUES = [
+    'plan',
+    'default',
+    'auto-edit',
+    'yolo',
+];
+function formatApprovalModeError(value) {
+    return new Error(`Invalid approval mode: ${value}. Valid values are: ${VALID_APPROVAL_MODE_VALUES.join(', ')}`);
+}
+function parseApprovalModeValue(value) {
+    const normalized = value.trim().toLowerCase();
+    switch (normalized) {
+        case 'plan':
+            return ApprovalMode.PLAN;
+        case 'default':
+            return ApprovalMode.DEFAULT;
+        case 'yolo':
+            return ApprovalMode.YOLO;
+        case 'auto_edit':
+        case 'autoedit':
+        case 'auto-edit':
+            return ApprovalMode.AUTO_EDIT;
+        default:
+            throw formatApprovalModeError(value);
+    }
+}
+export async function parseArguments(settings) {
+    const rawArgv = hideBin(process.argv);
+    const yargsInstance = yargs(rawArgv)
+        .locale('en')
         .scriptName('ums')
-        .usage('$0 [options]', 'UMS Code - Launch an interactive CLI, use -p/--prompt for non-interactive mode')
+        .usage('Usage: ums [options] [command]\n\nUMS Code - 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 UMS Code, 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 UMS Code CLI', (yargsInstance) => yargsInstance
+        .positional('query', {
+        description: 'Positional prompt. Defaults to one-shot; use -i/--prompt-interactive for interactive.',
+    })
         .option('model', {
         alias: 'm',
         type: 'string',
         description: `Model`,
-        default: process.env.GEMINI_MODEL,
     })
         .option('prompt', {
         alias: 'p',
@@ -51,12 +128,6 @@ export async function parseArguments() {
         .option('sandbox-image', {
         type: 'string',
         description: 'Sandbox image URI.',
-    })
-        .option('debug', {
-        alias: 'd',
-        type: 'boolean',
-        description: 'Run in debug mode?',
-        default: false,
     })
         .option('all-files', {
         alias: ['a'],
@@ -64,49 +135,21 @@ export async function parseArguments() {
         description: 'Include ALL files in context?',
         default: false,
     })
-        .option('all_files', {
-        type: 'boolean',
-        description: 'Include ALL files in context?',
-        default: false,
-    })
-        .deprecateOption('all_files', 'Use --all-files instead. We will be removing --all_files in the coming weeks.')
         .option('show-memory-usage', {
         type: 'boolean',
         description: 'Show memory usage in status bar',
         default: false,
     })
-        .option('show_memory_usage', {
-        type: 'boolean',
-        description: 'Show memory usage in status bar',
-        default: false,
-    })
-        .deprecateOption('show_memory_usage', 'Use --show-memory-usage instead. We will be removing --show_memory_usage in the coming weeks.')
         .option('yolo', {
         alias: 'y',
         type: 'boolean',
         description: 'Automatically accept all actions (aka YOLO mode, see https://www.youtube.com/watch?v=xvFZjo5PgG0 for more details)?',
         default: false,
     })
-        .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-log-prompts', {
-        type: 'boolean',
-        description: 'Enable or disable logging of user prompts for telemetry. Overrides settings files.',
-    })
-        .option('telemetry-outfile', {
+        .option('approval-mode', {
         type: 'string',
-        description: 'Redirect all telemetry output to the specified file.',
+        choices: ['plan', 'default', 'auto-edit', 'yolo'],
+        description: 'Set the approval mode: plan (plan only), default (prompt for approval), auto-edit (auto-approve edit tools), yolo (auto-approve all tools)',
     })
         .option('checkpointing', {
         alias: 'c',
@@ -122,21 +165,39 @@ export async function parseArguments() {
         type: 'array',
         string: true,
         description: 'Allowed MCP server names',
+        coerce: (mcpServerNames) => 
+        // Handle comma-separated values
+        mcpServerNames.flatMap((mcpServerName) => mcpServerName.split(',').map((m) => m.trim())),
+    })
+        .option('allowed-tools', {
+        type: 'array',
+        string: true,
+        description: 'Tools that are allowed to run without confirmation',
+        coerce: (tools) => 
+        // Handle comma-separated values
+        tools.flatMap((tool) => tool.split(',').map((t) => t.trim())),
     })
         .option('extensions', {
         alias: 'e',
         type: 'array',
         string: true,
         description: 'A list of extensions to use. If not provided, all extensions are used.',
+        coerce: (extensions) => 
+        // Handle comma-separated values
+        extensions.flatMap((extension) => extension.split(',').map((e) => e.trim())),
     })
         .option('list-extensions', {
         alias: 'l',
         type: 'boolean',
         description: 'List all available extensions and exit.',
     })
-        .option('ide-mode-feature', {
-        type: 'boolean',
-        description: 'Run in IDE mode?',
+        .option('include-directories', {
+        type: 'array',
+        string: true,
+        description: 'Additional directories to include in the workspace (comma-separated or multiple --include-directories)',
+        coerce: (dirs) => 
+        // Handle comma-separated values
+        dirs.flatMap((dir) => dir.split(',').map((d) => d.trim())),
     })
         .option('openai-logging', {
         type: 'boolean',
@@ -154,36 +215,90 @@ export async function parseArguments() {
         type: 'string',
         description: 'Tavily API key for web search functionality',
     })
-        .option('proxy', {
+        .option('screen-reader', {
+        type: 'boolean',
+        description: 'Enable screen reader mode for accessibility.',
+    })
+        .option('vlm-switch-mode', {
         type: 'string',
-        description: 'Proxy for gemini client, like schema://user:password@host:port',
+        choices: ['once', 'session', 'persist'],
+        description: 'Default behavior when images are detected in input. Values: once (one-time switch), session (switch for entire session), persist (continue with current model). Overrides settings files.',
+        default: process.env['VLM_SWITCH_MODE'],
     })
-        .option('include-directories', {
-        type: 'array',
-        string: true,
-        description: 'Additional directories to include in the workspace (comma-separated or multiple --include-directories)',
-        coerce: (dirs) => 
-        // Handle comma-separated values
-        dirs.flatMap((dir) => dir.split(',').map((d) => d.trim())),
+        .option('output-format', {
+        alias: 'o',
+        type: 'string',
+        description: 'The format of the CLI output.',
+        choices: ['text', 'json'],
     })
-        .option('load-memory-from-include-directories', {
-        type: 'boolean',
-        description: 'If true, when refreshing memory, UMS.md files should be loaded from all directories that are added. If false, UMS.md files should only be loaded from the primary working directory.',
-        default: false,
+        .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) => {
+        console.error(msg || err?.message || 'Unknown error');
+        yargs.showHelp();
+        process.exit(1);
     })
+        .check((argv) => {
+        // The 'query' positional can be a string (for one arg) or string[] (for multiple).
+        // This guard safely checks if any positional argument was provided.
+        const query = argv['query'];
+        const hasPositionalQuery = Array.isArray(query)
+            ? query.length > 0
+            : !!query;
+        if (argv['prompt'] && hasPositionalQuery) {
+            return 'Cannot use both a positional prompt and the --prompt (-p) flag together';
+        }
+        if (argv['prompt'] && argv['promptInteractive']) {
+            return 'Cannot use both --prompt (-p) and --prompt-interactive (-i) together';
+        }
+        if (argv['yolo'] && argv['approvalMode']) {
+            return 'Cannot use both --yolo (-y) and --approval-mode together. Use --approval-mode=yolo instead.';
+        }
+        return true;
+    }))
+        // Register MCP subcommands
+        .command(mcpCommand);
+    if (settings?.experimental?.extensionManagement ?? true) {
+        yargsInstance.command(extensionsCommand);
+    }
+    yargsInstance
         .version(await getCliVersion()) // This will enable the --version flag based on package.json
         .alias('v', 'version')
         .help()
         .alias('h', 'help')
         .strict()
-        .check((argv) => {
-        if (argv.prompt && argv.promptInteractive) {
-            throw new Error('Cannot use both --prompt (-p) and --prompt-interactive (-i) together');
-        }
-        return true;
-    });
+        .demandCommand(0, 0); // Allow base command to run with no subcommands
     yargsInstance.wrap(yargsInstance.terminalWidth());
-    const result = yargsInstance.parseSync();
+    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
+        process.exit(0);
+    }
+    // Normalize query args: handle both quoted "@path file" and unquoted @path file
+    const queryArg = result.query;
+    const q = Array.isArray(queryArg)
+        ? queryArg.join(' ')
+        : queryArg;
+    // Route positional args: explicit -i flag -> interactive; else -> one-shot (even for @commands)
+    if (q && !result['prompt']) {
+        const hasExplicitInteractive = result['promptInteractive'] === '' || !!result['promptInteractive'];
+        if (hasExplicitInteractive) {
+            result['promptInteractive'] = q;
+        }
+        else {
+            result['prompt'] = q;
+        }
+    }
+    // Keep CliArgs.query as a string for downstream typing
+    result['query'] = q || undefined;
     // The import format is now only controlled by settings.memoryImportFormat
     // We no longer accept it as a CLI argument
     return result;
@@ -191,7 +306,7 @@ export async function parseArguments() {
 // This function is now a thin wrapper around the server's implementation.
 // It's kept in the CLI for now as App.tsx directly calls it for memory refresh.
 // TODO: Consider if App.tsx should get memory via a server call or if Config should refresh itself.
-export async function loadHierarchicalGeminiMemory(currentWorkingDirectory, includeDirectoriesToReadGemini = [], debugMode, fileService, settings, extensionContextFilePaths = [], memoryImportFormat = 'tree', fileFilteringOptions) {
+export async function loadHierarchicalGeminiMemory(currentWorkingDirectory, includeDirectoriesToReadGemini = [], debugMode, fileService, settings, extensionContextFilePaths = [], folderTrust, memoryImportFormat = 'tree', fileFilteringOptions) {
     // FIX: Use real, canonical paths for a reliable comparison to handle symlinks.
     const realCwd = fs.realpathSync(path.resolve(currentWorkingDirectory));
     const realHome = fs.realpathSync(path.resolve(homedir()));
@@ -203,176 +318,241 @@ export async function loadHierarchicalGeminiMemory(currentWorkingDirectory, incl
         logger.debug(`CLI: Delegating hierarchical memory load to server for CWD: ${currentWorkingDirectory} (memoryImportFormat: ${memoryImportFormat})`);
     }
     // Directly call the server function with the corrected path.
-    return loadServerHierarchicalMemory(effectiveCwd, includeDirectoriesToReadGemini, debugMode, fileService, extensionContextFilePaths, memoryImportFormat, fileFilteringOptions, settings.memoryDiscoveryMaxDirs);
+    return loadServerHierarchicalMemory(effectiveCwd, includeDirectoriesToReadGemini, debugMode, fileService, extensionContextFilePaths, folderTrust, memoryImportFormat, fileFilteringOptions, settings.context?.discoveryMaxDirs);
 }
-export async function loadCliConfig(settings, extensions, sessionId, argv) {
-    const debugMode = argv.debug ||
-        [process.env.DEBUG, process.env.DEBUG_MODE].some((v) => v === 'true' || v === '1') ||
-        false;
-    const memoryImportFormat = settings.memoryImportFormat || 'tree';
-    const ideMode = settings.ideMode ?? false;
-    const ideModeFeature = argv.ideModeFeature ?? settings.ideModeFeature ?? false;
-    const allExtensions = annotateActiveExtensions(extensions, argv.extensions || []);
+export function isDebugMode(argv) {
+    return (argv.debug ||
+        [process.env['DEBUG'], process.env['DEBUG_MODE']].some((v) => v === 'true' || v === '1'));
+}
+export async function loadCliConfig(settings, extensions, extensionEnablementManager, sessionId, argv, cwd = process.cwd()) {
+    const debugMode = isDebugMode(argv);
+    const memoryImportFormat = settings.context?.importFormat || 'tree';
+    const ideMode = settings.ide?.enabled ?? false;
+    const folderTrust = settings.security?.folderTrust?.enabled ?? false;
+    const trustedFolder = isWorkspaceTrusted(settings)?.isTrusted ?? true;
+    const allExtensions = annotateActiveExtensions(extensions, cwd, extensionEnablementManager);
     const activeExtensions = extensions.filter((_, i) => allExtensions[i].isActive);
-    // Handle OpenAI API key from command line
-    if (argv.openaiApiKey) {
-        process.env.OPENAI_API_KEY = argv.openaiApiKey;
-    }
-    // Handle OpenAI base URL from command line
-    if (argv.openaiBaseUrl) {
-        process.env.OPENAI_BASE_URL = argv.openaiBaseUrl;
-    }
-    // Handle Tavily API key from command line
-    if (argv.tavilyApiKey) {
-        process.env.TAVILY_API_KEY = argv.tavilyApiKey;
-    }
     // Set the context filename in the server's memoryTool module BEFORE loading memory
     // TODO(b/343434939): This is a bit of a hack. The contextFileName should ideally be passed
     // directly to the Config constructor in core, and have core handle setGeminiMdFilename.
     // However, loadHierarchicalGeminiMemory is called *before* createServerConfig.
-    if (settings.contextFileName) {
-        setServerGeminiMdFilename(settings.contextFileName);
+    if (settings.context?.fileName) {
+        setServerGeminiMdFilename(settings.context.fileName);
     }
     else {
         // Reset to default if not provided in settings.
         setServerGeminiMdFilename(getCurrentGeminiMdFilename());
     }
     const extensionContextFilePaths = activeExtensions.flatMap((e) => e.contextFiles);
-    const fileService = new FileDiscoveryService(process.cwd());
+    const fileService = new FileDiscoveryService(cwd);
     const fileFiltering = {
         ...DEFAULT_MEMORY_FILE_FILTERING_OPTIONS,
-        ...settings.fileFiltering,
+        ...settings.context?.fileFiltering,
     };
-    const includeDirectories = (settings.includeDirectories || [])
+    const includeDirectories = (settings.context?.includeDirectories || [])
         .map(resolvePath)
         .concat((argv.includeDirectories || []).map(resolvePath));
     // Call the (now wrapper) loadHierarchicalGeminiMemory which calls the server's version
-    const { memoryContent, fileCount } = await loadHierarchicalGeminiMemory(process.cwd(), settings.loadMemoryFromIncludeDirectories ? includeDirectories : [], debugMode, fileService, settings, extensionContextFilePaths, memoryImportFormat, fileFiltering);
+    const { memoryContent, fileCount } = await loadHierarchicalGeminiMemory(cwd, settings.context?.loadMemoryFromIncludeDirectories
+        ? includeDirectories
+        : [], debugMode, fileService, settings, extensionContextFilePaths, trustedFolder, memoryImportFormat, fileFiltering);
     let mcpServers = mergeMcpServers(settings, activeExtensions);
-    const excludeTools = mergeExcludeTools(settings, activeExtensions);
+    const question = argv.promptInteractive || argv.prompt || '';
+    // Determine approval mode with backward compatibility
+    let approvalMode;
+    if (argv.approvalMode) {
+        approvalMode = parseApprovalModeValue(argv.approvalMode);
+    }
+    else if (argv.yolo) {
+        approvalMode = ApprovalMode.YOLO;
+    }
+    else if (settings.tools?.approvalMode) {
+        approvalMode = parseApprovalModeValue(settings.tools.approvalMode);
+    }
+    else {
+        approvalMode = ApprovalMode.DEFAULT;
+    }
+    // Force approval mode to default if the folder is not trusted.
+    if (!trustedFolder &&
+        approvalMode !== ApprovalMode.DEFAULT &&
+        approvalMode !== ApprovalMode.PLAN) {
+        logger.warn(`Approval mode overridden to "default" because the current folder is not trusted.`);
+        approvalMode = ApprovalMode.DEFAULT;
+    }
+    let telemetrySettings;
+    try {
+        telemetrySettings = await resolveTelemetrySettings({
+            argv,
+            env: process.env,
+            settings: settings.telemetry,
+        });
+    }
+    catch (err) {
+        if (err instanceof FatalConfigError) {
+            throw new FatalConfigError(`Invalid telemetry configuration: ${err.message}.`);
+        }
+        throw err;
+    }
+    // Interactive mode: explicit -i flag or (TTY + no args + no -p flag)
+    const hasQuery = !!argv.query;
+    const interactive = !!argv.promptInteractive ||
+        (process.stdin.isTTY && !hasQuery && !argv.prompt);
+    // In non-interactive mode, exclude tools that require a prompt.
+    const extraExcludes = [];
+    if (!interactive && !argv.experimentalAcp) {
+        switch (approvalMode) {
+            case ApprovalMode.PLAN:
+            case ApprovalMode.DEFAULT:
+                // In default non-interactive mode, all tools that require approval are excluded.
+                extraExcludes.push(ShellTool.Name, EditTool.Name, WriteFileTool.Name);
+                break;
+            case ApprovalMode.AUTO_EDIT:
+                // In auto-edit non-interactive mode, only tools that still require a prompt are excluded.
+                extraExcludes.push(ShellTool.Name);
+                break;
+            case ApprovalMode.YOLO:
+                // No extra excludes for YOLO mode.
+                break;
+            default:
+                // This should never happen due to validation earlier, but satisfies the linter
+                break;
+        }
+    }
+    const excludeTools = mergeExcludeTools(settings, activeExtensions, extraExcludes.length > 0 ? extraExcludes : undefined);
     const blockedMcpServers = [];
     if (!argv.allowedMcpServerNames) {
-        if (settings.allowMCPServers) {
-            const allowedNames = new Set(settings.allowMCPServers.filter(Boolean));
-            if (allowedNames.size > 0) {
-                mcpServers = Object.fromEntries(Object.entries(mcpServers).filter(([key]) => allowedNames.has(key)));
-            }
+        if (settings.mcp?.allowed) {
+            mcpServers = allowedMcpServers(mcpServers, settings.mcp.allowed, blockedMcpServers);
         }
-        if (settings.excludeMCPServers) {
-            const excludedNames = new Set(settings.excludeMCPServers.filter(Boolean));
+        if (settings.mcp?.excluded) {
+            const excludedNames = new Set(settings.mcp.excluded.filter(Boolean));
             if (excludedNames.size > 0) {
                 mcpServers = Object.fromEntries(Object.entries(mcpServers).filter(([key]) => !excludedNames.has(key)));
             }
         }
     }
     if (argv.allowedMcpServerNames) {
-        const allowedNames = new Set(argv.allowedMcpServerNames.filter(Boolean));
-        if (allowedNames.size > 0) {
-            mcpServers = Object.fromEntries(Object.entries(mcpServers).filter(([key, server]) => {
-                const isAllowed = allowedNames.has(key);
-                if (!isAllowed) {
-                    blockedMcpServers.push({
-                        name: key,
-                        extensionName: server.extensionName || '',
-                    });
-                }
-                return isAllowed;
-            }));
-        }
-        else {
-            blockedMcpServers.push(...Object.entries(mcpServers).map(([key, server]) => ({
-                name: key,
-                extensionName: server.extensionName || '',
-            })));
-            mcpServers = {};
-        }
+        mcpServers = allowedMcpServers(mcpServers, argv.allowedMcpServerNames, blockedMcpServers);
     }
+    const resolvedModel = argv.model ||
+        process.env['OPENAI_MODEL'] ||
+        process.env['QWEN_MODEL'] ||
+        settings.model?.name;
     const sandboxConfig = await loadSandboxConfig(settings, argv);
-    const cliVersion = await getCliVersion();
+    const screenReader = argv.screenReader !== undefined
+        ? argv.screenReader
+        : (settings.ui?.accessibility?.screenReader ?? false);
+    const vlmSwitchMode = argv.vlmSwitchMode || settings.experimental?.vlmSwitchMode;
     return new Config({
         sessionId,
-        embeddingModel: DEFAULT_GEMINI_EMBEDDING_MODEL,
+        embeddingModel: DEFAULT_QWEN_EMBEDDING_MODEL,
         sandbox: sandboxConfig,
-        targetDir: process.cwd(),
+        targetDir: cwd,
         includeDirectories,
-        loadMemoryFromIncludeDirectories: argv.loadMemoryFromIncludeDirectories ||
-            settings.loadMemoryFromIncludeDirectories ||
-            false,
+        loadMemoryFromIncludeDirectories: settings.context?.loadMemoryFromIncludeDirectories || false,
         debugMode,
-        question: argv.promptInteractive || argv.prompt || '',
-        fullContext: argv.allFiles || argv.all_files || false,
-        coreTools: settings.coreTools || undefined,
+        question,
+        fullContext: argv.allFiles || false,
+        coreTools: settings.tools?.core || undefined,
+        allowedTools: argv.allowedTools || settings.tools?.allowed || undefined,
         excludeTools,
-        toolDiscoveryCommand: settings.toolDiscoveryCommand,
-        toolCallCommand: settings.toolCallCommand,
-        mcpServerCommand: settings.mcpServerCommand,
+        toolDiscoveryCommand: settings.tools?.discoveryCommand,
+        toolCallCommand: settings.tools?.callCommand,
+        mcpServerCommand: settings.mcp?.serverCommand,
         mcpServers,
         userMemory: memoryContent,
         geminiMdFileCount: fileCount,
-        approvalMode: argv.yolo || false ? ApprovalMode.YOLO : ApprovalMode.DEFAULT,
-        showMemoryUsage: argv.showMemoryUsage ||
-            argv.show_memory_usage ||
-            settings.showMemoryUsage ||
-            false,
-        accessibility: settings.accessibility,
-        telemetry: {
-            enabled: argv.telemetry ?? settings.telemetry?.enabled,
-            target: (argv.telemetryTarget ??
-                settings.telemetry?.target),
-            otlpEndpoint: argv.telemetryOtlpEndpoint ??
-                process.env.OTEL_EXPORTER_OTLP_ENDPOINT ??
-                settings.telemetry?.otlpEndpoint,
-            logPrompts: argv.telemetryLogPrompts ?? settings.telemetry?.logPrompts,
-            outfile: argv.telemetryOutfile ?? settings.telemetry?.outfile,
+        approvalMode,
+        showMemoryUsage: argv.showMemoryUsage || settings.ui?.showMemoryUsage || false,
+        accessibility: {
+            ...settings.ui?.accessibility,
+            screenReader,
         },
-        usageStatisticsEnabled: settings.usageStatisticsEnabled ?? true,
-        // Git-aware file filtering settings
-        fileFiltering: {
-            respectGitIgnore: settings.fileFiltering?.respectGitIgnore,
-            respectGeminiIgnore: settings.fileFiltering?.respectGeminiIgnore,
-            enableRecursiveFileSearch: settings.fileFiltering?.enableRecursiveFileSearch,
-        },
-        checkpointing: argv.checkpointing || settings.checkpointing?.enabled,
+        telemetry: telemetrySettings,
+        usageStatisticsEnabled: settings.privacy?.usageStatisticsEnabled ?? true,
+        fileFiltering: settings.context?.fileFiltering,
+        checkpointing: argv.checkpointing || settings.general?.checkpointing?.enabled,
         proxy: argv.proxy ||
-            process.env.HTTPS_PROXY ||
-            process.env.https_proxy ||
-            process.env.HTTP_PROXY ||
-            process.env.http_proxy,
-        cwd: process.cwd(),
+            process.env['HTTPS_PROXY'] ||
+            process.env['https_proxy'] ||
+            process.env['HTTP_PROXY'] ||
+            process.env['http_proxy'],
+        cwd,
         fileDiscoveryService: fileService,
-        bugCommand: settings.bugCommand,
-        model: argv.model || settings.model || DEFAULT_GEMINI_MODEL,
+        bugCommand: settings.advanced?.bugCommand,
+        model: resolvedModel,
         extensionContextFilePaths,
-        maxSessionTurns: settings.maxSessionTurns ?? -1,
-        sessionTokenLimit: settings.sessionTokenLimit ?? -1,
-        maxFolderItems: settings.maxFolderItems ?? 20,
-        experimentalAcp: argv.experimentalAcp || false,
+        sessionTokenLimit: settings.model?.sessionTokenLimit ?? -1,
+        maxSessionTurns: settings.model?.maxSessionTurns ?? -1,
+        experimentalZedIntegration: argv.experimentalAcp || false,
         listExtensions: argv.listExtensions || false,
         extensions: allExtensions,
         blockedMcpServers,
-        noBrowser: !!process.env.NO_BROWSER,
-        summarizeToolOutput: settings.summarizeToolOutput,
+        noBrowser: !!process.env['NO_BROWSER'],
+        authType: settings.security?.auth?.selectedType,
+        generationConfig: {
+            ...(settings.model?.generationConfig || {}),
+            model: resolvedModel,
+            apiKey: argv.openaiApiKey ||
+                process.env['OPENAI_API_KEY'] ||
+                settings.security?.auth?.apiKey,
+            baseUrl: argv.openaiBaseUrl ||
+                process.env['OPENAI_BASE_URL'] ||
+                settings.security?.auth?.baseUrl,
+            enableOpenAILogging: (typeof argv.openaiLogging === 'undefined'
+                ? settings.model?.enableOpenAILogging
+                : argv.openaiLogging) ?? false,
+        },
+        cliVersion: await getCliVersion(),
+        tavilyApiKey: argv.tavilyApiKey ||
+            settings.advanced?.tavilyApiKey ||
+            process.env['TAVILY_API_KEY'],
+        summarizeToolOutput: settings.model?.summarizeToolOutput,
         ideMode,
-        ideModeFeature,
-        enableOpenAILogging: (typeof argv.openaiLogging === 'undefined'
-            ? settings.enableOpenAILogging
-            : argv.openaiLogging) ?? false,
-        sampling_params: settings.sampling_params,
-        systemPromptMappings: settings.systemPromptMappings ?? [
-            {
-                baseUrls: [
-                    'https://dashscope.aliyuncs.com/compatible-mode/v1/',
-                    'https://dashscope-intl.aliyuncs.com/compatible-mode/v1/',
-                ],
-                modelNames: ['qwen3-coder-plus'],
-                template: 'SYSTEM_TEMPLATE:{"name":"qwen3_coder","params":{"is_git_repository":{RUNTIME_VARS_IS_GIT_REPO},"sandbox":"{RUNTIME_VARS_SANDBOX}"}}',
-            },
-        ],
-        contentGenerator: settings.contentGenerator,
-        cliVersion,
-        tavilyApiKey: argv.tavilyApiKey || settings.tavilyApiKey || process.env.TAVILY_API_KEY,
+        chatCompression: settings.model?.chatCompression,
+        folderTrust,
+        interactive,
+        trustedFolder,
+        useRipgrep: settings.tools?.useRipgrep,
+        useBuiltinRipgrep: settings.tools?.useBuiltinRipgrep,
+        shouldUseNodePtyShell: settings.tools?.shell?.enableInteractiveShell,
+        skipNextSpeakerCheck: settings.model?.skipNextSpeakerCheck,
+        enablePromptCompletion: settings.general?.enablePromptCompletion ?? false,
+        skipLoopDetection: settings.model?.skipLoopDetection ?? false,
+        vlmSwitchMode,
+        truncateToolOutputThreshold: settings.tools?.truncateToolOutputThreshold,
+        truncateToolOutputLines: settings.tools?.truncateToolOutputLines,
+        enableToolOutputTruncation: settings.tools?.enableToolOutputTruncation,
+        eventEmitter: appEvents,
+        useSmartEdit: argv.useSmartEdit ?? settings.useSmartEdit,
+        output: {
+            format: (argv.outputFormat ?? settings.output?.format),
+        },
     });
 }
+function allowedMcpServers(mcpServers, allowMCPServers, blockedMcpServers) {
+    const allowedNames = new Set(allowMCPServers.filter(Boolean));
+    if (allowedNames.size > 0) {
+        mcpServers = Object.fromEntries(Object.entries(mcpServers).filter(([key, server]) => {
+            const isAllowed = allowedNames.has(key);
+            if (!isAllowed) {
+                blockedMcpServers.push({
+                    name: key,
+                    extensionName: server.extensionName || '',
+                });
+            }
+            return isAllowed;
+        }));
+    }
+    else {
+        blockedMcpServers.push(...Object.entries(mcpServers).map(([key, server]) => ({
+            name: key,
+            extensionName: server.extensionName || '',
+        })));
+        mcpServers = {};
+    }
+    return mcpServers;
+}
 function mergeMcpServers(settings, extensions) {
     const mcpServers = { ...(settings.mcpServers || {}) };
     for (const extension of extensions) {
@@ -389,8 +569,11 @@ function mergeMcpServers(settings, extensions) {
     }
     return mcpServers;
 }
-function mergeExcludeTools(settings, extensions) {
-    const allExcludeTools = new Set(settings.excludeTools || []);
+function mergeExcludeTools(settings, extensions, extraExcludes) {
+    const allExcludeTools = new Set([
+        ...(settings.tools?.exclude || []),
+        ...(extraExcludes || []),
+    ]);
     for (const extension of extensions) {
         for (const tool of extension.config.excludeTools || []) {
             allExcludeTools.add(tool);