@cloudbase/cli 2.9.10-beta.0 → 2.9.11

package/lib/commands/ai/index.js

@@ -65,6 +65,10 @@ let AICommand = class AICommand extends common_1.Command {
                 {
                     flags: '--template <template>',
                     desc: (0, i18n_1.t)('指定模板类型 (miniprogram, react, vue, uniapp, rules)')
+                },
+                {
+                    flags: '-y, --yes',
+                    desc: (0, i18n_1.t)('自动设置默认模板规则')
                 }
             ],
             desc: (0, i18n_1.t)('CloudBase AI ToolKit CLI - 快速启动和配置主流 AI 编程工具\n\n示例：\n  tcb ai -a claude -- --continue\n  tcb ai -a codebuddy -- mcp list\n\n说明：-- 后的参数会直接传递给目标 AI CLI。'),
@@ -76,7 +80,7 @@ let AICommand = class AICommand extends common_1.Command {
     execute(options, ctx, log) {
         return __awaiter(this, void 0, void 0, function* () {
             yield (0, ensureFiles_1.ensureFiles)();
-            const { envId, setup, config, reset, template } = options;
+            const { envId, setup, config, reset, template, yes: useDefaultConfig } = options;
             let { agent } = options;
             try {
                 yield (0, banner_1.showBanner)(log);
@@ -104,7 +108,8 @@ let AICommand = class AICommand extends common_1.Command {
                     log,
                     agent: agent || (yield configManager.loadConfig()).defaultAgent,
                     envId,
-                    template
+                    template,
+                    useDefaultConfig
                 });
             }
             catch (error) {

package/lib/commands/cloudrun/base.js

@@ -532,6 +532,11 @@ let CloudRunDeployCommand = class CloudRunDeployCommand extends common_1.Command
                     flags: '--force',
                     desc: (0, i18n_1.t)('强制部署，跳过所有确认提示'),
                     defaultValue: false
+                },
+                {
+                    flags: '--installDependency <installDependency>',
+                    desc: '在线安装依赖',
+                    defaultValue: true
                 }
             ],
             requiredEnvId: false,
@@ -542,7 +547,7 @@ let CloudRunDeployCommand = class CloudRunDeployCommand extends common_1.Command
     execute(ctx, envId, log, options) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            let { serviceName, source, force, port, createAgent } = options;
+            let { serviceName, source, force, port, createAgent, installDependency = true } = options;
             const targetDir = path_1.default.resolve(source || process.cwd());
             if (!envId) {
                 const envConfig = (0, camelcase_keys_1.default)(yield iac_core_1.utils.loadEnv(targetDir));
@@ -660,7 +665,7 @@ let CloudRunDeployCommand = class CloudRunDeployCommand extends common_1.Command
                         yield cloudrunService.deploy({
                             serverName: serviceName,
                             targetPath: targetDir,
-                            serverConfig: Object.assign({}, (port ? { Port: Number(port) } : {}))
+                            serverConfig: Object.assign(Object.assign({}, (port ? { Port: Number(port) } : {})), { InstallDependency: installDependency !== 'false' })
                         });
                         utils_2.trackCallback === null || utils_2.trackCallback === void 0 ? void 0 : (0, utils_2.trackCallback)({
                             details: (0, i18n_1.t)('提交{{serverType}} {{serviceName}} 已完成！', { serverType: ResourceTitle[serverType], serviceName }),
@@ -719,6 +724,7 @@ let CloudRunDeployCommand = class CloudRunDeployCommand extends common_1.Command
                                 details: `${e.message}`,
                                 originalError: e
                             }, log);
+                            throw e;
                         }
                     }
                 });

package/lib/commands/config/interface.js

@@ -1,4 +1,5 @@
 "use strict";
+var _a, _b;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_CONFIGS = exports.CONFIGS = void 0;
 const i18n_1 = require("../../i18n");
@@ -6,14 +7,14 @@ exports.CONFIGS = {
     isIntl: {
         key: 'isIntl',
         type: 'boolean',
-        value: false,
+        value: ((_a = process.env.TCB_IS_INTL) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === 'true',
         description: (0, i18n_1.t)('是否使用国际站'),
         envKey: 'TCB_IS_INTL'
     },
     lang: {
         key: 'lang',
         type: 'string',
-        value: 'zh',
+        value: process.env.TCB_LANG || ((_b = process.env.LANG) === null || _b === void 0 ? void 0 : _b.startsWith('zh')) ? 'zh' : 'en',
         description: (0, i18n_1.t)('语言，可用值：zh(中文), en(English)'),
         envKey: 'TCB_LANG'
     }

package/lib/utils/ai/router.js

@@ -103,7 +103,7 @@ class AICommandRouter {
     constructor() {
         this.configManager = new config_1.AIConfigManager();
     }
-    execute({ agent, addtionalArgs, log, template }) {
+    execute({ agent, addtionalArgs, log, template, useDefaultConfig }) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if ((0, config_1.isValidAgent)(agent) !== true) {
@@ -123,7 +123,7 @@ class AICommandRouter {
             }
             log.info((0, i18n_1.t)('🚀 启动 {{agent}} AI CLI 工具', { agent: chalk_1.default.bold(agentUpperCased) }));
             try {
-                yield this.checkToolkitConfig(agent, log, template);
+                yield this.checkToolkitConfig({ agent, log, template, useDefaultConfig });
             }
             catch (e) {
                 log.warn((0, i18n_1.t)('⚠️ 云开发功能检查失败，但 AI 工具仍可正常使用'));
@@ -136,8 +136,9 @@ class AICommandRouter {
             this.executeAgentWithConfig(agent, agentConfig, this.parseArgs(addtionalArgs), log);
         });
     }
-    checkToolkitConfig(agent, log, template) {
+    checkToolkitConfig(checkOptions) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { agent, log, template, useDefaultConfig } = checkOptions;
             const { missingFiles } = yield this.configManager.checkToolkitConfig(agent);
             if (missingFiles.length > 0) {
                 const skipTemplate = yield this.checkSkipTemplateConfig();
@@ -146,7 +147,7 @@ class AICommandRouter {
                     return;
                 }
                 log.log('');
-                yield this.downloadTemplate(log, template);
+                yield this.downloadTemplate({ log, template, agent, useDefaultConfig });
                 log.log('');
             }
         });
@@ -176,31 +177,37 @@ class AICommandRouter {
             }
         });
     }
-    downloadTemplate(log, template) {
+    downloadTemplate(options) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { log, template, agent, useDefaultConfig } = options;
             try {
                 let templateType;
                 if (template) {
                     templateType = template;
                 }
                 else {
-                    const { templateType: selectedType } = yield inquirer_1.default.prompt([
-                        {
-                            type: 'list',
-                            name: 'templateType',
-                            message: (0, i18n_1.t)('下载模板以获取完整的开发体验: {{hint}}', { hint: const_1.LIST_HINT }),
-                            choices: [
-                                { name: (0, i18n_1.t)('🟦 微信小程序 + CloudBase'), value: 'miniprogram' },
-                                { name: (0, i18n_1.t)('🚀 Web 应用 - React + CloudBase'), value: 'react' },
-                                { name: (0, i18n_1.t)('🟢 Web 应用 - Vue + CloudBase'), value: 'vue' },
-                                { name: (0, i18n_1.t)('🌈 跨端应用 - UniApp + CloudBase'), value: 'uniapp' },
-                                { name: (0, i18n_1.t)('🧩 只下载 AI 规则和配置'), value: 'rules' },
-                                { name: (0, i18n_1.t)('🚫 不下载模板'), value: 'none' }
-                            ],
-                            default: 'miniprogram'
-                        }
-                    ]);
-                    templateType = selectedType;
+                    if (useDefaultConfig) {
+                        templateType = 'rules';
+                    }
+                    else {
+                        const { templateType: selectedType } = yield inquirer_1.default.prompt([
+                            {
+                                type: 'list',
+                                name: 'templateType',
+                                message: (0, i18n_1.t)('下载模板以获取完整的开发体验: {{hint}}', { hint: const_1.LIST_HINT }),
+                                choices: [
+                                    { name: (0, i18n_1.t)('🟦 微信小程序 + CloudBase'), value: 'miniprogram' },
+                                    { name: (0, i18n_1.t)('🚀 Web 应用 - React + CloudBase'), value: 'react' },
+                                    { name: (0, i18n_1.t)('🟢 Web 应用 - Vue + CloudBase'), value: 'vue' },
+                                    { name: (0, i18n_1.t)('🌈 跨端应用 - UniApp + CloudBase'), value: 'uniapp' },
+                                    { name: (0, i18n_1.t)('🧩 只下载 AI 规则和配置'), value: 'rules' },
+                                    { name: (0, i18n_1.t)('🚫 不下载模板'), value: 'none' }
+                                ],
+                                default: 'miniprogram'
+                            }
+                        ]);
+                        templateType = selectedType;
+                    }
                 }
                 if (templateType === 'none') {
                     log.info((0, i18n_1.t)('🚫 跳过模板下载'));
@@ -208,7 +215,7 @@ class AICommandRouter {
                     return;
                 }
                 log.info((0, i18n_1.t)('📦 正在下载并解压 {{templateType}} 模板...', { templateType }));
-                yield this.downloadAndExtractTemplate(templateType, log);
+                yield this.downloadAndExtractTemplate({ templateType, log, agent: agent, useDefaultConfig: useDefaultConfig || false });
                 log.info((0, i18n_1.t)('✅ {{templateType}} 模板配置完成', { templateType }));
             }
             catch (error) {
@@ -217,7 +224,7 @@ class AICommandRouter {
             }
         });
     }
-    downloadAndExtractTemplate(templateType, log) {
+    downloadAndExtractTemplate(options) {
         var _a, e_1, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             const fs = yield Promise.resolve().then(() => __importStar(require('fs-extra')));
@@ -226,6 +233,7 @@ class AICommandRouter {
             const unzipper = yield Promise.resolve().then(() => __importStar(require('unzipper')));
             const https = yield Promise.resolve().then(() => __importStar(require('https')));
             let ConfigParser;
+            const { templateType, log, agent, useDefaultConfig } = options;
             try {
                 ConfigParser = (yield Promise.resolve().then(() => __importStar(require('@cloudbase/toolbox')))).ConfigParser;
             }
@@ -275,6 +283,7 @@ class AICommandRouter {
             });
             const extractDir = process.cwd();
             const zipStream = fs.createReadStream(zipPath).pipe(unzipper.Parse({ forceStream: true }));
+            const agentDirs = ['.claude', '.codex', '.qwen', '.codebuddy', '.cursor'];
             try {
                 for (var _e = true, _f = __asyncValues(zipStream), _g; _g = yield _f.next(), _a = _g.done, !_a;) {
                     _c = _g.value;
@@ -283,6 +292,15 @@ class AICommandRouter {
                         const entry = _c;
                         const entryPath = entry.path;
                         const destPath = path.join(extractDir, entryPath);
+                        if (useDefaultConfig && agent) {
+                            const currentAgentDir = `.${agent}`;
+                            const isAgentDir = agentDirs.some(dir => entryPath.startsWith(dir + '/') || entryPath === dir);
+                            if (isAgentDir && !entryPath.startsWith(currentAgentDir + '/') && entryPath !== currentAgentDir) {
+                                log.debug && log.debug((0, i18n_1.t)('跳过不匹配的 agent 目录: {{entryPath}} (当前 agent: {{agent}})', { entryPath, agent }));
+                                entry.autodrain();
+                                continue;
+                            }
+                        }
                         if (entry.type === 'Directory') {
                             yield fs.ensureDir(destPath);
                             entry.autodrain();
@@ -327,6 +345,10 @@ class AICommandRouter {
                             continue;
                         }
                         if (yield fs.pathExists(destPath)) {
+                            if (useDefaultConfig) {
+                                entry.autodrain();
+                                continue;
+                            }
                             const { confirmOverwriteFile } = yield inquirer_1.default.prompt([
                                 {
                                     type: 'confirm',

package/lib/utils/store/db.js

@@ -55,10 +55,11 @@ class LocalStore {
         return db;
     }
     get(key) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const defaultValue = this.defaults[key];
             const db = yield this.getDB();
-            return db.get(key).value() || defaultValue;
+            return (_a = db.get(key).value()) !== null && _a !== void 0 ? _a : defaultValue;
         });
     }
     set(key, value) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/cli",
-    "version": "2.9.10-beta.0",
+    "version": "2.9.11",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {
@@ -55,7 +55,7 @@
         "@cloudbase/functions-framework": "1.16.0",
         "@cloudbase/iac-core": "0.0.3-alpha.11",
         "@cloudbase/lowcode-cli": "^0.22.2",
-        "@cloudbase/manager-node": "4.6.4",
+        "@cloudbase/manager-node": "4.6.5",
         "@cloudbase/toolbox": "^0.7.9",
         "@dotenvx/dotenvx": "^1.48.3",
         "@musistudio/claude-code-router": "1.0.36",

package/types/commands/cloudrun/base.d.ts

@@ -138,6 +138,7 @@ export declare class CloudRunDeployCommand extends Command {
         force?: boolean;
         port?: number;
         createAgent?: boolean;
+        installDependency?: string;
     }): Promise<void>;
 }
 export declare class CloudRunRunCommand extends Command {

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

@@ -5,11 +5,12 @@ interface IExecute {
     addtionalArgs: string[];
     log: Logger;
     template?: string;
+    useDefaultConfig?: boolean;
 }
 export declare class AICommandRouter {
     private configManager;
     constructor();
-    execute({ agent, addtionalArgs, log, template }: IExecute): Promise<void>;
+    execute({ agent, addtionalArgs, log, template, useDefaultConfig }: IExecute): Promise<void>;
     private checkToolkitConfig;
     private checkSkipTemplateConfig;
     private saveSkipTemplateConfig;