polydev-ai 1.9.16 → 1.9.17

package/mcp/stdio-wrapper.js

@@ -299,11 +299,11 @@ class StdioMCPWrapper {
     
     // Pending session file for surviving restarts
     this.PENDING_SESSION_FILE = path.join(os.homedir(), '.polydev-pending-session');
-    
+
     // MCP client info (set during initialize handshake)
     // Used to detect which IDE is running us and exclude its CLI to avoid recursive calls
     this.clientInfo = null;
-    
+
     // Initialize CLI Manager for local CLI functionality
     // Disable StatusReporter - it's redundant (updateCliStatusInDatabase handles DB updates via /api/cli-status-update)
     // and causes 401 errors because /api/mcp uses different auth than /api/cli-status-update
@@ -1000,10 +1000,11 @@ Token will be saved automatically after login.`
           perspectivesSection += ` (${perspectiveCount} active)`;
           
           // Show providers in order with their selected models
-          for (const p of modelPrefs.allProviders) {
+          for (let i = 0; i < modelPrefs.allProviders.length; i++) {
+            const p = modelPrefs.allProviders[i];
             const providerName = p.provider.charAt(0).toUpperCase() + p.provider.slice(1);
             const source = p.cliId ? 'CLI' : (p.tier ? `Credits/${p.tier}` : 'API');
-            perspectivesSection += `\n  ${providerName.padEnd(12)} ${p.model} [${source}]`;
+            perspectivesSection += `\n  ${i + 1}. ${providerName.padEnd(12)} ${p.model} [${source}]`;
           }
         } else {
           perspectivesSection += '\n  (none configured - using defaults)';
@@ -1421,6 +1422,273 @@ Error: ${error.message}`
 </html>`;
   }
 
+  async forwardToRemoteServer(request) {
+    console.error(`[Stdio Wrapper] Forwarding request to remote server`);
+
+    try {
+      // Use AbortController for timeout if available, otherwise rely on fetch timeout
+      const controller = typeof AbortController !== 'undefined' ? new AbortController() : null;
+      const timeoutId = controller ? setTimeout(() => controller.abort(), 240000) : null; // 240s timeout
+
+      const response = await fetch('https://www.polydev.ai/api/mcp', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          'Authorization': `Bearer ${this.userToken}`,
+          'User-Agent': 'polydev-stdio-wrapper/1.0.0'
+        },
+        body: JSON.stringify(request),
+        ...(controller ? { signal: controller.signal } : {})
+      });
+
+      if (timeoutId) clearTimeout(timeoutId);
+
+      if (!response.ok) {
+        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,
+          error: {
+            code: -32603,
+            message: `Remote server error: ${response.status} - ${errorText}`
+          }
+        };
+      }
+
+      const result = await response.json();
+      console.error(`[Stdio Wrapper] Got response from remote server`);
+      return result;
+    } catch (error) {
+      console.error(`[Stdio Wrapper] Network error:`, error.message);
+      return {
+        jsonrpc: '2.0',
+        id: request.id,
+        error: {
+          code: -32603,
+          message: `Network error: ${error.message}`
+        }
+      };
+    }
+  }
+
+  /**
+   * Check if a tool is a CLI tool that should be handled locally
+   */
+  isCliTool(toolName) {
+    const cliTools = [
+      'force_cli_detection',
+      'get_cli_status', 
+      'send_cli_prompt',
+      'polydev.force_cli_detection',
+      'polydev.get_cli_status', 
+      'polydev.send_cli_prompt'
+    ];
+    return cliTools.includes(toolName);
+  }
+
+  /**
+   * Handle get_perspectives with local CLIs + remote perspectives
+   */
+  async handleGetPerspectivesWithCLIs(params, id) {
+    console.error(`[Stdio Wrapper] Handling get_perspectives with local CLIs + remote`);
+    
+    try {
+      // Use existing localSendCliPrompt logic which already:
+      // 1. Checks all local CLIs
+      // 2. Calls remote perspectives
+      // 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,
+        result: {
+          content: [
+            {
+              type: 'text',
+              text: resultText
+            }
+          ]
+        }
+      };
+
+    } 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,
+        error: {
+          code: -32603,
+          message: error.message
+        }
+      };
+    }
+  }
+
+  /**
+   * Handle CLI tools locally without remote server calls
+   */
+  async handleLocalCliTool(request) {
+    const { method, params, id } = request;
+    const { name: toolName, arguments: args } = params;
+
+    console.error(`[Stdio Wrapper] Handling local CLI tool: ${toolName}`);
+
+    try {
+      let result;
+
+      switch (toolName) {
+        case 'force_cli_detection':
+        case 'polydev.force_cli_detection':
+          result = await this.localForceCliDetection(args);
+          break;
+        
+        case 'get_cli_status':
+        case 'polydev.get_cli_status':
+          result = await this.localGetCliStatus(args);
+          break;
+        
+        case 'send_cli_prompt':
+        case 'polydev.send_cli_prompt':
+          result = await this.localSendCliPrompt(args);
+          break;
+        
+        default:
+          throw new Error(`Unknown CLI tool: ${toolName}`);
+      }
+
+      return {
+        jsonrpc: '2.0',
+        id,
+        result: {
+          content: [
+            {
+              type: 'text',
+              text: this.formatCliResponse(result)
+            }
+          ]
+        }
+      };
+
+    } catch (error) {
+      console.error(`[Stdio Wrapper] CLI tool error:`, error);
+      return {
+        jsonrpc: '2.0',
+        id,
+        error: {
+          code: -32603,
+          message: error.message
+        }
+      };
+    }
+  }
+
+  /**
+   * Local CLI detection implementation with database updates
+   */
+  async localForceCliDetection(args) {
+    console.error(`[Stdio Wrapper] Local CLI detection with model detection started`);
+    
+    try {
+      const providerId = args.provider_id; // Optional - detect specific provider
+      
+      // Force detection using CLI Manager (no remote API calls)
+      const results = await this.cliManager.forceCliDetection(providerId);
+      console.error(`[Stdio Wrapper] CLI detection results:`, JSON.stringify(results, null, 2));
+      
+      // Save status locally to file-based cache
+      await this.saveLocalCliStatus(results);
+
+      // Update database with CLI status
+      await this.updateCliStatusInDatabase(results);
+      
+      return {
+        success: true,
+        results,
+        message: `Local CLI detection completed for ${providerId || 'all providers'}`,
+        timestamp: new Date().toISOString(),
+        local_only: true
+      };
+
+    } catch (error) {
+      console.error('[Stdio Wrapper] Local CLI detection error:', error);
+      return {
+        success: false,
+        error: error.message,
+        timestamp: new Date().toISOString(),
+        local_only: true
+      };
+    }
+  }
+
+  /**
+   * Local CLI status retrieval
+   */
+  async localGetCliStatus(args) {
+    console.error(`[Stdio Wrapper] Local CLI status retrieval`);
+    
+    try {
+      const providerId = args.provider_id;
+      let results = {};
+
+      if (providerId) {
+        // Get specific provider status
+        const status = await this.cliManager.getCliStatus(providerId);
+        results = status;
+      } else {
+        // Get all providers status
+        const providers = this.cliManager.getProviders();
+        for (const provider of providers) {
+          const status = await this.cliManager.getCliStatus(provider.id);
+          results[provider.id] = status;
+        }
+      }
+
+      // Update database with current status
+      await this.updateCliStatusInDatabase(results);
+
+      return {
+        success: true,
+        results,
+        message: 'Local CLI status retrieved successfully',
+        timestamp: new Date().toISOString(),
+        local_only: true
+      };
+
+    } catch (error) {
+      console.error('[Stdio Wrapper] Local CLI status error:', error);
+      return {
+        success: false,
+        error: error.message,
+        timestamp: new Date().toISOString(),
+        local_only: true
+      };
+    }
+  }
+
   /**
    * Get the CLI ID to exclude based on the current IDE client.
    * Prevents recursive calls (e.g., Claude Code calling claude_code CLI which spawns another Claude Code).
@@ -1428,9 +1696,9 @@ Error: ${error.message}`
    */
   getExcludedCliForCurrentIDE() {
     if (!this.clientInfo?.name) return null;
-    
+
     const clientName = this.clientInfo.name.toLowerCase();
-    
+
     // Map known IDE client names to their corresponding CLI IDs
     // These are the clientInfo.name values sent during MCP initialize handshake
     const ideToCliMap = {
@@ -1439,8 +1707,7 @@ Error: ${error.message}`
       'claude_code': 'claude_code',
       'claude code': 'claude_code',
       'claudecode': 'claude_code',
-      // Cursor (uses Claude under the hood but is a separate IDE)
-      // Don't exclude any CLI for Cursor since it's not calling itself
+      // Cursor uses Claude under the hood but is a separate IDE — don't exclude
       // Gemini CLI / Google IDX
       'gemini-cli': 'gemini_cli',
       'gemini_cli': 'gemini_cli',
@@ -1449,17 +1716,17 @@ Error: ${error.message}`
       'codex_cli': 'codex_cli',
       'codex': 'codex_cli',
     };
-    
+
     // Direct match first
     if (ideToCliMap[clientName]) {
       return ideToCliMap[clientName];
     }
-    
+
     // Fuzzy match: check if client name contains known patterns
     if (clientName.includes('claude')) return 'claude_code';
     if (clientName.includes('gemini')) return 'gemini_cli';
     if (clientName.includes('codex')) return 'codex_cli';
-    
+
     return null;
   }
 
@@ -1548,17 +1815,17 @@ Error: ${error.message}`
         
         // CLI priority order: Claude Code first, then Gemini, then Codex
         const cliPriorityOrder = ['claude_code', 'gemini_cli', 'codex_cli'];
-        
+
         // Detect if we should exclude the current IDE's CLI to avoid recursive calls
         const excludedCli = this.getExcludedCliForCurrentIDE();
         if (excludedCli) {
           console.error(`[Stdio Wrapper] Excluding CLI '${excludedCli}' (current IDE: ${this.clientInfo?.name}) to avoid recursive calls`);
         }
-        
+
         // Build merged provider list: CLIs first, then API-only
         const finalProviders = [];
         const usedProviderNames = new Set();
-        
+
         // STEP 1: Add ALL available CLIs (in priority order) - they're FREE
         // Don't limit to maxPerspectives here — we run all CLIs in parallel
         // and take the first maxPerspectives successes (fast-collect pattern)
@@ -1584,7 +1851,7 @@ Error: ${error.message}`
           
           finalProviders.push({
             provider: providerName,
-            model: configuredProvider?.model || null, // null = use CLI default model
+            model: configuredProvider?.model || null, // null = use CLI's default model
             cliId: cliId,
             source: 'cli',
             tier: null // CLIs don't use credits tiers
@@ -1664,7 +1931,7 @@ Error: ${error.message}`
             }
           });
           
-          // Fast-collect: resolve early once we have maxPerspectives successes OR all complete
+          // Fast-collect: resolve once we have maxPerspectives successes OR all complete
           localResults = await this.collectFirstNSuccesses(cliPromises, maxPerspectives);
           console.error(`[Stdio Wrapper] Fast-collect: got ${localResults.filter(r => r.success).length} successful, ${localResults.filter(r => !r.success).length} failed out of ${cliPromises.length} CLIs`);
         }
@@ -2456,7 +2723,7 @@ Error: ${error.message}`
   /**
    * Fetch user's model preferences from API keys
    * Returns a map of CLI provider -> default_model
-   * Also fetches and caches perspectives_per_message setting and allProviders list
+   * Also fetches and caches perspectivesPerMessage setting and allProviders list
    */
   async fetchUserModelPreferences() {
     // Check cache first

package/package.json

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