@gitlab/gitlab-ai-provider 3.5.0 → 3.6.0

package/dist/index.mjs

@@ -665,6 +665,7 @@ import OpenAI from "openai";
 var MODEL_MAPPINGS = {
   // Anthropic models
   "duo-chat-opus-4-6": { provider: "anthropic", model: "claude-opus-4-6" },
+  "duo-chat-sonnet-4-6": { provider: "anthropic", model: "claude-sonnet-4-6" },
   "duo-chat-opus-4-5": { provider: "anthropic", model: "claude-opus-4-5-20251101" },
   "duo-chat-sonnet-4-5": { provider: "anthropic", model: "claude-sonnet-4-5-20250929" },
   "duo-chat-haiku-4-5": { provider: "anthropic", model: "claude-haiku-4-5-20251001" },
@@ -1460,6 +1461,7 @@ var GitLabOpenAILanguageModel = class {
 };
 
 // src/gitlab-oauth-types.ts
+var OPENCODE_GITLAB_AUTH_CLIENT_ID = "1d89f9fdb23ee96d4e603201f6861dab6e143c5c3c00469a018a2d94bdc03d4e";
 var BUNDLED_CLIENT_ID = "36f2a70cddeb5a0889d4fd8295c241b7e9848e89cf9e599d0eed2d8e5350fbf5";
 var GITLAB_COM_URL = "https://gitlab.com";
 var TOKEN_EXPIRY_SKEW_MS = 5 * 60 * 1e3;
@@ -1533,14 +1535,21 @@ var GitLabOAuthManager = class {
     return this.createTokensFromResponse(tokenResponse, instanceUrl);
   }
   /**
-   * Get the OAuth client ID for an instance
+   * Get the OAuth client ID for an instance.
+   * Priority: env var > opencode-gitlab-auth default (for GitLab.com).
+   * Note: callers (e.g. exchangeRefreshToken) may pass an explicit clientId
+   * that bypasses this method entirely.
    */
   getClientId(instanceUrl) {
+    const envClientId = process.env["GITLAB_OAUTH_CLIENT_ID"];
+    if (envClientId) {
+      return envClientId;
+    }
     if (instanceUrl === GITLAB_COM_URL) {
-      return BUNDLED_CLIENT_ID;
+      return OPENCODE_GITLAB_AUTH_CLIENT_ID;
     }
     throw new GitLabError({
-      message: `No OAuth client ID configured for instance ${instanceUrl}. Please provide a clientId parameter.`
+      message: `No OAuth client ID configured for instance ${instanceUrl}. Please provide a clientId parameter or set GITLAB_OAUTH_CLIENT_ID environment variable.`
     });
   }
   /**
@@ -1622,7 +1631,7 @@ var GitLabOAuthManager = class {
 };
 
 // src/version.ts
-var VERSION = true ? "3.4.1" : "0.0.0-dev";
+var VERSION = true ? "3.5.1" : "0.0.0-dev";
 
 // src/gitlab-provider.ts
 import * as fs from "fs";
@@ -1675,20 +1684,26 @@ async function loadApiKey(options, instanceUrl, clientId) {
         });
         const authPath = getOpenCodeAuthPath();
         const authData = JSON.parse(fs.readFileSync(authPath, "utf-8"));
-        const normalizedUrl = instanceUrl.replace(/\/$/, "");
-        authData[normalizedUrl] = {
+        authData.gitlab = {
           type: "oauth",
           refresh: refreshed.refreshToken,
           access: refreshed.accessToken,
           expires: refreshed.expiresAt,
-          instanceUrl
+          enterpriseUrl: instanceUrl
+          // Use enterpriseUrl to match auth plugin format
         };
-        fs.writeFileSync(authPath, JSON.stringify(authData, null, 2));
+        fs.writeFileSync(authPath, JSON.stringify(authData, null, 2), { mode: 384 });
         return refreshed.accessToken;
       } catch (error) {
-        console.warn(
-          `Failed to refresh OAuth token: ${error instanceof Error ? error.message : String(error)}`
-        );
+        const refreshErrorMsg = error instanceof Error ? error.message : String(error);
+        console.warn(`Failed to refresh OAuth token: ${refreshErrorMsg}`);
+        const envApiKey = process.env[options.environmentVariableName];
+        if (envApiKey) {
+          return envApiKey;
+        }
+        throw new GitLabError({
+          message: `OAuth token refresh failed and no fallback ${options.environmentVariableName} environment variable is set. Refresh error: ${refreshErrorMsg}. Re-authenticate with 'opencode auth login gitlab' or set ${options.environmentVariableName}.`
+        });
       }
     } else {
       return auth.access;
@@ -1737,7 +1752,16 @@ function createGitLab(options = {}) {
   const refreshApiKey = async () => {
     cachedApiKey = void 0;
     apiKeyPromise = void 0;
-    cachedApiKey = await getApiKey();
+    cachedApiKey = await loadApiKey(
+      {
+        apiKey: void 0,
+        // Bypass stale options.apiKey to force auth.json read
+        environmentVariableName: "GITLAB_TOKEN",
+        description: "GitLab"
+      },
+      instanceUrl,
+      options.clientId
+    );
   };
   const getHeaders = () => {
     const apiKey = cachedApiKey || options.apiKey || process.env["GITLAB_TOKEN"] || "";
@@ -2113,6 +2137,7 @@ export {
   MODEL_ID_TO_ANTHROPIC_MODEL,
   MODEL_MAPPINGS,
   OAUTH_SCOPES,
+  OPENCODE_GITLAB_AUTH_CLIENT_ID,
   TOKEN_EXPIRY_SKEW_MS,
   VERSION,
   createGitLab,