@cloudbase/cloudbase-mcp 2.6.3 → 2.6.5

package/dist/index.cjs

@@ -1944,7 +1944,7 @@ function registerEnvTools(server) {
                 content: [
                     {
                         type: "text",
-                        text: JSON.stringify(result, null, 2),
+                        text: `${JSON.stringify(result, null, 2)}\n\n请注意安全域名需要10分钟才能生效，用户也应该了解这一点。`,
                     },
                 ],
             };
@@ -23634,14 +23634,59 @@ class EnvironmentManager {
             }
             // 2. 自动设置环境ID (pass mcpServer for IDE detection)
             (0, logger_js_1.debug)('未找到环境ID，尝试自动设置...');
-            const autoEnvId = await (0, interactive_js_1.autoSetupEnvironmentId)(mcpServer);
+            let setupResult;
+            try {
+                setupResult = await (0, interactive_js_1._promptAndSetEnvironmentId)(true, { server: mcpServer });
+            }
+            catch (setupError) {
+                // Preserve original error information
+                const errorObj = setupError instanceof Error ? setupError : new Error(String(setupError));
+                (0, logger_js_1.error)('自动设置环境ID时发生异常:', {
+                    error: errorObj.message,
+                    stack: errorObj.stack,
+                    name: errorObj.name,
+                });
+                // Re-throw with enhanced context
+                const enhancedError = new Error(`自动设置环境ID失败: ${errorObj.message}`);
+                enhancedError.originalError = errorObj;
+                enhancedError.failureInfo = {
+                    reason: 'unknown_error',
+                    error: errorObj.message,
+                    errorCode: 'SETUP_EXCEPTION',
+                };
+                throw enhancedError;
+            }
+            const autoEnvId = setupResult.selectedEnvId;
             if (!autoEnvId) {
-                throw new Error("CloudBase Environment ID not found after auto setup. Please set CLOUDBASE_ENV_ID or run setupEnvironmentId tool.");
+                // Build detailed error message from failure info
+                const errorMessage = this._buildDetailedErrorMessage(setupResult.failureInfo);
+                (0, logger_js_1.error)('自动设置环境ID失败:', {
+                    reason: setupResult.failureInfo?.reason,
+                    errorCode: setupResult.failureInfo?.errorCode,
+                    error: setupResult.failureInfo?.error,
+                    details: setupResult.failureInfo?.details,
+                });
+                // Create error with detailed information
+                const detailedError = new Error(errorMessage);
+                detailedError.failureInfo = setupResult.failureInfo;
+                throw detailedError;
             }
             (0, logger_js_1.debug)('自动设置环境ID成功:', { envId: autoEnvId });
             this._setCachedEnvId(autoEnvId);
             return autoEnvId;
         }
+        catch (err) {
+            // Log the error with full context before re-throwing
+            const errorObj = err instanceof Error ? err : new Error(String(err));
+            (0, logger_js_1.error)('获取环境ID失败:', {
+                message: errorObj.message,
+                stack: errorObj.stack,
+                name: errorObj.name,
+                failureInfo: errorObj.failureInfo,
+                originalError: errorObj.originalError,
+            });
+            throw errorObj;
+        }
         finally {
             this.envIdPromise = null;
         }
@@ -23652,6 +23697,65 @@ class EnvironmentManager {
         process.env.CLOUDBASE_ENV_ID = envId;
         (0, logger_js_1.debug)('已更新环境ID缓存:', { envId });
     }
+    // Build detailed error message from failure info
+    _buildDetailedErrorMessage(failureInfo) {
+        if (!failureInfo) {
+            return "CloudBase Environment ID not found after auto setup. Please set CLOUDBASE_ENV_ID or run setupEnvironmentId tool.";
+        }
+        const { reason, error: errorMsg, errorCode, helpUrl, details } = failureInfo;
+        let message = "CloudBase Environment ID not found after auto setup.\n\n";
+        message += `原因: ${this._getReasonDescription(reason)}\n`;
+        if (errorMsg) {
+            message += `错误: ${errorMsg}\n`;
+        }
+        if (errorCode) {
+            message += `错误代码: ${errorCode}\n`;
+        }
+        // Add specific details based on failure reason
+        if (reason === 'tcb_init_failed' && details?.initTcbError) {
+            const initError = details.initTcbError;
+            if (initError.needRealNameAuth) {
+                message += "\n需要完成实名认证才能使用 CloudBase 服务。\n";
+            }
+            if (initError.needCamAuth) {
+                message += "\n需要 CAM 权限才能使用 CloudBase 服务。\n";
+            }
+        }
+        if (reason === 'env_creation_failed' && details?.createEnvError) {
+            const createError = details.createEnvError;
+            message += `\n环境创建失败: ${createError.message || '未知错误'}\n`;
+        }
+        if (reason === 'env_query_failed' && details?.queryEnvError) {
+            message += `\n环境查询失败: ${details.queryEnvError}\n`;
+        }
+        if (reason === 'timeout' && details?.timeoutDuration) {
+            message += `\n超时时间: ${details.timeoutDuration / 1000} 秒\n`;
+            message += "提示: 请确保浏览器窗口已打开，并在规定时间内完成环境选择。\n";
+        }
+        message += "\n解决方案:\n";
+        message += "1. 手动设置环境ID: 设置环境变量 CLOUDBASE_ENV_ID\n";
+        message += "2. 使用工具设置: 运行 setupEnvironmentId 工具\n";
+        if (helpUrl) {
+            message += `3. 查看帮助文档: ${helpUrl}\n`;
+        }
+        else {
+            message += "3. 查看帮助文档: https://docs.cloudbase.net/cli-v1/env\n";
+        }
+        return message;
+    }
+    _getReasonDescription(reason) {
+        const descriptions = {
+            'timeout': '环境选择超时',
+            'cancelled': '用户取消了环境选择',
+            'no_environments': '没有可用环境',
+            'login_failed': '登录失败',
+            'tcb_init_failed': 'CloudBase 服务初始化失败',
+            'env_query_failed': '环境列表查询失败',
+            'env_creation_failed': '环境创建失败',
+            'unknown_error': '未知错误',
+        };
+        return descriptions[reason] || '未知原因';
+    }
     // 手动设置环境ID（用于外部调用）
     async setEnvId(envId) {
         this._setCachedEnvId(envId);
@@ -23966,6 +24070,11 @@ async function _promptAndSetEnvironmentId(autoSelectSingle, options) {
             selectedEnvId: null,
             cancelled: false,
             error: "请先登录云开发账户",
+            failureInfo: {
+                reason: 'login_failed',
+                error: "请先登录云开发账户",
+                errorCode: "LOGIN_REQUIRED",
+            },
         };
     }
     // Get UIN for telemetry
@@ -24096,13 +24205,15 @@ async function _promptAndSetEnvironmentId(autoSelectSingle, options) {
             (0, logger_js_1.debug)("降级到 listEnvs() 也失败:", fallbackError instanceof Error ? fallbackError : new Error(String(fallbackError)));
         }
     }
-    // Report query_env_list event
+    // Report query_env_list event with detailed information
     await telemetry_js_1.telemetryReporter.report('toolkit_env_setup', {
         step: 'query_env_list',
         success: queryEnvSuccess ? 'true' : 'false',
         uin: setupContext.uin || 'unknown',
         error: queryEnvError ? queryEnvError.substring(0, 200) : undefined,
-        envCount: (envResult?.EnvList || []).length
+        envCount: (envResult?.EnvList || []).length,
+        hasInitTcbError: !!setupContext.initTcbError,
+        tcbServiceInitialized: setupContext.tcbServiceInitialized,
     });
     (0, logger_js_1.debug)("[interactive] Environment query result:", {
         hasResult: !!envResult,
@@ -24110,6 +24221,24 @@ async function _promptAndSetEnvironmentId(autoSelectSingle, options) {
         querySuccess: queryEnvSuccess,
         queryError: queryEnvError
     });
+    // If query failed completely, return error
+    if (!queryEnvSuccess && queryEnvError) {
+        (0, logger_js_1.debug)("[interactive] Environment query failed completely, returning error");
+        return {
+            selectedEnvId: null,
+            cancelled: false,
+            error: `无法获取环境列表: ${queryEnvError}`,
+            failureInfo: {
+                reason: 'env_query_failed',
+                error: `无法获取环境列表: ${queryEnvError}`,
+                errorCode: "ENV_QUERY_FAILED",
+                helpUrl: "https://docs.cloudbase.net/cli-v1/env",
+                details: {
+                    queryEnvError,
+                },
+            },
+        };
+    }
     const { EnvList } = envResult || {};
     let selectedEnvId = null;
     // 4. 如果没有环境，尝试自动创建免费环境
@@ -24120,11 +24249,15 @@ async function _promptAndSetEnvironmentId(autoSelectSingle, options) {
     });
     if (!EnvList || EnvList.length === 0) {
         (0, logger_js_1.debug)("[interactive] No environments found");
-        // Report no_envs event
+        // Report no_envs event with context
         await telemetry_js_1.telemetryReporter.report('toolkit_env_setup', {
             step: 'no_envs',
             success: 'true',
-            uin: setupContext.uin || 'unknown'
+            uin: setupContext.uin || 'unknown',
+            hasInitTcbError: !!setupContext.initTcbError,
+            tcbServiceInitialized: setupContext.tcbServiceInitialized,
+            initTcbErrorCode: setupContext.initTcbError?.code,
+            inCloudMode,
         });
         // Only try to create free environment if TCB service is initialized successfully
         // If InitTcb failed, skip environment creation
@@ -24276,11 +24409,19 @@ async function _promptAndSetEnvironmentId(autoSelectSingle, options) {
         if (inCloudMode) {
             (0, logger_js_1.debug)("[interactive] CloudMode: Returning error message");
             let errorMsg = "未找到可用环境";
+            let failureReason = 'no_environments';
+            let errorCode = "NO_ENVIRONMENTS";
             if (setupContext.initTcbError) {
                 errorMsg += `\nCloudBase 初始化失败: ${setupContext.initTcbError.message}`;
+                failureReason = 'tcb_init_failed';
+                errorCode = setupContext.initTcbError.code || "TCB_INIT_FAILED";
             }
             if (setupContext.createEnvError) {
                 errorMsg += `\n环境创建失败: ${setupContext.createEnvError.message}`;
+                if (failureReason === 'no_environments') {
+                    failureReason = 'env_creation_failed';
+                }
+                errorCode = setupContext.createEnvError.code || "ENV_CREATION_FAILED";
             }
             const helpUrl = setupContext.createEnvError?.helpUrl || setupContext.initTcbError?.helpUrl;
             if (helpUrl) {
@@ -24290,7 +24431,17 @@ async function _promptAndSetEnvironmentId(autoSelectSingle, options) {
                 selectedEnvId: null,
                 cancelled: false,
                 error: errorMsg,
-                noEnvs: true
+                noEnvs: true,
+                failureInfo: {
+                    reason: failureReason,
+                    error: errorMsg,
+                    errorCode,
+                    helpUrl,
+                    details: {
+                        initTcbError: setupContext.initTcbError,
+                        createEnvError: setupContext.createEnvError,
+                    },
+                },
             };
         }
         // In normal mode, show UI (even if creation failed or skipped)
@@ -24351,7 +24502,23 @@ async function _promptAndSetEnvironmentId(autoSelectSingle, options) {
     cloudbase, // Pass manager for refreshing env list
     resolvedServer);
     if (result.cancelled) {
-        return { selectedEnvId: null, cancelled: true };
+        const isTimeout = result.timeout === true;
+        const timeoutDuration = result.timeoutDuration;
+        return {
+            selectedEnvId: null,
+            cancelled: true,
+            failureInfo: {
+                reason: isTimeout ? 'timeout' : 'cancelled',
+                error: isTimeout
+                    ? `环境选择超时（${timeoutDuration ? timeoutDuration / 1000 : 120}秒），请重新尝试或手动设置环境ID`
+                    : "用户取消了环境选择",
+                errorCode: isTimeout ? "ENV_SELECTION_TIMEOUT" : "USER_CANCELLED",
+                helpUrl: isTimeout ? "https://docs.cloudbase.net/cli-v1/env" : undefined,
+                details: isTimeout ? {
+                    timeoutDuration,
+                } : undefined,
+            },
+        };
     }
     if (result.switch) {
         // Report switch_account event
@@ -24374,20 +24541,70 @@ async function _promptAndSetEnvironmentId(autoSelectSingle, options) {
 // 自动设置环境ID（无需MCP工具调用）
 async function autoSetupEnvironmentId(mcpServer) {
     try {
-        const { selectedEnvId, cancelled, error, noEnvs } = await _promptAndSetEnvironmentId(true, { server: mcpServer });
+        const { selectedEnvId, cancelled, error, noEnvs, failureInfo } = await _promptAndSetEnvironmentId(true, { server: mcpServer });
         if (error || noEnvs || cancelled) {
-            (0, logger_js_1.debug)("Auto setup environment ID interrupted or failed silently.", {
+            (0, logger_js_1.debug)("Auto setup environment ID interrupted or failed.", {
                 error,
                 noEnvs,
                 cancelled,
+                failureInfo,
             });
+            // Report failure to telemetry with detailed information
+            if (failureInfo) {
+                const telemetryData = {
+                    step: 'auto_setup_failed',
+                    success: 'false',
+                    reason: failureInfo.reason,
+                    errorCode: failureInfo.errorCode,
+                    error: failureInfo.error?.substring(0, 200),
+                };
+                // Add detailed context based on failure reason
+                if (failureInfo.details) {
+                    if (failureInfo.details.initTcbError) {
+                        telemetryData.initTcbErrorCode = failureInfo.details.initTcbError.code;
+                        telemetryData.needRealNameAuth = failureInfo.details.initTcbError.needRealNameAuth;
+                        telemetryData.needCamAuth = failureInfo.details.initTcbError.needCamAuth;
+                    }
+                    if (failureInfo.details.createEnvError) {
+                        telemetryData.createEnvErrorCode = failureInfo.details.createEnvError.code;
+                    }
+                    if (failureInfo.details.queryEnvError) {
+                        telemetryData.queryEnvError = failureInfo.details.queryEnvError.substring(0, 200);
+                    }
+                    if (failureInfo.details.timeoutDuration) {
+                        telemetryData.timeoutDuration = failureInfo.details.timeoutDuration;
+                    }
+                }
+                if (failureInfo.helpUrl) {
+                    telemetryData.helpUrl = failureInfo.helpUrl;
+                }
+                await telemetry_js_1.telemetryReporter.report('toolkit_env_setup', telemetryData);
+            }
+            else {
+                // Fallback: report without failureInfo
+                await telemetry_js_1.telemetryReporter.report('toolkit_env_setup', {
+                    step: 'auto_setup_failed',
+                    success: 'false',
+                    reason: 'unknown',
+                    error: error || (noEnvs ? 'no_environments' : cancelled ? 'cancelled' : 'unknown'),
+                });
+            }
             return null;
         }
         (0, logger_js_1.debug)("Auto setup environment ID successful.", { selectedEnvId });
         return selectedEnvId;
     }
     catch (error) {
-        console.error("自动配置环境ID时出错:", error);
+        const errorObj = error instanceof Error ? error : new Error(String(error));
+        console.error("自动配置环境ID时出错:", errorObj);
+        // Report unexpected error to telemetry
+        await telemetry_js_1.telemetryReporter.report('toolkit_env_setup', {
+            step: 'auto_setup_exception',
+            success: 'false',
+            reason: 'unknown_error',
+            error: errorObj.message.substring(0, 200),
+            stack: errorObj.stack?.substring(0, 500),
+        });
         return null;
     }
 }
@@ -89075,7 +89292,21 @@ function registerFunctionTools(server) {
         // }
         // 使用闭包中的 cloudBaseOptions
         const cloudbase = await getManager();
-        const result = await cloudbase.functions.updateFunctionConfig(funcParam);
+        const functionDetail = await cloudbase.functions.getFunctionDetail(funcParam.name);
+        functionDetail.Environment;
+        const vpc = (typeof functionDetail.VpcConfig === 'object' && functionDetail.VpcConfig !== null && functionDetail.VpcConfig.SubnetId && functionDetail.VpcConfig.VpcId) ? {
+            subnetId: functionDetail.VpcConfig.SubnetId,
+            vpcId: functionDetail.VpcConfig.VpcId
+        } : undefined;
+        const result = await cloudbase.functions.updateFunctionConfig({
+            name: funcParam.name,
+            envVariables: Object.assign({}, functionDetail.Environment.Variables.reduce((acc, curr) => {
+                acc[curr.Key] = curr.Value;
+                return acc;
+            }, {}), funcParam.envVariables ?? {}),
+            timeout: funcParam.timeout ?? functionDetail.Timeout,
+            vpc: Object.assign({}, vpc, funcParam.vpc ?? {}),
+        });
         (0, cloudbase_manager_js_1.logCloudBaseResult)(server.logger, result);
         return {
             content: [
@@ -136788,7 +137019,7 @@ class TelemetryReporter {
         const nodeVersion = process.version; // Node.js版本
         const arch = os_1.default.arch(); // 系统架构
         // 从构建时注入的版本号获取MCP版本信息
-        const mcpVersion = process.env.npm_package_version || "2.6.3" || 0;
+        const mcpVersion = process.env.npm_package_version || "2.6.5" || 0;
         return {
             userAgent: `${osType} ${osRelease} ${arch} ${nodeVersion} CloudBase-MCP/${mcpVersion}`,
             deviceId: this.deviceId,
@@ -203352,7 +203583,7 @@ ${envIdSection}
 ## 环境信息
 - 操作系统: ${os_1.default.type()} ${os_1.default.release()}
 - Node.js版本: ${process.version}
-- MCP 版本：${process.env.npm_package_version || "2.6.3" || 0}
+- MCP 版本：${process.env.npm_package_version || "2.6.5" || 0}
 - 系统架构: ${os_1.default.arch()}
 - 时间: ${new Date().toISOString()}
 - 请求ID: ${requestId}
@@ -217967,6 +218198,20 @@ function matchesPath(file, pathPattern) {
         return file === pathPattern;
     }
 }
+// 构建 IDE 配置文件检查清单
+// 返回所有需要检查的路径模式列表
+function buildIDEChecklist() {
+    return ALL_IDE_FILES;
+}
+// 检查文件是否在检查清单范围内
+function isInChecklist(file, checklist) {
+    for (const pattern of checklist) {
+        if (matchesPath(file, pattern)) {
+            return true;
+        }
+    }
+    return false;
+}
 // 文件过滤函数
 function filterFilesByIDE(files, ide) {
     if (ide === "all") {
@@ -217976,32 +218221,24 @@ function filterFilesByIDE(files, ide) {
     if (!ideFiles) {
         return files; // 如果找不到映射，返回所有文件
     }
-    // 计算需要排除的IDE文件（除了当前IDE需要的文件）
-    const filesToExclude = [];
-    // 遍历所有IDE文件，找出不属于当前IDE的文件
-    for (const ideFile of ALL_IDE_FILES) {
-        // 检查这个文件是否属于当前IDE需要的文件
-        let isCurrentIDEFile = false;
-        for (const currentIDEFile of ideFiles) {
-            if (matchesPath(ideFile, currentIDEFile)) {
-                isCurrentIDEFile = true;
-                break;
-            }
-        }
-        // 如果不属于当前IDE，加入排除列表
-        if (!isCurrentIDEFile) {
-            filesToExclude.push(ideFile);
-        }
-    }
-    // 排除不需要的IDE配置文件，保留其他所有文件
+    // 构建检查清单
+    const checklist = buildIDEChecklist();
+    // 两阶段过滤
     return files.filter((file) => {
-        // 检查文件是否应该被排除
-        for (const excludePath of filesToExclude) {
-            if (matchesPath(file, excludePath)) {
-                return false; // 排除
+        // 阶段1: 检查文件是否在检查清单范围内
+        if (!isInChecklist(file, checklist)) {
+            // 不在检查清单范围内，直接保留
+            return true;
+        }
+        // 阶段2: 在检查清单范围内，检查是否属于当前 IDE
+        for (const ideFile of ideFiles) {
+            if (matchesPath(file, ideFile)) {
+                // 属于当前 IDE，保留
+                return true;
             }
         }
-        return true; // 保留
+        // 在检查清单范围内但不属于当前 IDE，排除
+        return false;
     });
 }
 // 创建过滤后的目录结构
@@ -218029,7 +218266,7 @@ function registerSetupTools(server) {
         title: "下载项目模板",
         description: `自动下载并部署CloudBase项目模板。⚠️ **MANDATORY FOR NEW PROJECTS** ⚠️
 
-**CRITICAL**: This tool MUST be called FIRST when starting a new project.\n\n支持的模板:\n- react: React + CloudBase 全栈应用模板\n- vue: Vue + CloudBase 全栈应用模板\n- miniprogram: 微信小程序 + 云开发模板  \n- uniapp: UniApp + CloudBase 跨端应用模板\n- rules: 只包含AI编辑器配置文件（包含Cursor、WindSurf、CodeBuddy等所有主流编辑器配置），适合在已有项目中补充AI编辑器配置\n\n支持的IDE类型:\n- all: 下载所有IDE配置（默认）\n- cursor: Cursor AI编辑器\n- windsurf: WindSurf AI编辑器\n- codebuddy: CodeBuddy AI编辑器\n- claude-code: Claude Code AI编辑器\n- cline: Cline AI编辑器\n- gemini-cli: Gemini CLI\n- opencode: OpenCode AI编辑器\n- qwen-code: 通义灵码\n- baidu-comate: 百度Comate\n- openai-codex-cli: OpenAI Codex CLI\n- augment-code: Augment Code\n- github-copilot: GitHub Copilot\n- roocode: RooCode AI编辑器\n- tongyi-lingma: 通义灵码\n- trae: Trae AI编辑器\n- qoder: Qoder AI编辑器\n- antigravity: Google Antigravity AI编辑器\n- vscode: Visual Studio Code\n\n特别说明：\n- rules 模板会自动包含当前 mcp 版本号信息（版本号：${ true ? "2.6.3" : 0}），便于后续维护和版本追踪\n- 下载 rules 模板时，如果项目中已存在 README.md 文件，系统会自动保护该文件不被覆盖（除非设置 overwrite=true）`,
+**CRITICAL**: This tool MUST be called FIRST when starting a new project.\n\n支持的模板:\n- react: React + CloudBase 全栈应用模板\n- vue: Vue + CloudBase 全栈应用模板\n- miniprogram: 微信小程序 + 云开发模板  \n- uniapp: UniApp + CloudBase 跨端应用模板\n- rules: 只包含AI编辑器配置文件（包含Cursor、WindSurf、CodeBuddy等所有主流编辑器配置），适合在已有项目中补充AI编辑器配置\n\n支持的IDE类型:\n- all: 下载所有IDE配置（默认）\n- cursor: Cursor AI编辑器\n- windsurf: WindSurf AI编辑器\n- codebuddy: CodeBuddy AI编辑器\n- claude-code: Claude Code AI编辑器\n- cline: Cline AI编辑器\n- gemini-cli: Gemini CLI\n- opencode: OpenCode AI编辑器\n- qwen-code: 通义灵码\n- baidu-comate: 百度Comate\n- openai-codex-cli: OpenAI Codex CLI\n- augment-code: Augment Code\n- github-copilot: GitHub Copilot\n- roocode: RooCode AI编辑器\n- tongyi-lingma: 通义灵码\n- trae: Trae AI编辑器\n- qoder: Qoder AI编辑器\n- antigravity: Google Antigravity AI编辑器\n- vscode: Visual Studio Code\n\n特别说明：\n- rules 模板会自动包含当前 mcp 版本号信息（版本号：${ true ? "2.6.5" : 0}），便于后续维护和版本追踪\n- 下载 rules 模板时，如果项目中已存在 README.md 文件，系统会自动保护该文件不被覆盖（除非设置 overwrite=true）`,
         inputSchema: {
             template: zod_1.z
                 .enum(["react", "vue", "miniprogram", "uniapp", "rules"])
@@ -229561,7 +229798,7 @@ class CloudService {
             [service]: `https://${service}.internal.tencentcloudapi.com`,
         })).reduce((acc, cur) => (Object.assign(Object.assign({}, acc), cur)), {});
         if (internalEndpoint) {
-            return intranetUrlMap[this.service];
+            return intranetUrlMap[this.service] || `https://${this.service}.internal.tencentcloudapi.com`;
         }
         if (urlMap[this.service]) {
             return urlMap[this.service];
@@ -256510,7 +256747,7 @@ class InteractiveServer {
                         this.stop().catch((err) => {
                             (0, logger_js_1.debug)("Error stopping server after timeout:", err);
                         });
-                        resolve({ type: "envId", data: null, cancelled: true });
+                        resolve({ type: "envId", data: null, cancelled: true, timeout: true, timeoutDuration });
                     }
                 }, timeoutDuration);
                 // Store timeout ID so we can clear it if resolved early