gitlab-mcp-agent-server 0.2.4 → 0.2.5

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

@@ -61,7 +61,7 @@ class GitLabOAuthManager {
         return this.waitForTokenFromOtherProcess(lockFilePath);
     }
     async waitForTokenFromOtherProcess(lockFilePath) {
-        const maxWaitMs = 2 * 60 * 1000;
+        const maxWaitMs = 15 * 1000;
         const pollMs = 1000;
         let elapsed = 0;
         console.error('OAuth flow is already running in another process for this instance. Waiting for token...');
@@ -86,7 +86,7 @@ class GitLabOAuthManager {
             await sleep(pollMs);
             elapsed += pollMs;
         }
-        throw new Error('Timed out waiting for OAuth token from another process. Retry request or complete authorization in the first window.');
+        throw new Error(`Timed out waiting for OAuth token from another process. Complete OAuth in the first window or remove stale lock: ${lockFilePath}`);
     }
     async refreshToken(refreshToken) {
         this.assertOAuthClientCredentials();
@@ -124,6 +124,7 @@ class GitLabOAuthManager {
         authorizeUrl.searchParams.set('state', state);
         const localEntryUrl = `${redirect.protocol}//${redirect.host}/`;
         const code = await new Promise((resolve, reject) => {
+            let settled = false;
             const server = (0, node_http_1.createServer)((req, res) => {
                 if (!req.url) {
                     return;
@@ -155,6 +156,7 @@ class GitLabOAuthManager {
                         actionLabel: 'Start OAuth Again'
                     }));
                     server.close();
+                    settled = true;
                     reject(new Error(`OAuth authorization failed: ${error}`));
                     return;
                 }
@@ -170,6 +172,7 @@ class GitLabOAuthManager {
                         actionLabel: 'Start OAuth Again'
                     }));
                     server.close();
+                    settled = true;
                     reject(new Error('Invalid OAuth callback: code/state mismatch.'));
                     return;
                 }
@@ -182,9 +185,11 @@ class GitLabOAuthManager {
                     hint: 'This tab can be closed now.'
                 }));
                 server.close();
+                settled = true;
                 resolve(authCode);
             });
             server.on('error', (error) => {
+                settled = true;
                 reject(new Error(`OAuth callback server failed on ${redirect.hostname}:${resolvePort(redirect)}: ${error.message}`));
             });
             server.listen(resolvePort(redirect), redirect.hostname, () => {
@@ -196,6 +201,14 @@ class GitLabOAuthManager {
                     console.error(authorizeUrl.toString());
                 }
             });
+            const timeoutMs = 20_000;
+            setTimeout(() => {
+                if (settled) {
+                    return;
+                }
+                server.close();
+                reject(new Error(`OAuth was not completed in time. Open ${localEntryUrl} to continue, or use ${authorizeUrl.toString()}`));
+            }, timeoutMs);
         });
         const tokenResponse = await fetch(`${this.oauthBaseUrl}/oauth/token`, {
             method: 'POST',

package/docs/USER_GUIDE.md

@@ -168,6 +168,11 @@ npx -y gitlab-mcp-agent-server
 3. Если lock застрял после краша, удали stale lock:
    - `<tokenStorePath>.oauth.lock`
 
+`gitlab_list_issues`/другой tool уходит в timeout после удаления token:
+1. Проверь stale lock и удали его:
+   - `rm -f ~/.config/gitlab-mcp/<gitlab-host>/token.json.oauth.lock`
+2. Повтори запрос и заверши OAuth в браузере в течение окна авторизации.
+
 ## 10. Advanced (необязательно)
 
 Если нужен тонкий контроль, можно использовать:

package/package.json

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