@rdmind/rdmind 0.0.15-alpha.1 → 0.0.15-alpha.2

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

@@ -8,15 +8,20 @@ import { vi } from 'vitest';
 import { validateAuthMethod } from './auth.js';
 vi.mock('./settings.js', () => ({
     loadEnvironment: vi.fn(),
+    loadSettings: vi.fn().mockReturnValue({
+        merged: vi.fn().mockReturnValue({}),
+    }),
 }));
 describe('validateAuthMethod', () => {
-    const originalEnv = process.env;
     beforeEach(() => {
         vi.resetModules();
-        process.env = {};
+        vi.stubEnv('GEMINI_API_KEY', undefined);
+        vi.stubEnv('GOOGLE_CLOUD_PROJECT', undefined);
+        vi.stubEnv('GOOGLE_CLOUD_LOCATION', undefined);
+        vi.stubEnv('GOOGLE_API_KEY', undefined);
     });
     afterEach(() => {
-        process.env = originalEnv;
+        vi.unstubAllEnvs();
     });
     it('should return null for LOGIN_WITH_GOOGLE', () => {
         expect(validateAuthMethod(AuthType.LOGIN_WITH_GOOGLE)).toBeNull();
@@ -26,24 +31,27 @@ describe('validateAuthMethod', () => {
     });
     describe('USE_GEMINI', () => {
         it('should return null if GEMINI_API_KEY is set', () => {
-            process.env['GEMINI_API_KEY'] = 'test-key';
+            vi.stubEnv('GEMINI_API_KEY', 'test-key');
             expect(validateAuthMethod(AuthType.USE_GEMINI)).toBeNull();
         });
         it('should return an error message if GEMINI_API_KEY is not set', () => {
+            vi.stubEnv('GEMINI_API_KEY', undefined);
             expect(validateAuthMethod(AuthType.USE_GEMINI)).toBe('GEMINI_API_KEY environment variable not found. Add that to your environment and try again (no reload needed if using .env)!');
         });
     });
     describe('USE_VERTEX_AI', () => {
         it('should return null if GOOGLE_CLOUD_PROJECT and GOOGLE_CLOUD_LOCATION are set', () => {
-            process.env['GOOGLE_CLOUD_PROJECT'] = 'test-project';
-            process.env['GOOGLE_CLOUD_LOCATION'] = 'test-location';
+            vi.stubEnv('GOOGLE_CLOUD_PROJECT', 'test-project');
+            vi.stubEnv('GOOGLE_CLOUD_LOCATION', 'test-location');
             expect(validateAuthMethod(AuthType.USE_VERTEX_AI)).toBeNull();
         });
         it('should return null if GOOGLE_API_KEY is set', () => {
-            process.env['GOOGLE_API_KEY'] = 'test-api-key';
+            vi.stubEnv('GOOGLE_API_KEY', 'test-api-key');
             expect(validateAuthMethod(AuthType.USE_VERTEX_AI)).toBeNull();
         });
         it('should return an error message if no required environment variables are set', () => {
+            vi.stubEnv('GOOGLE_CLOUD_PROJECT', undefined);
+            vi.stubEnv('GOOGLE_CLOUD_LOCATION', undefined);
             expect(validateAuthMethod(AuthType.USE_VERTEX_AI)).toBe('When using Vertex AI, you must specify either:\n' +
                 '• GOOGLE_CLOUD_PROJECT and GOOGLE_CLOUD_LOCATION environment variables.\n' +
                 '• GOOGLE_API_KEY environment variable (if using express mode).\n' +

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,qBAAqB,CAAC;AAC/C,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;CACzB,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC;IAEhC,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO,CAAC,GAAG,GAAG,EAAE,CAAC;IACnB,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,OAAO,CAAC,GAAG,GAAG,WAAW,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;QAClD,MAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IACpE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;QAC5C,MAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC9D,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;QAC1B,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;YACrD,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,GAAG,UAAU,CAAC;YAC3C,MAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC7D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,6DAA6D,EAAE,GAAG,EAAE;YACrE,MAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAClD,6HAA6H,CAC9H,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;QAC7B,EAAE,CAAC,8EAA8E,EAAE,GAAG,EAAE;YACtF,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,GAAG,cAAc,CAAC;YACrD,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,GAAG,eAAe,CAAC;YACvD,MAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QAChE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;YACrD,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,GAAG,cAAc,CAAC;YAC/C,MAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QAChE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,6EAA6E,EAAE,GAAG,EAAE;YACrF,MAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CACrD,kDAAkD;gBAChD,2EAA2E;gBAC3E,kEAAkE;gBAClE,yEAAyE,CAC5E,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,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":"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"}

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

@@ -7,7 +7,9 @@ import type { FileFilteringOptions } from '@rdmind/rdmind-core';
 import { Config, FileDiscoveryService } from '@rdmind/rdmind-core';
 import type { Settings } from './settings.js';
 import type { Extension } from './extension.js';
+import type { ExtensionEnablementManager } from './extensions/extensionEnablement.js';
 export interface CliArgs {
+    query: string | undefined;
     model: string | undefined;
     sandbox: boolean | string | undefined;
     sandboxImage: string | undefined;
@@ -38,10 +40,13 @@ export interface CliArgs {
     tavilyApiKey: string | undefined;
     screenReader: boolean | undefined;
     vlmSwitchMode: string | undefined;
+    useSmartEdit: boolean | undefined;
+    outputFormat: string | undefined;
 }
 export declare function parseArguments(settings: Settings): Promise<CliArgs>;
-export declare function loadHierarchicalGeminiMemory(currentWorkingDirectory: string, includeDirectoriesToReadGemini: readonly string[] | undefined, debugMode: boolean, fileService: FileDiscoveryService, settings: Settings, extensionContextFilePaths?: string[], memoryImportFormat?: 'flat' | 'tree', fileFilteringOptions?: FileFilteringOptions): Promise<{
+export declare function loadHierarchicalGeminiMemory(currentWorkingDirectory: string, includeDirectoriesToReadGemini: readonly string[] | undefined, debugMode: boolean, fileService: FileDiscoveryService, settings: Settings, extensionContextFilePaths: string[] | undefined, folderTrust: boolean, memoryImportFormat?: 'flat' | 'tree', fileFilteringOptions?: FileFilteringOptions): Promise<{
     memoryContent: string;
     fileCount: number;
 }>;
-export declare function loadCliConfig(settings: Settings, extensions: Extension[], sessionId: string, argv: CliArgs, cwd?: string): Promise<Config>;
+export declare function isDebugMode(argv: CliArgs): boolean;
+export declare function loadCliConfig(settings: Settings, extensions: Extension[], extensionEnablementManager: ExtensionEnablementManager, sessionId: string, argv: CliArgs, cwd?: string): Promise<Config>;

package/dist/src/config/config.js

@@ -3,19 +3,19 @@
  * 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 '@rdmind/rdmind-core';
+import { extensionsCommand } from '../commands/extensions.js';
+import { ApprovalMode, Config, DEFAULT_QWEN_MODEL, DEFAULT_QWEN_EMBEDDING_MODEL, DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, EditTool, FileDiscoveryService, getCurrentGeminiMdFilename, loadServerHierarchicalMemory, setGeminiMdFilename as setServerGeminiMdFilename, ShellTool, WriteFileTool, resolveTelemetrySettings, FatalConfigError, } from '@rdmind/rdmind-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';
 // Simple console logger for now - replace with actual logger if available
 const logger = {
@@ -53,17 +53,62 @@ function parseApprovalModeValue(value) {
     }
 }
 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('rdmind')
         .usage('使用方法: rdmind [options] [command]\n\nRDMind - 启动交互式 CLI，使用 -p/--prompt 进入非交互模式')
-        .command('$0', '启动 RDMind', (yargsInstance) => yargsInstance
+        .option('telemetry', {
+        type: 'boolean',
+        description: '启用遥测？控制是否发送遥测数据',
+    })
+        .option('telemetry-target', {
+        type: 'string',
+        choices: ['local', 'gcp'],
+        description: '设置遥测目标',
+    })
+        .option('telemetry-otlp-endpoint', {
+        type: 'string',
+        description: '设置遥测的 OTLP 端点',
+    })
+        .option('telemetry-otlp-protocol', {
+        type: 'string',
+        choices: ['grpc', 'http'],
+        description: '设置遥测的 OTLP 协议',
+    })
+        .option('telemetry-log-prompts', {
+        type: 'boolean',
+        description: '启用或禁用遥测中用户提示词的日志记录',
+    })
+        .option('telemetry-outfile', {
+        type: 'string',
+        description: '将所有遥测输出重定向到指定文件',
+    })
+        .deprecateOption('telemetry', 'Use the "telemetry.enabled" setting in settings.json instead. This flag will be removed in a future version.')
+        .deprecateOption('telemetry-target', 'Use the "telemetry.target" setting in settings.json instead. This flag will be removed in a future version.')
+        .deprecateOption('telemetry-otlp-endpoint', 'Use the "telemetry.otlpEndpoint" setting in settings.json instead. This flag will be removed in a future version.')
+        .deprecateOption('telemetry-otlp-protocol', 'Use the "telemetry.otlpProtocol" setting in settings.json instead. This flag will be removed in a future version.')
+        .deprecateOption('telemetry-log-prompts', 'Use the "telemetry.logPrompts" setting in settings.json instead. This flag will be removed in a future version.')
+        .deprecateOption('telemetry-outfile', 'Use the "telemetry.outfile" setting in settings.json instead. This flag will be removed in a future version.')
+        .option('debug', {
+        alias: 'd',
+        type: 'boolean',
+        description: 'Run in debug mode?',
+        default: false,
+    })
+        .option('proxy', {
+        type: 'string',
+        description: 'Proxy for gemini client, like schema://user:password@host:port',
+    })
+        .deprecateOption('proxy', 'Use the "proxy" setting in settings.json instead. This flag will be removed in a future version.')
+        .command('$0 [query..]', '启动 RDMind', (yargsInstance) => yargsInstance
+        .positional('query', {
+        description: 'Positional prompt. Defaults to one-shot; use -i/--prompt-interactive for interactive.',
+    })
         .option('model', {
         alias: 'm',
         type: 'string',
         description: `模型`,
-        default: process.env['GEMINI_MODEL'],
     })
         .option('prompt', {
         alias: 'p',
@@ -83,12 +128,6 @@ export async function parseArguments(settings) {
         .option('sandbox-image', {
         type: 'string',
         description: '沙盒镜像',
-    })
-        .option('debug', {
-        alias: 'd',
-        type: 'boolean',
-        description: '调试模式？',
-        default: false,
     })
         .option('all-files', {
         alias: ['a'],
@@ -111,32 +150,6 @@ export async function parseArguments(settings) {
         type: 'string',
         choices: ['plan', 'default', 'auto-edit', 'yolo'],
         description: '设置审批模式：plan（只做规划）、default（提示确认）、auto_edit（接受编辑）、yolo（接受所有工具）',
-    })
-        .option('telemetry', {
-        type: 'boolean',
-        description: '启用遥测？控制是否发送遥测数据',
-    })
-        .option('telemetry-target', {
-        type: 'string',
-        choices: ['local', 'gcp'],
-        description: '设置遥测目标（local 或 gcp）。覆盖设置文件',
-    })
-        .option('telemetry-otlp-endpoint', {
-        type: 'string',
-        description: '设置遥测的 OTLP 端点。覆盖环境变量和设置文件',
-    })
-        .option('telemetry-otlp-protocol', {
-        type: 'string',
-        choices: ['grpc', 'http'],
-        description: '设置遥测的 OTLP 协议（grpc 或 http）。覆盖设置文件',
-    })
-        .option('telemetry-log-prompts', {
-        type: 'boolean',
-        description: '启用或禁用遥测中用户提示词的日志记录。覆盖设置文件',
-    })
-        .option('telemetry-outfile', {
-        type: 'string',
-        description: '将所有遥测输出重定向到指定文件',
     })
         .option('checkpointing', {
         alias: 'c',
@@ -152,26 +165,31 @@ export async function parseArguments(settings) {
         type: 'array',
         string: true,
         description: '允许的 MCP 服务名称',
+        coerce: (mcpServerNames) => 
+        // Handle comma-separated values
+        mcpServerNames.flatMap((mcpServerName) => mcpServerName.split(',').map((m) => m.trim())),
     })
         .option('allowed-tools', {
         type: 'array',
         string: true,
         description: '无需确认即可运行的工具',
+        coerce: (tools) => 
+        // Handle comma-separated values
+        tools.flatMap((tool) => tool.split(',').map((t) => t.trim())),
     })
         .option('extensions', {
         alias: 'e',
         type: 'array',
         string: true,
         description: '要使用的扩展列表。未提供则使用所有扩展',
+        coerce: (extensions) => 
+        // Handle comma-separated values
+        extensions.flatMap((extension) => extension.split(',').map((e) => e.trim())),
     })
         .option('list-extensions', {
         alias: 'l',
         type: 'boolean',
         description: '列出所有可用扩展并退出',
-    })
-        .option('proxy', {
-        type: 'string',
-        description: '客户端代理，格式如 schema://user:password@host:port',
     })
         .option('include-directories', {
         type: 'array',
@@ -200,26 +218,51 @@ export async function parseArguments(settings) {
         .option('screen-reader', {
         type: 'boolean',
         description: '启用 screen-reader',
-        default: false,
     })
         .option('vlm-switch-mode', {
         type: 'string',
         choices: ['once', 'session', 'persist'],
         description: '检测到输入中包含图像时的默认行为。可选值：once（切换一次）、session（整个会话期间切换）、persist（继续使用当前模型）。会覆盖设置文件的配置',
         default: process.env['VLM_SWITCH_MODE'],
+    })
+        .option('output-format', {
+        alias: 'o',
+        type: 'string',
+        description: 'The format of the CLI output.',
+        choices: ['text', 'json'],
+    })
+        .deprecateOption('show-memory-usage', 'Use the "ui.showMemoryUsage" setting in settings.json instead. This flag will be removed in a future version.')
+        .deprecateOption('sandbox-image', 'Use the "tools.sandbox" setting in settings.json instead. This flag will be removed in a future version.')
+        .deprecateOption('checkpointing', 'Use the "general.checkpointing.enabled" setting in settings.json instead. This flag will be removed in a future version.')
+        .deprecateOption('all-files', 'Use @ includes in the application instead. This flag will be removed in a future version.')
+        .deprecateOption('prompt', 'Use the positional prompt instead. This flag will be removed in a future version.')
+        // Ensure validation flows through .fail() for clean UX
+        .fail((msg, err, yargs) => {
+        console.error(msg || err?.message || 'Unknown error');
+        yargs.showHelp();
+        process.exit(1);
     })
         .check((argv) => {
-        if (argv.prompt && argv['promptInteractive']) {
-            throw new Error('不能同时使用 --prompt (-p) 和 --prompt-interactive (-i)');
+        // 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 '不能同时使用位置参数提示词和 --prompt (-p) 标志';
+        }
+        if (argv['prompt'] && argv['promptInteractive']) {
+            return '不能同时使用 --prompt (-p) 和 --prompt-interactive (-i)';
         }
-        if (argv.yolo && argv['approvalMode']) {
-            throw new Error('不能同时使用 --yolo (-y) 和 --approval-mode。请使用 --approval-mode=yolo 替代');
+        if (argv['yolo'] && argv['approvalMode']) {
+            return '不能同时使用 --yolo (-y) 和 --approval-mode。请使用 --approval-mode=yolo 替代';
         }
         return true;
     }))
         // Register MCP subcommands
         .command(mcpCommand);
-    if (settings?.experimental?.extensionManagement ?? false) {
+    if (settings?.experimental?.extensionManagement ?? true) {
         yargsInstance.command(extensionsCommand);
     }
     yargsInstance
@@ -231,6 +274,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 +282,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 +306,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 +318,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.
@@ -306,7 +355,7 @@ 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 || '';
     // Determine approval mode with backward compatibility
@@ -317,8 +366,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 +379,24 @@ 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: 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) {
@@ -368,15 +434,20 @@ export async function loadCliConfig(settings, extensions, sessionId, argv, cwd =
     if (argv.allowedMcpServerNames) {
         mcpServers = allowedMcpServers(mcpServers, argv.allowedMcpServerNames, blockedMcpServers);
     }
+    const defaultModel = DEFAULT_QWEN_MODEL;
+    const resolvedModel = argv.model ||
+        process.env['OPENAI_MODEL'] ||
+        process.env['QWEN_MODEL'] ||
+        settings.model?.name ||
+        defaultModel;
     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 +470,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 +482,49 @@ 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,
+        generationConfig: {
+            ...(settings.model?.generationConfig || {}),
+            model: resolvedModel,
+            apiKey: argv.openaiApiKey || process.env['OPENAI_API_KEY'],
+            baseUrl: argv.openaiBaseUrl || process.env['OPENAI_BASE_URL'],
+            enableOpenAILogging: (typeof argv.openaiLogging === 'undefined'
+                ? settings.model?.enableOpenAILogging
+                : argv.openaiLogging) ?? false,
+        },
+        cliVersion: await getCliVersion(),
         tavilyApiKey: argv.tavilyApiKey ||
-            settings.tavilyApiKey ||
+            settings.advanced?.tavilyApiKey ||
             process.env['TAVILY_API_KEY'],
         summarizeToolOutput: settings.model?.summarizeToolOutput,
         ideMode,
         chatCompression: settings.model?.chatCompression,
-        folderTrustFeature,
         folderTrust,
         interactive,
         trustedFolder,
         useRipgrep: settings.tools?.useRipgrep,
-        shouldUseNodePtyShell: settings.tools?.usePty,
+        shouldUseNodePtyShell: settings.tools?.shell?.enableInteractiveShell,
         skipNextSpeakerCheck: settings.model?.skipNextSpeakerCheck,
         enablePromptCompletion: settings.general?.enablePromptCompletion ?? false,
-        skipLoopDetection: settings.skipLoopDetection ?? 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) {