gitlab-mcp-agent-server 0.2.6 → 0.2.7

package/build/src/infrastructure/auth/gitlab-oauth-manager.js

@@ -54,6 +54,13 @@ class GitLabOAuthManager {
             try {
                 return await this.loginInteractively();
             }
+            catch (error) {
+                if (error instanceof OAuthCallbackPortBusyError) {
+                    console.error(error.message);
+                    return this.waitForTokenFromOtherProcess(lockFilePath);
+                }
+                throw error;
+            }
             finally {
                 lock.release();
             }
@@ -190,6 +197,11 @@ class GitLabOAuthManager {
             });
             server.on('error', (error) => {
                 settled = true;
+                const errno = error;
+                if (errno.code === 'EADDRINUSE') {
+                    reject(new OAuthCallbackPortBusyError(`OAuth callback port is busy (${redirect.hostname}:${resolvePort(redirect)}). If another OAuth flow is active, finish it and retry.`));
+                    return;
+                }
                 reject(new Error(`OAuth callback server failed on ${redirect.hostname}:${resolvePort(redirect)}: ${error.message}`));
             });
             server.listen(resolvePort(redirect), redirect.hostname, () => {
@@ -315,6 +327,12 @@ class OAuthRefreshError extends Error {
         this.name = 'OAuthRefreshError';
     }
 }
+class OAuthCallbackPortBusyError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = 'OAuthCallbackPortBusyError';
+    }
+}
 function shouldReloginOnRefreshFailure(error) {
     if (!(error instanceof OAuthRefreshError)) {
         return false;
@@ -375,6 +393,15 @@ function isStaleLock(lockFilePath) {
     try {
         const raw = (0, node_fs_1.readFileSync)(lockFilePath, 'utf8');
         const parsed = JSON.parse(raw);
+        if (parsed.startedAt) {
+            const startedAtMs = new Date(parsed.startedAt).getTime();
+            if (!Number.isNaN(startedAtMs)) {
+                const ageMs = Date.now() - startedAtMs;
+                if (ageMs > 10 * 60 * 1000) {
+                    return true;
+                }
+            }
+        }
         if (!parsed.pid || !Number.isInteger(parsed.pid)) {
             return true;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitlab-mcp-agent-server",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "description": "MCP server for GitLab integration via OAuth",
   "main": "build/src/index.js",
   "bin": {