converse-mcp-server 1.9.0 → 1.10.0

package/.env.example

@@ -1,18 +1,32 @@
-# Zen MCP Server Environment Configuration
+# Converse MCP Server Environment Configuration
 # Copy this file to .env and fill in your values
 
-# API Keys - At least one is required
-#
-# IMPORTANT: Choose ONE approach:
-# - Native APIs (Gemini/OpenAI/XAI) for direct access
-# - DIAL for unified enterprise access
-# - OpenRouter for unified cloud access
-# Having multiple unified providers creates ambiguity about which serves each model.
-#
-# Option 1: Use native APIs (recommended for direct access)
-# Get your Gemini API key from: https://makersuite.google.com/app/apikey
+# ============================================
+# Google/Gemini Configuration Options
+# ============================================
+# You can use EITHER Gemini Developer API OR Vertex AI
+
+# Option 1: Gemini Developer API (simpler setup)
+# Get your API key from: https://makersuite.google.com/app/apikey
+# You can use either GOOGLE_API_KEY or GEMINI_API_KEY (GOOGLE_API_KEY takes priority)
+GOOGLE_API_KEY=your_google_api_key_here
+# or
 GEMINI_API_KEY=your_gemini_api_key_here
 
+# Option 2: Google Vertex AI (enterprise/production)
+# Requires Google Cloud project with billing and Vertex AI API enabled
+# Set these THREE variables together:
+# GOOGLE_GENAI_USE_VERTEXAI=true
+# GOOGLE_CLOUD_PROJECT=your-project-id
+# GOOGLE_CLOUD_LOCATION=us-central1
+
+# Optional: API version (v1, v1beta, v1alpha) - defaults to v1beta
+# GOOGLE_API_VERSION=v1beta
+
+# ============================================
+# Other Provider API Keys
+# ============================================
+
 # Get your OpenAI API key from: https://platform.openai.com/api-keys
 OPENAI_API_KEY=your_openai_api_key_here
 

package/README.md

@@ -19,7 +19,7 @@ You need at least one API key from these providers:
 | Provider | Where to Get | Example Format |
 |----------|-------------|----------------|
 | **OpenAI** | [platform.openai.com/api-keys](https://platform.openai.com/api-keys) | `sk-proj-...` |
-| **Google** | [makersuite.google.com/app/apikey](https://makersuite.google.com/app/apikey) | `AIzaSy...` |
+| **Google/Gemini** | [makersuite.google.com/app/apikey](https://makersuite.google.com/app/apikey) | `AIzaSy...` |
 | **X.AI** | [console.x.ai](https://console.x.ai/) | `xai-...` |
 | **Anthropic** | [console.anthropic.com](https://console.anthropic.com/) | `sk-ant-...` |
 | **Mistral** | [console.mistral.ai](https://console.mistral.ai/) | `wfBMkWL0...` |
@@ -33,7 +33,7 @@ You need at least one API key from these providers:
 # Add the server with your API keys
 claude mcp add converse \
   -e OPENAI_API_KEY=your_key_here \
-  -e GOOGLE_API_KEY=your_key_here \
+  -e GEMINI_API_KEY=your_key_here \
   -e XAI_API_KEY=your_key_here \
   -e ANTHROPIC_API_KEY=your_key_here \
   -e MISTRAL_API_KEY=your_key_here \
@@ -55,7 +55,7 @@ Add this configuration to your Claude Desktop settings:
       "args": ["converse-mcp-server"],
       "env": {
         "OPENAI_API_KEY": "your_key_here",
-        "GOOGLE_API_KEY": "your_key_here",
+        "GEMINI_API_KEY": "your_key_here",
         "XAI_API_KEY": "your_key_here",
         "ANTHROPIC_API_KEY": "your_key_here",
         "MISTRAL_API_KEY": "your_key_here",
@@ -140,6 +140,11 @@ Get multiple AI models to analyze the same question simultaneously. Each model c
 - **gpt-4o-mini**: Fast multimodal (128K context)
 
 ### Google/Gemini Models
+
+**API Key Options**:
+- **GEMINI_API_KEY**: For Gemini Developer API (recommended)
+- **GOOGLE_API_KEY**: Alternative name (GEMINI_API_KEY takes priority)
+- **Vertex AI**: Use `GOOGLE_GENAI_USE_VERTEXAI=true` with project/location settings
 - **gemini-2.5-flash** (alias: `flash`): Ultra-fast (1M context)
 - **gemini-2.5-pro** (alias: `pro`): Deep reasoning (1M context)
 - **gemini-2.0-flash**: Latest with experimental thinking
@@ -195,7 +200,7 @@ Create a `.env` file in your project root:
 ```bash
 # Required: At least one API key
 OPENAI_API_KEY=sk-proj-your_openai_key_here
-GOOGLE_API_KEY=your_google_api_key_here  
+GEMINI_API_KEY=your_gemini_api_key_here  # Or GOOGLE_API_KEY (GEMINI_API_KEY takes priority)  
 XAI_API_KEY=xai-your_xai_key_here
 ANTHROPIC_API_KEY=sk-ant-your_anthropic_key_here
 MISTRAL_API_KEY=your_mistral_key_here
@@ -272,7 +277,7 @@ If you've cloned the repository locally:
       ],
       "env": {
         "OPENAI_API_KEY": "your_key_here",
-        "GOOGLE_API_KEY": "your_key_here",
+        "GEMINI_API_KEY": "your_key_here",
         "XAI_API_KEY": "your_key_here",
         "ANTHROPIC_API_KEY": "your_key_here",
         "MISTRAL_API_KEY": "your_key_here",

package/bin/converse.js

@@ -1,32 +1,35 @@
 #!/usr/bin/env node
-
-/**
- * Converse MCP Server - CLI Entry Point
- * 
- * This script allows the MCP server to be run via npx/pnpm dlx for easy installation and execution.
- */
-
-import { fileURLToPath, pathToFileURL } from 'url';
-import { dirname, join } from 'path';
-import { createRequire } from 'module';
-
-// Get the directory of this script
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-
-// Get the project root (parent of bin directory)
-const projectRoot = dirname(__dirname);
-
-// Import and start the server
-try {
-  const indexPath = join(projectRoot, 'src/index.js');
-  const { main } = await import(pathToFileURL(indexPath).href);
-  
-  // The main function will handle all logging appropriately based on transport type
-  await main();
-} catch (error) {
-  // For stdio transport, we must not output anything to stdout
-  // For http transport, this will be logged by the error handler in main
-  // Just exit with error code
-  process.exit(1);
+
+/**
+ * Converse MCP Server - CLI Entry Point
+ * 
+ * This script allows the MCP server to be run via npx/pnpm dlx for easy installation and execution.
+ */
+
+import { fileURLToPath, pathToFileURL } from 'url';
+import { dirname, join } from 'path';
+import { createRequire } from 'module';
+
+// Get the directory of this script
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+// Get the project root (parent of bin directory)
+const projectRoot = dirname(__dirname);
+
+// Change working directory to project root so Node.js can find dependencies
+process.chdir(projectRoot);
+
+// Import and start the server
+try {
+  const indexPath = join(projectRoot, 'src/index.js');
+  const { main } = await import(pathToFileURL(indexPath).href);
+  
+  // The main function will handle all logging appropriately based on transport type
+  await main();
+} catch (error) {
+  // For stdio transport, we must not output anything to stdout
+  // For http transport, this will be logged by the error handler in main
+  // Just exit with error code
+  process.exit(1);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "converse-mcp-server",
-  "version": "1.9.0",
+  "version": "1.10.0",
   "description": "Converse MCP Server - Converse with other LLMs with chat and consensus tools",
   "type": "module",
   "main": "src/index.js",
@@ -63,8 +63,7 @@
     "validate": "node scripts/validate.js",
     "validate:fix": "node scripts/validate.js --fix",
     "validate:fast": "node scripts/validate.js --skip-tests --skip-lint",
-    "precommit": "npm run validate",
-    "prepublishOnly": "node scripts/fix-line-endings.js"
+    "precommit": "npm run validate"
   },
   "keywords": [
     "mcp",

package/src/config.js

@@ -80,6 +80,7 @@ const CONFIG_SCHEMA = {
     OPENAI_API_KEY: { type: 'string', required: false, secret: true, description: 'OpenAI API key' },
     XAI_API_KEY: { type: 'string', required: false, secret: true, description: 'XAI API key' },
     GOOGLE_API_KEY: { type: 'string', required: false, secret: true, description: 'Google API key' },
+    GEMINI_API_KEY: { type: 'string', required: false, secret: true, description: 'Gemini API key (alternative to GOOGLE_API_KEY)' },
     ANTHROPIC_API_KEY: { type: 'string', required: false, secret: true, description: 'Anthropic API key' },
     MISTRAL_API_KEY: { type: 'string', required: false, secret: true, description: 'Mistral API key' },
     DEEPSEEK_API_KEY: { type: 'string', required: false, secret: true, description: 'DeepSeek API key' },
@@ -91,6 +92,12 @@ const CONFIG_SCHEMA = {
     OPENROUTER_REFERER: { type: 'string', required: false, description: 'OpenRouter referer header for compliance' },
     OPENROUTER_TITLE: { type: 'string', required: false, description: 'OpenRouter X-Title header for request tracking' },
     OPENROUTER_DYNAMIC_MODELS: { type: 'boolean', default: false, description: 'Enable dynamic model discovery via OpenRouter endpoints API' },
+
+    // Google Vertex AI configuration
+    GOOGLE_GENAI_USE_VERTEXAI: { type: 'boolean', default: false, description: 'Use Google Vertex AI instead of Gemini Developer API' },
+    GOOGLE_CLOUD_PROJECT: { type: 'string', required: false, description: 'Google Cloud project ID for Vertex AI' },
+    GOOGLE_CLOUD_LOCATION: { type: 'string', required: false, description: 'Google Cloud location for Vertex AI (e.g., us-central1)' },
+    GOOGLE_API_VERSION: { type: 'string', default: 'v1beta', description: 'Google API version (v1, v1beta, v1alpha)' }
   },
 
 
@@ -161,7 +168,10 @@ function validateApiKeyFormat(provider, apiKey) {
   case 'xai':
     return apiKey.startsWith('xai-') && apiKey.length > 20;
   case 'google':
-    return apiKey.length > 20; // Google keys vary in format
+  case 'gemini':
+    // Special case for Vertex AI marker
+    if (apiKey === 'VERTEX_AI') return true;
+    return apiKey.length > 20; // Google/Gemini keys vary in format
   case 'anthropic':
     return apiKey.startsWith('sk-ant-') && apiKey.length >= 30;
   case 'mistral':
@@ -232,7 +242,15 @@ export async function loadConfig() {
         const value = validateEnvVar(key, process.env[key], schema);
         if (value) {
           const providerName = key.replace('_API_KEY', '').toLowerCase();
-          config.apiKeys[providerName] = value;
+          // Map GEMINI_API_KEY to google provider
+          if (providerName === 'gemini') {
+            // Only use GEMINI_API_KEY if GOOGLE_API_KEY is not already set
+            if (!config.apiKeys.google) {
+              config.apiKeys.google = value;
+            }
+          } else {
+            config.apiKeys[providerName] = value;
+          }
         }
       } catch (error) {
         errors.push(error.message);
@@ -285,14 +303,26 @@ export async function loadConfig() {
       nodeEnv,
     };
 
-    // Validate that at least one API key is present
+    // Validate that at least one API key is present OR Vertex AI is configured
     const availableKeys = Object.keys(config.apiKeys);
-    if (availableKeys.length === 0) {
+    const hasVertexAI = config.providers.googlegenaiusevertexai &&
+                        config.providers.googlecloudproject &&
+                        config.providers.googlecloudlocation;
+
+    if (availableKeys.length === 0 && !hasVertexAI) {
       errors.push(
-        'At least one API key must be configured: OPENAI_API_KEY, XAI_API_KEY, GOOGLE_API_KEY, ANTHROPIC_API_KEY, MISTRAL_API_KEY, DEEPSEEK_API_KEY, or OPENROUTER_API_KEY'
+        'At least one API key must be configured: OPENAI_API_KEY, XAI_API_KEY, GOOGLE_API_KEY, GEMINI_API_KEY, ANTHROPIC_API_KEY, MISTRAL_API_KEY, DEEPSEEK_API_KEY, or OPENROUTER_API_KEY. Alternatively, configure Google Vertex AI with GOOGLE_GENAI_USE_VERTEXAI, GOOGLE_CLOUD_PROJECT, and GOOGLE_CLOUD_LOCATION.'
       );
     }
 
+    // If Vertex AI is enabled, add it as a special google provider config
+    if (hasVertexAI) {
+      // Mark google as available even without API key when using Vertex AI
+      if (!config.apiKeys.google) {
+        config.apiKeys.google = 'VERTEX_AI'; // Special marker for Vertex AI mode
+      }
+    }
+
     // Validate API key formats
     for (const [provider, apiKey] of Object.entries(config.apiKeys)) {
       if (!validateApiKeyFormat(provider, apiKey)) {

package/src/providers/google.js

@@ -122,13 +122,18 @@ function resolveModelName(modelName) {
 }
 
 /**
- * Validate Google API key format
+ * Validate Google API key format or Vertex AI marker
  */
 function validateApiKey(apiKey) {
   if (!apiKey || typeof apiKey !== 'string') {
     return false;
   }
 
+  // Special marker for Vertex AI mode
+  if (apiKey === 'VERTEX_AI') {
+    return true;
+  }
+
   // Google API keys are typically long strings, usually starting with specific patterns
   // They are generally 39+ characters long
   return apiKey.length >= 20;
@@ -333,20 +338,58 @@ export const googleProvider = {
       reasoning_effort = 'medium',
       use_websearch = false,
       config,
-      ...otherOptions
+      ..._otherOptions
     } = options;
 
-    // Validate API key
-    if (!config?.apiKeys?.google) {
-      throw new GoogleProviderError('Google API key not configured', 'MISSING_API_KEY');
-    }
+    // Check if using Vertex AI or Gemini Developer API
+    const useVertexAI = config?.providers?.googlegenaiusevertexai;
+    const vertexProject = config?.providers?.googlecloudproject;
+    const vertexLocation = config?.providers?.googlecloudlocation;
+    const apiVersion = config?.providers?.googleapiversion || 'v1beta';
+
+    let genAI;
+
+    if (useVertexAI) {
+      // Validate Vertex AI configuration
+      if (!vertexProject || !vertexLocation) {
+        throw new GoogleProviderError(
+          'Vertex AI requires GOOGLE_CLOUD_PROJECT and GOOGLE_CLOUD_LOCATION',
+          'MISSING_VERTEX_CONFIG'
+        );
+      }
 
-    if (!validateApiKey(config.apiKeys.google)) {
-      throw new GoogleProviderError('Invalid Google API key format', 'INVALID_API_KEY');
-    }
+      debugLog(`[Google] Using Vertex AI: project=${vertexProject}, location=${vertexLocation}, apiVersion=${apiVersion}`);
 
-    // Initialize Google AI client
-    const genAI = new GoogleGenAI({apiKey: config.apiKeys.google});
+      // Initialize with Vertex AI configuration
+      genAI = new GoogleGenAI({
+        vertexai: true,
+        project: vertexProject,
+        location: vertexLocation,
+        apiVersion
+      });
+    } else {
+      // Use Gemini Developer API with API key
+      const apiKey = config?.apiKeys?.google;
+
+      if (!apiKey || apiKey === 'VERTEX_AI') {
+        throw new GoogleProviderError(
+          'Google API key not configured. Set GOOGLE_API_KEY or GEMINI_API_KEY, or configure Vertex AI',
+          'MISSING_API_KEY'
+        );
+      }
+
+      if (!validateApiKey(apiKey)) {
+        throw new GoogleProviderError('Invalid Google API key format', 'INVALID_API_KEY');
+      }
+
+      debugLog(`[Google] Using Gemini Developer API with configured API key, apiVersion=${apiVersion}`);
+
+      // Initialize with API key - SDK will use GOOGLE_API_KEY as the actual key name
+      genAI = new GoogleGenAI({
+        apiKey,
+        apiVersion
+      });
+    }
 
     // Resolve model name
     const resolvedModel = resolveModelName(model);
@@ -466,7 +509,15 @@ export const googleProvider = {
    * @returns {boolean} - True if configuration is valid
    */
   validateConfig(config) {
-    return !!(config?.apiKeys?.google && validateApiKey(config.apiKeys.google));
+    // Check for Vertex AI configuration
+    const hasVertexAI = !!(config?.providers?.googlegenaiusevertexai &&
+                          config?.providers?.googlecloudproject &&
+                          config?.providers?.googlecloudlocation);
+
+    // Check for API key configuration
+    const hasApiKey = !!(config?.apiKeys?.google && validateApiKey(config.apiKeys.google));
+
+    return hasVertexAI || hasApiKey;
   },
 
   /**