gitlab-ai-provider 6.9.1 → 6.9.2

package/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## <small>6.9.2 (2026-06-10)</small>
+
+- Merge branch 'fix/auth-json-api-token-handling' into 'main' ([19a6e58](https://gitlab.com/vglafirov/gitlab-ai-provider/commit/19a6e58))
+- fix(auth): use PAT and enterpriseUrl-less OAuth tokens from auth.json ([6feeb58](https://gitlab.com/vglafirov/gitlab-ai-provider/commit/6feeb58))
+
 ## <small>6.9.1 (2026-06-10)</small>
 
 - Merge branch 'fix-security-review-hardening' into 'main' ([81e627b](https://gitlab.com/vglafirov/gitlab-ai-provider/commit/81e627b))

package/dist/index.js

@@ -2496,7 +2496,7 @@ var import_node_async_hooks = require("async_hooks");
 var import_isomorphic_ws = __toESM(require("isomorphic-ws"));
 
 // src/version.ts
-var VERSION = true ? "6.9.0" : "0.0.0-dev";
+var VERSION = true ? "6.9.1" : "0.0.0-dev";
 
 // src/gitlab-workflow-client.ts
 var WS_CONNECT_TIMEOUT_MS = 3e4;
@@ -5048,12 +5048,15 @@ async function loadOpenCodeAuth(instanceUrl) {
     }
     const authData = JSON.parse(fs3.readFileSync(authPath, "utf-8"));
     const normalizedUrl = instanceUrl.replace(/\/$/, "");
-    if (authData.gitlab?.type === "oauth") {
-      const gitlabAuth = authData.gitlab;
-      const normalizedEnterpriseUrl = typeof gitlabAuth.enterpriseUrl === "string" ? gitlabAuth.enterpriseUrl.replace(/\/$/, "") : gitlabAuth.enterpriseUrl;
-      if (normalizedEnterpriseUrl === normalizedUrl) {
+    const gitlabAuth = authData.gitlab;
+    if (gitlabAuth?.type === "oauth") {
+      const normalizedEnterpriseUrl = typeof gitlabAuth.enterpriseUrl === "string" ? gitlabAuth.enterpriseUrl.replace(/\/$/, "") : void 0;
+      const matchesInstance = normalizedEnterpriseUrl === normalizedUrl || normalizedEnterpriseUrl === void 0 && normalizedUrl === GITLAB_COM_URL;
+      if (matchesInstance) {
         return gitlabAuth;
       }
+    } else if (gitlabAuth?.type === "api" && typeof gitlabAuth.key === "string") {
+      return gitlabAuth;
     }
     const auth = authData[normalizedUrl] || authData[`${normalizedUrl}/`];
     return auth;
@@ -5066,6 +5069,9 @@ async function loadApiKey(options, instanceUrl, clientId) {
     return options.apiKey;
   }
   const auth = await loadOpenCodeAuth(instanceUrl);
+  if (auth?.type === "api") {
+    return auth.key;
+  }
   if (auth?.type === "oauth") {
     const oauthManager = new GitLabOAuthManager();
     if (oauthManager.needsRefresh(auth.expires)) {