polydev-ai 1.9.12 → 1.9.14

package/mcp/stdio-wrapper.js

@@ -476,27 +476,37 @@ Token will be saved automatically after login.`
   async handleLoginTool(params, id) {
     const crypto = require('crypto');
     
-    // Check if already authenticated
+    // Check if already authenticated - verify with server first
     if (this.isAuthenticated && this.userToken) {
-      return {
-        jsonrpc: '2.0',
-        id,
-        result: {
-          content: [{
-            type: 'text',
-            text: `ALREADY AUTHENTICATED
+      console.error('[Polydev] Token exists locally, verifying with server...');
+      const isValid = await this.verifyTokenWithServer();
+      
+      if (isValid) {
+        return {
+          jsonrpc: '2.0',
+          id,
+          result: {
+            content: [{
+              type: 'text',
+              text: `ALREADY AUTHENTICATED
 =====================
 
-Your token is configured and ready.
+Your token is configured and verified.
 
 Available commands:
   /polydev:ask   Query multiple AI models
   /polydev:auth  Check status & credits
 
 To re-login: npx polydev-ai`
-          }]
-        }
-      };
+            }]
+          }
+        };
+      }
+      
+      // Token is invalid/expired - clear state and proceed with login
+      console.error('[Polydev] Token invalid/expired, proceeding with re-authentication...');
+      this.isAuthenticated = false;
+      this.userToken = null;
     }
     
     // Generate unique session ID for polling-based auth
@@ -575,7 +585,16 @@ To re-login: npx polydev-ai`
       // if this process dies, the new one can resume polling with same session)
       this.startLoginPolling(sessionId);
       
-      // Return immediately with accurate status
+      // Wait for authentication to complete (blocks up to 120s)
+      console.error('[Polydev] Waiting for browser authentication to complete...');
+      const authenticated = await this.waitForAuthCompletion();
+      
+      if (authenticated) {
+        console.error('[Polydev] Login successful, returning status...');
+        return await this.fetchAuthStatusResponse(id);
+      }
+      
+      // Timeout - return fallback message
       return {
         jsonrpc: '2.0',
         id,
@@ -585,34 +604,239 @@ To re-login: npx polydev-ai`
             text: `AUTHENTICATION STARTED
 ======================
 
-A browser window is opening for you to sign in.
+A browser window was opened for you to sign in.
 
-If it doesn't open, visit:
+If it didn't open, visit:
   ${authUrl}
 
-Once you sign in, your token will be saved automatically to:
-  ~/.polydev.env
-  ~/.zshrc
+Still waiting for login. Use /polydev:auth to check status after signing in.`
+          }]
+        }
+      };
+      
+    } catch (error) {
+      const cause = error.cause ? ` (${error.cause.code || error.cause.message || error.cause})` : '';
+      console.error('[Polydev] Login error:', error.message, cause);
+      return {
+        jsonrpc: '2.0',
+        id,
+        result: {
+          content: [{
+            type: 'text',
+            text: `Login failed: ${error.message}${cause}\n\nPlease try: npx polydev-ai`
+          }],
+          isError: true
+        }
+      };
+    }
+  }
+
+  /**
+   * Verify the current token is valid by checking with the server
+   * Returns true if valid, false if invalid/expired
+   * On network error, returns true (don't block for transient issues)
+   */
+  async verifyTokenWithServer() {
+    if (!this.userToken) return false;
+    try {
+      const response = await fetch('https://www.polydev.ai/api/auth/status', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          'Authorization': `Bearer ${this.userToken}`,
+          'User-Agent': 'polydev-stdio-wrapper/1.0.0'
+        }
+      });
+      if (!response.ok) {
+        console.error(`[Polydev] Token verification failed: ${response.status}`);
+        return false;
+      }
+      return true;
+    } catch (error) {
+      // Network error - assume valid to avoid blocking on transient issues
+      console.error('[Polydev] Token verification network error (assuming valid):', error.message);
+      return true;
+    }
+  }
+
+  /**
+   * Wait for authentication to complete by polling this.isAuthenticated
+   * Used to block tool calls until login is detected by startLoginPolling
+   * @param {number} timeoutMs - Max time to wait (default 120s)
+   * @returns {boolean} true if authenticated, false if timed out
+   */
+  async waitForAuthCompletion(timeoutMs = 120000) {
+    const pollInterval = 3000; // Check every 3 seconds
+    const maxPolls = Math.floor(timeoutMs / pollInterval);
+    
+    for (let i = 0; i < maxPolls; i++) {
+      await new Promise(r => setTimeout(r, pollInterval));
+      if (this.isAuthenticated && this.userToken) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Fetch account status and return formatted response
+   * Standalone helper that doesn't trigger re-auth (avoids circular calls)
+   * @param {*} id - JSON-RPC request id
+   * @returns {object} JSON-RPC response with account status
+   */
+  async fetchAuthStatusResponse(id) {
+    try {
+      const accountResponse = await fetch('https://www.polydev.ai/api/auth/status', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          'Authorization': `Bearer ${this.userToken}`,
+          'User-Agent': 'polydev-stdio-wrapper/1.0.0'
+        }
+      });
+      
+      if (accountResponse.ok) {
+        const data = await accountResponse.json();
+        const credits = data.credits_remaining?.toLocaleString() || 0;
+        const messages = data.messages_remaining?.toLocaleString() || 0;
+        const tier = data.subscription_tier || 'Free';
+        const email = data.email || 'Connected';
+        
+        return {
+          jsonrpc: '2.0',
+          id,
+          result: {
+            content: [{
+              type: 'text',
+              text: `LOGIN SUCCESSFUL
+================
+
+Authentication: Connected
+Account:        ${email}
+Credits:        ${credits}
+Messages:       ${messages}
+Tier:           ${tier}
 
-After login completes, you can:
+You can now use:
   /polydev:ask   Query multiple AI models
-  /polydev:auth  Check status & credits
+  /polydev:auth  Check full status & credits
+
+Dashboard: https://polydev.ai/dashboard`
+            }]
+          }
+        };
+      }
+    } catch (e) {
+      console.error('[Polydev] Post-login status fetch failed:', e.message);
+    }
+    
+    // Fallback if status fetch fails
+    return {
+      jsonrpc: '2.0',
+      id,
+      result: {
+        content: [{
+          type: 'text',
+          text: `LOGIN SUCCESSFUL
+================
+
+Your token has been saved and is active.
+
+You can now use:
+  /polydev:ask   Query multiple AI models
+  /polydev:auth  Check full status & credits
 
 Dashboard: https://polydev.ai/dashboard`
+        }]
+      }
+    };
+  }
+
+  /**
+   * Trigger re-authentication by opening browser and starting polling
+   * Waits for auth to complete inline (up to 120s) then returns full status
+   * Used when token is detected as invalid/expired
+   * @param {*} id - JSON-RPC request id
+   * @param {string} reason - Human-readable reason for re-auth
+   * @returns {object} JSON-RPC response
+   */
+  async triggerReAuth(id, reason = 'Token invalid or expired') {
+    const crypto = require('crypto');
+    const sessionId = crypto.randomBytes(32).toString('hex');
+
+    // Clear local auth state
+    this.isAuthenticated = false;
+    this.userToken = null;
+
+    try {
+      const createResponse = await fetch(`https://www.polydev.ai/api/auth/cli-session/${sessionId}`, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' }
+      });
+
+      if (!createResponse.ok) {
+        return {
+          jsonrpc: '2.0',
+          id,
+          result: {
+            content: [{
+              type: 'text',
+              text: `${reason}\n\nCould not initiate re-authentication. Please run:\n  npx polydev-ai`
+            }],
+            isError: true
+          }
+        };
+      }
+
+      const authUrl = `https://polydev.ai/auth?session_id=${sessionId}&redirect=ide-plugin&auto=true`;
+
+      console.error(`[Polydev] Opening browser for re-authentication...`);
+      this.openBrowser(authUrl).catch(() => {
+        console.error('[Polydev] Could not open browser for re-authentication');
+      });
+
+      this.savePendingSession(sessionId);
+      this.startLoginPolling(sessionId);
+
+      // Wait for authentication to complete (blocks up to 120s)
+      console.error('[Polydev] Waiting for browser authentication to complete...');
+      const authenticated = await this.waitForAuthCompletion();
+      
+      if (authenticated) {
+        console.error('[Polydev] Re-authentication successful, returning status...');
+        return await this.fetchAuthStatusResponse(id);
+      }
+
+      // Timeout - return fallback message
+      return {
+        jsonrpc: '2.0',
+        id,
+        result: {
+          content: [{
+            type: 'text',
+            text: `RE-AUTHENTICATION STARTED
+=========================
+
+${reason}
+
+A browser window was opened for re-authentication.
+
+If it didn't open, visit:
+  ${authUrl}
+
+Still waiting for login. Use /polydev:auth to check status after signing in.`
           }]
         }
       };
-      
     } catch (error) {
       const cause = error.cause ? ` (${error.cause.code || error.cause.message || error.cause})` : '';
-      console.error('[Polydev] Login error:', error.message, cause);
       return {
         jsonrpc: '2.0',
         id,
         result: {
           content: [{
             type: 'text',
-            text: `Login failed: ${error.message}${cause}\n\nPlease try: npx polydev-ai`
+            text: `${reason}\n\nCould not reach server: ${error.message}${cause}\nPlease run: npx polydev-ai`
           }],
           isError: true
         }
@@ -808,24 +1032,9 @@ Configure: https://polydev.ai/dashboard/models`
           }
         };
       } else {
-        return {
-          jsonrpc: '2.0',
-          id,
-          result: {
-            content: [{
-              type: 'text',
-              text: `POLYDEV STATUS
-==============
-
-Token invalid or expired.
-
-Please re-login:
-  1. Use the "login" tool
-  2. Or run: npx polydev-ai login`
-            }],
-            isError: true
-          }
-        };
+        // Token invalid/expired - auto-trigger re-authentication
+        console.error('[Polydev] Auth status: token invalid/expired, auto-triggering re-auth...');
+        return await this.triggerReAuth(id, 'Token invalid or expired.');
       }
     } catch (error) {
       return {
@@ -1228,6 +1437,12 @@ Error: ${error.message}`
         const errorText = await response.text();
         console.error(`[Stdio Wrapper] Remote server error: ${response.status} - ${errorText}`);
 
+        // Handle 401 specifically - token expired/invalid, trigger re-auth
+        if (response.status === 401) {
+          console.error('[Polydev] Remote API returned 401, auto-triggering re-authentication...');
+          return await this.triggerReAuth(request.id, 'Authentication expired. Re-authenticating...');
+        }
+
         return {
           jsonrpc: '2.0',
           id: request.id,
@@ -1282,6 +1497,13 @@ Error: ${error.message}`
       // 3. Combines results
       const result = await this.localSendCliPrompt(params.arguments);
       
+      // Check if result indicates auth failure (from forwardToRemoteServer 401 handling)
+      const resultText = result.content || this.formatCliResponse(result);
+      if (result.result?.content?.[0]?.text?.includes('RE-AUTHENTICATION REQUIRED')) {
+        // Auth failure already handled with re-auth response - pass through
+        return result;
+      }
+      
       return {
         jsonrpc: '2.0',
         id,
@@ -1289,7 +1511,7 @@ Error: ${error.message}`
           content: [
             {
               type: 'text',
-              text: result.content || this.formatCliResponse(result)
+              text: resultText
             }
           ]
         }
@@ -1297,6 +1519,14 @@ Error: ${error.message}`
 
     } catch (error) {
       console.error(`[Stdio Wrapper] get_perspectives error:`, error);
+      
+      // Check if error is auth-related
+      const errMsg = (error.message || '').toLowerCase();
+      if (errMsg.includes('401') || errMsg.includes('unauthorized') || errMsg.includes('auth') || errMsg.includes('token')) {
+        console.error('[Polydev] Perspectives auth error, auto-triggering re-authentication...');
+        return await this.triggerReAuth(id, 'Authentication expired. Re-authenticating...');
+      }
+      
       return {
         jsonrpc: '2.0',
         id,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "polydev-ai",
-  "version": "1.9.12",
+  "version": "1.9.14",
   "engines": {
     "node": ">=20.x <=22.x"
   },