polydev-ai 1.8.10 → 1.8.12

package/lib/cliManager.js

@@ -443,38 +443,82 @@ This is a known issue with @google/gemini-cli@0.3.4 and older Node.js versions.`
 
       if (providerId === 'codex_cli') {
         const execArgs = promptVariants.find(args => args.includes('exec')) || promptVariants[0];
-        try {
-          const result = await this.executeCodexExec(provider.command, execArgs, prompt, timeoutMs, model);
-          // executeCodexExec now returns { content, detectedModel, rawStdout, rawStderr }
-          const content = result.content;
-          const detectedModel = result.detectedModel;
-          
-          // Use detected model if available, otherwise fall back to what was requested or 'cli_default'
-          const actualModel = detectedModel || model || 'cli_default';
-          
-          if (detectedModel && detectedModel !== model) {
-            console.log(`[Polydev CLI] Codex CLI detected model: ${detectedModel} (requested: ${model || 'none'})`);
+        
+        // Try with specified model first, fallback to CLI default if model fails
+        let modelToUse = model;
+        let attempts = 0;
+        const maxAttempts = model ? 2 : 1; // Only retry if model was specified
+        
+        while (attempts < maxAttempts) {
+          attempts++;
+          try {
+            const result = await this.executeCodexExec(provider.command, execArgs, prompt, timeoutMs, modelToUse);
+            // executeCodexExec now returns { content, detectedModel, rawStdout, rawStderr }
+            const content = result.content;
+            const detectedModel = result.detectedModel;
+            const rawStdout = result.rawStdout || '';
+            const rawStderr = result.rawStderr || '';
+            
+            // Check ALL outputs for model error - content, rawStdout, and rawStderr
+            const combinedOutput = `${content || ''} ${rawStdout} ${rawStderr}`.toLowerCase();
+            const modelError = combinedOutput.includes('model is not supported') ||
+              combinedOutput.includes('model not found') ||
+              combinedOutput.includes('invalid model') ||
+              combinedOutput.includes("doesn't exist") ||
+              combinedOutput.includes("model does not exist") ||
+              combinedOutput.includes("unknown model");
+            
+            if (modelError && modelToUse && attempts < maxAttempts) {
+              console.log(`[Polydev CLI] Model '${modelToUse}' failed for Codex CLI (detected in output), retrying with CLI default...`);
+              modelToUse = null; // Retry without model flag
+              continue;
+            }
+            
+            // Use detected model if available, otherwise fall back to what was requested or 'cli_default'
+            const actualModel = detectedModel || modelToUse || 'cli_default';
+            
+            if (detectedModel && detectedModel !== model) {
+              console.log(`[Polydev CLI] Codex CLI detected model: ${detectedModel} (requested: ${model || 'none'})`);
+            }
+            
+            return {
+              success: true,
+              content,
+              tokens_used: this.estimateTokens(prompt + content),
+              latency_ms: Date.now() - startTime,
+              provider: providerId,
+              mode: 'args',
+              model_used: actualModel,
+              timestamp: new Date()
+            };
+          } catch (error) {
+            const errorMsg = error instanceof Error ? error.message : String(error);
+            
+            // Check if error is model-related and we can retry
+            const isModelError = errorMsg.toLowerCase().includes('model') && (
+              errorMsg.includes('not supported') ||
+              errorMsg.includes('not found') ||
+              errorMsg.includes('invalid') ||
+              errorMsg.includes("doesn't exist") ||
+              errorMsg.includes("does not exist") ||
+              errorMsg.includes("unknown")
+            );
+            
+            if (isModelError && modelToUse && attempts < maxAttempts) {
+              console.log(`[Polydev CLI] Model '${modelToUse}' error for Codex CLI, retrying with CLI default...`);
+              modelToUse = null; // Retry without model flag
+              continue;
+            }
+            
+            return {
+              success: false,
+              error: `CLI execution failed: ${errorMsg}`,
+              latency_ms: Date.now() - startTime,
+              provider: providerId,
+              mode,
+              timestamp: new Date()
+            };
           }
-          
-          return {
-            success: true,
-            content,
-            tokens_used: this.estimateTokens(prompt + content),
-            latency_ms: Date.now() - startTime,
-            provider: providerId,
-            mode: 'args',
-            model_used: actualModel,
-            timestamp: new Date()
-          };
-        } catch (error) {
-          return {
-            success: false,
-            error: `CLI execution failed: ${error instanceof Error ? error.message : String(error)}`,
-            latency_ms: Date.now() - startTime,
-            provider: providerId,
-            mode,
-            timestamp: new Date()
-          };
         }
       }
 

package/package.json

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