polydev-ai 1.8.20 → 1.8.22

package/lib/cliManager.js

@@ -75,7 +75,8 @@ class CLIManager {
         subcommands: {
           chat: ['chat'],
           version: ['--version'],
-          auth_status: ['auth-status'] // gemini-mcp auth-status command
+          auth_status: ['auth-status'],
+          test_prompt: ['-p']  // Gemini CLI uses -p for headless prompts
         },
         install_instructions: 'Install Gemini CLI from Google',
         auth_instructions: 'Authenticate with: gemini (then /auth login)'
@@ -327,7 +328,21 @@ This is a known issue with @google/gemini-cli@0.3.4 and older Node.js versions.`
           return false;
         
         case 'gemini_cli':
-          // Check for Gemini CLI auth files (if any)
+          // Check for Gemini CLI auth files
+          // Gemini CLI stores OAuth credentials in ~/.gemini/oauth_creds.json
+          const geminiOauthPath = path.join(os.homedir(), '.gemini', 'oauth_creds.json');
+          if (fs.existsSync(geminiOauthPath)) {
+            try {
+              const oauthContent = fs.readFileSync(geminiOauthPath, 'utf8');
+              const oauthData = JSON.parse(oauthContent);
+              // Check for valid OAuth tokens
+              return !!(oauthData && (oauthData.access_token || oauthData.refresh_token));
+            } catch {
+              // Has OAuth file but couldn't parse - assume authenticated
+              return true;
+            }
+          }
+          // Fallback: check legacy location
           const geminiConfigPath = path.join(os.homedir(), '.config', 'gemini-cli', 'config.json');
           if (fs.existsSync(geminiConfigPath)) {
             const configContent = fs.readFileSync(geminiConfigPath, 'utf8');
@@ -568,14 +583,21 @@ This is a known issue with @google/gemini-cli@0.3.4 and older Node.js versions.`
             // Claude Code uses --model flag
             args = ['--model', model, ...args, prompt];
           } else if (providerId === 'gemini_cli') {
-            // Gemini CLI uses -m flag
-            args = ['-m', model, ...args, prompt];
+            // Gemini CLI: -m for model, -p for prompt (headless mode)
+            // Format: gemini -m gemini-2.0-flash -p "prompt"
+            args = ['-m', model, '-p', prompt];
           } else {
             // Default: just append prompt
             args = [...args, prompt];
           }
         } else {
-          args = [...args, prompt];
+          // No model specified
+          if (providerId === 'gemini_cli') {
+            // Gemini CLI still needs -p flag for headless mode
+            args = ['-p', prompt];
+          } else {
+            args = [...args, prompt];
+          }
         }
 
         try {

package/mcp/stdio-wrapper.js

@@ -770,7 +770,8 @@ class StdioMCPWrapper {
     try {
       const cliResults = localResults.map(result => ({
         provider_id: result.provider_id,
-        model: result.model || this.getDefaultModelForCli(result.provider_id),
+        // IMPORTANT: cliManager returns model_used, not model
+        model: result.model_used || result.model || this.getModelPreferenceForCli(result.provider_id),
         content: result.content || '',
         tokens_used: result.tokens_used || 0,
         latency_ms: result.latency_ms || 0,
@@ -810,6 +811,37 @@ class StdioMCPWrapper {
     }
   }
 
+  /**
+   * Get model preference for a CLI provider from cached user preferences
+   * Falls back to a descriptive default if not available
+   */
+  getModelPreferenceForCli(providerId) {
+    // Try to get from cached user model preferences first
+    if (this.userModelPreferences && this.userModelPreferences[providerId]) {
+      return this.userModelPreferences[providerId];
+    }
+    
+    // Map CLI provider to API provider for lookup
+    const cliToApiProvider = {
+      'claude_code': 'anthropic',
+      'codex_cli': 'openai',
+      'gemini_cli': 'google'
+    };
+    
+    const apiProvider = cliToApiProvider[providerId];
+    if (apiProvider && this.userModelPreferences && this.userModelPreferences[apiProvider]) {
+      return this.userModelPreferences[apiProvider];
+    }
+    
+    // Fallback to descriptive defaults based on typical CLI models
+    const defaults = {
+      'claude_code': 'claude-sonnet-4',
+      'codex_cli': 'gpt-4.1',
+      'gemini_cli': 'gemini-2.5-pro'
+    };
+    return defaults[providerId] || 'unknown';
+  }
+
   /**
    * Get default model name for a CLI tool (used when model not specified in result)
    * These are just display labels - actual model selection is done by:
@@ -817,14 +849,8 @@ class StdioMCPWrapper {
    * 2. CLI tool's own default if no preference set
    */
   getDefaultModelForCli(providerId) {
-    // Return a display label indicating CLI default was used
-    // The actual model depends on the CLI tool's configuration
-    const defaults = {
-      'claude_code': 'CLI Default',
-      'codex_cli': 'CLI Default',
-      'gemini_cli': 'CLI Default'
-    };
-    return defaults[providerId] || 'CLI Default';
+    // Prefer user's model preference if available
+    return this.getModelPreferenceForCli(providerId);
   }
 
   /**

package/package.json

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