opencode-codebuddy-external-auth 1.0.15 → 1.0.17

package/dist/plugin.js

@@ -24,6 +24,8 @@ const CONFIG = {
     tenantId: process.env.CODEBUDDY_TENANT_ID || "",
     enterpriseId: process.env.CODEBUDDY_ENTERPRISE_ID || "",
     userId: process.env.CODEBUDDY_USER_ID || "",
+    // 强制覆盖模型（避免 OpenCode 仍使用旧模型）
+    defaultModel: process.env.CODEBUDDY_DEFAULT_MODEL || "",
 };
 // ============================================================================
 // Utility Functions
@@ -57,6 +59,9 @@ function extractTenantIdFromIss(iss) {
     const match = iss.match(/realms\/sso-([^/]+)$/);
     return match?.[1] || "";
 }
+let warnedTenantId = false;
+let warnedEnterpriseId = false;
+let warnedUserId = false;
 function resolveTenantId(accessToken) {
     if (CONFIG.tenantId)
         return CONFIG.tenantId;
@@ -81,17 +86,60 @@ function resolveUserId(accessToken) {
     const payload = decodeJwtPayload(accessToken);
     return payload?.user_id || payload?.userId || payload?.uid || payload?.sub || "";
 }
-function buildAuthHeaders(accessToken) {
-    const tenantId = resolveTenantId(accessToken);
-    const enterpriseId = resolveEnterpriseId(accessToken);
-    const userId = resolveUserId(accessToken);
-    if (!tenantId) {
-        console.warn("[codebuddy-external] 未获取到 X-Tenant-Id，请设置 CODEBUDDY_TENANT_ID");
+function resolveModel(inputModel) {
+    if (CONFIG.defaultModel)
+        return CONFIG.defaultModel;
+    return inputModel || "";
+}
+let cachedTenantId = "";
+let cachedEnterpriseId = "";
+let cachedUserId = "";
+async function fetchEnterpriseId(accessToken, tenantId) {
+    if (!tenantId)
+        return "";
+    try {
+        const url = `${CONFIG.serverUrl}/console/enterprises/${tenantId}/config/models`;
+        const response = await fetch(url, {
+            method: "GET",
+            headers: {
+                "Accept": "application/json, text/plain, */*",
+                "X-Requested-With": "XMLHttpRequest",
+                "Authorization": `Bearer ${accessToken}`,
+            },
+        });
+        if (!response.ok) {
+            return "";
+        }
+        const data = await response.json();
+        return data?.data?.enterpriseId || data?.enterpriseId || "";
     }
+    catch {
+        return "";
+    }
+}
+async function buildAuthHeaders(accessToken) {
+    const tenantId = cachedTenantId || resolveTenantId(accessToken);
+    let enterpriseId = cachedEnterpriseId || resolveEnterpriseId(accessToken);
+    const userId = cachedUserId || resolveUserId(accessToken);
     if (!enterpriseId) {
+        enterpriseId = await fetchEnterpriseId(accessToken, tenantId);
+    }
+    if (tenantId)
+        cachedTenantId = tenantId;
+    if (enterpriseId)
+        cachedEnterpriseId = enterpriseId;
+    if (userId)
+        cachedUserId = userId;
+    if (!tenantId && !warnedTenantId) {
+        warnedTenantId = true;
+        console.warn("[codebuddy-external] 未获取到 X-Tenant-Id，请设置 CODEBUDDY_TENANT_ID");
+    }
+    if (!enterpriseId && !warnedEnterpriseId) {
+        warnedEnterpriseId = true;
         console.warn("[codebuddy-external] 未获取到 X-Enterprise-Id，请设置 CODEBUDDY_ENTERPRISE_ID");
     }
-    if (!userId) {
+    if (!userId && !warnedUserId) {
+        warnedUserId = true;
         console.warn("[codebuddy-external] 未获取到 X-User-Id，请设置 CODEBUDDY_USER_ID");
     }
     const conversationId = generateUuid();
@@ -330,15 +378,21 @@ async function executeViaAuthApi(openaiRequest, auth) {
         throw new Error("缺少 access token，无法调用 CodeBuddy API");
     }
     let accessToken = auth.access;
+    const resolvedModel = resolveModel(openaiRequest.model);
+    if (!resolvedModel) {
+        throw new Error("未设置模型，请设置 CODEBUDDY_DEFAULT_MODEL 或在 OpenCode 选择模型");
+    }
     const requestBody = {
         ...openaiRequest,
+        model: resolvedModel,
         response_format: openaiRequest.response_format || { type: "text" },
         stream: openaiRequest.stream ?? true,
     };
     const doRequest = async (token) => {
+        const headers = await buildAuthHeaders(token);
         const response = await fetch(`${CONFIG.serverUrl}${CONFIG.chatCompletionsPath}`, {
             method: "POST",
-            headers: buildAuthHeaders(token),
+            headers,
             body: JSON.stringify(requestBody),
         });
         return response;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-codebuddy-external-auth",
-  "version": "1.0.15",
+  "version": "1.0.17",
   "description": "OpenCode plugin for CodeBuddy External (IOA) authentication",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",