polydev-ai 1.9.2 → 1.9.4

package/lib/cliManager.js

@@ -429,16 +429,16 @@ This is a known issue with @google/gemini-cli@0.3.4 and older Node.js versions.`
   }
 
   async sendCliPrompt(providerId, prompt, mode = 'args', timeoutMs = null, model = null) {
-    // Set default timeout for CLI-within-CLI scenarios (90 seconds)
-    // This is important when Claude Code calls Claude Code via Polydev MCP
+    // Set default timeout for CLI responses (240 seconds / 4 minutes)
+    // CLI-within-CLI scenarios (Claude Code calling Claude Code) need generous timeouts
     if (timeoutMs === null) {
-      timeoutMs = 90000; // 90 seconds default for CLI responses
+      timeoutMs = 240000; // 240 seconds (4 minutes) default for CLI responses
     }
 
     // Ensure timeoutMs is valid (not undefined, null, Infinity, or negative)
     // Allow up to 600 seconds (10 minutes) for very complex operations
     if (!timeoutMs || timeoutMs === Infinity || timeoutMs < 1 || timeoutMs > 600000) {
-      timeoutMs = 90000 // Default to 90 seconds for CLI responses
+      timeoutMs = 240000 // Default to 240 seconds (4 minutes) for CLI responses
     }
     
     const startTime = Date.now();
@@ -777,11 +777,11 @@ This is a known issue with @google/gemini-cli@0.3.4 and older Node.js versions.`
     }
   }
 
-  async executeCliCommand(command, args, mode = 'args', timeoutMs = 90000, stdinInput) {
+  async executeCliCommand(command, args, mode = 'args', timeoutMs = 240000, stdinInput) {
     // Ensure timeoutMs is valid (not undefined, null, Infinity, or negative)
-    // 90 seconds default for CLI-within-CLI scenarios
+    // 240 seconds (4 minutes) default for CLI responses
     if (!timeoutMs || timeoutMs === Infinity || timeoutMs < 1 || timeoutMs > 600000) {
-      timeoutMs = 90000 // Default to 90 seconds
+      timeoutMs = 240000 // Default to 240 seconds (4 minutes)
     }
     
     return new Promise((resolve, reject) => {

package/mcp/stdio-wrapper.js

@@ -35,7 +35,7 @@ if (typeof globalThis.fetch === 'undefined') {
       });
 
       req.on('error', reject);
-      req.setTimeout(30000, () => { req.destroy(); reject(new Error('Request timed out')); });
+      req.setTimeout(240000, () => { req.destroy(); reject(new Error('Request timed out')); });
       if (options.body) req.write(options.body);
       req.end();
     });
@@ -436,8 +436,8 @@ Token will be saved automatically after login.`
             return await this.handleGetPerspectivesWithCLIs(params, id);
           }
           
-          // Handle other CLI tools locally
-          if (toolName.startsWith('polydev.') && this.isCliTool(toolName)) {
+          // Handle CLI tools locally (support both prefixed and unprefixed names)
+          if (this.isCliTool(toolName)) {
             return await this.handleLocalCliTool(request);
           } else {
             // Forward non-CLI tools to remote server
@@ -1170,6 +1170,10 @@ Error: ${error.message}`
     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: {
@@ -1177,9 +1181,12 @@ Error: ${error.message}`
           'Authorization': `Bearer ${this.userToken}`,
           'User-Agent': 'polydev-stdio-wrapper/1.0.0'
         },
-        body: JSON.stringify(request)
+        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}`);
@@ -1215,6 +1222,9 @@ Error: ${error.message}`
    */
   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'
@@ -1274,14 +1284,17 @@ Error: ${error.message}`
       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;
@@ -1551,7 +1564,23 @@ Error: ${error.message}`
               if (model) {
                 console.error(`[Stdio Wrapper] Using model for ${providerEntry.cliId}: ${model}`);
               }
-              const result = await this.cliManager.sendCliPrompt(providerEntry.cliId, prompt, mode, gracefulTimeout, model);
+              let result = await this.cliManager.sendCliPrompt(providerEntry.cliId, prompt, mode, gracefulTimeout, model);
+              
+              // If CLI failed with a model and the error suggests model issue, retry with CLI default
+              if (!result.success && model) {
+                const errorLower = (result.error || '').toLowerCase();
+                const isModelError = errorLower.includes('not found') || 
+                  errorLower.includes('not supported') || 
+                  errorLower.includes('invalid model') ||
+                  errorLower.includes('entity was not found') ||
+                  errorLower.includes('does not exist') ||
+                  errorLower.includes('unknown model');
+                if (isModelError) {
+                  console.error(`[Stdio Wrapper] Model '${model}' failed for ${providerEntry.cliId}, retrying with CLI default...`);
+                  result = await this.cliManager.sendCliPrompt(providerEntry.cliId, prompt, mode, gracefulTimeout, null);
+                }
+              }
+              
               return { 
                 provider_id: providerEntry.cliId, 
                 original_provider: providerEntry.provider,
@@ -1657,18 +1686,23 @@ Error: ${error.message}`
         console.error('[Polydev] CLI detection ready, proceeding with request');
       }
       
-      const results = await this.cliManager.forceCliDetection();
-      console.error(`[Stdio Wrapper] CLI detection results:`, JSON.stringify(results, null, 2));
+      // Use cached status (refreshed by smart scheduler) instead of forceCliDetection on every request
+      const results = await this.cliManager.getCliStatus();
+      console.error(`[Stdio Wrapper] CLI status (cached):`, JSON.stringify(results, null, 2));
       const availableProviders = [];
       const unavailableProviders = [];
       
-      // Use user's provider order from dashboard (fetched via model-preferences API)
-      // Falls back to default order if not yet loaded or empty
-      // NOTE: Use length check because empty array [] is truthy in JS
-      const priorityOrder = (this.userProviderOrder && this.userProviderOrder.length > 0) 
+      // ALWAYS check ALL CLIs (they're FREE) — don't limit to userProviderOrder
+      // userProviderOrder only affects ordering, not which CLIs get checked
+      // This fixes the bug where CLIs were missed because model-preferences API
+      // only returned providerOrder for credits-tier models
+      const allCliIds = ['claude_code', 'codex_cli', 'gemini_cli'];
+      const userOrder = (this.userProviderOrder && this.userProviderOrder.length > 0) 
         ? this.userProviderOrder 
-        : ['claude_code', 'codex_cli', 'gemini_cli'];
-      console.error(`[Stdio Wrapper] Using provider order: ${priorityOrder.join(' > ')}`);
+        : [];
+      // Merge: user's preferred order first, then any CLIs not in their order
+      const priorityOrder = [...new Set([...userOrder, ...allCliIds])];
+      console.error(`[Stdio Wrapper] Using provider order: ${priorityOrder.join(' > ')} (user order: ${userOrder.join(', ') || 'none'})`);
       
       for (const providerId of priorityOrder) {
         const status = results[providerId];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "polydev-ai",
-  "version": "1.9.2",
+  "version": "1.9.4",
   "engines": {
     "node": ">=20.x <=22.x"
   },
@@ -45,7 +45,11 @@
     "test:admin": "jest __tests__/api/admin",
     "mcp": "node mcp/server.js",
     "mcp-stdio": "node mcp/stdio-wrapper.js",
-    "cli-detect": "node -e \"const CLIManager = require('./lib/cliManager').default; const m = new CLIManager(); m.forceCliDetection().then(console.log);\""
+    "cli-detect": "node -e \"const CLIManager = require('./lib/cliManager').default; const m = new CLIManager(); m.forceCliDetection().then(console.log);\"",
+    "release": "bash scripts/release.sh",
+    "release:patch": "bash scripts/release.sh patch",
+    "release:minor": "bash scripts/release.sh minor",
+    "release:major": "bash scripts/release.sh major"
   },
   "repository": {
     "type": "git",