@cloudbase/cloudbase-mcp 2.15.2-beta.2 → 2.15.2

package/dist/index.js

@@ -289,6 +289,20 @@ async function getGuidePrompt(server) {
         return "";
     }
 }
+function normalizeOptionalToolString(value) {
+    return typeof value === "string" && value.trim().length > 0
+        ? value.trim()
+        : undefined;
+}
+function normalizeOptionalToolBoolean(value) {
+    return typeof value === "boolean" ? value : undefined;
+}
+function resolveToolAuthOptions(server, overrides) {
+    return (0, auth_js_1.resolveAuthOptions)({
+        ...overrides,
+        serverAuthOptions: server.authOptions,
+    });
+}
 function registerEnvTools(server) {
     // 获取 cloudBaseOptions，如果没有则为 undefined
     const cloudBaseOptions = server.cloudBaseOptions;
@@ -321,6 +335,18 @@ function registerEnvTools(server) {
                         .enum(["device", "web"])
                         .optional()
                         .describe("认证模式：device=设备码授权，web=浏览器回调授权"),
+                    oauthEndpoint: zod_1.z
+                        .string()
+                        .optional()
+                        .describe("高级可选：自定义 device-code 登录 endpoint。配置后 oauthCustom 默认按 true 处理"),
+                    clientId: zod_1.z
+                        .string()
+                        .optional()
+                        .describe("高级可选：自定义 device-code 登录 client_id，不传则使用默认值"),
+                    oauthCustom: zod_1.z
+                        .boolean()
+                        .optional()
+                        .describe("高级可选：自定义 endpoint 返回格式开关。未配置 endpoint 时默认 false；配置 endpoint 后默认 true，且不能设为 false"),
                 }
                 : {}),
             envId: zod_1.z
@@ -348,8 +374,18 @@ function registerEnvTools(server) {
         const authMode = rawArgs.authMode === "device" || rawArgs.authMode === "web"
             ? rawArgs.authMode
             : undefined;
+        const oauthEndpoint = normalizeOptionalToolString(rawArgs.oauthEndpoint);
+        const clientId = normalizeOptionalToolString(rawArgs.clientId);
+        const oauthCustom = normalizeOptionalToolBoolean(rawArgs.oauthCustom);
         const envId = rawArgs.envId;
         const confirm = rawArgs.confirm === "yes" ? "yes" : undefined;
+        const resolvedAuthOptions = resolveToolAuthOptions(server, {
+            authMode,
+            oauthEndpoint,
+            clientId,
+            oauthCustom,
+        });
+        const authConfigSummary = (0, auth_js_1.buildAuthConfigSummary)(resolvedAuthOptions);
         let deviceAuthInfo;
         const onDeviceCode = (info) => {
             deviceAuthInfo = info;
@@ -406,6 +442,7 @@ function registerEnvTools(server) {
                     auth_status: authStatus,
                     env_status: envStatus,
                     current_env_id: envId || null,
+                    auth_config: authConfigSummary,
                     ...buildEnvCandidatePayload(envCandidates),
                     auth_challenge: authFlowState.status === "PENDING" && authFlowState.authChallenge
                         ? {
@@ -474,12 +511,20 @@ function registerEnvTools(server) {
                 catch {
                     // 忽略 getLoginState 错误，继续尝试发起登录
                 }
+                const validationError = (0, auth_js_1.getAuthConfigValidationError)(resolvedAuthOptions);
+                if (validationError) {
+                    return (0, tool_result_js_1.buildJsonToolResult)({
+                        ok: false,
+                        code: "INVALID_ARGS",
+                        message: validationError,
+                        auth_config: authConfigSummary,
+                        next_step: (0, tool_result_js_1.buildAuthNextStep)("start_auth", {
+                            suggestedArgs: { action: "start_auth", authMode: "device" },
+                        }),
+                    });
+                }
                 // 2. 设备码模式：监听到 device code 即返回 AUTH_PENDING，后续由 toolbox 异步轮询并更新本地 credential
-                const effectiveMode = authMode && (authMode === "device" || authMode === "web")
-                    ? authMode
-                    : process.env.TCB_AUTH_MODE === "web"
-                        ? "web"
-                        : "device";
+                const effectiveMode = resolvedAuthOptions.authMode;
                 if (effectiveMode === "device") {
                     let resolveCode;
                     let rejectCode;
@@ -498,6 +543,15 @@ function registerEnvTools(server) {
                         auth
                             .loginByWebAuth({
                             flow: "device",
+                            ...(resolvedAuthOptions.clientId
+                                ? { client_id: resolvedAuthOptions.clientId }
+                                : {}),
+                            ...(resolvedAuthOptions.oauthEndpoint
+                                ? { getOAuthEndpoint: () => resolvedAuthOptions.oauthEndpoint }
+                                : {}),
+                            ...(resolvedAuthOptions.oauthCustom
+                                ? { custom: true }
+                                : {}),
                             onDeviceCode: deviceOnCode,
                         })
                             .then(() => {
@@ -556,6 +610,9 @@ function registerEnvTools(server) {
                 const loginState = await (0, auth_js_1.ensureLogin)({
                     region,
                     authMode: effectiveMode,
+                    clientId: resolvedAuthOptions.clientId,
+                    oauthEndpoint: resolvedAuthOptions.oauthEndpoint,
+                    oauthCustom: resolvedAuthOptions.oauthCustom,
                 });
                 if (!loginState) {
                     return (0, tool_result_js_1.buildJsonToolResult)({
@@ -1209,7 +1266,7 @@ ${envIdSection}
 ## 环境信息
 - 操作系统: ${os_1.default.type()} ${os_1.default.release()}
 - Node.js版本: ${process.version}
-- MCP 版本：${process.env.npm_package_version || "2.15.2-beta.2" || 0}
+- MCP 版本：${process.env.npm_package_version || "2.15.2" || 0}
 - 系统架构: ${os_1.default.arch()}
 - 时间: ${new Date().toISOString()}
 - 请求ID: ${requestId}
@@ -1525,7 +1582,7 @@ function parseEnabledPlugins(pluginsEnabled, pluginsDisabled) {
  * await server.connect(transport);
  */
 async function createCloudBaseMcpServer(options) {
-    const { name = "cloudbase-mcp", version = "1.0.0", enableTelemetry = true, cloudBaseOptions, cloudMode = false, ide, logger, pluginsEnabled, pluginsDisabled, } = options ?? {};
+    const { name = "cloudbase-mcp", version = "1.0.0", enableTelemetry = true, cloudBaseOptions, authOptions, cloudMode = false, ide, logger, pluginsEnabled, pluginsDisabled, } = options ?? {};
     // Enable cloud mode if specified
     if (cloudMode) {
         (0, cloud_mode_js_1.enableCloudMode)();
@@ -1563,6 +1620,9 @@ async function createCloudBaseMcpServer(options) {
     if (cloudBaseOptions) {
         server.cloudBaseOptions = cloudBaseOptions;
     }
+    if (authOptions) {
+        server.authOptions = authOptions;
+    }
     // Store ide in server instance for telemetry
     if (ide) {
         server.ide = ide;
@@ -6152,6 +6212,7 @@ async function _promptAndSetEnvironmentId(autoSelectSingle, options) {
         region,
         authMode: options?.authMode,
         clientId: options?.clientId,
+        serverAuthOptions: server?.authOptions,
         onDeviceCode: options?.onDeviceCode,
     });
     (0, logger_js_1.debug)("[interactive] Login state:", {
@@ -7170,7 +7231,7 @@ deleteCollection: 删除集合`),
     // writeNoSqlDatabaseContent
     server.registerTool?.("writeNoSqlDatabaseContent", {
         title: "修改 NoSQL 数据库数据记录",
-        description: "修改 NoSQL 数据库数据记录",
+        description: "修改 NoSQL 数据库数据记录。可按 MongoDB updateOne/updateMany 的心智模型理解：部分更新必须使用 $set/$inc/$push 等更新操作符；如果直接传 { field: value } 这类普通对象，底层会把它当作替换内容，存在覆盖整条文档的风险。",
         inputSchema: {
             action: zod_1.z
                 .enum(["insert", "update", "delete"])
@@ -7187,7 +7248,7 @@ deleteCollection: 删除集合`),
             update: zod_1.z
                 .union([zod_1.z.object({}).passthrough(), zod_1.z.string()])
                 .optional()
-                .describe("更新内容(对象或字符串,推荐对象)(update 操作必填)"),
+                .describe("更新内容(对象或字符串,推荐对象)(update 操作必填)。按 MongoDB 更新语义传入 MgoUpdate：部分更新请使用 $set/$inc/$unset/$push 等操作符，例如 { \"$set\": { \"status\": \"pending\" } }；不要直接传 { \"status\": \"pending\" }，否则可能替换整条文档。"),
             isMulti: zod_1.z
                 .boolean()
                 .optional()
@@ -8870,11 +8931,11 @@ async function registerRagTools(server) {
     }
     server.registerTool?.("searchKnowledgeBase", {
         title: "云开发知识库检索",
-        description: `云开发知识库智能检索工具，支持向量查询 (vector)、固定文档 (doc) 和 OpenAPI 文档 (openapi) 查询。
+        description: `云开发知识库智能检索工具，支持向量查询 (vector)、固定技能文档 (skill) 和 OpenAPI 文档 (openapi) 查询。
 
-      强烈推荐始终优先使用固定文档 (doc) 或 OpenAPI 文档 (openapi) 模式进行检索，仅当固定文档无法覆盖你的问题时，再使用向量查询 (vector) 模式。
+      强烈推荐始终优先使用固定技能文档 (skill) 或 OpenAPI 文档 (openapi) 模式进行检索，仅当固定技能文档无法覆盖你的问题时，再使用向量查询 (vector) 模式。
 
-      固定文档 (doc) 查询当前支持 ${skills.length} 个固定文档，分别是：
+      固定技能文档 (skill) 查询当前支持 ${skills.length} 个固定文档，分别是：
       ${skills
             .map((skill) => `文档名：${path.basename(path.dirname(skill.absolutePath))} 文档介绍：${skill.description}`)
             .join("\n")}
@@ -8884,11 +8945,11 @@ async function registerRagTools(server) {
             .map((api) => `API名：${api.name} API介绍：${api.description}`)
             .join("\n")}`,
         inputSchema: {
-            mode: zod_1.z.enum(["vector", "doc", "openapi"]),
-            docName: zod_1.z
+            mode: zod_1.z.enum(["vector", "skill", "openapi"]),
+            skillName: zod_1.z
                 .enum(skills.map((skill) => path.basename(path.dirname(skill.absolutePath))))
                 .optional()
-                .describe("mode=doc 时指定。文档名称。"),
+                .describe("mode=skill 时指定。技能名称。"),
             apiName: zod_1.z
                 .enum(openapis.map((api) => api.name))
                 .optional()
@@ -8922,14 +8983,14 @@ async function registerRagTools(server) {
             openWorldHint: true,
             category: "rag",
         },
-    }, async ({ id, content, options: { chunkExpand = [3, 3] } = {}, limit = 5, threshold = 0.5, mode, docName, apiName, }) => {
-        if (mode === "doc") {
-            const absolutePath = skills.find((skill) => skill.absolutePath.includes(docName)).absolutePath;
+    }, async ({ id, content, options: { chunkExpand = [3, 3] } = {}, limit = 5, threshold = 0.5, mode, skillName, apiName, }) => {
+        if (mode === "skill") {
+            const absolutePath = skills.find((skill) => skill.absolutePath.includes(skillName)).absolutePath;
             return {
                 content: [
                     {
                         type: "text",
-                        text: `The doc's absolute path is: ${absolutePath}. ${(await fs.readFile(absolutePath)).toString()}`,
+                        text: `The skill doc's absolute path is: ${absolutePath}. ${(await fs.readFile(absolutePath)).toString()}`,
                     },
                 ],
             };
@@ -10531,7 +10592,7 @@ class TelemetryReporter {
         const nodeVersion = process.version; // Node.js版本
         const arch = os_1.default.arch(); // 系统架构
         // 从构建时注入的版本号获取MCP版本信息
-        const mcpVersion = process.env.npm_package_version || "2.15.2-beta.2" || 0;
+        const mcpVersion = process.env.npm_package_version || "2.15.2" || 0;
         return {
             userAgent: `${osType} ${osRelease} ${arch} ${nodeVersion} CloudBase-MCP/${mcpVersion}`,
             deviceId: this.deviceId,
@@ -12363,7 +12424,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- 其他IDE类型见下方列表\n\n注意：如果未传入 ide 参数且无法从环境变量检测到 IDE，将提示错误并要求传入 ide 参数\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- kiro: Kiro AI编辑器\n- aider: Aider AI编辑器\n\n特别说明：\n- rules 模板会自动包含当前 mcp 版本号信息（版本号：${ true ? "2.15.2-beta.2" : 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- 其他IDE类型见下方列表\n\n注意：如果未传入 ide 参数且无法从环境变量检测到 IDE，将提示错误并要求传入 ide 参数\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- kiro: Kiro AI编辑器\n- aider: Aider AI编辑器\n\n特别说明：\n- rules 模板会自动包含当前 mcp 版本号信息（版本号：${ true ? "2.15.2" : 0}），便于后续维护和版本追踪\n- 下载 rules 模板时，如果项目中已存在 README.md 文件，系统会自动保护该文件不被覆盖（除非设置 overwrite=true）`,
         inputSchema: {
             template: zod_1.z
                 .enum(["react", "vue", "miniprogram", "uniapp", "rules"])
@@ -14311,6 +14372,9 @@ function registerHostingTools(server) {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.getAuthProgressStateSync = getAuthProgressStateSync;
 exports.getAuthProgressState = getAuthProgressState;
+exports.resolveAuthOptions = resolveAuthOptions;
+exports.getAuthConfigValidationError = getAuthConfigValidationError;
+exports.buildAuthConfigSummary = buildAuthConfigSummary;
 exports.setPendingAuthProgressState = setPendingAuthProgressState;
 exports.resolveAuthProgressState = resolveAuthProgressState;
 exports.rejectAuthProgressState = rejectAuthProgressState;
@@ -14327,6 +14391,32 @@ const authProgressState = {
     status: "IDLE",
     updatedAt: Date.now(),
 };
+function normalizeOptionalString(value) {
+    if (typeof value !== "string") {
+        return undefined;
+    }
+    const trimmed = value.trim();
+    return trimmed.length > 0 ? trimmed : undefined;
+}
+function normalizeAuthMode(value) {
+    return value === "web" || value === "device" ? value : undefined;
+}
+function normalizeOptionalBoolean(value) {
+    if (typeof value === "boolean") {
+        return value;
+    }
+    if (typeof value !== "string") {
+        return undefined;
+    }
+    const normalized = value.trim().toLowerCase();
+    if (normalized === "true") {
+        return true;
+    }
+    if (normalized === "false") {
+        return false;
+    }
+    return undefined;
+}
 function updateAuthProgressState(partial) {
     Object.assign(authProgressState, partial, {
         updatedAt: Date.now(),
@@ -14384,6 +14474,68 @@ async function getAuthProgressState() {
     }
     return getAuthProgressStateSync();
 }
+function resolveAuthOptions(options) {
+    const envAuthMode = options?.ignoreEnvVars
+        ? undefined
+        : normalizeAuthMode(process.env.TCB_AUTH_MODE);
+    const envClientId = options?.ignoreEnvVars
+        ? undefined
+        : normalizeOptionalString(process.env.TCB_AUTH_CLIENT_ID);
+    const envOAuthEndpoint = options?.ignoreEnvVars
+        ? undefined
+        : normalizeOptionalString(process.env.TCB_AUTH_OAUTH_ENDPOINT);
+    const envOAuthCustom = options?.ignoreEnvVars
+        ? undefined
+        : normalizeOptionalBoolean(process.env.TCB_AUTH_OAUTH_CUSTOM);
+    const explicitAuthMode = normalizeAuthMode(options?.authMode) ??
+        normalizeAuthMode(options?.serverAuthOptions?.authMode) ??
+        envAuthMode;
+    const clientId = normalizeOptionalString(options?.clientId) ??
+        normalizeOptionalString(options?.serverAuthOptions?.clientId) ??
+        envClientId;
+    const oauthEndpoint = normalizeOptionalString(options?.oauthEndpoint) ??
+        normalizeOptionalString(options?.serverAuthOptions?.oauthEndpoint) ??
+        envOAuthEndpoint;
+    const explicitOAuthCustom = normalizeOptionalBoolean(options?.oauthCustom) ??
+        normalizeOptionalBoolean(options?.serverAuthOptions?.oauthCustom) ??
+        envOAuthCustom;
+    const oauthCustom = explicitOAuthCustom ?? (oauthEndpoint ? true : false);
+    const authMode = explicitAuthMode ?? "device";
+    return {
+        authMode,
+        clientId,
+        oauthEndpoint,
+        oauthCustom,
+        usesToolboxDefaults: explicitAuthMode === undefined &&
+            clientId === undefined &&
+            oauthEndpoint === undefined &&
+            oauthCustom === false,
+    };
+}
+function getAuthConfigValidationError(options) {
+    if (options.authMode === "web" &&
+        (options.clientId !== undefined ||
+            options.oauthEndpoint !== undefined ||
+            options.oauthCustom)) {
+        return "自定义 device 登录参数仅支持 authMode=device。";
+    }
+    if (options.oauthCustom && !options.oauthEndpoint) {
+        return "oauthCustom=true 时必须同时提供 oauthEndpoint。";
+    }
+    if (options.oauthEndpoint && !options.oauthCustom) {
+        return "配置自定义 oauthEndpoint 时必须启用 oauthCustom=true。";
+    }
+    return null;
+}
+function buildAuthConfigSummary(options) {
+    return {
+        auth_mode: options.authMode,
+        client_id: options.clientId ?? null,
+        oauth_endpoint: options.oauthEndpoint ?? null,
+        oauth_custom: options.oauthCustom,
+        uses_toolbox_defaults: options.usesToolboxDefaults,
+    };
+}
 function setPendingAuthProgressState(challenge, authMode = "device") {
     return updateAuthProgressState({
         status: "PENDING",
@@ -14427,9 +14579,19 @@ async function ensureLogin(options) {
         ignoreEnvVars: options?.ignoreEnvVars,
     });
     if (!loginState) {
-        const envMode = process.env.TCB_AUTH_MODE;
-        const normalizedEnvMode = envMode === "web" || envMode === "device" ? envMode : undefined;
-        const mode = options?.authMode || normalizedEnvMode || "device";
+        const resolvedAuthOptions = resolveAuthOptions({
+            authMode: options?.authMode,
+            clientId: options?.clientId,
+            oauthEndpoint: options?.oauthEndpoint,
+            oauthCustom: options?.oauthCustom,
+            ignoreEnvVars: options?.ignoreEnvVars,
+            serverAuthOptions: options?.serverAuthOptions,
+        });
+        const validationError = getAuthConfigValidationError(resolvedAuthOptions);
+        if (validationError) {
+            throw new Error(validationError);
+        }
+        const mode = resolvedAuthOptions.authMode;
         const loginOptions = { flow: mode };
         if (mode === "web") {
             loginOptions.getAuthUrl =
@@ -14448,8 +14610,14 @@ async function ensureLogin(options) {
                     };
         }
         else {
-            if (options?.clientId) {
-                loginOptions.client_id = options.clientId;
+            if (resolvedAuthOptions.clientId) {
+                loginOptions.client_id = resolvedAuthOptions.clientId;
+            }
+            if (resolvedAuthOptions.oauthEndpoint) {
+                loginOptions.getOAuthEndpoint = () => resolvedAuthOptions.oauthEndpoint;
+            }
+            if (resolvedAuthOptions.oauthCustom) {
+                loginOptions.custom = true;
             }
             if (options?.onDeviceCode) {
                 loginOptions.onDeviceCode = (info) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/cloudbase-mcp",
-  "version": "2.15.2-beta.2",
+  "version": "2.15.2",
   "description": "腾讯云开发 MCP Server，通过AI提示词和MCP协议+云开发，让开发更智能、更高效,当你在Cursor/ VSCode GitHub Copilot/WinSurf/CodeBuddy/Augment Code/Claude Code等AI编程工具里写代码时，它能自动帮你生成可直接部署的前后端应用+小程序，并一键发布到腾讯云开发 CloudBase。",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",