polydev-ai 1.5.1 → 1.5.3

package/lib/cliManager.js

@@ -379,17 +379,15 @@ 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) {
-    // Set provider-specific default timeouts
+    // Set provider-specific default timeouts (180s for all by default, complex prompts take time)
     if (timeoutMs === null) {
-      timeoutMs = providerId === 'claude_code' ? 60000 : 30000; // 60s for Claude Code, 30s for others
-    }
-    if (providerId === 'codex_cli' && timeoutMs < 90000) {
-      timeoutMs = 90000;
+      timeoutMs = 180000; // 180 seconds default for all providers
     }
     
     // Ensure timeoutMs is valid (not undefined, null, Infinity, or negative)
+    // Allow up to 300 seconds (5 minutes) for complex operations
     if (!timeoutMs || timeoutMs === Infinity || timeoutMs < 1 || timeoutMs > 300000) {
-      timeoutMs = 30000 // Default to 30 seconds
+      timeoutMs = 180000 // Default to 180 seconds
     }
     
     const startTime = Date.now();
@@ -514,10 +512,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 = 30000, stdinInput) {
+  async executeCliCommand(command, args, mode = 'args', timeoutMs = 180000, stdinInput) {
     // Ensure timeoutMs is valid (not undefined, null, Infinity, or negative)
+    // Allow up to 300 seconds (5 minutes) for complex operations
     if (!timeoutMs || timeoutMs === Infinity || timeoutMs < 1 || timeoutMs > 300000) {
-      timeoutMs = 30000 // Default to 30 seconds
+      timeoutMs = 180000 // Default to 180 seconds
     }
     
     return new Promise((resolve, reject) => {
@@ -672,17 +671,98 @@ This is a known issue with @google/gemini-cli@0.3.4 and older Node.js versions.`
         stop(() => reject(new Error(`Codex exec timeout after ${timeoutMs}ms`)));
       }, timeoutMs);
 
+      // Helper function to parse Codex output robustly
+      const parseCodexOutput = (output) => {
+        if (!output || !output.trim()) return null;
+        
+        // First, try to extract the response between "codex" marker and "tokens used"
+        // This is the most reliable pattern for Codex CLI output
+        const codexMarkerMatch = output.match(/\bcodex\s*\n([\s\S]*?)(?:\n\s*tokens used|\n\s*$)/i);
+        if (codexMarkerMatch && codexMarkerMatch[1]) {
+          const extracted = codexMarkerMatch[1].trim();
+          if (extracted.length > 0 && !extracted.startsWith('ERROR')) {
+            return extracted;
+          }
+        }
+        
+        // Fallback: Try to find bullet point responses
+        const bulletMatches = output.match(/•\s*(.+)/g);
+        if (bulletMatches && bulletMatches.length > 0) {
+          const bulletContent = bulletMatches
+            .map(m => m.replace(/^•\s*/, '').trim())
+            .filter(s => s.length > 0)
+            .join('\n');
+          if (bulletContent.length > 0) {
+            return bulletContent;
+          }
+        }
+        
+        // Last resort: Filter out known noise patterns line by line
+        const lines = output.split('\n');
+        const contentLines = [];
+        
+        // Patterns to skip (Codex-specific noise)
+        const noisePatterns = [
+          /^\s*$/,                                          // Empty lines
+          /^\d{4}-\d{2}-\d{2}T[\d:]+.*?(ERROR|WARN|INFO)/i, // Timestamp logs
+          /^OpenAI Codex v[\d.]+/i,                         // Version banner
+          /^-{4,}$/,                                        // Separator lines
+          /^workdir:/i,                                     // Header fields
+          /^model:/i,
+          /^provider:/i,
+          /^approval:/i,
+          /^sandbox:/i,
+          /^reasoning effort:/i,
+          /^reasoning summaries:/i,
+          /^session id:/i,
+          /^user$/i,                                        // "user" marker
+          /^thinking$/i,                                    // "thinking" marker
+          /^codex$/i,                                       // "codex" marker
+          /^tokens used$/i,                                 // Token count header
+          /^[\d,]+$/,                                       // Just numbers (token counts)
+          /^ERROR:\s*MCP/i,                                 // MCP errors
+          /MCP client for .* failed/i,                      // MCP client failures
+          /handshake.*failed/i,                             // Handshake errors
+          /connection closed/i,                             // Connection errors
+          /\[MCP\]/i,                                       // MCP tags
+          /^MCP\s/i,                                        // MCP prefix
+          /rmcp::transport/i,                               // Rust MCP transport errors
+          /serde error/i,                                   // Serde parsing errors
+          /^\*\*.*\*\*$/,                                   // Bold status messages like **Awaiting next steps**
+        ];
+        
+        for (const line of lines) {
+          const trimmedLine = line.trim();
+          
+          // Check if line matches any noise pattern
+          const isNoise = noisePatterns.some(pattern => pattern.test(trimmedLine));
+          if (isNoise) continue;
+          
+          // Skip if line looks like the echoed user prompt (heuristic: contains "?" and is long)
+          if (trimmedLine.includes('?') && trimmedLine.length > 20) continue;
+          
+          contentLines.push(trimmedLine);
+        }
+        
+        const result = contentLines.join('\n').trim();
+        return result.length > 0 ? result : null;
+      };
+
+      // Check if we have a complete response - look for actual content
       const flushIfComplete = () => {
-        const match = stdout.match(/•\s*(.+)/);
-        if (match && match[1]) {
+        const parsed = parseCodexOutput(stdout);
+        // Only resolve early if we have meaningful content (at least 2 chars) and output seems done
+        // This prevents cutting off multi-line responses
+        if (parsed && parsed.length >= 2 && stdout.includes('\n') && !stdout.endsWith('...')) {
           clearTimeout(timeoutHandle);
-          stop(() => resolve(match[1].trim()));
+          stop(() => resolve(parsed));
         }
       };
 
       child.stdout?.on('data', (data) => {
         stdout += data.toString();
-        flushIfComplete();
+        // Don't flush too eagerly - wait a bit for more data
+        // flushIfComplete(); // Disabled: let the process complete naturally
       });
 
       child.stderr?.on('data', (data) => {
@@ -696,16 +776,49 @@ This is a known issue with @google/gemini-cli@0.3.4 and older Node.js versions.`
 
         const trimmedStdout = stdout.trim();
         const trimmedStderr = stderr.trim();
+        
+        // Combine stdout and stderr for parsing - Codex may output to either
+        const combinedOutput = trimmedStdout + '\n' + trimmedStderr;
+
+        // Always try to parse stdout first, regardless of exit code
+        // MCP handshake failures cause non-zero exit but don't prevent valid responses
+        const parsedStdout = parseCodexOutput(trimmedStdout);
+        if (parsedStdout) {
+          resolve(parsedStdout);
+          return;
+        }
+        
+        // Try parsing combined output (some responses may appear in stderr)
+        const parsedCombined = parseCodexOutput(combinedOutput);
+        if (parsedCombined) {
+          resolve(parsedCombined);
+          return;
+        }
 
-        if (code === 0 && trimmedStdout) {
-          const match = trimmedStdout.match(/•\s*(.+)/);
-          if (match && match[1]) {
-            resolve(match[1].trim());
-            return;
+        // Only now consider it a failure
+        if (code === 0) {
+          // Successful exit but no parseable output
+          if (trimmedStdout) {
+            resolve(trimmedStdout); // Return raw output as fallback
+          } else {
+            reject(new Error('Codex completed but produced no output'));
           }
-          resolve(trimmedStdout);
         } else {
-          reject(new Error(trimmedStderr || trimmedStdout || `Codex exited with code ${code}`));
+          // Non-zero exit and no parseable response - this is a real error
+          // Filter error message to remove MCP noise
+          const errorLines = (trimmedStderr || trimmedStdout).split('\n')
+            .filter(line => {
+              const l = line.trim().toLowerCase();
+              return l.length > 0 && 
+                     !l.includes('mcp') && 
+                     !l.includes('handshake') &&
+                     !l.includes('rmcp::') &&
+                     !l.includes('serde error');
+            })
+            .slice(0, 3); // Only first 3 relevant error lines
+          
+          const cleanError = errorLines.join('; ') || `Codex exited with code ${code}`;
+          reject(new Error(cleanError));
         }
       });
 

package/mcp/stdio-wrapper.js

@@ -449,8 +449,8 @@ class StdioMCPWrapper {
         throw new Error('prompt is required');
       }
 
-      // Use reasonable timeout for CLI responses (15 seconds instead of 5)
-      const gracefulTimeout = Math.min(timeout_ms, 15000);
+      // Use reasonable timeout for CLI responses (180 seconds for complex prompts)
+      const gracefulTimeout = Math.min(timeout_ms, 180000);
 
       let localResults = [];
 

package/package.json

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