polydev-ai 1.9.15 → 1.9.17

package/mcp/stdio-wrapper.js

@@ -299,7 +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
@@ -363,6 +367,12 @@ class StdioMCPWrapper {
     try {
       switch (method) {
         case 'initialize':
+          // Capture client info to detect which IDE is running us
+          // This lets us exclude its CLI to avoid recursive calls (e.g., Claude Code → claude_code CLI)
+          this.clientInfo = params?.clientInfo || null;
+          if (this.clientInfo) {
+            console.error(`[Stdio Wrapper] IDE detected: ${this.clientInfo.name} v${this.clientInfo.version || 'unknown'}`);
+          }
           return {
             jsonrpc: '2.0',
             id,
@@ -1679,6 +1689,47 @@ Error: ${error.message}`
     }
   }
 
+  /**
+   * 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).
+   * Returns null if no CLI should be excluded.
+   */
+  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 = {
+      // Claude Code variants
+      'claude-code': 'claude_code',
+      '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
+      // Gemini CLI / Google IDX
+      'gemini-cli': 'gemini_cli',
+      'gemini_cli': 'gemini_cli',
+      // Codex CLI / OpenAI
+      'codex-cli': 'codex_cli',
+      '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;
+  }
+
   /**
    * Local CLI prompt sending with ALL available CLIs + remote perspectives
    * Respects user's perspectives_per_message setting for total perspectives
@@ -1764,16 +1815,27 @@ 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)
+        // Skip the CLI that matches the current IDE to avoid recursive calls
         for (const cliId of cliPriorityOrder) {
           if (!availableClis.includes(cliId)) continue;
+          if (cliId === excludedCli) {
+            console.error(`[Stdio Wrapper] [CLI-FIRST] Skipping ${cliId} (same as current IDE — would cause recursive call)`);
+            continue;
+          }
           
           const providerName = cliToProviderMap[cliId];
           usedProviderNames.add(providerName);

package/package.json

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