converse-mcp-server 2.5.0 → 2.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "converse-mcp-server",
-  "version": "2.5.0",
+  "version": "2.5.2",
   "description": "Converse MCP Server - Converse with other LLMs with chat and consensus tools",
   "type": "module",
   "main": "src/index.js",
@@ -11,58 +11,6 @@
   "engines": {
     "node": ">=20.0.0"
   },
-  "keywords": [
-    "mcp",
-    "server",
-    "ai",
-    "chat",
-    "consensus",
-    "openai",
-    "google",
-    "gemini",
-    "grok"
-  ],
-  "author": "Converse MCP Server",
-  "license": "MIT",
-  "homepage": "https://github.com/FallDownTheSystem/converse#readme",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/FallDownTheSystem/converse.git"
-  },
-  "bugs": {
-    "url": "https://github.com/FallDownTheSystem/converse/issues"
-  },
-  "files": [
-    "src/",
-    "bin/",
-    "docs/",
-    "README.md",
-    ".env.example"
-  ],
-  "dependencies": {
-    "@anthropic-ai/sdk": "^0.70.0",
-    "@google/genai": "^1.30.0",
-    "@mistralai/mistralai": "^1.10.0",
-    "@modelcontextprotocol/sdk": "^1.22.0",
-    "@openai/codex-sdk": "^0.58.0",
-    "ai": "^5.0.101",
-    "ai-sdk-provider-gemini-cli": "^1.4.0",
-    "cors": "^2.8.5",
-    "dotenv": "^17.2.3",
-    "express": "^5.1.0",
-    "lru-cache": "^11.2.2",
-    "openai": "^6.9.1",
-    "p-limit": "^7.2.0",
-    "vite": "^7.2.2"
-  },
-  "devDependencies": {
-    "@vitest/coverage-v8": "^4.0.10",
-    "cross-env": "^10.1.0",
-    "eslint": "^9.39.1",
-    "prettier": "^3.6.2",
-    "rimraf": "^6.1.0",
-    "vitest": "^4.0.10"
-  },
   "scripts": {
     "kill-server": "node scripts/kill-server.js",
     "start": "npm run kill-server && node src/index.js",
@@ -116,5 +64,57 @@
     "validate:fix": "node scripts/validate.js --fix",
     "validate:fast": "node scripts/validate.js --skip-tests --skip-lint",
     "precommit": "npm run validate"
+  },
+  "keywords": [
+    "mcp",
+    "server",
+    "ai",
+    "chat",
+    "consensus",
+    "openai",
+    "google",
+    "gemini",
+    "grok"
+  ],
+  "author": "Converse MCP Server",
+  "license": "MIT",
+  "homepage": "https://github.com/FallDownTheSystem/converse#readme",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/FallDownTheSystem/converse.git"
+  },
+  "bugs": {
+    "url": "https://github.com/FallDownTheSystem/converse/issues"
+  },
+  "files": [
+    "src/",
+    "bin/",
+    "docs/",
+    "README.md",
+    ".env.example"
+  ],
+  "dependencies": {
+    "@anthropic-ai/sdk": "^0.70.0",
+    "@google/genai": "^1.30.0",
+    "@mistralai/mistralai": "^1.10.0",
+    "@modelcontextprotocol/sdk": "^1.22.0",
+    "@openai/codex-sdk": "^0.58.0",
+    "ai": "^5.0.101",
+    "ai-sdk-provider-gemini-cli": "^1.4.0",
+    "cors": "^2.8.5",
+    "dotenv": "^17.2.3",
+    "express": "^5.1.0",
+    "lru-cache": "^11.2.2",
+    "openai": "^6.9.1",
+    "p-limit": "^7.2.0",
+    "vite": "^7.2.2"
+  },
+  "devDependencies": {
+    "@vitest/coverage-v8": "^4.0.10",
+    "cross-env": "^10.1.0",
+    "eslint": "^9.39.1",
+    "prettier": "^3.6.2",
+    "rimraf": "^6.1.0",
+    "vitest": "^4.0.10"
   }
-}
+}

package/src/providers/gemini-cli.js

@@ -24,8 +24,8 @@ import { ProviderError, ErrorCodes, StopReasons } from './interface.js';
 
 // Supported Gemini CLI models with their configurations
 const SUPPORTED_MODELS = {
-  'gemini-3-pro-preview': {
-    modelName: 'gemini-3-pro-preview',
+  gemini: {
+    modelName: 'gemini',
     friendlyName: 'Gemini 3.0 Pro Preview (via CLI)',
     contextWindow: 1048576, // 1M tokens
     maxOutputTokens: 64000,
@@ -37,6 +37,9 @@ const SUPPORTED_MODELS = {
     timeout: 300000, // 5 minutes
     description:
 			'Gemini 3.0 Pro Preview via OAuth - requires Gemini CLI authentication',
+    aliases: ['gemini-cli'],
+    // Internal SDK model name (user-facing "gemini" maps to SDK's "gemini-3-pro-preview")
+    sdkModelName: 'gemini-3-pro-preview',
   },
 };
 
@@ -103,16 +106,17 @@ async function getAISDK() {
  * Yields normalized events compatible with ProviderStreamNormalizer
  */
 async function* createStreamingGenerator(
-  model,
+  modelInstance,
   messages,
   options,
   signal,
+  userFacingModelName = 'gemini',
 ) {
   const { streamText } = await getAISDK();
 
   try {
     const streamOptions = {
-      model,
+      model: modelInstance,
       messages,
       ...options,
     };
@@ -127,7 +131,7 @@ async function* createStreamingGenerator(
     yield {
       type: 'start',
       provider: 'gemini-cli',
-      model: options.model || 'gemini-3-pro-preview',
+      model: userFacingModelName,
     };
 
     // Stream text chunks
@@ -137,10 +141,12 @@ async function* createStreamingGenerator(
         throw new GeminiCliProviderError('Request cancelled', 'CANCELLED');
       }
 
-      // Yield delta event with content chunk
+      // Yield delta event with content chunk (normalized format)
       yield {
         type: 'delta',
-        content: chunk,
+        data: {
+          textDelta: chunk,
+        },
       };
     }
 
@@ -196,6 +202,68 @@ function mapFinishReason(finishReason) {
   }
 }
 
+/**
+ * Convert messages from Converse internal format to Gemini CLI SDK format
+ *
+ * Converse format (used by other providers like Anthropic):
+ * - Images: { type: 'image', source: { type: 'base64', media_type: '...', data: '...' } }
+ *
+ * Gemini CLI SDK format (from SDK guide):
+ * - Images: { type: 'image', data: '...' }  (base64 string)
+ * - Text: { type: 'text', text: '...' }
+ *
+ * @param {Array} messages - Messages in Converse internal format
+ * @returns {Array} Messages in Gemini CLI SDK format
+ */
+function convertToGeminiCliMessages(messages) {
+  return messages.map((message) => {
+    // If content is a string, no conversion needed
+    if (typeof message.content === 'string') {
+      return message;
+    }
+
+    // If content is an array, convert each part
+    if (Array.isArray(message.content)) {
+      const convertedContent = message.content.map((part) => {
+        // Text parts are already in correct format
+        if (part.type === 'text') {
+          return part;
+        }
+
+        // Convert image from Converse format to Gemini CLI SDK format
+        if (part.type === 'image' && part.source) {
+          return {
+            type: 'image',
+            data: part.source.data, // Extract base64 data (use 'data' not 'image')
+          };
+        }
+
+        // If already in Gemini CLI format, return as-is
+        if (part.type === 'image' && part.data) {
+          return part;
+        }
+
+        // Handle file parts (future-proofing)
+        if (part.type === 'file' && part.data) {
+          return part;
+        }
+
+        // Unknown part type, return as-is and let SDK handle it
+        debugLog(`[Gemini CLI] Unknown content part type: ${part.type}`);
+        return part;
+      });
+
+      return {
+        ...message,
+        content: convertedContent,
+      };
+    }
+
+    // Unknown content type, return as-is
+    return message;
+  });
+}
+
 /**
  * Gemini CLI Provider Implementation
  */
@@ -208,7 +276,7 @@ export const geminiCliProvider = {
 	 */
   async invoke(messages, options = {}) {
     const {
-      model = 'gemini-3-pro-preview',
+      model = 'gemini',
       config,
       stream = false,
       signal,
@@ -234,6 +302,18 @@ export const geminiCliProvider = {
     }
 
     try {
+      // Get model configuration to map user-facing name to SDK model name
+      const modelConfig = this.getModelConfig(model);
+      if (!modelConfig) {
+        throw new GeminiCliProviderError(
+          `Model ${model} not supported by Gemini CLI provider`,
+          ErrorCodes.MODEL_NOT_FOUND,
+        );
+      }
+
+      // Get the SDK model name (e.g., "gemini" -> "gemini-3-pro-preview")
+      const sdkModelName = modelConfig.sdkModelName || model;
+
       // Get SDKs
       const createGeminiProvider = await getGeminiCliSDK();
       const { generateText } = await getAISDK();
@@ -243,12 +323,15 @@ export const geminiCliProvider = {
         authType: 'oauth-personal',
       });
 
-      // Create model instance
-      const modelInstance = gemini(model);
+      // Create model instance with SDK model name
+      const modelInstance = gemini(sdkModelName);
+
+      // Convert messages from Converse format to Gemini CLI SDK format
+      const convertedMessages = convertToGeminiCliMessages(messages);
 
       // Build AI SDK options
       const aiOptions = {
-        messages,
+        messages: convertedMessages,
       };
 
       // Add optional parameters
@@ -271,7 +354,13 @@ export const geminiCliProvider = {
 
       // Streaming mode
       if (stream) {
-        return createStreamingGenerator(modelInstance, messages, aiOptions, signal);
+        return createStreamingGenerator(
+          modelInstance,
+          convertedMessages,
+          aiOptions,
+          signal,
+          model, // Pass user-facing model name for metadata
+        );
       }
 
       // Synchronous mode
@@ -382,7 +471,17 @@ export const geminiCliProvider = {
       return SUPPORTED_MODELS[modelNameLower];
     }
 
-    // No aliases for Gemini CLI models currently
+    // Check aliases
+    for (const [supportedModel, config] of Object.entries(SUPPORTED_MODELS)) {
+      if (config.aliases) {
+        for (const alias of config.aliases) {
+          if (alias.toLowerCase() === modelNameLower) {
+            return config;
+          }
+        }
+      }
+    }
+
     return null;
   },
 };

package/src/providers/google.js

@@ -144,7 +144,6 @@ const SUPPORTED_MODELS = {
       'gemini3',
       'gemini-3-pro',
       '3-pro',
-      'gemini', // Moving from 2.5 Pro
       'gemini pro', // Moving from 2.5 Pro
       'gemini-pro', // Moving from 2.5 Pro
       'pro', // Moving from 2.5 Pro

package/src/providers/index.js

@@ -26,13 +26,13 @@ import { geminiCliProvider } from './gemini-cli.js';
 const providers = {
   openai: openaiProvider,
   xai: xaiProvider,
+  'gemini-cli': geminiCliProvider,
   google: googleProvider,
   anthropic: anthropicProvider,
   mistral: mistralProvider,
   deepseek: deepseekProvider,
   openrouter: openrouterProvider,
   codex: codexProvider,
-  'gemini-cli': geminiCliProvider,
 };
 
 /**

package/src/tools/chat.js

@@ -416,6 +416,8 @@ function resolveAutoModel(model, providerName) {
   }
 
   const defaults = {
+    codex: 'codex',
+    'gemini-cli': 'gemini',
     openai: 'gpt-5',
     xai: 'grok-4-0709',
     google: 'gemini-pro',
@@ -431,8 +433,15 @@ function resolveAutoModel(model, providerName) {
 export function mapModelToProvider(model, providers) {
   const modelLower = model.toLowerCase();
 
-  // Handle "auto" - default to OpenAI
+  // Handle "auto" - prioritize: codex > gemini-cli > openai
   if (modelLower === 'auto') {
+    // Check availability in priority order
+    if (providers['codex']) {
+      return 'codex';
+    }
+    if (providers['gemini-cli']) {
+      return 'gemini-cli';
+    }
     return 'openai';
   }
 
@@ -442,7 +451,7 @@ export function mapModelToProvider(model, providers) {
   }
 
   // Check Gemini CLI (exact match only - routes to CLI provider instead of Google API)
-  if (modelLower === 'gemini') {
+  if (modelLower === 'gemini' || modelLower === 'gemini-cli') {
     return 'gemini-cli';
   }
 
@@ -495,7 +504,6 @@ export function mapModelToProvider(model, providers) {
 
   // Google models
   if (
-    modelLower.includes('gemini') ||
     modelLower.includes('flash') ||
     modelLower.includes('pro') ||
     modelLower === 'google'
@@ -939,7 +947,7 @@ chatTool.inputSchema = {
     model: {
       type: 'string',
       description:
-        'AI model to use. Examples: "auto" (recommended), "gpt-5", "gemini-pro", "grok-4-0709". Defaults to auto-selection.',
+        'AI model to use. Examples: "auto" (recommended), "codex", "gemini", "gpt-5", "grok-4-0709". Defaults to auto-selection.',
     },
     files: {
       type: 'array',

package/src/tools/consensus.js

@@ -653,6 +653,8 @@ Please provide your refined response:`;
  */
 function getDefaultModelForProvider(providerName) {
   const defaults = {
+    codex: 'codex',
+    'gemini-cli': 'gemini',
     openai: 'gpt-5',
     xai: 'grok-4-0709',
     google: 'gemini-pro',
@@ -679,8 +681,15 @@ function resolveAutoModel(model, providerName) {
 function mapModelToProvider(model, providers) {
   const modelLower = model.toLowerCase();
 
-  // Handle "auto" - default to OpenAI
+  // Handle "auto" - prioritize: codex > gemini-cli > openai
   if (modelLower === 'auto') {
+    // Check availability in priority order
+    if (providers['codex']) {
+      return 'codex';
+    }
+    if (providers['gemini-cli']) {
+      return 'gemini-cli';
+    }
     return 'openai';
   }
 
@@ -690,7 +699,7 @@ function mapModelToProvider(model, providers) {
   }
 
   // Check Gemini CLI (exact match only - routes to CLI provider instead of Google API)
-  if (modelLower === 'gemini') {
+  if (modelLower === 'gemini' || modelLower === 'gemini-cli') {
     return 'gemini-cli';
   }
 
@@ -743,7 +752,6 @@ function mapModelToProvider(model, providers) {
 
   // Google models
   if (
-    modelLower.includes('gemini') ||
     modelLower.includes('flash') ||
     modelLower.includes('pro') ||
     modelLower === 'google'