@cloudbase/cli 2.8.2-beta.1 → 2.8.2-beta.3

package/lib/commands/ai/index.js

@@ -84,7 +84,6 @@ let AICommand = class AICommand extends common_1.Command {
                     return yield this.showConfig(configManager, log);
                 }
                 if (!(yield configManager.isConfigured())) {
-                    log.info('AI 功能未配置，正在启动配置向导...');
                     const wizard = new setup_1.AISetupWizard(envId);
                     const { defaultAgent } = yield wizard.setUpDefault(log);
                     agent = defaultAgent;

package/lib/utils/ai/claudeWindows.js

@@ -0,0 +1,62 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.claudeWindowsCheck = void 0;
+const child_process_1 = require("child_process");
+const path_1 = require("path");
+const output_1 = require("../output");
+function claudeWindowsCheck(log) {
+    const claudeWindowsCheck = checkWindowsClaudeOk();
+    if ('error' in claudeWindowsCheck) {
+        log.error(claudeWindowsCheck.error);
+        process.exit(1);
+    }
+}
+exports.claudeWindowsCheck = claudeWindowsCheck;
+function checkWindowsClaudeOk() {
+    if (process.platform !== 'win32')
+        return { success: true };
+    if (process.env.CLAUDE_CODE_GIT_BASH_PATH) {
+        if (pathExistsOnWindows(process.env.CLAUDE_CODE_GIT_BASH_PATH))
+            return { success: true };
+        return {
+            error: `环境变量 CLAUDE_CODE_GIT_BASH_PATH 指定的路径 "${process.env.CLAUDE_CODE_GIT_BASH_PATH}" 不存在，请检查`
+        };
+    }
+    let gitExecutablePath = resolveWindowsExecutablePath('git');
+    if (gitExecutablePath) {
+        let bashExeCandidate = path_1.win32.join(gitExecutablePath, '..', '..', 'bin', 'bash.exe');
+        if (pathExistsOnWindows(bashExeCandidate))
+            return { success: true };
+    }
+    return {
+        error: `Claude Code 在 Windows 上需要 git-bash (https://git-scm.com/downloads/win)。如果已安装但不在 PATH 中，请设置环境变量 CLAUDE_CODE_GIT_BASH_PATH 指向你的 bash.exe，类似：CLAUDE_CODE_GIT_BASH_PATH=C:\\Program Files\\Git\\bin\\bash.exe
+或者使用 WSL 运行。详情可阅读官方文档 ${(0, output_1.genClickableLink)('https://docs.anthropic.com/zh-CN/docs/claude-code/setup#windows-%E8%AE%BE%E7%BD%AE')}`
+    };
+}
+function pathExistsOnWindows(targetPath) {
+    try {
+        return (0, child_process_1.execSync)(`dir "${targetPath}"`, { stdio: 'pipe' });
+    }
+    catch (_a) {
+        return !1;
+    }
+}
+function resolveWindowsExecutablePath(executableName) {
+    if (executableName === 'git') {
+        let candidatePaths = [
+            'C:\\Program Files\\Git\\cmd\\git.exe',
+            'C:\\Program Files (x86)\\Git\\cmd\\git.exe'
+        ];
+        for (let candidatePath of candidatePaths)
+            if (pathExistsOnWindows(candidatePath))
+                return candidatePath;
+    }
+    try {
+        return ((0, child_process_1.execSync)(`where.exe ${executableName}`, { stdio: 'pipe', encoding: 'utf8' }).trim()
+            .split(`\r
+`)[0] || null);
+    }
+    catch (_a) {
+        return null;
+    }
+}

package/lib/utils/ai/const.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LIST_HINT = exports.getBooleanHint = exports.getDefaultModelByBaseUrl = exports.BASE_URL_MODEL_MAPPING = exports.getAgentConfigValidator = exports.getDefaultConfig = exports.CLOUDBASE_PROVIDERS = exports.AGENTS = exports.NONE = exports.AIDER = exports.CODEX = exports.QWEN = exports.CLAUDE = exports.DEFAULT_CONFIG = exports.CLOUDBASE_MCP_CONFIG_PATH = exports.CLAUDE_CODE_ROUTER_LOG_PATH = exports.CLAUDE_CODE_ROUTER_CONFIG_PATH = exports.ENV_LOCAL_PATH = exports.CONFIG_PATH = void 0;
+exports.LIST_HINT = exports.getBooleanHint = exports.getDefaultModelByBaseUrl = exports.BASE_URL_MODEL_MAPPING = exports.getAgentConfigValidator = exports.getDefaultConfig = exports.CLOUDBASE_PROVIDERS = exports.AGENTS = exports.NONE = exports.AIDER = exports.CODEX = exports.QWEN = exports.CLAUDE = exports.DEFAULT_CONFIG = exports.CLOUDBASE_MCP_CONFIG_PATH = exports.CLAUDE_CODE_ROUTER_LOGS_DIR_PATH = exports.CLAUDE_CODE_ROUTER_LOG_PATH = exports.CLAUDE_CODE_ROUTER_CONFIG_PATH = exports.ENV_LOCAL_PATH = exports.CONFIG_PATH = void 0;
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const v3_1 = __importDefault(require("zod/v3"));
@@ -11,6 +11,7 @@ exports.CONFIG_PATH = path_1.default.join(process.cwd(), 'cloudbaserc.json');
 exports.ENV_LOCAL_PATH = path_1.default.join(process.cwd(), '.env.local');
 exports.CLAUDE_CODE_ROUTER_CONFIG_PATH = path_1.default.join(os_1.default.homedir(), '.claude-code-router', 'config.json');
 exports.CLAUDE_CODE_ROUTER_LOG_PATH = path_1.default.join(os_1.default.homedir(), '.claude-code-router', 'claude-code-router.log');
+exports.CLAUDE_CODE_ROUTER_LOGS_DIR_PATH = path_1.default.join(os_1.default.homedir(), '.claude-code-router', 'logs');
 exports.CLOUDBASE_MCP_CONFIG_PATH = path_1.default.join(os_1.default.homedir(), '.cloudbase-env-id');
 exports.DEFAULT_CONFIG = `{
   "envId": "{{env.ENV_ID}}"
@@ -168,4 +169,4 @@ function getBooleanHint(defaultValue) {
     return `y 是${defaultValue === true ? '(留空默认)' : ''}; n 否${defaultValue === false ? '(留空默认)' : ''}; enter 确认`;
 }
 exports.getBooleanHint = getBooleanHint;
-exports.LIST_HINT = '使用上下键选择，输入 enter 确认选项';
+exports.LIST_HINT = '使用上下键选择，按下 Enter 键确认选项';

package/lib/utils/ai/ensureFiles.js

@@ -21,6 +21,7 @@ function ensureFiles() {
         if (!(yield fs_extra_1.default.exists(const_1.CONFIG_PATH))) {
             yield fs_extra_1.default.writeFile(const_1.CONFIG_PATH, const_1.DEFAULT_CONFIG);
         }
+        yield fs_extra_1.default.ensureDir(const_1.CLAUDE_CODE_ROUTER_LOGS_DIR_PATH);
     });
 }
 exports.ensureFiles = ensureFiles;

package/lib/utils/ai/env.js

@@ -0,0 +1,29 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensureValidEnv = void 0;
+const env_1 = require("../../env");
+const constants_1 = require("../../commands/constants");
+function ensureValidEnv(envId, log) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const envs = yield (0, env_1.listEnvs)({ source: [constants_1.EnvSource.MINIAPP, constants_1.EnvSource.QCLOUD] });
+        const validEnv = envs.find((env) => env.EnvId === envId);
+        if (!validEnv) {
+            log.error(`❌ 环境 ${envId} 与当前账号不匹配，请运行 tcb ai --setup 配置其他环境`);
+            process.exit(1);
+        }
+        if (validEnv.Status !== constants_1.EnvStatus.NORMAL) {
+            log.error(`❌ 环境 ${envId} 不可用，请运行 tcb ai --setup 配置其他环境 ${validEnv.Status}`);
+            process.exit(1);
+        }
+    });
+}
+exports.ensureValidEnv = ensureValidEnv;

package/lib/utils/ai/router.js

@@ -52,68 +52,50 @@ const const_1 = require("./const");
 const utils_1 = require("../../commands/utils");
 const auth_1 = require("../../auth");
 const nodeVersion_1 = require("./nodeVersion");
+const claudeWindows_1 = require("./claudeWindows");
+const env_1 = require("./env");
 const IDE_FILE_MAPPINGS = {
-    "cursor": [
-        ".cursor/rules/cloudbase-rules.mdc",
-        ".cursor/mcp.json"
+    cursor: [
+        { path: '.cursor/rules/cloudbase-rules.mdc' },
+        { path: '.cursor/mcp.json', isMcpConfig: true }
     ],
-    "windsurf": [
-        ".windsurf/rules/cloudbase-rules.md"
+    windsurf: [{ path: '.windsurf/rules/cloudbase-rules.md' }],
+    codebuddy: [{ path: '.rules/cloudbase-rules.md' }],
+    'claude-code': [{ path: 'CLAUDE.md' }, { path: '.mcp.json', isMcpConfig: true }],
+    cline: [{ path: '.clinerules/cloudbase-rules.mdc' }],
+    'gemini-cli': [
+        { path: '.gemini/GEMINI.md' },
+        { path: '.gemini/settings.json', isMcpConfig: true }
     ],
-    "codebuddy": [
-        ".rules/cloudbase-rules.md"
+    opencode: [{ path: '.opencode.json', isMcpConfig: true }],
+    'qwen-code': [{ path: '.qwen/QWEN.md' }, { path: '.qwen/settings.json', isMcpConfig: true }],
+    'baidu-comate': [
+        { path: '.comate/rules/cloudbase-rules.mdr' },
+        { path: '.comate/rules/cloudbaase-rules.mdr' },
+        { path: '.comate/mcp.json', isMcpConfig: true }
     ],
-    "claude-code": [
-        "CLAUDE.md",
-        ".mcp.json"
+    'openai-codex-cli': [{ path: '.codex/config.toml', isMcpConfig: true }, { path: 'AGENTS.md' }],
+    'augment-code': [{ path: '.augment-guidelines' }],
+    'github-copilot': [{ path: '.github/copilot-instructions.md' }],
+    roocode: [
+        { path: '.roo/rules/cloudbaase-rules.md' },
+        { path: '.roo/mcp.json', isMcpConfig: true }
     ],
-    "cline": [
-        ".clinerules/cloudbase-rules.mdc"
-    ],
-    "gemini-cli": [
-        ".gemini/GEMINI.md",
-        ".gemini/settings.json"
-    ],
-    "opencode": [
-        ".opencode.json"
-    ],
-    "qwen-code": [
-        ".qwen/QWEN.md",
-        ".qwen/settings.json"
-    ],
-    "baidu-comate": [
-        ".comate/rules/cloudbase-rules.mdr",
-        ".comate/rules/cloudbaase-rules.mdr",
-        ".comate/mcp.json"
-    ],
-    "openai-codex-cli": [
-        ".codex/config.toml",
-        "AGENTS.md",
-    ],
-    "augment-code": [
-        ".augment-guidelines"
-    ],
-    "github-copilot": [
-        ".github/copilot-instructions.md"
-    ],
-    "roocode": [
-        ".roo/rules/cloudbaase-rules.md",
-        ".roo/mcp.json"
-    ],
-    "tongyi-lingma": [
-        ".lingma/rules/cloudbaase-rules.md"
-    ],
-    "trae": [
-        ".trae/rules/cloudbase-rules.md"
-    ],
-    "vscode": [
-        ".vscode/mcp.json",
-        ".vscode/settings.json"
-    ],
-    "aider": [
-        "mcp.json"
-    ]
+    'tongyi-lingma': [{ path: '.lingma/rules/cloudbaase-rules.md' }],
+    trae: [{ path: '.trae/rules/cloudbase-rules.md' }],
+    vscode: [{ path: '.vscode/mcp.json', isMcpConfig: true }, { path: '.vscode/settings.json' }],
+    aider: [{ path: 'mcp.json', isMcpConfig: true }]
 };
+const MCP_CONFIG_SET = new Set(Object.values(IDE_FILE_MAPPINGS).reduce((acc, descriptors) => {
+    for (const d of descriptors) {
+        if (d.isMcpConfig)
+            acc.push(d.path);
+    }
+    return acc;
+}, []));
+function inferConfigFormat(filePath) {
+    return filePath.toLowerCase().endsWith('.toml') ? 'toml' : 'json';
+}
 class AICommandRouter {
     constructor() {
         this.configManager = new config_1.AIConfigManager();
@@ -183,21 +165,8 @@ class AICommandRouter {
                 if (templateType === 'none') {
                     return;
                 }
-                const shouldCheckOverwrite = yield this.shouldCheckOverwrite(templateType);
-                let overwrite = false;
-                if (shouldCheckOverwrite) {
-                    const { confirmOverwrite } = yield inquirer_1.default.prompt([
-                        {
-                            type: 'confirm',
-                            name: 'confirmOverwrite',
-                            message: `检测到已存在文件，是否覆盖？ ${(0, const_1.getBooleanHint)(false)}`,
-                            default: false
-                        }
-                    ]);
-                    overwrite = confirmOverwrite;
-                }
                 log.info(`📦 正在下载并解压 ${templateType} 模板...`);
-                yield this.downloadAndExtractTemplate(templateType, overwrite, log);
+                yield this.downloadAndExtractTemplate(templateType, log);
                 log.info(`✅ ${templateType} 模板配置完成`);
             }
             catch (error) {
@@ -206,7 +175,7 @@ class AICommandRouter {
             }
         });
     }
-    downloadAndExtractTemplate(templateType, overwrite, log) {
+    downloadAndExtractTemplate(templateType, log) {
         var _a, e_1, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             const fs = yield Promise.resolve().then(() => __importStar(require('fs-extra')));
@@ -277,6 +246,15 @@ class AICommandRouter {
                             entry.autodrain();
                             continue;
                         }
+                        if (MCP_CONFIG_SET.has(entryPath)) {
+                            try {
+                                yield this.mergeMcpConfig(entry, destPath, inferConfigFormat(entryPath), log);
+                            }
+                            catch (e) {
+                                log.warn(`MCP 配置合并失败 ${entryPath}：${e.message}，已跳过`);
+                            }
+                            continue;
+                        }
                         if (entryPath === 'cloudbaserc.json' && (yield fs.pathExists(destPath))) {
                             try {
                                 const templateContent = yield entry.buffer();
@@ -306,9 +284,19 @@ class AICommandRouter {
                             }
                             continue;
                         }
-                        if (!overwrite && (yield fs.pathExists(destPath))) {
-                            entry.autodrain();
-                            continue;
+                        if (yield fs.pathExists(destPath)) {
+                            const { confirmOverwriteFile } = yield inquirer_1.default.prompt([
+                                {
+                                    type: 'confirm',
+                                    name: 'confirmOverwriteFile',
+                                    message: `检测到已存在文件 ${entryPath}，是否覆盖？ ${(0, const_1.getBooleanHint)(false)}`,
+                                    default: false
+                                }
+                            ]);
+                            if (!confirmOverwriteFile) {
+                                entry.autodrain();
+                                continue;
+                            }
                         }
                         yield fs.ensureDir(path.dirname(destPath));
                         yield new Promise((res, rej) => {
@@ -365,12 +353,6 @@ class AICommandRouter {
                 return { success: false, message: `# 请查阅 ${agent} 的官方安装文档` };
         }
     }
-    shouldCheckOverwrite(templateType) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const fs = yield Promise.resolve().then(() => __importStar(require('fs-extra')));
-            return (yield fs.pathExists('.mcp.json')) || (yield fs.pathExists('CLAUDE.md'));
-        });
-    }
     executeCommand(command, args, env, log) {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => {
@@ -452,14 +434,20 @@ class AICommandRouter {
         return __awaiter(this, void 0, void 0, function* () {
             switch (agent) {
                 case const_1.CLAUDE.value:
-                    if (agentConfig.type === 'cloudbase') {
-                        return yield this.executeClaudeCloudbaseAgent(agentConfig, additionalArgs, log);
-                    }
-                    else if (agentConfig.type === 'custom') {
-                        return yield this.executeClaudeAgent(agentConfig, additionalArgs, log);
+                    try {
+                        if (agentConfig.type === 'cloudbase') {
+                            return yield this.executeClaudeCloudbaseAgent(agentConfig, additionalArgs, log);
+                        }
+                        else if (agentConfig.type === 'custom') {
+                            return yield this.executeClaudeAgent(agentConfig, additionalArgs, log);
+                        }
+                        else {
+                            return yield this.executeNoneClaudeAgent(additionalArgs, log);
+                        }
                     }
-                    else {
-                        return yield this.executeNoneClaudeAgent(additionalArgs, log);
+                    catch (_) {
+                        (0, claudeWindows_1.claudeWindowsCheck)(log);
+                        return process.exit(1);
                     }
                 case const_1.QWEN.value:
                     if (agentConfig.type === 'cloudbase') {
@@ -526,6 +514,7 @@ class AICommandRouter {
             const envId = yield (0, config_1.createConfigParser)().get('envId');
             yield (0, auth_1.checkLogin)();
             const credential = yield (0, utils_1.getCredential)({}, {});
+            yield (0, env_1.ensureValidEnv)(envId, log);
             const accessToken = yield (0, utils_1.rawFetchAccessToken)({
                 envId,
                 secretId: credential.secretId,
@@ -605,6 +594,7 @@ class AICommandRouter {
             const envId = yield (0, config_1.createConfigParser)().get('envId');
             yield (0, auth_1.checkLogin)();
             const credential = yield (0, utils_1.getCredential)({}, {});
+            yield (0, env_1.ensureValidEnv)(envId, log);
             const accessToken = yield (0, utils_1.rawFetchAccessToken)({
                 envId,
                 secretId: credential.secretId,
@@ -802,6 +792,7 @@ class AICommandRouter {
             const envId = yield (0, config_1.createConfigParser)().get('envId');
             yield (0, auth_1.checkLogin)();
             const credential = yield (0, utils_1.getCredential)({}, {});
+            yield (0, env_1.ensureValidEnv)(envId, log);
             const accessToken = yield (0, utils_1.rawFetchAccessToken)({
                 envId,
                 secretId: credential.secretId,
@@ -870,6 +861,7 @@ class AICommandRouter {
             const envId = yield (0, config_1.createConfigParser)().get('envId');
             yield (0, auth_1.checkLogin)();
             const credential = yield (0, utils_1.getCredential)({}, {});
+            yield (0, env_1.ensureValidEnv)(envId, log);
             const accessToken = yield (0, utils_1.rawFetchAccessToken)({
                 envId,
                 secretId: credential.secretId,
@@ -924,14 +916,17 @@ class AICommandRouter {
             const path = yield Promise.resolve().then(() => __importStar(require('path')));
             try {
                 log.info('🔧 正在修改 MCP 配置文件...');
-                for (const [ide, files] of Object.entries(IDE_FILE_MAPPINGS)) {
-                    for (const file of files) {
-                        const filePath = path.join(extractDir, file);
+                for (const [, files] of Object.entries(IDE_FILE_MAPPINGS)) {
+                    for (const descriptor of files) {
+                        if (!descriptor.isMcpConfig)
+                            continue;
+                        const filePath = path.join(extractDir, descriptor.path);
                         if (yield fs.pathExists(filePath)) {
-                            if (file.endsWith('.json')) {
+                            const format = inferConfigFormat(descriptor.path);
+                            if (format === 'json') {
                                 yield this.modifyMCPJsonFile(filePath, log);
                             }
-                            else if (file.endsWith('.toml')) {
+                            else if (format === 'toml') {
                                 yield this.modifyMCPTomlFile(filePath, log);
                             }
                         }
@@ -956,12 +951,13 @@ class AICommandRouter {
                         return obj;
                     }
                     if (Array.isArray(obj)) {
-                        return obj.map(item => modifyCommands(item));
+                        return obj.map((item) => modifyCommands(item));
                     }
                     const result = Object.assign({}, obj);
                     if (result.command === 'npx' && Array.isArray(result.args)) {
                         const argsStr = result.args.join(' ');
-                        if (argsStr.includes('npm-global-exec@latest') && argsStr.includes('@cloudbase/cloudbase-mcp@latest')) {
+                        if (argsStr.includes('npm-global-exec@latest') &&
+                            argsStr.includes('@cloudbase/cloudbase-mcp@latest')) {
                             result.command = 'cloudbase-mcp';
                             result.args = [];
                             result.env = {
@@ -990,7 +986,7 @@ class AICommandRouter {
     modifyMCPTomlFile(filePath, log) {
         return __awaiter(this, void 0, void 0, function* () {
             const fs = yield Promise.resolve().then(() => __importStar(require('fs-extra')));
-            const toml = require('toml');
+            const toml = yield Promise.resolve().then(() => __importStar(require('toml')));
             try {
                 const content = yield fs.readFile(filePath, 'utf-8');
                 const config = toml.parse(content);
@@ -1000,7 +996,7 @@ class AICommandRouter {
                         return obj;
                     }
                     if (Array.isArray(obj)) {
-                        return obj.map(item => modifyCommands(item));
+                        return obj.map((item) => modifyCommands(item));
                     }
                     const result = Object.assign({}, obj);
                     if (result.command === 'npx' && Array.isArray(result.args)) {
@@ -1032,6 +1028,53 @@ class AICommandRouter {
             }
         });
     }
+    mergeMcpConfig(entry, destPath, format, log) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const fs = yield Promise.resolve().then(() => __importStar(require('fs-extra')));
+            const path = yield Promise.resolve().then(() => __importStar(require('path')));
+            const incomingStr = (yield entry.buffer()).toString('utf8');
+            const deepMerge = (target, source) => {
+                if (typeof target !== 'object' || typeof source !== 'object' || !target || !source) {
+                    return target;
+                }
+                const result = Array.isArray(target) ? [...target] : Object.assign(Object.assign({}, source), target);
+                for (const key of Object.keys(source)) {
+                    if (key in target &&
+                        typeof target[key] === 'object' &&
+                        typeof source[key] === 'object') {
+                        result[key] = deepMerge(target[key], source[key]);
+                    }
+                }
+                return result;
+            };
+            yield fs.ensureDir(path.dirname(destPath));
+            if (format === 'json') {
+                const incomingObj = JSON.parse(incomingStr);
+                if (yield fs.pathExists(destPath)) {
+                    const existingObj = yield fs.readJson(destPath);
+                    const merged = deepMerge(existingObj, incomingObj);
+                    yield fs.writeJson(destPath, merged, { spaces: 2 });
+                }
+                else {
+                    yield fs.writeJson(destPath, incomingObj, { spaces: 2 });
+                }
+                return;
+            }
+            const toml = yield Promise.resolve().then(() => __importStar(require('toml')));
+            const incomingObj = toml.parse(incomingStr);
+            if (yield fs.pathExists(destPath)) {
+                const existingStr = yield fs.readFile(destPath, 'utf-8');
+                const existingObj = toml.parse(existingStr);
+                const merged = deepMerge(existingObj, incomingObj);
+                const out = this.objectToToml(merged);
+                yield fs.writeFile(destPath, out, 'utf-8');
+            }
+            else {
+                const out = this.objectToToml(incomingObj);
+                yield fs.writeFile(destPath, out, 'utf-8');
+            }
+        });
+    }
     objectToToml(obj, prefix = '') {
         const lines = [];
         for (const [key, value] of Object.entries(obj)) {
@@ -1041,12 +1084,14 @@ class AICommandRouter {
                 lines.push(this.objectToToml(value, fullKey));
             }
             else if (Array.isArray(value)) {
-                const arrayStr = value.map(item => {
+                const arrayStr = value
+                    .map((item) => {
                     if (typeof item === 'string') {
                         return `"${item}"`;
                     }
                     return item;
-                }).join(', ');
+                })
+                    .join(', ');
                 lines.push(`${key} = [${arrayStr}]`);
             }
             else if (typeof value === 'string') {

package/lib/utils/ai/setup.js

@@ -229,7 +229,7 @@ class AISetupWizard {
                     choices: [
                         { name: '使用 CloudBase 服务，一键登录，无需配置', value: 'cloudbase' },
                         { name: '自配置 API KEY 和 Base URL', value: 'custom' },
-                        { name: '暂不配置，使用 AI CLI 内置鉴权方式（如 OAuth）', value: 'none' }
+                        { name: '暂不配置，使用 Claude Code 内置鉴权方式（如 OAuth）', value: 'none' }
                     ],
                     default: 'cloudbase'
                 }
@@ -296,7 +296,7 @@ class AISetupWizard {
                     choices: [
                         { name: '使用 CloudBase 服务，一键登录，无需配置', value: 'cloudbase' },
                         { name: '自配置 API KEY 和 Base URL', value: 'custom' },
-                        { name: '暂不配置，使用 AI CLI 内置鉴权方式（如 OAuth）', value: 'none' }
+                        { name: '暂不配置，使用 Qwen Code 内置鉴权方式（如 OAuth）', value: 'none' }
                     ],
                     default: 'cloudbase'
                 }
@@ -348,7 +348,7 @@ class AISetupWizard {
                     choices: [
                         { name: '使用 CloudBase 服务，一键登录，无需配置', value: 'cloudbase' },
                         { name: '自配置 API KEY 和 Base URL', value: 'custom' },
-                        { name: '暂不配置，使用 AI CLI 内置鉴权方式（如 OAuth）', value: 'none' }
+                        { name: '暂不配置，使用 OpenAI Codex 内置鉴权方式（如 OAuth）', value: 'none' }
                     ],
                     default: 'cloudbase'
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/cli",
-    "version": "2.8.2-beta.1",
+    "version": "2.8.2-beta.3",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {

package/types/utils/ai/claudeWindows.d.ts

@@ -0,0 +1,2 @@
+import { Logger } from '../log';
+export declare function claudeWindowsCheck(log: Logger): void;

package/types/utils/ai/const.d.ts

@@ -3,6 +3,7 @@ export declare const CONFIG_PATH: string;
 export declare const ENV_LOCAL_PATH: string;
 export declare const CLAUDE_CODE_ROUTER_CONFIG_PATH: string;
 export declare const CLAUDE_CODE_ROUTER_LOG_PATH: string;
+export declare const CLAUDE_CODE_ROUTER_LOGS_DIR_PATH: string;
 export declare const CLOUDBASE_MCP_CONFIG_PATH: string;
 export declare const DEFAULT_CONFIG = "{\n  \"envId\": \"{{env.ENV_ID}}\"\n}";
 export declare const CLAUDE: {
@@ -328,4 +329,4 @@ export declare const BASE_URL_MODEL_MAPPING: {
 };
 export declare function getDefaultModelByBaseUrl(baseUrl: string): string;
 export declare function getBooleanHint(defaultValue?: boolean): string;
-export declare const LIST_HINT = "\u4F7F\u7528\u4E0A\u4E0B\u952E\u9009\u62E9\uFF0C\u8F93\u5165 enter \u786E\u8BA4\u9009\u9879";
+export declare const LIST_HINT = "\u4F7F\u7528\u4E0A\u4E0B\u952E\u9009\u62E9\uFF0C\u6309\u4E0B Enter \u952E\u786E\u8BA4\u9009\u9879";

package/types/utils/ai/env.d.ts

@@ -0,0 +1,2 @@
+import { Logger } from '../log';
+export declare function ensureValidEnv(envId: string, log: Logger): Promise<void>;

package/types/utils/ai/router.d.ts

@@ -13,7 +13,6 @@ export declare class AICommandRouter {
     private downloadTemplate;
     private downloadAndExtractTemplate;
     private getInstallCommand;
-    private shouldCheckOverwrite;
     private executeCommand;
     private isToolAvailable;
     private validateAgentConfig;
@@ -41,6 +40,7 @@ export declare class AICommandRouter {
     private modifyMCPConfigs;
     private modifyMCPJsonFile;
     private modifyMCPTomlFile;
+    private mergeMcpConfig;
     private objectToToml;
 }
 export {};