polydev-ai 1.8.17 → 1.8.19

package/mcp/stdio-wrapper.js

@@ -245,6 +245,7 @@ class StdioMCPWrapper {
     
     // Cache for user model preferences (provider -> model)
     this.userModelPreferences = null;
+    this.perspectivesPerMessage = 2; // Default to 2 perspectives
     this.modelPreferencesCacheTime = null;
     this.MODEL_PREFERENCES_CACHE_TTL = 5 * 60 * 1000; // 5 minutes cache
   }
@@ -564,6 +565,7 @@ class StdioMCPWrapper {
 
   /**
    * Local CLI prompt sending with ALL available CLIs + remote perspectives
+   * Respects user's perspectives_per_message setting for total perspectives
    */
   async localSendCliPrompt(args) {
     console.error(`[Stdio Wrapper] Local CLI prompt sending with perspectives`);
@@ -585,6 +587,7 @@ class StdioMCPWrapper {
       const gracefulTimeout = Math.min(timeout_ms, 600000);
 
       // Fetch user's model preferences (cached, non-blocking on failure)
+      // This also fetches perspectivesPerMessage setting
       let modelPreferences = {};
       try {
         modelPreferences = await this.fetchUserModelPreferences();
@@ -592,6 +595,10 @@ class StdioMCPWrapper {
         console.error('[Stdio Wrapper] Model preferences fetch failed (will use CLI defaults):', prefError.message);
       }
 
+      // Get the user's perspectives_per_message setting (default 2)
+      const maxPerspectives = this.perspectivesPerMessage || 2;
+      console.error(`[Stdio Wrapper] Max perspectives per message: ${maxPerspectives}`);
+
       let localResults = [];
 
       if (provider_id) {
@@ -606,18 +613,29 @@ class StdioMCPWrapper {
         const result = await this.cliManager.sendCliPrompt(provider_id, prompt, mode, gracefulTimeout, model);
         localResults = [{ provider_id, ...result }];
       } else {
-        // No specific provider - use ALL available local CLIs
-        console.error(`[Stdio Wrapper] Using all available local CLIs`);
-        const availableProviders = await this.getAllAvailableProviders();
+        // No specific provider - use providers in user's preferred order
+        // Mix CLI (where available) + API fallback (where CLI unavailable)
+        console.error(`[Stdio Wrapper] Using providers in user's preferred order (max: ${maxPerspectives})`);
+        const { available: availableClis, unavailable: unavailableClis } = await this.getAllAvailableProviders();
+        
+        // Build ordered list: use CLI if available, otherwise mark for API fallback
+        const userOrder = this.userProviderOrder || ['claude_code', 'codex_cli', 'gemini_cli'];
+        const providersToUse = userOrder.slice(0, maxPerspectives);
+        
+        // Separate into CLI vs API fallback
+        const cliProviders = providersToUse.filter(p => availableClis.includes(p));
+        const apiProviders = providersToUse.filter(p => unavailableClis.includes(p));
+        
+        console.error(`[Stdio Wrapper] Provider breakdown: CLI=${cliProviders.join(', ') || 'none'}, API fallback=${apiProviders.join(', ') || 'none'}`);
         
-        if (availableProviders.length === 0) {
-          console.error(`[Stdio Wrapper] No local CLIs available, will use remote perspectives only`);
+        if (cliProviders.length === 0 && apiProviders.length === 0) {
+          console.error(`[Stdio Wrapper] No providers available, will use remote perspectives only`);
           localResults = [];
         } else {
-          console.error(`[Stdio Wrapper] Found ${availableProviders.length} available CLIs: ${availableProviders.join(', ')}`);
+          console.error(`[Stdio Wrapper] Using ${cliProviders.length} CLIs + ${apiProviders.length} API fallbacks`);
           
           // Run all CLI prompts concurrently
-          const cliPromises = availableProviders.map(async (providerId) => {
+          const cliPromises = cliProviders.map(async (providerId) => {
             try {
               const model = modelPreferences[providerId] || null;
               if (model) {
@@ -645,8 +663,25 @@ class StdioMCPWrapper {
         console.error('[Stdio Wrapper] CLI results reporting failed (non-critical):', err.message);
       });
 
-      // Get remote perspectives (only for models not covered by local CLIs)
-      const perspectivesResult = await this.callPerspectivesForCli(args, localResults);
+      // Calculate how many successful local perspectives we got
+      const successfulLocalCount = localResults.filter(r => r.success).length;
+      const remainingPerspectives = maxPerspectives - successfulLocalCount;
+
+      // Get remote perspectives only if we need more perspectives to reach maxPerspectives
+      let perspectivesResult;
+      if (remainingPerspectives > 0) {
+        console.error(`[Stdio Wrapper] Need ${remainingPerspectives} more perspectives from remote`);
+        perspectivesResult = await this.callPerspectivesForCli(args, localResults, remainingPerspectives);
+      } else {
+        console.error(`[Stdio Wrapper] Already have ${successfulLocalCount} perspectives, skipping remote call`);
+        perspectivesResult = {
+          success: true,
+          content: '',
+          skipped: true,
+          reason: `Already have ${successfulLocalCount} perspectives (max: ${maxPerspectives})`,
+          timestamp: new Date().toISOString()
+        };
+      }
 
       // Record usage for all CLI responses
       for (const localResult of localResults) {
@@ -673,14 +708,19 @@ class StdioMCPWrapper {
 
   /**
    * Get all available and authenticated CLI providers
+   * Uses user's provider order from dashboard (display_order) instead of hardcoded order
+   * Falls back to API for providers where CLI is not available/authenticated
    */
   async getAllAvailableProviders() {
     try {
       const results = await this.cliManager.forceCliDetection();
       const availableProviders = [];
+      const unavailableProviders = [];
       
-      // Priority order: claude_code > codex_cli > gemini_cli
-      const priorityOrder = ['claude_code', 'codex_cli', 'gemini_cli'];
+      // Use user's provider order from dashboard (fetched via model-preferences API)
+      // Falls back to default order if not yet loaded
+      const priorityOrder = this.userProviderOrder || ['claude_code', 'codex_cli', 'gemini_cli'];
+      console.error(`[Stdio Wrapper] Using provider order: ${priorityOrder.join(' > ')}`);
       
       for (const providerId of priorityOrder) {
         const status = results[providerId];
@@ -688,17 +728,25 @@ class StdioMCPWrapper {
           // Skip providers with quota exhausted - they'll use API fallback
           if (status.quota_exhausted) {
             console.error(`[Stdio Wrapper] Skipping ${providerId} - quota exhausted, will use API fallback`);
+            unavailableProviders.push(providerId);
             continue;
           }
           availableProviders.push(providerId);
+        } else {
+          // CLI not available - will fall back to API for this provider
+          const reason = !status ? 'not detected' : (!status.available ? 'not installed' : 'not authenticated');
+          console.error(`[Stdio Wrapper] CLI ${providerId} ${reason}, will use API fallback`);
+          unavailableProviders.push(providerId);
         }
       }
       
-      return availableProviders;
+      // Return available CLIs first, then unavailable ones (for API fallback)
+      // The caller will handle mixing CLI + API based on availability
+      return { available: availableProviders, unavailable: unavailableProviders };
       
     } catch (error) {
       console.error('[Stdio Wrapper] Failed to get available providers:', error);
-      return [];
+      return { available: [], unavailable: [] };
     }
   }
 
@@ -782,8 +830,11 @@ class StdioMCPWrapper {
   /**
    * Call remote perspectives for CLI prompts
    * Only calls remote APIs for providers NOT covered by successful local CLIs
+   * @param {Object} args - Original request arguments
+   * @param {Array} localResults - Results from local CLIs
+   * @param {number} maxPerspectives - Maximum number of remote perspectives to fetch
    */
-  async callPerspectivesForCli(args, localResults) {
+  async callPerspectivesForCli(args, localResults, maxPerspectives = 2) {
     // Determine which providers succeeded locally
     const successfulLocalProviders = localResults
       .filter(r => r.success)
@@ -800,20 +851,21 @@ class StdioMCPWrapper {
       .map(cli => cliToApiProvider[cli])
       .filter(Boolean);
     
-    // If all major providers are covered locally, skip remote call entirely
-    if (excludeProviders.length >= 3 || 
+    // If all major providers are covered locally OR we don't need more perspectives, skip remote call
+    if (maxPerspectives <= 0 ||
+        excludeProviders.length >= 3 || 
         (excludeProviders.includes('anthropic') && excludeProviders.includes('openai') && excludeProviders.includes('google'))) {
-      console.error(`[Stdio Wrapper] All providers covered by local CLIs, skipping remote perspectives`);
+      console.error(`[Stdio Wrapper] All providers covered by local CLIs or max perspectives reached, skipping remote perspectives`);
       return {
         success: true,
         content: '',
         skipped: true,
-        reason: 'All providers covered by local CLIs',
+        reason: 'All providers covered by local CLIs or max perspectives reached',
         timestamp: new Date().toISOString()
       };
     }
     
-    console.error(`[Stdio Wrapper] Calling remote perspectives (excluding: ${excludeProviders.join(', ') || 'none'})`);
+    console.error(`[Stdio Wrapper] Calling remote perspectives (excluding: ${excludeProviders.join(', ') || 'none'}, max: ${maxPerspectives})`);
     
     // Format CLI responses for logging on the server
     const cliResponses = localResults.map(result => ({
@@ -839,6 +891,8 @@ class StdioMCPWrapper {
             exclude_providers: excludeProviders,
             // Pass CLI responses for dashboard logging
             cli_responses: cliResponses,
+            // Limit remote perspectives to what we need
+            max_perspectives: maxPerspectives,
             project_memory: 'none',
             temperature: 0.7,
             max_tokens: 20000
@@ -1307,6 +1361,7 @@ class StdioMCPWrapper {
   /**
    * Fetch user's model preferences from API keys
    * Returns a map of CLI provider -> default_model
+   * Also fetches and caches perspectivesPerMessage setting
    */
   async fetchUserModelPreferences() {
     // Check cache first
@@ -1342,7 +1397,16 @@ class StdioMCPWrapper {
         this.userModelPreferences = result.modelPreferences;
         this.modelPreferencesCacheTime = Date.now();
         
+        // Also cache perspectives_per_message setting (default 2)
+        this.perspectivesPerMessage = result.perspectivesPerMessage || 2;
+        
+        // Cache provider order from user's dashboard (respects display_order)
+        // This determines which CLIs/APIs to use first
+        this.userProviderOrder = result.providerOrder || ['claude_code', 'codex_cli', 'gemini_cli'];
+        
         console.error('[Stdio Wrapper] Model preferences loaded:', JSON.stringify(result.modelPreferences));
+        console.error('[Stdio Wrapper] Provider order:', JSON.stringify(this.userProviderOrder));
+        console.error('[Stdio Wrapper] Perspectives per message:', this.perspectivesPerMessage);
         return result.modelPreferences;
       } else {
         console.error('[Stdio Wrapper] No model preferences in response');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "polydev-ai",
-  "version": "1.8.17",
+  "version": "1.8.19",
   "description": "Agentic workflow assistant with CLI integration - get diverse perspectives from multiple LLMs when stuck or need enhanced reasoning",
   "keywords": [
     "mcp",