@cloudbase/cli 2.9.10 → 2.9.12

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/i18n/index.js

@@ -4,19 +4,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isIntl = exports.getLanguage = exports.t = void 0;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
 const os_locale_1 = __importDefault(require("os-locale"));
 const db_1 = require("../utils/store/db");
+const locales_1 = require("../../locales");
 let i18n;
+const LANG_DATA = {
+    zh: locales_1.zh,
+    en: locales_1.en
+};
 const configDB = (0, db_1.getSyncDB)('config');
 const AVAILABLE_LANGS = ['zh', 'en'];
 class I18n {
     constructor() {
         this.lang = getLanguage();
+        this.mapping = locales_1.mappingData;
         if (this.lang !== 'zh') {
-            this.loadLanguage();
-            this.loadMapping();
+            this.data = LANG_DATA[this.lang];
         }
     }
     t(key, options) {
@@ -29,11 +32,6 @@ class I18n {
         }
         return key;
     }
-    loadLanguage() {
-        const langPath = path_1.default.resolve(I18n.langDir, `${this.lang}.json`);
-        const langData = fs_1.default.readFileSync(langPath, 'utf-8');
-        this.data = JSON.parse(langData);
-    }
     replaceVars(str, vars) {
         let result = str;
         if (!vars) {
@@ -44,13 +42,7 @@ class I18n {
         });
         return result;
     }
-    loadMapping() {
-        const mappingPath = path_1.default.resolve(__dirname, '../../locales/mapping.json');
-        const mappingStr = fs_1.default.readFileSync(mappingPath, 'utf-8');
-        this.mapping = JSON.parse(mappingStr);
-    }
 }
-I18n.langDir = path_1.default.resolve(__dirname, '../../locales/langs');
 function t(key, options) {
     if (!i18n) {
         i18n = new I18n();

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/locales/index.js

@@ -0,0 +1,9 @@
+import en from './langs/en.json' with { type: 'json' }
+import zh from './langs/zh.json' with { type: 'json' }
+import mappingData from './mapping.json' with { type: 'json' }
+
+export { 
+    en, 
+    zh,
+    mappingData,
+}

package/package.json

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

package/tsconfig.json

@@ -12,7 +12,8 @@
         "declarationDir": "./types",
         "experimentalDecorators": true,
         "emitDecoratorMetadata": true,
-        "newLine": "LF"
+        "newLine": "LF",
+        "resolveJsonModule": true
     },
     "include": ["src/**/*"],
     "exclude": ["node_modules", "test"]

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;