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

package/dist/src/config/config.js

@@ -3,20 +3,21 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { ApprovalMode, Config, DEFAULT_GEMINI_EMBEDDING_MODEL, DEFAULT_GEMINI_MODEL, DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, EditTool, FileDiscoveryService, getCurrentGeminiMdFilename, loadServerHierarchicalMemory, setGeminiMdFilename as setServerGeminiMdFilename, ShellTool, WriteFileTool, } from '@umsai/ums-code-core';
+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, Storage, InputFormat, OutputFormat, } from '@umsai/ums-code-core';
+import yargs, {} from 'yargs';
+import { hideBin } from 'yargs/helpers';
 import * as fs from 'node:fs';
-import { homedir } from 'node:os';
 import * as path from 'node:path';
-import process from 'node:process';
-import { hideBin } from 'yargs/helpers';
-import yargs from 'yargs/yargs';
-import { extensionsCommand } from '../commands/extensions.js';
-import { mcpCommand } from '../commands/mcp.js';
+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 { appEvents } from '../utils/events.js';
+import { mcpCommand } from '../commands/mcp.js';
 import { isWorkspaceTrusted } from './trustedFolders.js';
+import { buildWebSearchConfig } from './webSearch.js';
 // Simple console logger for now - replace with actual logger if available
 const logger = {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -52,18 +53,75 @@ function parseApprovalModeValue(value) {
             throw formatApprovalModeError(value);
     }
 }
+function normalizeOutputFormat(format) {
+    if (!format) {
+        return undefined;
+    }
+    if (format === OutputFormat.STREAM_JSON) {
+        return OutputFormat.STREAM_JSON;
+    }
+    if (format === 'json' || format === OutputFormat.JSON) {
+        return OutputFormat.JSON;
+    }
+    return OutputFormat.TEXT;
+}
 export async function parseArguments(settings) {
-    const yargsInstance = yargs(hideBin(process.argv))
-        // Set locale to English for consistent output, especially in tests
+    const rawArgv = hideBin(process.argv);
+    const yargsInstance = yargs(rawArgv)
         .locale('en')
-        .scriptName('qwen')
-        .usage('Usage: qwen [options] [command]\n\nUMS Code - Launch an interactive CLI, use -p/--prompt for non-interactive mode')
-        .command('$0', 'Launch UMS Code', (yargsInstance) => yargsInstance
+        .scriptName('ums')
+        .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',
@@ -83,12 +141,6 @@ export async function parseArguments(settings) {
         .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'],
@@ -111,32 +163,6 @@ export async function parseArguments(settings) {
         type: 'string',
         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('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.',
     })
         .option('checkpointing', {
         alias: 'c',
@@ -152,26 +178,31 @@ export async function parseArguments(settings) {
         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('proxy', {
-        type: 'string',
-        description: 'Proxy for qwen client, like schema://user:password@host:port',
     })
         .option('include-directories', {
         type: 'array',
@@ -184,6 +215,10 @@ export async function parseArguments(settings) {
         .option('openai-logging', {
         type: 'boolean',
         description: 'Enable logging of OpenAI API calls for debugging and analysis',
+    })
+        .option('openai-logging-dir', {
+        type: 'string',
+        description: 'Custom directory path for OpenAI API logs. Overrides settings files.',
     })
         .option('openai-api-key', {
         type: 'string',
@@ -195,31 +230,87 @@ export async function parseArguments(settings) {
     })
         .option('tavily-api-key', {
         type: 'string',
-        description: 'Tavily API key for web search functionality',
+        description: 'Tavily API key for web search',
+    })
+        .option('google-api-key', {
+        type: 'string',
+        description: 'Google Custom Search API key',
+    })
+        .option('google-search-engine-id', {
+        type: 'string',
+        description: 'Google Custom Search Engine ID',
+    })
+        .option('web-search-default', {
+        type: 'string',
+        description: 'Default web search provider (dashscope, tavily, google)',
     })
         .option('screen-reader', {
         type: 'boolean',
         description: 'Enable screen reader mode for accessibility.',
-        default: false,
     })
         .option('vlm-switch-mode', {
         type: 'string',
         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('input-format', {
+        type: 'string',
+        choices: ['text', 'stream-json'],
+        description: 'The format consumed from standard input.',
+        default: 'text',
+    })
+        .option('output-format', {
+        alias: 'o',
+        type: 'string',
+        description: 'The format of the CLI output.',
+        choices: ['text', 'json', 'stream-json'],
+    })
+        .option('include-partial-messages', {
+        type: 'boolean',
+        description: 'Include partial assistant messages when using stream-json output.',
+        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) => {
-        if (argv.prompt && argv['promptInteractive']) {
-            throw new Error('Cannot use both --prompt (-p) and --prompt-interactive (-i) together');
+        // 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']) {
-            throw new Error('Cannot use both --yolo (-y) and --approval-mode together. Use --approval-mode=yolo instead.');
+        if (argv['yolo'] && argv['approvalMode']) {
+            return 'Cannot use both --yolo (-y) and --approval-mode together. Use --approval-mode=yolo instead.';
+        }
+        if (argv['includePartialMessages'] &&
+            argv['outputFormat'] !== OutputFormat.STREAM_JSON) {
+            return '--include-partial-messages requires --output-format stream-json';
+        }
+        if (argv['inputFormat'] === 'stream-json' &&
+            argv['outputFormat'] !== OutputFormat.STREAM_JSON) {
+            return '--input-format stream-json requires --output-format stream-json';
         }
         return true;
     }))
         // Register MCP subcommands
         .command(mcpCommand);
-    if (settings?.experimental?.extensionManagement ?? false) {
+    if (settings?.experimental?.extensionManagement ?? true) {
         yargsInstance.command(extensionsCommand);
     }
     yargsInstance
@@ -231,6 +322,7 @@ export async function parseArguments(settings) {
         .demandCommand(0, 0); // Allow base command to run with no subcommands
     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 &&
@@ -238,6 +330,23 @@ export async function parseArguments(settings) {
         // 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;
@@ -245,7 +354,7 @@ export async function parseArguments(settings) {
 // 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()));
@@ -257,32 +366,20 @@ 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.context?.discoveryMaxDirs);
+    return loadServerHierarchicalMemory(effectiveCwd, includeDirectoriesToReadGemini, debugMode, fileService, extensionContextFilePaths, folderTrust, memoryImportFormat, fileFilteringOptions, settings.context?.discoveryMaxDirs);
+}
+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, sessionId, argv, cwd = process.cwd()) {
-    const debugMode = argv.debug ||
-        [process.env['DEBUG'], process.env['DEBUG_MODE']].some((v) => v === 'true' || v === '1') ||
-        false;
+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 folderTrustFeature = settings.security?.folderTrust?.featureEnabled ?? false;
-    const folderTrustSetting = settings.security?.folderTrust?.enabled ?? true;
-    const folderTrust = folderTrustFeature && folderTrustSetting;
-    const trustedFolder = isWorkspaceTrusted(settings);
-    const allExtensions = annotateActiveExtensions(extensions, argv.extensions || [], cwd);
+    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.
@@ -295,6 +392,14 @@ export async function loadCliConfig(settings, extensions, sessionId, argv, cwd =
         setServerGeminiMdFilename(getCurrentGeminiMdFilename());
     }
     const extensionContextFilePaths = activeExtensions.flatMap((e) => e.contextFiles);
+    // Automatically load output-language.md if it exists
+    const outputLanguageFilePath = path.join(Storage.getGlobalQwenDir(), 'output-language.md');
+    if (fs.existsSync(outputLanguageFilePath)) {
+        extensionContextFilePaths.push(outputLanguageFilePath);
+        if (debugMode) {
+            logger.debug(`Found output-language.md, adding to context files: ${outputLanguageFilePath}`);
+        }
+    }
     const fileService = new FileDiscoveryService(cwd);
     const fileFiltering = {
         ...DEFAULT_MEMORY_FILE_FILTERING_OPTIONS,
@@ -306,9 +411,20 @@ export async function loadCliConfig(settings, extensions, sessionId, argv, cwd =
     // Call the (now wrapper) loadHierarchicalGeminiMemory which calls the server's version
     const { memoryContent, fileCount } = await loadHierarchicalGeminiMemory(cwd, settings.context?.loadMemoryFromIncludeDirectories
         ? includeDirectories
-        : [], debugMode, fileService, settings, extensionContextFilePaths, memoryImportFormat, fileFiltering);
+        : [], debugMode, fileService, settings, extensionContextFilePaths, trustedFolder, memoryImportFormat, fileFiltering);
     let mcpServers = mergeMcpServers(settings, activeExtensions);
     const question = argv.promptInteractive || argv.prompt || '';
+    const inputFormat = argv.inputFormat ?? InputFormat.TEXT;
+    const argvOutputFormat = normalizeOutputFormat(argv.outputFormat);
+    const settingsOutputFormat = normalizeOutputFormat(settings.output?.format);
+    const outputFormat = argvOutputFormat ?? settingsOutputFormat ?? OutputFormat.TEXT;
+    const outputSettingsFormat = outputFormat === OutputFormat.STREAM_JSON
+        ? settingsOutputFormat &&
+            settingsOutputFormat !== OutputFormat.STREAM_JSON
+            ? settingsOutputFormat
+            : OutputFormat.TEXT
+        : outputFormat;
+    const includePartialMessages = Boolean(argv.includePartialMessages);
     // Determine approval mode with backward compatibility
     let approvalMode;
     if (argv.approvalMode) {
@@ -317,8 +433,8 @@ export async function loadCliConfig(settings, extensions, sessionId, argv, cwd =
     else if (argv.yolo) {
         approvalMode = ApprovalMode.YOLO;
     }
-    else if (settings.approvalMode) {
-        approvalMode = parseApprovalModeValue(settings.approvalMode);
+    else if (settings.tools?.approvalMode) {
+        approvalMode = parseApprovalModeValue(settings.tools.approvalMode);
     }
     else {
         approvalMode = ApprovalMode.DEFAULT;
@@ -330,7 +446,46 @@ export async function loadCliConfig(settings, extensions, sessionId, argv, cwd =
         logger.warn(`Approval mode overridden to "default" because the current folder is not trusted.`);
         approvalMode = ApprovalMode.DEFAULT;
     }
-    const interactive = !!argv.promptInteractive || (process.stdin.isTTY && question.length === 0);
+    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 determination with priority:
+    // 1. If promptInteractive (-i flag) is provided, it is explicitly interactive
+    // 2. If outputFormat is stream-json or json (no matter input-format) along with query or prompt, it is non-interactive
+    // 3. If no query or prompt is provided, check isTTY: TTY means interactive, non-TTY means non-interactive
+    const hasQuery = !!argv.query;
+    const hasPrompt = !!argv.prompt;
+    let interactive;
+    if (argv.promptInteractive) {
+        // Priority 1: Explicit -i flag means interactive
+        interactive = true;
+    }
+    else if ((outputFormat === OutputFormat.STREAM_JSON ||
+        outputFormat === OutputFormat.JSON) &&
+        (hasQuery || hasPrompt)) {
+        // Priority 2: JSON/stream-json output with query/prompt means non-interactive
+        interactive = false;
+    }
+    else if (!hasQuery && !hasPrompt) {
+        // Priority 3: No query or prompt means interactive only if TTY (format arguments ignored)
+        interactive = process.stdin.isTTY ?? false;
+    }
+    else {
+        // Default: If we have query/prompt but output format is TEXT, assume non-interactive
+        // (fallback for edge cases where query/prompt is provided with TEXT output)
+        interactive = false;
+    }
     // In non-interactive mode, exclude tools that require a prompt.
     const extraExcludes = [];
     if (!interactive && !argv.experimentalAcp) {
@@ -368,15 +523,18 @@ export async function loadCliConfig(settings, extensions, sessionId, argv, cwd =
     if (argv.allowedMcpServerNames) {
         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: cwd,
         includeDirectories,
@@ -399,26 +557,9 @@ export async function loadCliConfig(settings, extensions, sessionId, argv, cwd =
             ...settings.ui?.accessibility,
             screenReader,
         },
-        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,
-            otlpProtocol: ['grpc', 'http'].find((p) => p ===
-                (argv.telemetryOtlpProtocol ?? settings.telemetry?.otlpProtocol)),
-            logPrompts: argv.telemetryLogPrompts ?? settings.telemetry?.logPrompts,
-            outfile: argv.telemetryOutfile ?? settings.telemetry?.outfile,
-        },
+        telemetry: telemetrySettings,
         usageStatisticsEnabled: settings.privacy?.usageStatisticsEnabled ?? true,
-        // Git-aware file filtering settings
-        fileFiltering: {
-            respectGitIgnore: settings.context?.fileFiltering?.respectGitIgnore,
-            respectGeminiIgnore: settings.context?.fileFiltering?.respectGeminiIgnore,
-            enableRecursiveFileSearch: settings.context?.fileFiltering?.enableRecursiveFileSearch,
-            disableFuzzySearch: settings.context?.fileFiltering?.disableFuzzySearch,
-        },
+        fileFiltering: settings.context?.fileFiltering,
         checkpointing: argv.checkpointing || settings.general?.checkpointing?.enabled,
         proxy: argv.proxy ||
             process.env['HTTPS_PROXY'] ||
@@ -428,47 +569,56 @@ export async function loadCliConfig(settings, extensions, sessionId, argv, cwd =
         cwd,
         fileDiscoveryService: fileService,
         bugCommand: settings.advanced?.bugCommand,
-        model: argv.model || settings.model?.name || DEFAULT_GEMINI_MODEL,
+        model: resolvedModel,
         extensionContextFilePaths,
-        sessionTokenLimit: settings.sessionTokenLimit ?? -1,
+        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'],
-        enableOpenAILogging: (typeof argv.openaiLogging === 'undefined'
-            ? settings.enableOpenAILogging
-            : argv.openaiLogging) ?? false,
-        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}"}}',
-            },
-        ]),
         authType: settings.security?.auth?.selectedType,
-        contentGenerator: settings.contentGenerator,
-        cliVersion,
-        tavilyApiKey: argv.tavilyApiKey ||
-            settings.tavilyApiKey ||
-            process.env['TAVILY_API_KEY'],
+        inputFormat,
+        outputFormat,
+        includePartialMessages,
+        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,
+            openAILoggingDir: argv.openaiLoggingDir || settings.model?.openAILoggingDir,
+        },
+        cliVersion: await getCliVersion(),
+        webSearch: buildWebSearchConfig(argv, settings, settings.security?.auth?.selectedType),
         summarizeToolOutput: settings.model?.summarizeToolOutput,
         ideMode,
         chatCompression: settings.model?.chatCompression,
-        folderTrustFeature,
         folderTrust,
         interactive,
         trustedFolder,
         useRipgrep: settings.tools?.useRipgrep,
-        shouldUseNodePtyShell: settings.tools?.usePty,
+        useBuiltinRipgrep: settings.tools?.useBuiltinRipgrep,
+        shouldUseNodePtyShell: settings.tools?.shell?.enableInteractiveShell,
         skipNextSpeakerCheck: settings.model?.skipNextSpeakerCheck,
-        enablePromptCompletion: settings.general?.enablePromptCompletion ?? false,
-        skipLoopDetection: settings.skipLoopDetection ?? false,
+        skipLoopDetection: settings.model?.skipLoopDetection ?? false,
+        skipStartupContext: settings.model?.skipStartupContext ?? false,
         vlmSwitchMode,
+        truncateToolOutputThreshold: settings.tools?.truncateToolOutputThreshold,
+        truncateToolOutputLines: settings.tools?.truncateToolOutputLines,
+        enableToolOutputTruncation: settings.tools?.enableToolOutputTruncation,
+        eventEmitter: appEvents,
+        useSmartEdit: argv.useSmartEdit ?? settings.useSmartEdit,
+        output: {
+            format: outputSettingsFormat,
+        },
     });
 }
 function allowedMcpServers(mcpServers, allowMCPServers, blockedMcpServers) {