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

package/dist/index.cjs

@@ -2020,6 +2020,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;
@@ -2052,6 +2066,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
@@ -2079,8 +2105,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;
@@ -2137,6 +2173,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
                         ? {
@@ -2205,12 +2242,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;
@@ -2229,6 +2274,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(() => {
@@ -2287,6 +2341,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)({
@@ -24932,6 +24989,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:", {
@@ -84648,7 +84706,7 @@ class AuthSupervisor {
      */
     loginByWebAuth(options = {}) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { getAuthUrl, throwError, noBrowser, callbackTimeout, flow = 'device', client_id, onDeviceCode, getOAuthEndpoint, silent } = options;
+            const { getAuthUrl, throwError, noBrowser, callbackTimeout, flow = 'device', client_id, onDeviceCode, getOAuthEndpoint, silent, custom } = options;
             if (this.cacheCredential && this.needCache && !this.isCacheExpire()) {
                 return this.cacheCredential;
             }
@@ -84666,7 +84724,7 @@ class AuthSupervisor {
                 });
             }
             else {
-                credential = yield (0, oauth_1.getAuthTokenByDeviceFlow)({ client_id, onDeviceCode, getOAuthEndpoint, getAuthUrl, silent });
+                credential = yield (0, oauth_1.getAuthTokenByDeviceFlow)({ client_id, onDeviceCode, getOAuthEndpoint, getAuthUrl, silent, custom });
             }
             credential = (0, common_1.resolveCredential)(credential);
             try {
@@ -105786,7 +105844,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)();
@@ -105824,6 +105882,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;
@@ -140533,7 +140594,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,
@@ -191943,11 +192004,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")}
@@ -191957,11 +192018,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()
@@ -191995,14 +192056,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()}`,
                     },
                 ],
             };
@@ -207244,7 +207305,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}
@@ -215670,7 +215731,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"])
@@ -215687,7 +215748,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()
@@ -222103,7 +222164,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"])
@@ -223397,6 +223458,9 @@ module.exports.sync = path => {
 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;
@@ -223413,6 +223477,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(),
@@ -223470,6 +223560,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",
@@ -223513,9 +223665,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 =
@@ -223534,8 +223696,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) => {
@@ -263204,25 +263372,64 @@ function sleep(ms) {
         setTimeout(resolve, ms);
     });
 }
+/**
+ * 将接口原始返回值归一化为裸数据。
+ * - 标准模式：从 { code, result, reqId } 中解包，校验 code
+ * - custom 模式：返回值本身即为裸数据，直接透传
+ */
+function unwrapDeviceCodeResponse(raw, custom) {
+    if (custom) {
+        if (!raw || !raw.device_code) {
+            throw new error_1.CloudBaseError('Device Flow fetchDeviceCode failed (custom mode): 返回数据异常');
+        }
+        return { data: raw };
+    }
+    const resp = raw;
+    if (resp.code !== SUCCESS_CODE) {
+        throw new error_1.CloudBaseError('Device Flow fetchDeviceCode failed', {
+            code: resp.code,
+            requestId: resp.reqId,
+        });
+    }
+    return { data: resp.result, reqId: resp.reqId };
+}
+function unwrapTokenResponse(raw, custom) {
+    if (custom) {
+        return { data: raw };
+    }
+    const resp = raw;
+    // 标准模式下若外层 code 异常且无 result，直接抛错
+    if (resp.code !== SUCCESS_CODE && !resp.result) {
+        throw new error_1.CloudBaseError(`Device Flow 授权失败，错误码: ${resp.code}`, {
+            code: resp.code,
+            requestId: resp.reqId,
+        });
+    }
+    return { data: resp.result, reqId: resp.reqId };
+}
 function getAuthTokenByDeviceFlow(options = {}) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { client_id, onDeviceCode, getOAuthEndpoint, getAuthUrl, silent } = options;
+        const { client_id, onDeviceCode, getOAuthEndpoint, getAuthUrl, silent, custom } = 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,
-            });
+        // ---- 获取 device code ----
+        const deviceCodeRaw = yield fetchDeviceCode({ client_id, endpoint });
+        const { data: deviceCodeData } = unwrapDeviceCodeResponse(deviceCodeRaw, !!custom);
+        const { device_code, user_code, expires_in, interval } = deviceCodeData;
+        // ---- 构造 verification_uri ----
+        let verification_uri;
+        if (custom) {
+            // custom 模式直接使用接口返回的 verification_uri
+            const rawUri = deviceCodeData.verification_uri || '';
+            verification_uri = getAuthUrl ? getAuthUrl(rawUri) : rawUri;
+        }
+        else {
+            // 标准模式由客户端拼接 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`;
+            verification_uri = getAuthUrl ? getAuthUrl(rawVerificationUri) : rawVerificationUri;
         }
-        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`);
@@ -263232,21 +263439,25 @@ function getAuthTokenByDeviceFlow(options = {}) {
         if (onDeviceCode) {
             onDeviceCode({ user_code, verification_uri, device_code, expires_in });
         }
+        // ---- 轮询 token ----
         let pollInterval = interval;
         const deadline = Date.now() + expires_in * 1000;
         while (Date.now() < deadline) {
             yield sleep(pollInterval * 1000);
-            let resp;
+            let tokenData;
+            let reqId;
             try {
-                resp = yield fetchPollToken({ device_code, interval: pollInterval, client_id, endpoint });
+                const tokenRaw = yield fetchPollToken({ device_code, interval: pollInterval, client_id, endpoint });
+                ({ data: tokenData, reqId } = unwrapTokenResponse(tokenRaw, !!custom));
             }
             catch (e) {
+                if (e instanceof error_1.CloudBaseError)
+                    throw 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;
+            // 服务端返回业务错误（携带 error 字段）
+            if (tokenData && 'error' in tokenData) {
+                const { error, error_description } = tokenData;
                 if (error === POLL_ERROR_CODES.AUTHORIZATION_PENDING) {
                     continue;
                 }
@@ -263262,17 +263473,14 @@ function getAuthTokenByDeviceFlow(options = {}) {
                 }
                 throw new error_1.CloudBaseError(error_description || `Device Flow 授权失败，错误: ${error}`, {
                     code: error,
-                    requestId: resp.reqId,
+                    requestId: reqId,
                 });
             }
-            // 服务端返回成功的 Credential
-            if (code === SUCCESS_CODE && result) {
-                return result;
+            // 成功拿到 Credential
+            if (tokenData) {
+                return tokenData;
             }
-            throw new error_1.CloudBaseError(`Device Flow 授权失败，错误码: ${code}`, {
-                code,
-                requestId: resp.reqId,
-            });
+            throw new error_1.CloudBaseError('Device Flow 授权失败：返回数据异常', { requestId: reqId });
         }
         throw new error_1.CloudBaseError('授权超时，用户未在有效期内完成授权，请重试');
     });

package/dist/index.d.ts

@@ -5,7 +5,14 @@ import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js'
 
 export declare const ALL_SUPPORTED_RUNTIMES: ("Nodejs20.19" | "Nodejs18.15" | "Nodejs16.13" | "Nodejs14.18" | "Nodejs12.16" | "Nodejs10.15" | "Nodejs8.9" | "Python3.10" | "Python3.9" | "Python3.7" | "Python3.6" | "Python2.7" | "Php8.0" | "Php7.4" | "Php7.2" | "Java8" | "Java11" | "Golang1")[];
 
-declare type AuthFlowMode = "web" | "device";
+export declare type AuthFlowMode = "web" | "device";
+
+export declare interface AuthOptions {
+    authMode?: AuthFlowMode;
+    clientId?: string;
+    oauthEndpoint?: string;
+    oauthCustom?: boolean;
+}
 
 export declare type CloudBaseOptions = NonNullable<ConstructorParameters<typeof CloudBase>[0]>;
 
@@ -41,6 +48,7 @@ export declare function createCloudBaseMcpServer(options?: {
     version?: string;
     enableTelemetry?: boolean;
     cloudBaseOptions?: CloudBaseOptions;
+    authOptions?: AuthOptions;
     cloudMode?: boolean;
     ide?: string;
     logger?: Logger;
@@ -93,7 +101,7 @@ export declare interface DeleteFileParams {
     cloudPath: string;
 }
 
-declare interface DeviceFlowAuthInfo {
+export declare interface DeviceFlowAuthInfo {
     user_code: string;
     verification_uri?: string;
     device_code: string;
@@ -105,19 +113,13 @@ declare interface DeviceFlowAuthInfo {
  */
 export declare function enableCloudMode(): void;
 
-declare function ensureLogin(options?: {
+export declare interface EnsureLoginOptions extends AuthOptions {
     fromCloudBaseLoginPage?: boolean;
     ignoreEnvVars?: boolean;
     region?: string;
-    authMode?: AuthFlowMode;
-    clientId?: string;
+    serverAuthOptions?: AuthOptions;
     onDeviceCode?: (info: DeviceFlowAuthInfo) => void;
-}): Promise<{
-    secretId: string;
-    secretKey: string;
-    token: string | undefined;
-    envId: string | undefined;
-} | Credential_2>;
+}
 
 declare class EnvironmentManager {
     private cachedEnvId;
@@ -136,6 +138,7 @@ export declare const error: (message: string, data?: object | Error) => void;
 
 export declare interface ExtendedMcpServer extends McpServer {
     cloudBaseOptions?: CloudBaseOptions;
+    authOptions?: AuthOptions;
     ide?: string;
     logger?: Logger;
     setLogger(logger: Logger): void;
@@ -172,7 +175,7 @@ export declare interface GetFileInfoParams {
  */
 export declare function getInteractiveServerAsync(): Promise<InteractiveServer>;
 
-export declare function getLoginState(options?: Parameters<typeof ensureLogin>[0]): Promise<{
+export declare function getLoginState(options?: EnsureLoginOptions): Promise<{
     secretId: string;
     secretKey: string;
     token: string | undefined;