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

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

@@ -0,0 +1,172 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { loadSettings, SettingScope } from '../../config/settings.js';
+import { MCPServerConfig } from '@umsai/ums-code-core';
+async function addMcpServer(name, commandOrUrl, args, options) {
+    const { scope, transport, env, header, timeout, trust, description, includeTools, excludeTools, } = options;
+    const settings = loadSettings(process.cwd());
+    const inHome = settings.workspace.path === settings.user.path;
+    if (scope === 'project' && inHome) {
+        console.error('Error: Please use --scope user to edit settings in the home directory.');
+        process.exit(1);
+    }
+    const settingsScope = scope === 'user' ? SettingScope.User : SettingScope.Workspace;
+    let newServer = {};
+    const headers = header?.reduce((acc, curr) => {
+        const [key, ...valueParts] = curr.split(':');
+        const value = valueParts.join(':').trim();
+        if (key.trim() && value) {
+            acc[key.trim()] = value;
+        }
+        return acc;
+    }, {});
+    switch (transport) {
+        case 'sse':
+            newServer = {
+                url: commandOrUrl,
+                headers,
+                timeout,
+                trust,
+                description,
+                includeTools,
+                excludeTools,
+            };
+            break;
+        case 'http':
+            newServer = {
+                httpUrl: commandOrUrl,
+                headers,
+                timeout,
+                trust,
+                description,
+                includeTools,
+                excludeTools,
+            };
+            break;
+        case 'stdio':
+        default:
+            newServer = {
+                command: commandOrUrl,
+                args: args?.map(String),
+                env: env?.reduce((acc, curr) => {
+                    const [key, value] = curr.split('=');
+                    if (key && value) {
+                        acc[key] = value;
+                    }
+                    return acc;
+                }, {}),
+                timeout,
+                trust,
+                description,
+                includeTools,
+                excludeTools,
+            };
+            break;
+    }
+    const existingSettings = settings.forScope(settingsScope).settings;
+    const mcpServers = existingSettings.mcpServers || {};
+    const isExistingServer = !!mcpServers[name];
+    if (isExistingServer) {
+        console.log(`MCP server "${name}" is already configured within ${scope} settings.`);
+    }
+    mcpServers[name] = newServer;
+    settings.setValue(settingsScope, 'mcpServers', mcpServers);
+    if (isExistingServer) {
+        console.log(`MCP server "${name}" updated in ${scope} settings.`);
+    }
+    else {
+        console.log(`MCP server "${name}" added to ${scope} settings. (${transport})`);
+    }
+}
+export const addCommand = {
+    command: 'add <name> <commandOrUrl> [args...]',
+    describe: 'Add a server',
+    builder: (yargs) => yargs
+        .usage('Usage: gemini mcp add [options] <name> <commandOrUrl> [args...]')
+        .parserConfiguration({
+        'unknown-options-as-args': true, // Pass unknown options as server args
+        'populate--': true, // Populate server args after -- separator
+    })
+        .positional('name', {
+        describe: 'Name of the server',
+        type: 'string',
+        demandOption: true,
+    })
+        .positional('commandOrUrl', {
+        describe: 'Command (stdio) or URL (sse, http)',
+        type: 'string',
+        demandOption: true,
+    })
+        .option('scope', {
+        alias: 's',
+        describe: 'Configuration scope (user or project)',
+        type: 'string',
+        default: 'project',
+        choices: ['user', 'project'],
+    })
+        .option('transport', {
+        alias: 't',
+        describe: 'Transport type (stdio, sse, http)',
+        type: 'string',
+        default: 'stdio',
+        choices: ['stdio', 'sse', 'http'],
+    })
+        .option('env', {
+        alias: 'e',
+        describe: 'Set environment variables (e.g. -e KEY=value)',
+        type: 'array',
+        string: true,
+    })
+        .option('header', {
+        alias: 'H',
+        describe: 'Set HTTP headers for SSE and HTTP transports (e.g. -H "X-Api-Key: abc123" -H "Authorization: Bearer abc123")',
+        type: 'array',
+        string: true,
+    })
+        .option('timeout', {
+        describe: 'Set connection timeout in milliseconds',
+        type: 'number',
+    })
+        .option('trust', {
+        describe: 'Trust the server (bypass all tool call confirmation prompts)',
+        type: 'boolean',
+    })
+        .option('description', {
+        describe: 'Set the description for the server',
+        type: 'string',
+    })
+        .option('include-tools', {
+        describe: 'A comma-separated list of tools to include',
+        type: 'array',
+        string: true,
+    })
+        .option('exclude-tools', {
+        describe: 'A comma-separated list of tools to exclude',
+        type: 'array',
+        string: true,
+    })
+        .middleware((argv) => {
+        // Handle -- separator args as server args if present
+        if (argv['--']) {
+            const existingArgs = argv['args'] || [];
+            argv['args'] = [...existingArgs, ...argv['--']];
+        }
+    }),
+    handler: async (argv) => {
+        await addMcpServer(argv['name'], argv['commandOrUrl'], argv['args'], {
+            scope: argv['scope'],
+            transport: argv['transport'],
+            env: argv['env'],
+            header: argv['header'],
+            timeout: argv['timeout'],
+            trust: argv['trust'],
+            description: argv['description'],
+            includeTools: argv['includeTools'],
+            excludeTools: argv['excludeTools'],
+        });
+    },
+};
+//# sourceMappingURL=add.js.map

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

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

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

@@ -0,0 +1,8 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { CommandModule } from 'yargs';
+export declare function listMcpServers(): Promise<void>;
+export declare const listCommand: CommandModule;

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

@@ -0,0 +1,111 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { loadSettings } from '../../config/settings.js';
+import { MCPServerStatus, createTransport } from '@umsai/ums-code-core';
+import { Client } from '@modelcontextprotocol/sdk/client/index.js';
+import { ExtensionStorage, loadExtensions } from '../../config/extension.js';
+import { ExtensionEnablementManager } from '../../config/extensions/extensionEnablement.js';
+const COLOR_GREEN = '\u001b[32m';
+const COLOR_YELLOW = '\u001b[33m';
+const COLOR_RED = '\u001b[31m';
+const RESET_COLOR = '\u001b[0m';
+async function getMcpServersFromConfig() {
+    const settings = loadSettings();
+    const extensions = loadExtensions(new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()));
+    const mcpServers = { ...(settings.merged.mcpServers || {}) };
+    for (const extension of extensions) {
+        Object.entries(extension.config.mcpServers || {}).forEach(([key, server]) => {
+            if (mcpServers[key]) {
+                return;
+            }
+            mcpServers[key] = {
+                ...server,
+                extensionName: extension.config.name,
+            };
+        });
+    }
+    return mcpServers;
+}
+async function testMCPConnection(serverName, config) {
+    const client = new Client({
+        name: 'mcp-test-client',
+        version: '0.0.1',
+    });
+    let transport;
+    try {
+        // Use the same transport creation logic as core
+        transport = await createTransport(serverName, config, false);
+    }
+    catch (_error) {
+        await client.close();
+        return MCPServerStatus.DISCONNECTED;
+    }
+    try {
+        // Attempt actual MCP connection with short timeout
+        await client.connect(transport, { timeout: 5000 }); // 5s timeout
+        // Test basic MCP protocol by pinging the server
+        await client.ping();
+        await client.close();
+        return MCPServerStatus.CONNECTED;
+    }
+    catch (_error) {
+        await transport.close();
+        return MCPServerStatus.DISCONNECTED;
+    }
+}
+async function getServerStatus(serverName, server) {
+    // Test all server types by attempting actual connection
+    return await testMCPConnection(serverName, server);
+}
+export async function listMcpServers() {
+    const mcpServers = await getMcpServersFromConfig();
+    const serverNames = Object.keys(mcpServers);
+    if (serverNames.length === 0) {
+        console.log('No MCP servers configured.');
+        return;
+    }
+    console.log('Configured MCP servers:\n');
+    for (const serverName of serverNames) {
+        const server = mcpServers[serverName];
+        const status = await getServerStatus(serverName, server);
+        let statusIndicator = '';
+        let statusText = '';
+        switch (status) {
+            case MCPServerStatus.CONNECTED:
+                statusIndicator = COLOR_GREEN + '✓' + RESET_COLOR;
+                statusText = 'Connected';
+                break;
+            case MCPServerStatus.CONNECTING:
+                statusIndicator = COLOR_YELLOW + '…' + RESET_COLOR;
+                statusText = 'Connecting';
+                break;
+            case MCPServerStatus.DISCONNECTED:
+            default:
+                statusIndicator = COLOR_RED + '✗' + RESET_COLOR;
+                statusText = 'Disconnected';
+                break;
+        }
+        let serverInfo = `${serverName}: `;
+        if (server.httpUrl) {
+            serverInfo += `${server.httpUrl} (http)`;
+        }
+        else if (server.url) {
+            serverInfo += `${server.url} (sse)`;
+        }
+        else if (server.command) {
+            serverInfo += `${server.command} ${server.args?.join(' ') || ''} (stdio)`;
+        }
+        console.log(`${statusIndicator} ${serverInfo} - ${statusText}`);
+    }
+}
+export const listCommand = {
+    command: 'list',
+    describe: 'List all configured MCP servers',
+    handler: async () => {
+        await listMcpServers();
+    },
+};
+//# sourceMappingURL=list.js.map

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

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

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

@@ -0,0 +1,7 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { CommandModule } from 'yargs';
+export declare const removeCommand: CommandModule;

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

@@ -0,0 +1,44 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { loadSettings, SettingScope } from '../../config/settings.js';
+async function removeMcpServer(name, options) {
+    const { scope } = options;
+    const settingsScope = scope === 'user' ? SettingScope.User : SettingScope.Workspace;
+    const settings = loadSettings();
+    const existingSettings = settings.forScope(settingsScope).settings;
+    const mcpServers = existingSettings.mcpServers || {};
+    if (!mcpServers[name]) {
+        console.log(`Server "${name}" not found in ${scope} settings.`);
+        return;
+    }
+    delete mcpServers[name];
+    settings.setValue(settingsScope, 'mcpServers', mcpServers);
+    console.log(`Server "${name}" removed from ${scope} settings.`);
+}
+export const removeCommand = {
+    command: 'remove <name>',
+    describe: 'Remove a server',
+    builder: (yargs) => yargs
+        .usage('Usage: gemini mcp remove [options] <name>')
+        .positional('name', {
+        describe: 'Name of the server',
+        type: 'string',
+        demandOption: true,
+    })
+        .option('scope', {
+        alias: 's',
+        describe: 'Configuration scope (user or project)',
+        type: 'string',
+        default: 'project',
+        choices: ['user', 'project'],
+    }),
+    handler: async (argv) => {
+        await removeMcpServer(argv['name'], {
+            scope: argv['scope'],
+        });
+    },
+};
+//# sourceMappingURL=remove.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"remove.js","sourceRoot":"","sources":["../../../../src/commands/mcp/remove.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAEtE,KAAK,UAAU,eAAe,CAC5B,IAAY,EACZ,OAEC;IAED,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IAC1B,MAAM,aAAa,GACjB,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC;IAChE,MAAM,QAAQ,GAAG,YAAY,EAAE,CAAC;IAEhC,MAAM,gBAAgB,GAAG,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,QAAQ,CAAC;IACnE,MAAM,UAAU,GAAG,gBAAgB,CAAC,UAAU,IAAI,EAAE,CAAC;IAErD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QACtB,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,kBAAkB,KAAK,YAAY,CAAC,CAAC;QAChE,OAAO;IACT,CAAC;IAED,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;IAExB,QAAQ,CAAC,QAAQ,CAAC,aAAa,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;IAE3D,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,kBAAkB,KAAK,YAAY,CAAC,CAAC;AAClE,CAAC;AAED,MAAM,CAAC,MAAM,aAAa,GAAkB;IAC1C,OAAO,EAAE,eAAe;IACxB,QAAQ,EAAE,iBAAiB;IAC3B,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CACjB,KAAK;SACF,KAAK,CAAC,2CAA2C,CAAC;SAClD,UAAU,CAAC,MAAM,EAAE;QAClB,QAAQ,EAAE,oBAAoB;QAC9B,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,IAAI;KACnB,CAAC;SACD,MAAM,CAAC,OAAO,EAAE;QACf,KAAK,EAAE,GAAG;QACV,QAAQ,EAAE,uCAAuC;QACjD,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,SAAS;QAClB,OAAO,EAAE,CAAC,MAAM,EAAE,SAAS,CAAC;KAC7B,CAAC;IACN,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACtB,MAAM,eAAe,CAAC,IAAI,CAAC,MAAM,CAAW,EAAE;YAC5C,KAAK,EAAE,IAAI,CAAC,OAAO,CAAW;SAC/B,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}

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

@@ -0,0 +1,7 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { CommandModule } from 'yargs';
+export declare const mcpCommand: CommandModule;

package/dist/src/commands/mcp.js

@@ -0,0 +1,23 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { addCommand } from './mcp/add.js';
+import { removeCommand } from './mcp/remove.js';
+import { listCommand } from './mcp/list.js';
+export const mcpCommand = {
+    command: 'mcp',
+    describe: 'Manage MCP servers',
+    builder: (yargs) => yargs
+        .command(addCommand)
+        .command(removeCommand)
+        .command(listCommand)
+        .demandCommand(1, 'You need at least one command before continuing.')
+        .version(false),
+    handler: () => {
+        // yargs will automatically show help if no subcommand is provided
+        // thanks to demandCommand(1) in the builder.
+    },
+};
+//# sourceMappingURL=mcp.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../../../src/commands/mcp.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,MAAM,CAAC,MAAM,UAAU,GAAkB;IACvC,OAAO,EAAE,KAAK;IACd,QAAQ,EAAE,oBAAoB;IAC9B,OAAO,EAAE,CAAC,KAAW,EAAE,EAAE,CACvB,KAAK;SACF,OAAO,CAAC,UAAU,CAAC;SACnB,OAAO,CAAC,aAAa,CAAC;SACtB,OAAO,CAAC,WAAW,CAAC;SACpB,aAAa,CAAC,CAAC,EAAE,kDAAkD,CAAC;SACpE,OAAO,CAAC,KAAK,CAAC;IACnB,OAAO,EAAE,GAAG,EAAE;QACZ,kEAAkE;QAClE,6CAA6C;IAC/C,CAAC;CACF,CAAC"}

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

@@ -3,10 +3,8 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-export declare const validateAuthMethod: (authMethod: string) => string | null;
-export declare const setOpenAIApiKey: (apiKey: string) => void;
-export declare const setOpenAIBaseUrl: (baseUrl: string) => void;
-export declare const setOpenAIModel: (model: string) => void;
+export declare function validateAuthMethod(authMethod: string): string | null;
 export declare const setUMSApiKey: (apiKey: string) => void;
 export declare const setUMSBaseUrl: (baseUrl: string) => void;
 export declare const setUMSModel: (model: string) => void;
+export declare const setUMSModelVL: (modelVl: string) => void;

package/dist/src/config/auth.js

@@ -4,40 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { AuthType } from '@umsai/ums-code-core';
-import { loadEnvironment } from './settings.js';
-export const validateAuthMethod = (authMethod) => {
-    loadEnvironment();
-    if (authMethod === AuthType.LOGIN_WITH_GOOGLE ||
-        authMethod === AuthType.CLOUD_SHELL) {
-        return null;
-    }
-    if (authMethod === AuthType.USE_GEMINI) {
-        if (!process.env.GEMINI_API_KEY) {
-            return 'GEMINI_API_KEY environment variable not found. Add that to your environment and try again (no reload needed if using .env)!';
-        }
-        return null;
-    }
-    if (authMethod === AuthType.USE_VERTEX_AI) {
-        const hasVertexProjectLocationConfig = !!process.env.GOOGLE_CLOUD_PROJECT && !!process.env.GOOGLE_CLOUD_LOCATION;
-        const hasGoogleApiKey = !!process.env.GOOGLE_API_KEY;
-        if (!hasVertexProjectLocationConfig && !hasGoogleApiKey) {
-            return ('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' +
-                'Update your environment and try again (no reload needed if using .env)!');
-        }
-        return null;
-    }
+import { loadEnvironment, loadSettings } from './settings.js';
+export function validateAuthMethod(authMethod) {
+    const settings = loadSettings();
+    loadEnvironment(settings.merged);
     if (authMethod === AuthType.USE_OPENAI) {
-        if (!process.env.OPENAI_API_KEY) {
+        const hasApiKey = process.env['OPENAI_API_KEY'] || settings.merged.security?.auth?.apiKey;
+        if (!hasApiKey) {
             return 'OPENAI_API_KEY environment variable not found. You can enter it interactively or add it to your .env file.';
         }
         return null;
     }
     // 天码Token验证
     if (authMethod === AuthType.UMS_OAUTH) {
-        if (!process.env.UMS_API_KEY) {
-            return 'UMS_API_KEY environment variable not found. You can enter it interactively.';
+        if (!process.env['UMS_API_KEY']) {
+            return 'UMS_API_KEY 环境变量未找到，请使用/auth 配置UMS OAUTH';
         }
         return null;
     }
@@ -47,24 +28,18 @@ export const validateAuthMethod = (authMethod) => {
         return null;
     }
     return 'Invalid auth method selected.';
-};
-export const setOpenAIApiKey = (apiKey) => {
-    process.env.OPENAI_API_KEY = apiKey;
-};
-export const setOpenAIBaseUrl = (baseUrl) => {
-    process.env.OPENAI_BASE_URL = baseUrl;
-};
-export const setOpenAIModel = (model) => {
-    process.env.OPENAI_MODEL = model;
-};
+}
 // 天码API_KEY
 export const setUMSApiKey = (apiKey) => {
-    process.env.UMS_API_KEY = apiKey;
+    process.env['UMS_API_KEY'] = apiKey;
 };
 export const setUMSBaseUrl = (baseUrl) => {
-    process.env.UMS_BASE_URL = baseUrl;
+    process.env['UMS_BASE_URL'] = baseUrl;
 };
 export const setUMSModel = (model) => {
-    process.env.UMS_MODEL = model;
+    process.env['UMS_MODEL'] = model;
+};
+export const setUMSModelVL = (modelVl) => {
+    process.env['UMS_MODEL_VL'] = modelVl;
 };
 //# sourceMappingURL=auth.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/config/auth.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAEhD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,UAAkB,EAAiB,EAAE;IACtE,eAAe,EAAE,CAAC;IAClB,IACE,UAAU,KAAK,QAAQ,CAAC,iBAAiB;QACzC,UAAU,KAAK,QAAQ,CAAC,WAAW,EACnC,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,UAAU,KAAK,QAAQ,CAAC,UAAU,EAAE,CAAC;QACvC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC;YAChC,OAAO,6HAA6H,CAAC;QACvI,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,UAAU,KAAK,QAAQ,CAAC,aAAa,EAAE,CAAC;QAC1C,MAAM,8BAA8B,GAClC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC;QAC5E,MAAM,eAAe,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;QACrD,IAAI,CAAC,8BAA8B,IAAI,CAAC,eAAe,EAAE,CAAC;YACxD,OAAO,CACL,kDAAkD;gBAClD,2EAA2E;gBAC3E,kEAAkE;gBAClE,yEAAyE,CAC1E,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,UAAU,KAAK,QAAQ,CAAC,UAAU,EAAE,CAAC;QACvC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC;YAChC,OAAO,4GAA4G,CAAC;QACtH,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,YAAY;IACZ,IAAI,UAAU,KAAK,QAAQ,CAAC,SAAS,EAAE,CAAC;QACtC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;YAC7B,OAAO,6EAA6E,CAAC;QACvF,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,UAAU,KAAK,QAAQ,CAAC,UAAU,EAAE,CAAC;QACvC,uEAAuE;QACvE,4CAA4C;QAC5C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,+BAA+B,CAAC;AACzC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,MAAc,EAAQ,EAAE;IACtD,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,MAAM,CAAC;AACtC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,OAAe,EAAQ,EAAE;IACxD,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,OAAO,CAAC;AACxC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,KAAa,EAAQ,EAAE;IACpD,OAAO,CAAC,GAAG,CAAC,YAAY,GAAG,KAAK,CAAC;AACnC,CAAC,CAAC;AAEF,YAAY;AACZ,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,MAAc,EAAQ,EAAE;IACnD,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,MAAM,CAAC;AACnC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,OAAe,EAAQ,EAAE;IACrD,OAAO,CAAC,GAAG,CAAC,YAAY,GAAG,OAAO,CAAC;AACrC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,KAAa,EAAQ,EAAE;IACjD,OAAO,CAAC,GAAG,CAAC,SAAS,GAAG,KAAK,CAAC;AAChC,CAAC,CAAC"}
+{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/config/auth.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE9D,MAAM,UAAU,kBAAkB,CAAC,UAAkB;IACnD,MAAM,QAAQ,GAAG,YAAY,EAAE,CAAC;IAChC,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAEjC,IAAI,UAAU,KAAK,QAAQ,CAAC,UAAU,EAAE,CAAC;QACvC,MAAM,SAAS,GACb,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,IAAI,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC;QAC1E,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO,4GAA4G,CAAC;QACtH,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,YAAY;IACZ,IAAI,UAAU,KAAK,QAAQ,CAAC,SAAS,EAAE,CAAC;QACtC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;YAChC,OAAO,0CAA0C,CAAC;QACpD,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,UAAU,KAAK,QAAQ,CAAC,UAAU,EAAE,CAAC;QACvC,uEAAuE;QACvE,4CAA4C;QAC5C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,+BAA+B,CAAC;AACzC,CAAC;AAED,YAAY;AACZ,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,MAAc,EAAQ,EAAE;IACnD,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,MAAM,CAAC;AACtC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,OAAe,EAAQ,EAAE;IACrD,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC;AACxC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,KAAa,EAAQ,EAAE;IACjD,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,KAAK,CAAC;AACnC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,OAAe,EAAQ,EAAE;IACrD,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC;AACxC,CAAC,CAAC"}

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

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

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

@@ -0,0 +1,37 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { AuthType } from '@umsai/ums-code-core';
+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', () => {
+    beforeEach(() => {
+        vi.resetModules();
+    });
+    afterEach(() => {
+        vi.unstubAllEnvs();
+    });
+    it('should return null for USE_OPENAI', () => {
+        process.env['OPENAI_API_KEY'] = 'fake-key';
+        expect(validateAuthMethod(AuthType.USE_OPENAI)).toBeNull();
+    });
+    it('should return an error message for USE_OPENAI if OPENAI_API_KEY is not set', () => {
+        delete process.env['OPENAI_API_KEY'];
+        expect(validateAuthMethod(AuthType.USE_OPENAI)).toBe('OPENAI_API_KEY environment variable not found. You can enter it interactively or add it to your .env file.');
+    });
+    it('should return null for QWEN_OAUTH', () => {
+        expect(validateAuthMethod(AuthType.QWEN_OAUTH)).toBeNull();
+    });
+    it('should return an error message for an invalid auth method', () => {
+        expect(validateAuthMethod('invalid-method')).toBe('Invalid auth method selected.');
+    });
+});
+//# sourceMappingURL=auth.test.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"auth.test.js","sourceRoot":"","sources":["../../../src/config/auth.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAE/C,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE,GAAG,EAAE,CAAC,CAAC;IAC9B,eAAe,EAAE,EAAE,CAAC,EAAE,EAAE;IACxB,YAAY,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC;QACpC,MAAM,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC;KACpC,CAAC;CACH,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,YAAY,EAAE,CAAC;IACpB,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mCAAmC,EAAE,GAAG,EAAE;QAC3C,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,GAAG,UAAU,CAAC;QAC3C,MAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4EAA4E,EAAE,GAAG,EAAE;QACpF,OAAO,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QACrC,MAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAClD,4GAA4G,CAC7G,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mCAAmC,EAAE,GAAG,EAAE;QAC3C,MAAM,CAAC,kBAAkB,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2DAA2D,EAAE,GAAG,EAAE;QACnE,MAAM,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAC/C,+BAA+B,CAChC,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

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

@@ -3,10 +3,13 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Config, FileDiscoveryService, FileFilteringOptions } from '@umsai/ums-code-core';
-import { Settings } from './settings.js';
-import { Extension } from './extension.js';
+import type { FileFilteringOptions } from '@umsai/ums-code-core';
+import { Config, FileDiscoveryService } from '@umsai/ums-code-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;
@@ -14,32 +17,36 @@ export interface CliArgs {
     prompt: string | undefined;
     promptInteractive: string | undefined;
     allFiles: boolean | undefined;
-    all_files: boolean | undefined;
     showMemoryUsage: boolean | undefined;
-    show_memory_usage: boolean | undefined;
     yolo: boolean | undefined;
+    approvalMode: string | undefined;
     telemetry: boolean | undefined;
     checkpointing: boolean | undefined;
     telemetryTarget: string | undefined;
     telemetryOtlpEndpoint: string | undefined;
+    telemetryOtlpProtocol: string | undefined;
     telemetryLogPrompts: boolean | undefined;
     telemetryOutfile: string | undefined;
     allowedMcpServerNames: string[] | undefined;
+    allowedTools: string[] | undefined;
     experimentalAcp: boolean | undefined;
     extensions: string[] | undefined;
     listExtensions: boolean | undefined;
-    ideModeFeature: boolean | undefined;
     openaiLogging: boolean | undefined;
     openaiApiKey: string | undefined;
     openaiBaseUrl: string | undefined;
     proxy: string | undefined;
     includeDirectories: string[] | undefined;
-    loadMemoryFromIncludeDirectories: boolean | undefined;
     tavilyApiKey: string | undefined;
+    screenReader: boolean | undefined;
+    vlmSwitchMode: string | undefined;
+    useSmartEdit: boolean | undefined;
+    outputFormat: string | undefined;
 }
-export declare function parseArguments(): 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 parseArguments(settings: Settings): Promise<CliArgs>;
+export declare function loadHierarchicalGeminiMemory(currentWorkingDirectory: string, includeDirectoriesToReadGemini: readonly string[] | undefined, debugMode: boolean, fileService: FileDiscoveryService, settings: Settings, extensionContextFilePaths: string[] | undefined, folderTrust: boolean, memoryImportFormat?: 'flat' | 'tree', fileFilteringOptions?: FileFilteringOptions): Promise<{
     memoryContent: string;
     fileCount: number;
 }>;
-export declare function loadCliConfig(settings: Settings, extensions: Extension[], sessionId: string, argv: CliArgs): 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>;