opencode-gitlab-plugin 3.2.0 → 3.2.1

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.2.1](https://gitlab.com/vglafirov/opencode-gitlab-plugin/compare/v3.2.0...v3.2.1) (2026-10-25)
+
+
+### 🐛 Bug Fixes
+
+* **auth:** read GitLab credentials from the OpenCode v2 store ([a039ea3](https://gitlab.com/vglafirov/opencode-gitlab-plugin/commit/a039ea3345db77973791d36f77716b9cd6e7bdc3))
+
 ## [3.2.0](https://gitlab.com/vglafirov/opencode-gitlab-plugin/compare/v3.1.0...v3.2.0) (2026-10-25)
 
 

package/dist/index.js

@@ -2819,36 +2819,70 @@ applyMixins(UnifiedGitLabClient, [
 ]);
 
 // src/utils.ts
+var integrationToken;
+function setIntegrationToken(token) {
+  integrationToken = token || void 0;
+}
+function credentialToToken(value) {
+  if (!value || typeof value !== "object") {
+    return void 0;
+  }
+  const credential = value;
+  if (credential["type"] === "oauth") {
+    const access = credential["access"];
+    if (typeof access !== "string" || !access) {
+      return void 0;
+    }
+    return isExpired(credential["expires"]) ? void 0 : access;
+  }
+  if (typeof credential["key"] === "string" && credential["key"]) {
+    return credential["key"];
+  }
+  if (typeof credential["token"] === "string" && credential["token"]) {
+    return credential["token"];
+  }
+  return void 0;
+}
+function isExpired(expires) {
+  return typeof expires === "number" && expires > 0 && expires <= Date.now();
+}
 function readTokenFromAuthStorage() {
   try {
     const authPath = path.join(os.homedir(), ".local", "share", "opencode", "auth.json");
     if (!fs.existsSync(authPath)) {
-      return void 0;
+      return {};
     }
     const authData = JSON.parse(fs.readFileSync(authPath, "utf-8"));
     const gitlabAuth = authData?.gitlab;
     if (!gitlabAuth) {
-      return void 0;
+      return {};
     }
-    if (gitlabAuth.type === "oauth" && gitlabAuth.access) {
-      return gitlabAuth.access;
+    const token = credentialToToken(gitlabAuth);
+    if (token) {
+      return { token };
     }
-    if (gitlabAuth.type === "api" && gitlabAuth.key) {
-      return gitlabAuth.key;
+    if (gitlabAuth.type === "oauth" && isExpired(gitlabAuth.expires)) {
+      return { expired: new Date(gitlabAuth.expires) };
     }
-    return gitlabAuth.token || void 0;
+    return {};
   } catch (error) {
-    return void 0;
+    return {};
   }
 }
 function getGitLabClient() {
-  let token = process.env["GITLAB_TOKEN"];
+  let token = process.env["GITLAB_TOKEN"] || integrationToken;
+  let expired;
   if (!token) {
-    token = readTokenFromAuthStorage();
+    ({ token, expired } = readTokenFromAuthStorage());
   }
   if (!token) {
+    if (expired) {
+      throw new Error(
+        `GitLab OAuth token in ~/.local/share/opencode/auth.json expired on ${expired.toISOString()}. Re-authenticate GitLab in OpenCode or set the GITLAB_TOKEN environment variable.`
+      );
+    }
     throw new Error(
-      "GitLab API token not found. Set GITLAB_TOKEN environment variable or configure it in OpenCode auth storage (~/.local/share/opencode/auth.json)."
+      "GitLab API token not found. Set GITLAB_TOKEN environment variable or connect GitLab in OpenCode."
     );
   }
   const instanceUrl = process.env["GITLAB_INSTANCE_URL"] || "https://gitlab.com";
@@ -6070,6 +6104,7 @@ function adaptTool(name, definition, options) {
     input: toInputSchema(definition.args),
     async execute(input, context) {
       const parsed = validator.parse(input ?? {});
+      await options.beforeExecute?.(context);
       const legacyContext = toLegacyContext(context, options.directory, options.worktree);
       const result = await definition.execute(
         parsed,
@@ -6085,6 +6120,19 @@ function adaptTools(tools, options) {
 
 // src/v2/plugin.ts
 var PLUGIN_ID = "gitlab";
+var GITLAB_INTEGRATION_ID = "gitlab";
+async function refreshIntegrationToken(ctx) {
+  const integration = ctx.integration;
+  if (!integration?.connection) {
+    return;
+  }
+  try {
+    const connection = await integration.connection.active(GITLAB_INTEGRATION_ID);
+    const resolved = connection ? await integration.connection.resolve(connection) : void 0;
+    setIntegrationToken(credentialToToken(resolved));
+  } catch {
+  }
+}
 var LAZY_MCP_HINT = `## GitLab Tools via lazy-mcp
 GitLab API tools (MRs, issues, pipelines, security, search, repos, users, todos, work items, discussions, notes, audit, git, award emoji) are served via the "gitlab" MCP server through lazy-mcp. Use lazy-mcp_list_commands with server "gitlab" to discover and call them.
 DAP tools (agents, flows, memory, skills) are on the "gitlab-dap" server instead.`;
@@ -6099,7 +6147,11 @@ var gitlabPluginV2 = Plugin.define({
     }
     const directory = ctx.location.directory;
     const worktree = ctx.location.project.directory ?? directory;
-    const tools = adaptTools(allTools, { directory, worktree });
+    const tools = adaptTools(allTools, {
+      directory,
+      worktree,
+      beforeExecute: () => refreshIntegrationToken(ctx)
+    });
     await ctx.tool.transform((editor) => {
       for (const definition of tools) {
         editor.add(definition);