@cloudbase/cli 2.12.5 → 2.12.7

package/dist/standalone/cli.js

@@ -2447,6 +2447,80 @@ function* pattern(...rest) {
 }
 //# sourceMappingURL=exec.js.map
 
+/***/ }),
+
+/***/ 325:
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.validateImageDeploy = exports.resolveFuncPathWithConfig = exports.resolveFunctionName = exports.resolveAndValidateFunctionDir = void 0;
+const path_1 = __importDefault(__webpack_require__(16928));
+const error_1 = __webpack_require__(66759);
+const i18n_1 = __webpack_require__(69258);
+const utils_1 = __webpack_require__(82079);
+function resolveAndValidateFunctionDir(options) {
+    const { dir, defaultDir, action, log } = options;
+    let targetDir = defaultDir;
+    if (dir) {
+        (0, utils_1.checkFullAccess)(dir, true);
+        if (!(0, utils_1.isDirectory)(dir)) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('--dir 参数必须指定为云函数的文件夹路径'));
+        }
+        targetDir = path_1.default.resolve(defaultDir, dir);
+        log === null || log === void 0 ? void 0 : log.info((0, i18n_1.t)(`将从目录 {{dir}} ${action}云函数`, { dir: targetDir }));
+    }
+    else {
+        log === null || log === void 0 ? void 0 : log.info((0, i18n_1.t)(`未找到配置文件，将从当前目录${action}云函数`));
+    }
+    return targetDir;
+}
+exports.resolveAndValidateFunctionDir = resolveAndValidateFunctionDir;
+function resolveFunctionName(name, deployDir) {
+    return name || path_1.default.basename(deployDir);
+}
+exports.resolveFunctionName = resolveFunctionName;
+function resolveFuncPathWithConfig(options) {
+    const { dir, funcDir, functionRootPath, name, deployMode, log } = options;
+    if (deployMode === 'image') {
+        return '';
+    }
+    let funcPath = '';
+    if (dir) {
+        (0, utils_1.checkFullAccess)(dir, true);
+        if (!(0, utils_1.isDirectory)(dir)) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('--dir 参数必须指定为云函数的文件夹路径'));
+        }
+        funcPath = path_1.default.resolve(process.cwd(), dir);
+        log.info((0, i18n_1.t)('使用命令行指定的目录：{{path}}', { path: funcPath }));
+    }
+    else if (funcDir) {
+        funcPath = path_1.default.resolve(process.cwd(), funcDir);
+        log.info((0, i18n_1.t)('使用配置文件中的目录：{{path}}', { path: funcPath }));
+    }
+    else {
+        funcPath = path_1.default.join(functionRootPath, name);
+    }
+    return funcPath;
+}
+exports.resolveFuncPathWithConfig = resolveFuncPathWithConfig;
+function validateImageDeploy(deployMode, hasConfig) {
+    if (deployMode === 'image') {
+        if (hasConfig === false) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('镜像部署时需要在配置文件中指定 imageConfig'));
+        }
+        if (hasConfig === undefined) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('镜像部署时需要在配置文件中指定函数配置和 imageConfig'));
+        }
+    }
+}
+exports.validateImageDeploy = validateImageDeploy;
+
+
 /***/ }),
 
 /***/ 340:
@@ -326254,7 +326328,7 @@ module.exports = function generate_pattern(it, $keyword, $ruleType) {
 /***/ ((module) => {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@cloudbase/cli","version":"2.12.5","description":"cli tool for cloudbase","main":"lib/index.js","scripts":{"build":"rimraf lib types && tsc --resolveJsonModule && cpx \\"src/**/*.html\\" lib","watch":"rimraf lib types && tsc -w","dev":"rimraf lib types && cpx \\"src/**/*.html\\" lib && tsc -w","eslint":"eslint \\"./**/*.ts\\"","test":"node --experimental-vm-modules node_modules/jest/bin/jest.js --runInBand --forceExit --detectOpenHandles --coverage --verbose --testTimeout=10000","tsc":"tsc","pkg":"pkg ./bin/cloudbase.js --out-path ./pkg","postinstall":"node ./post-install.js || exit 0 && patch-package","prepublishOnly":"node ./scripts/check-publish-source.js","debug":"bin/tcb.js lowcode watch","build:bundle":"webpack --config build/webpack/cli.cjs && webpack --config build/webpack/ccr.cjs && node build/scripts/copy-figlet-fonts.js","package:darwin-arm64":"OS=darwin ARCH=arm64 VERSION= node -e \\"require(\'child_process\').execSync(\'bash build/scripts/package.sh\',{stdio:\'inherit\'})\\"","package:darwin-x64":"OS=darwin ARCH=x64 VERSION= node -e \\"require(\'child_process\').execSync(\'bash build/scripts/package.sh\',{stdio:\'inherit\'})\\"","package:linux-arm64":"OS=linux ARCH=arm64 VERSION= node -e \\"require(\'child_process\').execSync(\'bash build/scripts/package.sh\',{stdio:\'inherit\'})\\"","package:linux-x64":"OS=linux ARCH=x64 VERSION= node -e \\"require(\'child_process\').execSync(\'bash build/scripts/package.sh\',{stdio:\'inherit\'})\\"","package:all":"bash build/scripts/build-all.sh","node:fetch:one":"node -e \\"require(\'child_process\').execSync(\'bash build/scripts/fetch-node.sh\',{stdio:\'inherit\'})\\"","node:fetch:all":"NODE_VERSION=22.18.0 bash build/scripts/fetch-node.sh --all","node:fetch:win-x64":"OS=windows ARCH=x64 NODE_VERSION=22.18.0 bash build/scripts/fetch-node.sh","node:fetch:win-arm64":"OS=windows ARCH=arm64 NODE_VERSION=22.18.0 bash build/scripts/fetch-node.sh","package:windows-x64":"OS=windows ARCH=x64 VERSION= node -e \\"require(\'child_process\').execSync(\'bash build/scripts/package.sh\',{stdio:\'inherit\'})\\"","package:windows-arm64":"OS=windows ARCH=arm64 VERSION= node -e \\"require(\'child_process\').execSync(\'bash build/scripts/package.sh\',{stdio:\'inherit\'})\\"","package:windows-all":"npm run -s node:fetch:win-x64 && npm run -s node:fetch:win-arm64 && npm run -s package:windows-x64 && npm run -s package:windows-arm64","package:npm":"npm run build && npm run build:bundle && bash build/scripts/prepare-publish.sh","out:prune":"bash build/scripts/prune-out.sh","i18n:scan":"i18next-scanner --config locales/i18next-scanner.config.js && node locales/scripts/generate.js","i18n:sync":"node locales/scripts/sync.js sync","publish":"node ./scripts/publish.js"},"repository":{"type":"git","url":"https://github.com/TencentCloudBase/cloud-base-cli.git"},"bin":{"cloudbase":"bin/cloudbase.js","cloudbase-mcp":"bin/cloudbase-mcp.cjs","tcb":"bin/tcb.js"},"husky":{"hooks":{"pre-commit":"npm run build"}},"author":"cwuyiqing@gmail.com","license":"ISC","dependencies":{"@cloudbase/cloud-api":"^0.5.5","@cloudbase/cloudbase-mcp":"^2.7.3","@cloudbase/framework-core":"^1.9.7","@cloudbase/functions-framework":"1.16.0","@cloudbase/iac-core":"0.0.3-alpha.14","@cloudbase/lowcode-cli":"^0.23.0","@cloudbase/manager-node":"4.10.2","@cloudbase/toolbox":"0.7.16","@dotenvx/dotenvx":"^1.48.3","@musistudio/claude-code-router":"1.0.36","address":"^1.1.2","camelcase-keys":"^7.0.2","chalk":"^2.4.2","cli-table3":"^0.5.1","commander":"7","del":"^5.1.0","didyoumean":"^1.2.2","enquirer":"^2.3.6","execa":"^4.0.3","figlet":"^1.7.0","fs-extra":"^8.1.0","gradient-string":"^2.0.2","https-proxy-agent":"^5.0.1","i":"^0.3.7","inquirer":"^6.5.0","json-schema-to-typescript":"^14.0.5","lodash":"^4.17.21","log-symbols":"^3.0.0","lowdb":"^1.0.0","make-dir":"^3.0.0","node-fetch":"^2.6.0","nodemon":"^3.1.4","npm":"^11.5.2","open":"^7.0.0","ora":"^4.0.2","os-locale":"5.0.0","patch-package":"^8.0.0","portfinder":"^1.0.28","progress":"^2.0.3","query-string":"^6.8.1","reflect-metadata":"^0.1.13","semver":"^7.3.7","simple-git":"^3.28.0","tar-fs":"^2.0.1","terminal-link":"^2.1.1","toml":"^3.0.0","unzipper":"^0.10.10","update-notifier":"^4.0.0","xdg-basedir":"^4.0.0","yargs":"^16.2.0","yargs-parser":"^21.0.1","zod":"^4.0.13"},"devDependencies":{"@babel/parser":"^7.28.4","@babel/traverse":"^7.28.4","@babel/types":"^7.28.4","@types/fs-extra":"^11.0.4","@types/jest":"^27","@types/koa__router":"^8.0.11","@types/lodash":"^4.14.182","@types/node":"^12.12.38","@types/node-fetch":"^2.5.4","@types/react":"^17.0.37","@types/semver":"^7.3.9","@types/unzipper":"^0.10.11","@types/webpack-dev-server":"^3.11.1","@typescript-eslint/eslint-plugin":"^4.8.1","@typescript-eslint/parser":"^4.8.1","cpx":"^1.5.0","eslint":"^7.14.0","eslint-config-alloy":"^3.8.2","husky":"^3.0.9","i18next-scanner":"^4.6.0","jest":"^27","rimraf":"^3.0.2","ts-jest":"^27","typescript":"^4.7.2","webpack":"^5.92.0","webpack-cli":"^5.1.4"},"packageManager":"yarn@3.6.2+sha512.2c2f8b9615e6659773f65cdec7cf92ef773a98a99e611579601f61c7a91ec94c89c929aac86f1cee819421a9b0db7acfd53ec3ebb95af44f77f77634b08b9557","ai":{"skills":"./skills","skillsIndex":"./skills/index.json","compatible":["codebuddy","cursor","copilot","claude","windsurf"],"description":"CloudBase CLI - 腾讯云云开发命令行工具，支持云函数、云数据库、静态托管等全栈云开发能力"}}');
+module.exports = /*#__PURE__*/JSON.parse('{"name":"@cloudbase/cli","version":"2.12.7","description":"cli tool for cloudbase","main":"lib/index.js","scripts":{"build":"rimraf lib types && tsc --resolveJsonModule && cpx \\"src/**/*.html\\" lib","watch":"rimraf lib types && tsc -w","dev":"rimraf lib types && cpx \\"src/**/*.html\\" lib && tsc -w","eslint":"eslint \\"./**/*.ts\\"","test":"node --experimental-vm-modules node_modules/jest/bin/jest.js --runInBand --forceExit --detectOpenHandles --coverage --verbose --testTimeout=10000","tsc":"tsc","pkg":"pkg ./bin/cloudbase.js --out-path ./pkg","postinstall":"node ./post-install.js || exit 0 && patch-package","prepublishOnly":"node ./scripts/check-publish-source.js","debug":"bin/tcb.js lowcode watch","build:bundle":"webpack --config build/webpack/cli.cjs && webpack --config build/webpack/ccr.cjs && node build/scripts/copy-figlet-fonts.js","package:darwin-arm64":"OS=darwin ARCH=arm64 VERSION= node -e \\"require(\'child_process\').execSync(\'bash build/scripts/package.sh\',{stdio:\'inherit\'})\\"","package:darwin-x64":"OS=darwin ARCH=x64 VERSION= node -e \\"require(\'child_process\').execSync(\'bash build/scripts/package.sh\',{stdio:\'inherit\'})\\"","package:linux-arm64":"OS=linux ARCH=arm64 VERSION= node -e \\"require(\'child_process\').execSync(\'bash build/scripts/package.sh\',{stdio:\'inherit\'})\\"","package:linux-x64":"OS=linux ARCH=x64 VERSION= node -e \\"require(\'child_process\').execSync(\'bash build/scripts/package.sh\',{stdio:\'inherit\'})\\"","package:all":"bash build/scripts/build-all.sh","node:fetch:one":"node -e \\"require(\'child_process\').execSync(\'bash build/scripts/fetch-node.sh\',{stdio:\'inherit\'})\\"","node:fetch:all":"NODE_VERSION=22.18.0 bash build/scripts/fetch-node.sh --all","node:fetch:win-x64":"OS=windows ARCH=x64 NODE_VERSION=22.18.0 bash build/scripts/fetch-node.sh","node:fetch:win-arm64":"OS=windows ARCH=arm64 NODE_VERSION=22.18.0 bash build/scripts/fetch-node.sh","package:windows-x64":"OS=windows ARCH=x64 VERSION= node -e \\"require(\'child_process\').execSync(\'bash build/scripts/package.sh\',{stdio:\'inherit\'})\\"","package:windows-arm64":"OS=windows ARCH=arm64 VERSION= node -e \\"require(\'child_process\').execSync(\'bash build/scripts/package.sh\',{stdio:\'inherit\'})\\"","package:windows-all":"npm run -s node:fetch:win-x64 && npm run -s node:fetch:win-arm64 && npm run -s package:windows-x64 && npm run -s package:windows-arm64","package:npm":"npm run build && npm run build:bundle && bash build/scripts/prepare-publish.sh","out:prune":"bash build/scripts/prune-out.sh","i18n:scan":"i18next-scanner --config locales/i18next-scanner.config.js && node locales/scripts/generate.js","i18n:sync":"node locales/scripts/sync.js sync","publish":"node ./scripts/publish.js"},"repository":{"type":"git","url":"https://github.com/TencentCloudBase/cloud-base-cli.git"},"bin":{"cloudbase":"bin/cloudbase.js","cloudbase-mcp":"bin/cloudbase-mcp.cjs","tcb":"bin/tcb.js"},"husky":{"hooks":{"pre-commit":"npm run build"}},"author":"cwuyiqing@gmail.com","license":"ISC","dependencies":{"@cloudbase/cloud-api":"^0.5.5","@cloudbase/cloudbase-mcp":"^2.7.3","@cloudbase/framework-core":"^1.9.7","@cloudbase/functions-framework":"1.16.0","@cloudbase/iac-core":"0.0.3-alpha.14","@cloudbase/lowcode-cli":"^0.23.0","@cloudbase/manager-node":"4.10.2","@cloudbase/toolbox":"0.7.17","@dotenvx/dotenvx":"^1.48.3","@musistudio/claude-code-router":"1.0.36","address":"^1.1.2","camelcase-keys":"^7.0.2","chalk":"^2.4.2","cli-table3":"^0.5.1","commander":"7","del":"^5.1.0","didyoumean":"^1.2.2","enquirer":"^2.3.6","execa":"^4.0.3","figlet":"^1.7.0","fs-extra":"^8.1.0","gradient-string":"^2.0.2","https-proxy-agent":"^5.0.1","i":"^0.3.7","inquirer":"^6.5.0","json-schema-to-typescript":"^14.0.5","lodash":"^4.17.21","log-symbols":"^3.0.0","lowdb":"^1.0.0","make-dir":"^3.0.0","node-fetch":"^2.6.0","nodemon":"^3.1.4","npm":"^11.5.2","open":"^7.0.0","ora":"^4.0.2","os-locale":"5.0.0","patch-package":"^8.0.0","portfinder":"^1.0.28","progress":"^2.0.3","query-string":"^6.8.1","reflect-metadata":"^0.1.13","semver":"^7.3.7","simple-git":"^3.28.0","tar-fs":"^2.0.1","terminal-link":"^2.1.1","toml":"^3.0.0","unzipper":"^0.10.10","update-notifier":"^4.0.0","xdg-basedir":"^4.0.0","yargs":"^16.2.0","yargs-parser":"^21.0.1","zod":"^4.0.13"},"devDependencies":{"@babel/parser":"^7.28.4","@babel/traverse":"^7.28.4","@babel/types":"^7.28.4","@types/fs-extra":"^11.0.4","@types/jest":"^27","@types/koa__router":"^8.0.11","@types/lodash":"^4.14.182","@types/node":"^12.12.38","@types/node-fetch":"^2.5.4","@types/react":"^17.0.37","@types/semver":"^7.3.9","@types/unzipper":"^0.10.11","@types/webpack-dev-server":"^3.11.1","@typescript-eslint/eslint-plugin":"^4.8.1","@typescript-eslint/parser":"^4.8.1","cpx":"^1.5.0","eslint":"^7.14.0","eslint-config-alloy":"^3.8.2","husky":"^3.0.9","i18next-scanner":"^4.6.0","jest":"^27","rimraf":"^3.0.2","ts-jest":"^27","typescript":"^4.7.2","webpack":"^5.92.0","webpack-cli":"^5.1.4"},"packageManager":"yarn@3.6.2+sha512.2c2f8b9615e6659773f65cdec7cf92ef773a98a99e611579601f61c7a91ec94c89c929aac86f1cee819421a9b0db7acfd53ec3ebb95af44f77f77634b08b9557","ai":{"skills":"./skills","skillsIndex":"./skills/index.json","compatible":["codebuddy","cursor","copilot","claude","windsurf"],"description":"CloudBase CLI - 腾讯云云开发命令行工具，支持云函数、云数据库、静态托管等全栈云开发能力"}}');
 
 /***/ }),
 
@@ -398398,12 +398472,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.AuthSupevisor = exports.AuthSupervisor = void 0;
 const web_auth_1 = __webpack_require__(76097);
+const oauth_1 = __webpack_require__(92423);
 const common_1 = __webpack_require__(96711);
 const credential_1 = __webpack_require__(99795);
 const error_1 = __webpack_require__(64119);
 __exportStar(__webpack_require__(96711), exports);
 __exportStar(__webpack_require__(99795), exports);
 __exportStar(__webpack_require__(76097), exports);
+__exportStar(__webpack_require__(92423), exports);
 class AuthSupervisor {
     /**
      * 单例模式，全局缓存
@@ -398453,7 +398529,7 @@ class AuthSupervisor {
      */
     loginByWebAuth(options = {}) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { getAuthUrl, throwError, noBrowser, callbackTimeout } = options;
+            const { getAuthUrl, throwError, noBrowser, callbackTimeout, flow = 'device', client_id, onDeviceCode, getOAuthEndpoint, silent } = options;
             if (this.cacheCredential && this.needCache && !this.isCacheExpire()) {
                 return this.cacheCredential;
             }
@@ -398461,12 +398537,19 @@ class AuthSupervisor {
             let credential = yield (0, credential_1.checkAndGetCredential)(this.requestConfig);
             if (credential)
                 return credential;
-            // 兼容临时秘钥
-            credential = yield (0, web_auth_1.getAuthTokenFromWeb)({
-                getAuthUrl,
-                noBrowser,
-                callbackTimeout
-            });
+            // 根据授权方式获取凭证
+            if (flow === 'web') {
+                credential = yield (0, web_auth_1.getAuthTokenFromWeb)({
+                    getAuthUrl,
+                    noBrowser,
+                    callbackTimeout,
+                    silent
+                });
+            }
+            else {
+                credential = yield (0, oauth_1.getAuthTokenByDeviceFlow)({ client_id, onDeviceCode, getOAuthEndpoint, getAuthUrl, silent });
+            }
+            credential = (0, common_1.resolveCredential)(credential);
             try {
                 yield (0, common_1.checkAuth)(credential, this.requestConfig);
             }
@@ -410365,7 +410448,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getDataFromWeb = void 0;
+exports.getDataFromWeb = exports.openUrl = exports.isTruthyFlag = void 0;
 const open_1 = __importDefault(__webpack_require__(30353));
 const query_string_1 = __importDefault(__webpack_require__(86663));
 const http_1 = __importDefault(__webpack_require__(58611));
@@ -410412,6 +410495,7 @@ function isTruthyFlag(value) {
     }
     return ['1', 'true', 'yes', 'on'].includes(String(value).trim().toLowerCase());
 }
+exports.isTruthyFlag = isTruthyFlag;
 function isVSCodeEnvironment() {
     return Boolean(process.env.VSCODE_IPC_HOOK_CLI
         || process.env.VSCODE_PID
@@ -410467,19 +410551,23 @@ function openUrl(url) {
         }
     });
 }
+exports.openUrl = openUrl;
 // 从 Web 页面中获取数据
 function getDataFromWeb(getUrl, type, options = {}) {
-    var _a, _b;
+    var _a, _b, _c;
     return __awaiter(this, void 0, void 0, function* () {
         const { server, port } = yield createLocalServer();
         const noBrowser = (_a = options.noBrowser) !== null && _a !== void 0 ? _a : isTruthyFlag(process.env.TCB_NO_BROWSER);
         const callbackTimeout = (_b = options.callbackTimeout) !== null && _b !== void 0 ? _b : 180000;
+        const silent = (_c = options.silent) !== null && _c !== void 0 ? _c : false;
         if (!Number.isFinite(callbackTimeout) || callbackTimeout <= 0) {
             throw new error_1.CloudBaseError('callbackTimeout must be a positive number');
         }
         const url = getUrl(port);
-        console.log('\n\n若链接未自动打开，请手动复制至浏览器，或尝试其他登录方式:');
-        console.log(`\n${url}\n`);
+        if (!silent) {
+            console.log('\n\n若链接未自动打开，请手动复制至浏览器，或尝试其他登录方式:');
+            console.log(`\n${url}\n`);
+        }
         if (!noBrowser) {
             // 对 url 转码, 避免 wsl 无法正常打开地址
             // https://www.npmjs.com/package/open#url
@@ -440152,16 +440240,23 @@ const LoginRes = {
         };
     }
 };
-function loginByWebAuth() {
+function loginByWebAuth({ flow } = {}) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
             const credential = yield utils_1.authSupevisor.loginByWebAuth({
+                flow,
                 getAuthUrl: (rawUrl) => {
                     if ((0, i18n_1.isIntl)()) {
                         return rawUrl.replace('https://tcb.cloud.tencent.com/dev', utils_1.EUrl.DevPlatform);
                     }
                     return rawUrl;
-                }
+                },
+                getOAuthEndpoint: (rawEndpoint) => {
+                    if ((0, i18n_1.isIntl)()) {
+                        return rawEndpoint.replace('https://tcb-api.cloud.tencent.com', 'https://tcb-api.tencentcloud.com');
+                    }
+                    return rawEndpoint;
+                },
             });
             if (lodash_1.default.isEmpty(credential)) {
                 return LoginRes.INVALID_TOKEN;
@@ -440169,9 +440264,6 @@ function loginByWebAuth() {
             return Object.assign({ credential }, LoginRes.SUCCESS);
         }
         catch (error) {
-            console.error((0, i18n_1.t)('Web 授权登录失败，可能是环境兼容性问题'));
-            console.error((0, i18n_1.t)('建议使用密钥登录：tcb login --key'));
-            console.error((0, i18n_1.t)('详细说明请参考：{{url}}', { url: 'https://docs.cloudbase.net/cli-v1/login#%E8%85%BE%E8%AE%AF%E4%BA%91-%E4%BA%91%E5%BC%80%E5%8F%91%E6%8E%A7%E5%88%B6%E5%8F%B0%E6%8E%88%E6%9D%83' }));
             return {
                 code: 'WEB_AUTH_FAILED',
                 msg: (0, i18n_1.t)('Web 授权登录失败，请使用密钥登录：tcb login --key'),
@@ -440196,8 +440288,8 @@ function loginWithKey(secretId, secretKey, token) {
 exports.loginWithKey = loginWithKey;
 function login(options = {}) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { secretId, secretKey, key, token } = options;
-        return key ? loginWithKey(secretId, secretKey, token) : loginByWebAuth();
+        const { secretId, secretKey, key, token, flow } = options;
+        return key ? loginWithKey(secretId, secretKey, token) : loginByWebAuth({ flow });
     });
 }
 exports.login = login;
@@ -467650,6 +467742,7 @@ const decorators_1 = __webpack_require__(93480);
 const i18n_1 = __webpack_require__(69258);
 const utils_2 = __webpack_require__(75213);
 const constant_1 = __webpack_require__(62977);
+const common_utils_1 = __webpack_require__(325);
 let CodeUpdate = class CodeUpdate extends common_1.Command {
     get options() {
         return {
@@ -467705,9 +467798,7 @@ let CodeUpdate = class CodeUpdate extends common_1.Command {
             }
             const configFiles = ['cloudbaserc.json', 'cloudbaserc.js', 'cloudbaserc.yaml', 'cloudbaserc.yml', 'cloudbaserc', 'cloudbase.config.js'];
             const hasConfigFile = configFiles.some(file => fs_1.default.existsSync(path_1.default.join(process.cwd(), file)));
-            if (deployMode === 'image' && !hasConfigFile) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('镜像部署时需要在配置文件中指定 imageConfig，请创建 cloudbaserc.json 并配置镜像参数'));
-            }
+            (0, common_utils_1.validateImageDeploy)(deployMode, hasConfigFile ? undefined : false);
             const hasConfig = hasConfigFile || functions.length > 0;
             if (hasConfig) {
                 return this.updateWithConfig({ name, dir, envId, codeSecret, deployMode, config, functions, log });
@@ -467725,26 +467816,19 @@ let CodeUpdate = class CodeUpdate extends common_1.Command {
                 log.info((0, i18n_1.t)('从配置文件读取函数 [{{name}}] 的配置', { name }));
             }
             else {
+                (0, common_utils_1.validateImageDeploy)(deployMode, undefined);
                 func = Object.assign({ name }, constant_1.DefaultFunctionDeployConfig);
                 log.info((0, i18n_1.t)('未找到函数 [{{name}}] 的配置，使用默认配置', { name }));
             }
             const functionRootPath = path_1.default.join(process.cwd(), config.functionRoot || 'functions');
-            let funcPath;
-            if (dir) {
-                (0, utils_1.checkFullAccess)(dir, true);
-                if (!(0, utils_1.isDirectory)(dir)) {
-                    throw new error_1.CloudBaseError((0, i18n_1.t)('--dir 参数必须指定为云函数的文件夹路径'));
-                }
-                funcPath = path_1.default.resolve(process.cwd(), dir);
-                log.info((0, i18n_1.t)('使用命令行指定的目录：{{path}}', { path: funcPath }));
-            }
-            else if (func === null || func === void 0 ? void 0 : func.dir) {
-                funcPath = path_1.default.resolve(process.cwd(), func.dir);
-                log.info((0, i18n_1.t)('使用配置文件中的目录：{{path}}', { path: funcPath }));
-            }
-            else {
-                funcPath = path_1.default.join(functionRootPath, name);
-            }
+            const funcPath = (0, common_utils_1.resolveFuncPathWithConfig)({
+                dir,
+                funcDir: func === null || func === void 0 ? void 0 : func.dir,
+                functionRootPath,
+                name,
+                deployMode,
+                log
+            });
             return this.doUpdateCode({
                 func, funcPath, functionRootPath, envId, codeSecret, deployMode,
                 functionPath: dir ? funcPath : undefined, log
@@ -467754,18 +467838,13 @@ let CodeUpdate = class CodeUpdate extends common_1.Command {
     updateWithoutConfig(options) {
         return __awaiter(this, void 0, void 0, function* () {
             const { name, dir, envId, codeSecret, deployMode, log } = options;
-            let updateDir = process.cwd();
-            if (dir) {
-                (0, utils_1.checkFullAccess)(dir, true);
-                if (!(0, utils_1.isDirectory)(dir)) {
-                    throw new error_1.CloudBaseError((0, i18n_1.t)('--dir 参数必须指定为云函数的文件夹路径'));
-                }
-                updateDir = path_1.default.resolve(process.cwd(), dir);
-                log.info((0, i18n_1.t)('将从目录 {{dir}} 更新云函数代码', { dir: updateDir }));
-            }
-            else {
-                log.info((0, i18n_1.t)('未找到配置文件，将从当前目录更新云函数代码'));
-            }
+            (0, common_utils_1.validateImageDeploy)(deployMode, false);
+            const updateDir = (0, common_utils_1.resolveAndValidateFunctionDir)({
+                dir,
+                defaultDir: process.cwd(),
+                action: '更新',
+                log
+            });
             let inferredConfig = this.inferFunctionConfig(name, updateDir);
             const isInferred = !!inferredConfig;
             if (!inferredConfig) {
@@ -693990,9 +694069,10 @@ function updateFunctionCode(options) {
             });
         }
         catch (e) {
-            throw new error_1.CloudBaseError((0, i18n_1.t)('[{{name}}] 函数代码更新失败： {{error}}', { name: funcName, error: e.message }), {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('[{{name}}] 函数代码更新失败： {{error}}', { name: funcName, error: e.message || String(e) }), {
                 code: e.code,
-                requestId: e.requestId
+                requestId: e.requestId,
+                original: e
             });
         }
     });
@@ -726130,7 +726210,9 @@ const outputHelpInfo = () => {
     hosting           [cmd]                      ${(0, i18n_1.t)('静态托管资源管理操作')}
     storage           [cmd]                      ${(0, i18n_1.t)('云存储资源管理操作')}
     service           [cmd]                      ${(0, i18n_1.t)('HTTP 访问服务管理操作')}
-    cloudrun          [cmd]                      ${(0, i18n_1.t)('云托管服务管理操作`')}
+    cloudrun          [cmd]                      ${(0, i18n_1.t)('云托管服务管理操作')}
+    config            [cmd]                      ${(0, i18n_1.t)('配置文件管理操作')}
+    gateway           [cmd]                      ${(0, i18n_1.t)('网关管理操作')}
 `;
     const options = `
   ${(0, i18n_1.t)('选项')}
@@ -743531,16 +743613,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getAuthTokenFromWeb = void 0;
+exports.getAuthTokenFromWeb = exports.CLI_AUTH_BASE_URL = void 0;
 const common_1 = __webpack_require__(96711);
 const coding_1 = __webpack_require__(40540);
 const web_1 = __webpack_require__(2240);
 const system_1 = __webpack_require__(62179);
-const CliAuthBaseUrl = 'https://tcb.cloud.tencent.com/dev';
+exports.CLI_AUTH_BASE_URL = 'https://tcb.cloud.tencent.com/dev';
 // 打开云开发控制台，获取授权
 function getAuthTokenFromWeb(options = {}) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { getAuthUrl, noBrowser, callbackTimeout } = options;
+        const { getAuthUrl, noBrowser, callbackTimeout, silent } = options;
         const mac = yield (0, system_1.getMacAddress)();
         const os = (0, system_1.getOSInfo)();
         const macHash = (0, coding_1.md5Encoding)(mac);
@@ -743553,7 +743635,7 @@ function getAuthTokenFromWeb(options = {}) {
                 + '&from=cli';
             const encodedCallbackUrl = encodeURIComponent(callbackUrl);
             // 授权链接
-            const rawAuthUrl = `${CliAuthBaseUrl}?authCallbackUrl=${encodedCallbackUrl}#/cli-auth?${encodedQuery}`;
+            const rawAuthUrl = `${exports.CLI_AUTH_BASE_URL}?authCallbackUrl=${encodedCallbackUrl}#/cli-auth?${encodedQuery}`;
             let cliAuthUrl = rawAuthUrl;
             if (getAuthUrl) {
                 try {
@@ -743566,7 +743648,8 @@ function getAuthTokenFromWeb(options = {}) {
             return cliAuthUrl;
         }, 'login', {
             noBrowser,
-            callbackTimeout
+            callbackTimeout,
+            silent
         });
         const credential = (0, common_1.resolveCredential)(query);
         return credential;
@@ -801600,9 +801683,12 @@ function inferNodejsConfig(targetDir, name, httpFn) {
                 runtime = 'Nodejs16.13';
             }
         }
+        const hasDependencies = Boolean(packageJson.dependencies && Object.keys(packageJson.dependencies).length > 0);
+        const hasDevDependencies = Boolean(packageJson.devDependencies && Object.keys(packageJson.devDependencies).length > 0);
+        const shouldInstallDeps = hasDependencies || hasDevDependencies;
         return {
-            config: Object.assign(Object.assign(Object.assign({ name: funcName }, constant_1.DefaultFunctionDeployConfig), { runtime,
-                handler, installDependency: true }), (httpFn ? { type: 'HTTP' } : {})),
+            config: Object.assign(Object.assign(Object.assign(Object.assign({ name: funcName }, constant_1.DefaultFunctionDeployConfig), { runtime,
+                handler }), (shouldInstallDeps ? { installDependency: true } : {})), (httpFn ? { type: 'HTTP' } : {})),
             source: (0, i18n_1.t)('Node.js 项目（package.json）')
         };
     }
@@ -801627,7 +801713,7 @@ function inferPythonConfig(targetDir, name, httpFn) {
         }
     }
     return {
-        config: Object.assign(Object.assign(Object.assign({ name: funcName }, constant_1.DefaultFunctionDeployConfig), { runtime: 'Python3.9', handler, installDependency: true }), (httpFn ? { type: 'HTTP' } : {})),
+        config: Object.assign(Object.assign(Object.assign({ name: funcName }, constant_1.DefaultFunctionDeployConfig), { runtime: 'Python3.9', handler }), (httpFn ? { type: 'HTTP' } : {})),
         source: (0, i18n_1.t)('Python 项目（{{file}}）', { file: foundFile })
     };
 }
@@ -801660,7 +801746,7 @@ function inferPhpConfig(targetDir, name, httpFn) {
         handler = 'index.main';
     }
     return {
-        config: Object.assign(Object.assign(Object.assign({ name: funcName }, constant_1.DefaultFunctionDeployConfig), { runtime: 'Php8.0', handler, installDependency: fs_1.default.existsSync(composerJsonPath) }), (httpFn ? { type: 'HTTP' } : {})),
+        config: Object.assign(Object.assign(Object.assign({ name: funcName }, constant_1.DefaultFunctionDeployConfig), { runtime: 'Php8.0', handler }), (httpFn ? { type: 'HTTP' } : {})),
         source
     };
 }
@@ -801684,7 +801770,7 @@ function inferJavaConfig(targetDir, name, httpFn) {
         }
     }
     return {
-        config: Object.assign(Object.assign(Object.assign({ name: funcName }, constant_1.DefaultFunctionDeployConfig), { runtime: 'Java11', handler: 'example.Hello::mainHandler', installDependency: true }), (httpFn ? { type: 'HTTP' } : {})),
+        config: Object.assign(Object.assign(Object.assign({ name: funcName }, constant_1.DefaultFunctionDeployConfig), { runtime: 'Java11', handler: 'example.Hello::mainHandler' }), (httpFn ? { type: 'HTTP' } : {})),
         source: (0, i18n_1.t)('Java 项目（{{file}}）', { file: foundFile })
     };
 }
@@ -801707,7 +801793,7 @@ function inferGoConfig(targetDir, name, httpFn) {
         }
     }
     return {
-        config: Object.assign(Object.assign(Object.assign({ name: funcName }, constant_1.DefaultFunctionDeployConfig), { runtime: 'Go1', handler: 'main', installDependency: true }), (httpFn ? { type: 'HTTP' } : {})),
+        config: Object.assign(Object.assign(Object.assign({ name: funcName }, constant_1.DefaultFunctionDeployConfig), { runtime: 'Go1', handler: 'main' }), (httpFn ? { type: 'HTTP' } : {})),
         source: (0, i18n_1.t)('Go 项目（{{file}}）', { file: foundFile })
     };
 }
@@ -801740,7 +801826,7 @@ function inferByFileExtension(targetDir, name, httpFn) {
             return null;
         }
         return {
-            config: Object.assign(Object.assign(Object.assign({ name: funcName }, constant_1.DefaultFunctionDeployConfig), { runtime: typeConfig.runtime, handler: typeConfig.handler }), (httpFn ? { type: 'HTTP' } : {})),
+            config: Object.assign({ name: funcName, timeout: constant_1.DefaultFunctionDeployConfig.timeout, runtime: typeConfig.runtime, handler: typeConfig.handler, ignore: constant_1.DefaultFunctionDeployConfig.ignore }, (httpFn ? { type: 'HTTP' } : {})),
             source: typeConfig.source
         };
     }
@@ -835712,6 +835798,27 @@ const decorators_1 = __webpack_require__(93480);
 const function_2 = __webpack_require__(11686);
 const i18n_1 = __webpack_require__(69258);
 const utils_2 = __webpack_require__(75213);
+const common_utils_1 = __webpack_require__(325);
+const MAX_PARALLEL_DEPLOY = 5;
+function buildImageConfig(functionConf) {
+    const fileImageConfig = (0, function_2.buildImageConfigFromConfig)(functionConf);
+    if (!fileImageConfig) {
+        return null;
+    }
+    return fileImageConfig;
+}
+function checkWebFunctionBootstrap(functionPath, functionConf) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return yield (0, function_1.checkAndCreateBootstrap)(functionPath, functionConf);
+    });
+}
+function resolveFunctionPath(options) {
+    const { functionRootPath, functionName, functionDirFromConfig } = options;
+    if (functionDirFromConfig) {
+        return path_1.default.resolve(process.cwd(), functionDirFromConfig);
+    }
+    return path_1.default.join(functionRootPath, functionName);
+}
 let FunctionDeploy = class FunctionDeploy extends common_1.Command {
     get options() {
         return {
@@ -835833,26 +835940,29 @@ let FunctionDeploy = class FunctionDeploy extends common_1.Command {
         return __awaiter(this, void 0, void 0, function* () {
             const { name, dir, envId, force, codeSecret, access, httpFn, ws, deployMode, functions, functionRootPath, yes, log } = options;
             let func = functions === null || functions === void 0 ? void 0 : functions.find((item) => item.name === name);
-            let funcPath;
-            if (dir) {
-                (0, utils_1.checkFullAccess)(dir, true);
-                if (!(0, utils_1.isDirectory)(dir)) {
-                    throw new error_1.CloudBaseError((0, i18n_1.t)('--dir 参数必须指定为云函数的文件夹路径'));
+            let funcPath = '';
+            if (deployMode !== 'image') {
+                if (dir) {
+                    (0, utils_1.checkFullAccess)(dir, true);
+                    if (!(0, utils_1.isDirectory)(dir)) {
+                        throw new error_1.CloudBaseError((0, i18n_1.t)('--dir 参数必须指定为云函数的文件夹路径'));
+                    }
+                    funcPath = path_1.default.resolve(process.cwd(), dir);
+                    log.info((0, i18n_1.t)('使用命令行指定的目录：{{path}}', { path: funcPath }));
+                }
+                else if (func === null || func === void 0 ? void 0 : func.dir) {
+                    funcPath = path_1.default.resolve(process.cwd(), func.dir);
+                    log.info((0, i18n_1.t)('使用配置文件中的目录：{{path}}', { path: funcPath }));
+                }
+                else {
+                    funcPath = path_1.default.join(functionRootPath, name);
+                }
+                if (!fs_1.default.existsSync(funcPath)) {
+                    throw new error_1.CloudBaseError((0, i18n_1.t)('未找到函数 [{{name}}] 的目录：{{path}}，请检查函数名称或使用 --dir 指定函数目录', { name, path: funcPath }));
                 }
-                funcPath = path_1.default.resolve(process.cwd(), dir);
-                log.info((0, i18n_1.t)('使用命令行指定的目录：{{path}}', { path: funcPath }));
-            }
-            else if (func === null || func === void 0 ? void 0 : func.dir) {
-                funcPath = path_1.default.resolve(process.cwd(), func.dir);
-                log.info((0, i18n_1.t)('使用配置文件中的目录：{{path}}', { path: funcPath }));
-            }
-            else {
-                funcPath = path_1.default.join(functionRootPath, name);
-            }
-            if (!fs_1.default.existsSync(funcPath)) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('未找到函数 [{{name}}] 的目录：{{path}}，请检查函数名称或使用 --dir 指定函数目录', { name, path: funcPath }));
             }
             if (!func) {
+                (0, common_utils_1.validateImageDeploy)(deployMode, undefined);
                 log.warn((0, i18n_1.t)('配置文件中未找到函数 [{{name}}] 的配置', { name }));
                 if (yes) {
                     const inferredConfig = this.inferFunctionConfig(httpFn, funcPath);
@@ -835895,7 +836005,8 @@ let FunctionDeploy = class FunctionDeploy extends common_1.Command {
     }
     deployWithoutConfig(options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { envId, codeSecret, httpFn, ws, log } = options;
+            const { envId, codeSecret, httpFn, ws, deployMode, log } = options;
+            (0, common_utils_1.validateImageDeploy)(deployMode, false);
             const { deployDir, functionName } = this.resolveFunctionInfo(options);
             log.verbose((0, i18n_1.t)('正在检测云端函数状态...'));
             let checkResult;
@@ -835933,19 +836044,13 @@ let FunctionDeploy = class FunctionDeploy extends common_1.Command {
     }
     resolveFunctionInfo(options) {
         const { name, dir, log } = options;
-        let deployDir = process.cwd();
-        if (dir) {
-            (0, utils_1.checkFullAccess)(dir, true);
-            if (!(0, utils_1.isDirectory)(dir)) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('--dir 参数必须指定为云函数的文件夹路径'));
-            }
-            deployDir = path_1.default.resolve(process.cwd(), dir);
-            log.info((0, i18n_1.t)('将从目录 {{dir}} 部署云函数', { dir: deployDir }));
-        }
-        else {
-            log.info((0, i18n_1.t)('未找到配置文件，将从当前目录部署云函数'));
-        }
-        const functionName = name || path_1.default.basename(deployDir);
+        const deployDir = (0, common_utils_1.resolveAndValidateFunctionDir)({
+            dir,
+            defaultDir: process.cwd(),
+            action: '部署',
+            log
+        });
+        const functionName = (0, common_utils_1.resolveFunctionName)(name, deployDir);
         return { deployDir, functionName };
     }
     handleExistingFunction(checkResult, inferredConfig, isInferred, options, deployDir) {
@@ -835953,7 +836058,7 @@ let FunctionDeploy = class FunctionDeploy extends common_1.Command {
             const { envId, force, codeSecret, access, deployMode, yes, log } = options;
             const conflicts = this.detectConfigConflicts(inferredConfig, checkResult.functionDetail);
             if (conflicts.length > 0) {
-                this.displayConfigConflicts(inferredConfig.name, conflicts);
+                this.displayConfigConflicts(inferredConfig.name, conflicts, log);
                 throw new error_1.CloudBaseError((0, i18n_1.t)('配置冲突，无法部署'));
             }
             let shouldUpdate = force || yes;
@@ -835966,7 +836071,7 @@ let FunctionDeploy = class FunctionDeploy extends common_1.Command {
             }
             const mergedConfig = this.mergeCloudAndLocalConfig(checkResult.functionDetail, inferredConfig);
             log.info((0, i18n_1.t)('✓ 函数已存在，将使用以下合并配置更新：'));
-            this.displayMergedConfig(inferredConfig.name, mergedConfig, isInferred ? 'inferred' : 'default');
+            this.displayMergedConfig(inferredConfig.name, mergedConfig, isInferred ? 'inferred' : 'default', log);
             let finalConfig = mergedConfig;
             if (!yes) {
                 const { action } = yield inquirer_1.default.prompt({
@@ -836163,7 +836268,11 @@ let FunctionDeploy = class FunctionDeploy extends common_1.Command {
                     type: 'confirm',
                     name: 'installDependency',
                     message: (0, i18n_1.t)('是否在线安装依赖'),
-                    default: defaultConfig.installDependency
+                    default: defaultConfig.installDependency,
+                    when: (answers) => {
+                        const runtime = answers.runtime || defaultConfig.runtime;
+                        return runtime === null || runtime === void 0 ? void 0 : runtime.startsWith('Nodejs');
+                    }
                 }
             ]);
             const enableWs = isWsFromCli || answers.enableWebSocket;
@@ -836175,7 +836284,7 @@ let FunctionDeploy = class FunctionDeploy extends common_1.Command {
                 dynamicEnabled: 'FALSE',
                 maxConcurrency: answers.maxConcurrency
             } : undefined;
-            return Object.assign(Object.assign(Object.assign(Object.assign({ name: answers.name.trim(), runtime: answers.runtime, handler: answers.handler, timeout: answers.timeout, memorySize: answers.memorySize, installDependency: answers.installDependency, ignore: defaultConfig.ignore || constant_1.DefaultFunctionDeployConfig.ignore }, (isHttpFnFromCli || answers.isHttpFn ? { type: 'HTTP' } : {})), (protocolType ? { protocolType } : {})), (protocolParams ? { protocolParams } : {})), (instanceConcurrencyConfig ? { instanceConcurrencyConfig } : {}));
+            return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ name: answers.name.trim(), runtime: answers.runtime, handler: answers.handler, timeout: answers.timeout, memorySize: answers.memorySize }, (answers.installDependency !== undefined ? { installDependency: answers.installDependency } : {})), { ignore: defaultConfig.ignore || constant_1.DefaultFunctionDeployConfig.ignore }), (isHttpFnFromCli || answers.isHttpFn ? { type: 'HTTP' } : {})), (protocolType ? { protocolType } : {})), (protocolParams ? { protocolParams } : {})), (instanceConcurrencyConfig ? { instanceConcurrencyConfig } : {}));
         });
     }
     promptFunctionName() {
@@ -836195,7 +836304,7 @@ let FunctionDeploy = class FunctionDeploy extends common_1.Command {
         });
     }
     printFunctionConfig(func, log, source) {
-        var _a, _b;
+        var _a, _b, _c;
         if (source) {
             log.info((0, i18n_1.t)('配置来源：{{source}}', { source }));
         }
@@ -836206,12 +836315,14 @@ let FunctionDeploy = class FunctionDeploy extends common_1.Command {
         if (func.memorySize) {
             log.info((0, i18n_1.t)('  - 内存大小：{{memorySize}} MB', { memorySize: func.memorySize }));
         }
-        log.info((0, i18n_1.t)('  - 在线安装依赖：{{installDependency}}', { installDependency: func.installDependency ? (0, i18n_1.t)('是') : (0, i18n_1.t)('否') }));
+        if (((_a = func.runtime) === null || _a === void 0 ? void 0 : _a.startsWith('Nodejs')) && func.installDependency !== undefined) {
+            log.info((0, i18n_1.t)('  - 在线安装依赖：{{installDependency}}', { installDependency: func.installDependency ? (0, i18n_1.t)('是') : (0, i18n_1.t)('否') }));
+        }
         if (func.type === 'HTTP') {
             log.info((0, i18n_1.t)('  - 函数类型：HTTP'));
             if (func.protocolType === 'WS') {
                 log.info((0, i18n_1.t)('  - WebSocket 协议：已启用'));
-                const idleTimeOut = (_b = (_a = func.protocolParams) === null || _a === void 0 ? void 0 : _a.wsParams) === null || _b === void 0 ? void 0 : _b.idleTimeOut;
+                const idleTimeOut = (_c = (_b = func.protocolParams) === null || _b === void 0 ? void 0 : _b.wsParams) === null || _c === void 0 ? void 0 : _c.idleTimeOut;
                 if (idleTimeOut) {
                     log.info((0, i18n_1.t)('  - 空闲超时时间：{{seconds}} 秒', { seconds: idleTimeOut }));
                 }
@@ -836282,7 +836393,7 @@ let FunctionDeploy = class FunctionDeploy extends common_1.Command {
             const { func, envId, force, codeSecret, access, deployMode, functionRootPath, functionPath, yes, log, preCheckResult } = options;
             let finalFunc = Object.assign({}, func);
             if (deployMode === 'image') {
-                const fileImageConfig = (0, function_2.buildImageConfigFromConfig)(func);
+                const fileImageConfig = buildImageConfig(func);
                 if (fileImageConfig) {
                     finalFunc.imageConfig = fileImageConfig;
                 }
@@ -836292,7 +836403,7 @@ let FunctionDeploy = class FunctionDeploy extends common_1.Command {
             }
             if (finalFunc.type === 'HTTP' && deployMode !== 'image') {
                 const funcPath = functionPath === '.' ? process.cwd() : (functionPath || path_1.default.join(functionRootPath, finalFunc.name));
-                const shouldContinue = yield (0, function_1.checkAndCreateBootstrap)(funcPath, finalFunc);
+                const shouldContinue = yield checkWebFunctionBootstrap(funcPath, finalFunc);
                 if (!shouldContinue) {
                     return;
                 }
@@ -836447,7 +836558,7 @@ let FunctionDeploy = class FunctionDeploy extends common_1.Command {
                     funcWithType = Object.assign(Object.assign({}, funcWithType), { type: 'HTTP', protocolType: 'WS' });
                 }
                 if (deployMode === 'image') {
-                    const fileImageConfig = (0, function_2.buildImageConfigFromConfig)(funcWithType);
+                    const fileImageConfig = buildImageConfig(funcWithType);
                     if (fileImageConfig) {
                         funcWithType = Object.assign(Object.assign({}, funcWithType), { imageConfig: fileImageConfig });
                     }
@@ -836456,21 +836567,24 @@ let FunctionDeploy = class FunctionDeploy extends common_1.Command {
                         return { status: 'skipped', name: func.name };
                     }
                 }
-                const funcPath = func.dir
-                    ? path_1.default.resolve(process.cwd(), func.dir)
-                    : path_1.default.join(functionRootPath, func.name);
+                const funcPath = resolveFunctionPath({
+                    functionRootPath,
+                    functionName: func.name,
+                    functionDirFromConfig: func.dir
+                });
                 if (deployMode !== 'image' && !fs_1.default.existsSync(funcPath)) {
                     log.error((0, i18n_1.t)('未找到函数 [{{name}}] 的目录：{{path}}，已跳过', { name: func.name, path: funcPath }));
                     return { status: 'skipped', name: func.name };
                 }
                 if (funcWithType.type === 'HTTP' && deployMode !== 'image') {
-                    const shouldContinue = yield (0, function_1.checkAndCreateBootstrap)(funcPath, funcWithType);
+                    const shouldContinue = yield checkWebFunctionBootstrap(funcPath, funcWithType);
                     if (!shouldContinue) {
                         log.warn((0, i18n_1.t)('[{{name}}] 已跳过部署', { name: func.name }));
                         return { status: 'skipped', name: func.name };
                     }
                 }
                 loading.start((0, i18n_1.t)('云函数部署中'));
+                let deployError = null;
                 try {
                     yield (0, function_1.createFunction)({
                         func: funcWithType,
@@ -836486,32 +836600,33 @@ let FunctionDeploy = class FunctionDeploy extends common_1.Command {
                     return { status: 'success', name: func.name };
                 }
                 catch (e) {
+                    deployError = e;
                     loading.stop();
-                    try {
-                        const result = yield this.handleDeployFail(e, {
-                            func: funcWithType,
-                            envId,
-                            force,
-                            codeSecret,
-                            functionRootPath,
-                            functionPath: func.dir ? funcPath : undefined,
-                            accessPath: access,
-                            yes: yes || force || functionsToOverwrite.has(func.name),
-                            batchMode: true,
-                            logger: log,
-                            deployMode
-                        });
-                        return { status: result || 'error', name: func.name };
-                    }
-                    catch (handleError) {
-                        return { status: 'error', name: func.name, error: handleError };
-                    }
+                }
+                try {
+                    const result = yield this.handleDeployFail(deployError, {
+                        func: funcWithType,
+                        envId,
+                        force,
+                        codeSecret,
+                        functionRootPath,
+                        functionPath: func.dir ? funcPath : undefined,
+                        accessPath: access,
+                        yes: yes || force || functionsToOverwrite.has(func.name),
+                        batchMode: true,
+                        logger: log,
+                        deployMode
+                    });
+                    return { status: result || 'error', name: func.name };
+                }
+                catch (handleError) {
+                    return { status: 'error', name: func.name, error: handleError };
                 }
             }));
             if (tasks.length > 5) {
                 log.info((0, i18n_1.t)('函数数量较多，将使用队列部署'));
             }
-            const asyncTaskController = new utils_1.AsyncTaskParallelController(5, 50);
+            const asyncTaskController = new utils_1.AsyncTaskParallelController(MAX_PARALLEL_DEPLOY, 50);
             asyncTaskController.loadTasks(tasks);
             const rawResults = yield asyncTaskController.run();
             const results = rawResults.map((r, index) => {
@@ -836602,7 +836717,7 @@ let FunctionDeploy = class FunctionDeploy extends common_1.Command {
                 }
                 const conflicts = this.detectConfigConflicts(func, existingFunction);
                 if (conflicts.length > 0) {
-                    this.displayConfigConflicts(func.name, conflicts);
+                    this.displayConfigConflicts(func.name, conflicts, log);
                     return 'error';
                 }
                 func = this.mergeCloudAndLocalConfig(existingFunction, func);
@@ -836947,7 +837062,22 @@ let FunctionDeploy = class FunctionDeploy extends common_1.Command {
         }
     }
     getSpecificSuggestions(error, context = {}) {
+        var _a, _b;
         const { functionName } = context;
+        if (((_a = error.message) === null || _a === void 0 ? void 0 : _a.includes('COS 上传失败')) || ((_b = error.message) === null || _b === void 0 ? void 0 : _b.includes('上传失败'))) {
+            const suggestions = [(0, i18n_1.t)('检查网络连接是否正常')];
+            if (error.code === 'AccessDenied') {
+                suggestions.push((0, i18n_1.t)('签名或权限不正确，拒绝访问'));
+                suggestions.push((0, i18n_1.t)('运行 {{command}} 重新登录', { command: (0, utils_1.highlightCommand)('tcb login') }));
+            }
+            else if (error.code === 'NoSuchBucket') {
+                suggestions.push((0, i18n_1.t)('指定的存储桶不存在，请检查环境配置'));
+            }
+            else if (error.code === 'RequestTimeout') {
+                suggestions.push((0, i18n_1.t)('请求超时，可能是文件过大或网络不稳定'));
+            }
+            return suggestions;
+        }
         if (error.code === 'Forbidden' || error.code === 'Unauthorized' ||
             error.code === 'AuthFailure' || error.code === 'UnauthorizedOperation') {
             return [
@@ -837010,33 +837140,35 @@ let FunctionDeploy = class FunctionDeploy extends common_1.Command {
             }
         });
     }
-    displayConfigConflicts(functionName, conflicts) {
-        utils_1.logger.error((0, i18n_1.t)('函数 [{{name}}] 存在配置冲突：', { name: functionName }));
+    displayConfigConflicts(functionName, conflicts, log) {
+        const activeLogger = log || utils_1.logger;
+        activeLogger.error((0, i18n_1.t)('函数 [{{name}}] 存在配置冲突：', { name: functionName }));
         conflicts.forEach((conflict) => {
-            utils_1.logger.error(`  ✗ ${conflict.field}: 云端 ${conflict.cloudValue} ≠ 本地 ${conflict.localValue}`);
-            utils_1.logger.error(`    ${conflict.message}`);
+            activeLogger.error(`  ✗ ${conflict.field}: 云端 ${conflict.cloudValue} ≠ 本地 ${conflict.localValue}`);
+            activeLogger.error(`    ${conflict.message}`);
         });
-        utils_1.logger.info((0, i18n_1.t)('解决建议：'));
-        utils_1.logger.info((0, i18n_1.t)('  1. 修改本地配置使其与云端一致'));
-        utils_1.logger.info((0, i18n_1.t)('  2. 删除云端函数后重新创建'));
-        utils_1.logger.info((0, i18n_1.t)('  3. 使用 {{command}} 查看云端配置', {
+        activeLogger.info((0, i18n_1.t)('解决建议：'));
+        activeLogger.info((0, i18n_1.t)('  1. 修改本地配置使其与云端一致'));
+        activeLogger.info((0, i18n_1.t)('  2. 删除云端函数后重新创建'));
+        activeLogger.info((0, i18n_1.t)('  3. 使用 {{command}} 查看云端配置', {
             command: (0, utils_1.highlightCommand)(`tcb fn detail ${functionName}`)
         }));
     }
-    displayMergedConfig(functionName, config, source) {
-        utils_1.logger.info((0, i18n_1.t)('函数 [{{name}}] 最终配置：', { name: functionName }));
-        utils_1.logger.info(`  ${(0, i18n_1.t)('类型')}: ${config.type || 'Event'}`);
-        utils_1.logger.info(`  ${(0, i18n_1.t)('运行时')}: ${config.runtime}`);
-        utils_1.logger.info(`  ${(0, i18n_1.t)('入口')}: ${config.handler}`);
+    displayMergedConfig(functionName, config, source, log) {
+        const activeLogger = log || utils_1.logger;
+        activeLogger.info((0, i18n_1.t)('函数 [{{name}}] 最终配置：', { name: functionName }));
+        activeLogger.info(`  ${(0, i18n_1.t)('类型')}: ${config.type || 'Event'}`);
+        activeLogger.info(`  ${(0, i18n_1.t)('运行时')}: ${config.runtime}`);
+        activeLogger.info(`  ${(0, i18n_1.t)('入口')}: ${config.handler}`);
         if (config.memorySize) {
-            utils_1.logger.info(`  ${(0, i18n_1.t)('内存')}: ${config.memorySize}MB`);
+            activeLogger.info(`  ${(0, i18n_1.t)('内存')}: ${config.memorySize}MB`);
         }
-        utils_1.logger.info(`  ${(0, i18n_1.t)('超时')}: ${config.timeout}s`);
+        activeLogger.info(`  ${(0, i18n_1.t)('超时')}: ${config.timeout}s`);
         if (source === 'inferred') {
-            utils_1.logger.info((0, i18n_1.t)('  (配置来源: 智能推测)'));
+            activeLogger.info((0, i18n_1.t)('  (配置来源: 智能推测)'));
         }
         else if (source === 'default') {
-            utils_1.logger.info((0, i18n_1.t)('  (配置来源: 默认配置)'));
+            activeLogger.info((0, i18n_1.t)('  (配置来源: 默认配置)'));
         }
     }
     confirmUpdate(functionName) {
@@ -866805,6 +866937,141 @@ const format = [format_1.default];
 exports["default"] = format;
 //# sourceMappingURL=index.js.map
 
+/***/ }),
+
+/***/ 92423:
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
+
+"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.getAuthTokenByDeviceFlow = void 0;
+const net_1 = __webpack_require__(31153);
+const web_1 = __webpack_require__(2240);
+const error_1 = __webpack_require__(64119);
+const coding_1 = __webpack_require__(40540);
+const system_1 = __webpack_require__(62179);
+const web_auth_1 = __webpack_require__(76097);
+/** 默认国内站 应用侧可通过 getOAuthEndpoint 覆写 */
+const OAUTH_ENDPOINT = process.env.TCB_OAUTH_ENDPOINT || 'https://tcb-api.cloud.tencent.com/qcloud-tcb/v1/oauth';
+const DEFAULT_CLIENT_ID = 'cloudbase-toolbox';
+const POLL_ERROR_CODES = {
+    AUTHORIZATION_PENDING: 'authorization_pending',
+    SLOW_DOWN: 'slow_down',
+    EXPIRED_TOKEN: 'expired_token',
+    ACCESS_DENIED: 'access_denied',
+};
+const SUCCESS_CODE = 'NORMAL';
+function fetchDeviceCode(options = {}) {
+    const { client_id = DEFAULT_CLIENT_ID, endpoint = OAUTH_ENDPOINT } = options;
+    return (0, net_1.postFetch)(`${endpoint}/device/code`, { client_id });
+}
+function fetchPollToken(options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { device_code, client_id = DEFAULT_CLIENT_ID, endpoint = OAUTH_ENDPOINT } = options;
+        const mac = yield (0, system_1.getMacAddress)();
+        return (0, net_1.postFetch)(`${endpoint}/token`, {
+            device_code,
+            client_id,
+            grant_type: 'urn:ietf:params:oauth:grant-type:device_code',
+            device_info: {
+                mac,
+                os: (0, system_1.getOSInfo)(),
+                hash: (0, coding_1.md5Encoding)(mac),
+            }
+        });
+    });
+}
+function sleep(ms) {
+    return new Promise((resolve) => {
+        setTimeout(resolve, ms);
+    });
+}
+function getAuthTokenByDeviceFlow(options = {}) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { client_id, onDeviceCode, getOAuthEndpoint, getAuthUrl, silent } = options;
+        const endpoint = getOAuthEndpoint ? getOAuthEndpoint(OAUTH_ENDPOINT) : OAUTH_ENDPOINT;
+        const deviceCodeResp = yield fetchDeviceCode({ client_id, endpoint });
+        if (deviceCodeResp.code !== SUCCESS_CODE) {
+            throw new error_1.CloudBaseError('Device Flow fetchDeviceCode failed', {
+                code: deviceCodeResp.code,
+                requestId: deviceCodeResp.reqId,
+            });
+        }
+        const { device_code, user_code, expires_in, interval } = deviceCodeResp.result;
+        // 暂时不消费 verification_uri，由客户端控制跳转
+        const defaultVerificationUri = `${web_auth_1.CLI_AUTH_BASE_URL}#/cli-auth`;
+        // from=cli 后续考虑改用 client_id，因为 toolbox 作为公共依赖，可能被不同 client 所引用
+        const rawVerificationUri = `${defaultVerificationUri}?user_code=${user_code}&from=cli&flow=device`;
+        const verification_uri = getAuthUrl ? getAuthUrl(rawVerificationUri) : rawVerificationUri;
+        if (!silent) {
+            // 打印授权信息，引导用户操作
+            console.log('\n\n若链接未自动打开，请手动复制至浏览器，或尝试其他登录方式:');
+            console.log(`\n${verification_uri}`);
+            console.log(`\n用户码: ${user_code}\n`);
+        }
+        // 尝试自动打开授权页面
+        yield (0, web_1.openUrl)(verification_uri);
+        if (onDeviceCode) {
+            onDeviceCode({ user_code, verification_uri, device_code, expires_in });
+        }
+        let pollInterval = interval;
+        const deadline = Date.now() + expires_in * 1000;
+        while (Date.now() < deadline) {
+            yield sleep(pollInterval * 1000);
+            let resp;
+            try {
+                resp = yield fetchPollToken({ device_code, interval: pollInterval, client_id, endpoint });
+            }
+            catch (e) {
+                throw new error_1.CloudBaseError('Device Flow 轮询请求失败', { original: e });
+            }
+            const { code, result } = resp;
+            // 服务端返回业务错误（result 中携带 error 字段）
+            if (result && 'error' in result) {
+                const { error, error_description } = result;
+                if (error === POLL_ERROR_CODES.AUTHORIZATION_PENDING) {
+                    continue;
+                }
+                if (error === POLL_ERROR_CODES.SLOW_DOWN) {
+                    pollInterval += 5;
+                    continue;
+                }
+                if (error === POLL_ERROR_CODES.EXPIRED_TOKEN) {
+                    throw new error_1.CloudBaseError('设备码已过期，请重新发起授权');
+                }
+                if (error === POLL_ERROR_CODES.ACCESS_DENIED) {
+                    throw new error_1.CloudBaseError('用户拒绝了授权请求');
+                }
+                throw new error_1.CloudBaseError(error_description || `Device Flow 授权失败，错误: ${error}`, {
+                    code: error,
+                    requestId: resp.reqId,
+                });
+            }
+            // 服务端返回成功的 Credential
+            if (code === SUCCESS_CODE && result) {
+                return result;
+            }
+            throw new error_1.CloudBaseError(`Device Flow 授权失败，错误码: ${code}`, {
+                code,
+                requestId: resp.reqId,
+            });
+        }
+        throw new error_1.CloudBaseError('授权超时，用户未在有效期内完成授权，请重试');
+    });
+}
+exports.getAuthTokenByDeviceFlow = getAuthTokenByDeviceFlow;
+
+
 /***/ }),
 
 /***/ 92452:
@@ -913315,6 +913582,10 @@ let LoginCommand = class LoginCommand extends common_1.Command {
                 {
                     flags: '--token [token]',
                     desc: (0, i18n_1.t)('腾讯云 API 临时秘钥 Token')
+                },
+                {
+                    flags: '--flow <flow>',
+                    desc: (0, i18n_1.t)('Web 登录授权方式（device 或 web），默认 device')
                 }
             ],
             desc: (0, i18n_1.t)('登录腾讯云账号'),
@@ -913325,7 +913596,7 @@ let LoginCommand = class LoginCommand extends common_1.Command {
     execute(options, log) {
         return __awaiter(this, void 0, void 0, function* () {
             log.verbose(options);
-            const { apiKeyId, apiKey, token } = options;
+            const { apiKeyId, apiKey, token, flow } = options;
             const loading = (0, utils_1.loadingFactory)();
             loading.start((0, i18n_1.t)('检验登录状态'));
             const credential = yield (0, utils_1.checkAndGetCredential)();
@@ -913387,7 +913658,7 @@ let LoginCommand = class LoginCommand extends common_1.Command {
             }
             else {
                 loading.start((0, i18n_1.t)('请在浏览器中打开的授权页面进行授权...'));
-                const res = yield (0, auth_1.login)();
+                const res = yield (0, auth_1.login)({ flow });
                 if (res.code === 'SUCCESS') {
                     loading.succeed((0, i18n_1.t)('登录成功！'));
                     yield askForCollectDataConfirm();
@@ -913395,6 +913666,9 @@ let LoginCommand = class LoginCommand extends common_1.Command {
                 }
                 else if (res.code === 'WEB_AUTH_FAILED') {
                     loading.fail((0, i18n_1.t)('Web 授权登录失败'));
+                    if (res.error) {
+                        log.error(res.error);
+                    }
                     console.log(chalk_1.default.yellow((0, i18n_1.t)('⚠️  检测到环境兼容性问题')));
                     console.log(chalk_1.default.cyan((0, i18n_1.t)('建议使用密钥登录：')));
                     console.log(chalk_1.default.cyan((0, i18n_1.t)('tcb login --key')));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/cli",
-  "version": "2.12.5",
+  "version": "2.12.7",
   "description": "CLI for Tencent CloudBase (standalone bundle)",
   "bin": {
     "tcb": "bin/tcb",