opencode-gitlab-plugin 3.2.0 → 3.2.1

package/dist/mcp-server.cjs

@@ -31583,36 +31583,67 @@ applyMixins(UnifiedGitLabClient, [
 ]);
 
 // src/utils.ts
+var integrationToken;
+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 = import_path.default.join(import_os.default.homedir(), ".local", "share", "opencode", "auth.json");
     if (!import_fs.default.existsSync(authPath)) {
-      return void 0;
+      return {};
     }
     const authData = JSON.parse(import_fs.default.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 (error45) {
-    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";
@@ -34797,7 +34828,7 @@ async function main() {
 `);
     process.exit(1);
   }
-  const version2 = true ? "3.2.0" : "0.0.0";
+  const version2 = true ? "3.2.1" : "0.0.0";
   const server = new McpServer({ name: "gitlab", version: version2 });
   adaptToolsToMcp(server, mcpTools);
   const transport = new StdioServerTransport();