converse-mcp-server 2.27.2 → 2.28.0

package/src/tools/chat.js

@@ -24,6 +24,10 @@ import { validateAllPaths } from '../utils/fileValidator.js';
 import { SummarizationService } from '../services/summarizationService.js';
 import { exportConversation } from '../utils/conversationExporter.js';
 import { isRecoverableError, retryWithBackoff } from '../utils/errorHandler.js';
+import {
+  providerSupportsImages,
+  getProviderUnavailableMessage,
+} from '../utils/modelRouting.js';
 
 const logger = createLogger('chat');
 
@@ -313,9 +317,16 @@ export async function chatTool(args, dependencies) {
         'openrouter',
       ];
 
+      const requestHasImages = Array.isArray(images) && images.length > 0;
+
       for (const name of providerOrder) {
         const provider = providers[name];
         if (provider && provider.isAvailable && provider.isAvailable(config)) {
+          // When the request has images, skip text-only providers (e.g.
+          // gemini-cli, copilot) so auto routing lands on an image-capable one.
+          if (requestHasImages && !providerSupportsImages(provider, name)) {
+            continue;
+          }
           providerCandidates.push({ name, provider });
         }
       }
@@ -335,9 +346,7 @@ export async function chatTool(args, dependencies) {
       }
 
       if (!selectedProvider.isAvailable(config)) {
-        return createToolError(
-          `Provider ${providerName} is not available. Check API key configuration.`,
-        );
+        return createToolError(getProviderUnavailableMessage(providerName));
       }
 
       providerCandidates.push({
@@ -590,6 +599,12 @@ export function mapModelToProvider(model, providers) {
     return 'gemini-cli';
   }
 
+  // Check gemini: prefix (e.g., gemini:flash, gemini:pro) - routes to Antigravity
+  // CLI provider. Must be before the google flash/pro keyword rule so it wins.
+  if (modelLower.startsWith('gemini:')) {
+    return 'gemini-cli';
+  }
+
   // Check Claude SDK (exact match only - routes to SDK provider instead of Anthropic API)
   if (
     modelLower === 'claude' ||
@@ -882,9 +897,15 @@ async function executeChatWithStreaming(args, dependencies, context) {
       'openrouter',
     ];
 
+    const requestHasImages = Array.isArray(images) && images.length > 0;
+
     for (const name of providerOrder) {
       const provider = providers[name];
       if (provider && provider.isAvailable && provider.isAvailable(config)) {
+        // Skip text-only providers when the request includes images.
+        if (requestHasImages && !providerSupportsImages(provider, name)) {
+          continue;
+        }
         providerName = name;
         selectedProvider = provider;
         break;
@@ -906,9 +927,7 @@ async function executeChatWithStreaming(args, dependencies, context) {
     }
 
     if (!selectedProvider.isAvailable(config)) {
-      throw new Error(
-        `Provider ${providerName} is not available. Check API key configuration.`,
-      );
+      throw new Error(getProviderUnavailableMessage(providerName));
     }
   }
 
@@ -1156,7 +1175,7 @@ chatTool.inputSchema = {
     model: {
       type: 'string',
       description:
-        'AI model to use. Examples: "auto" (recommended), "codex", "gemini", "claude", "claude:fable", "claude:opus", "copilot", "copilot:codex". Defaults to auto-selection.',
+        'AI model to use. Examples: "auto" (recommended), "codex", "gemini", "gemini:flash", "claude", "claude:fable", "claude:opus", "copilot", "copilot:codex". Defaults to auto-selection.',
     },
     files: {
       type: 'array',

package/src/tools/consensus.js

@@ -27,6 +27,10 @@ import { applyTokenLimit, getTokenLimit } from '../utils/tokenLimiter.js';
 import { validateAllPaths } from '../utils/fileValidator.js';
 import { SummarizationService } from '../services/summarizationService.js';
 import { exportConversation } from '../utils/conversationExporter.js';
+import {
+  providerSupportsImages,
+  getProviderUnavailableMessage,
+} from '../utils/modelRouting.js';
 
 const logger = createLogger('consensus');
 
@@ -315,10 +319,19 @@ export async function consensusTool(args, dependencies) {
         'openrouter',
       ];
 
+      const requestHasImages = Array.isArray(images) && images.length > 0;
+
       for (const providerName of providerOrder) {
         if (availableProviders.length >= 3) break;
         const provider = providers[providerName];
         if (provider && provider.isAvailable(config)) {
+          // Skip text-only providers when the request includes images.
+          if (
+            requestHasImages &&
+            !providerSupportsImages(provider, providerName)
+          ) {
+            continue;
+          }
           availableProviders.push(providerName);
         }
       }
@@ -369,7 +382,7 @@ export async function consensusTool(args, dependencies) {
         failedModels.push({
           model: modelName,
           provider: providerName,
-          error: `Provider ${providerName} not available (check API key)`,
+          error: getProviderUnavailableMessage(providerName),
           status: 'failed',
         });
         continue;
@@ -794,6 +807,12 @@ function mapModelToProvider(model, providers) {
     return 'gemini-cli';
   }
 
+  // Check gemini: prefix (e.g., gemini:flash, gemini:pro) - routes to Antigravity
+  // CLI provider. Must be before the google flash/pro keyword rule so it wins.
+  if (modelLower.startsWith('gemini:')) {
+    return 'gemini-cli';
+  }
+
   // Check Claude SDK (exact match only - routes to SDK provider instead of Anthropic API)
   if (
     modelLower === 'claude' ||
@@ -1070,10 +1089,19 @@ async function executeConsensusWithStreaming(args, dependencies, context) {
       'openrouter',
     ];
 
+    const requestHasImages = Array.isArray(images) && images.length > 0;
+
     for (const providerName of providerOrder) {
       if (availableProviders.length >= 3) break;
       const provider = providers[providerName];
       if (provider && provider.isAvailable(config)) {
+        // Skip text-only providers when the request includes images.
+        if (
+          requestHasImages &&
+          !providerSupportsImages(provider, providerName)
+        ) {
+          continue;
+        }
         availableProviders.push(providerName);
       }
     }
@@ -1125,7 +1153,7 @@ async function executeConsensusWithStreaming(args, dependencies, context) {
       failedModels.push({
         model: modelName,
         provider: providerName,
-        error: `Provider ${providerName} not available (check API key)`,
+        error: getProviderUnavailableMessage(providerName),
         status: 'failed',
       });
       continue;
@@ -1712,7 +1740,7 @@ consensusTool.inputSchema = {
       items: { type: 'string' },
       minItems: 1,
       description:
-        'List of models to consult. Examples: ["codex", "gemini", "claude", "claude:opus", "copilot", "copilot:codex"]',
+        'List of models to consult. Examples: ["codex", "gemini", "gemini:flash", "claude", "claude:opus", "copilot", "copilot:codex"]',
     },
     files: {
       type: 'array',

package/src/tools/conversation.js

@@ -42,6 +42,8 @@ import {
   mapModelToProvider,
   resolveAutoModel,
   getDefaultModelForProvider,
+  providerSupportsImages,
+  getProviderUnavailableMessage,
 } from '../utils/modelRouting.js';
 
 const logger = createLogger('conversation');
@@ -202,7 +204,7 @@ function formatLapTranscript(lapTurns) {
  * @param {object} config - Configuration
  * @returns {Array<object>} Ordered turn plan entries
  */
-function resolveTurnPlan(models, providers, config) {
+function resolveTurnPlan(models, providers, config, hasImages = false) {
   // Single "auto" expands to the first available provider's default model only
   // (a single-model round-table is valid). Multiple explicit models resolve per-entry.
   let modelsToProcess = models;
@@ -225,6 +227,10 @@ function resolveTurnPlan(models, providers, config) {
     for (const providerName of providerOrder) {
       const provider = providers[providerName];
       if (provider && provider.isAvailable(config)) {
+        // Skip text-only providers when the request includes images.
+        if (hasImages && !providerSupportsImages(provider, providerName)) {
+          continue;
+        }
         firstAvailable = providerName;
         break;
       }
@@ -268,7 +274,7 @@ function resolveTurnPlan(models, providers, config) {
         provider: providerName,
         providerInstance: null,
         resolvedModel,
-        preFailReason: `Provider ${providerName} not available (check API key)`,
+        preFailReason: getProviderUnavailableMessage(providerName),
       };
     }
 
@@ -573,7 +579,12 @@ export async function conversationTool(args, dependencies) {
     );
 
     // Resolve ordered turn plan (unavailable models kept as pre-failed turns)
-    const turnPlan = resolveTurnPlan(models, providers, config);
+    const turnPlan = resolveTurnPlan(
+      models,
+      providers,
+      config,
+      Array.isArray(images) && images.length > 0,
+    );
 
     const startedAt = Date.now();
     const lapTurns = [];
@@ -939,7 +950,12 @@ async function executeConversationWithStreaming(args, dependencies, context) {
   );
 
   const priorTranscriptText = renderStoredTranscriptToText(conversationHistory);
-  const turnPlan = resolveTurnPlan(models, providers, config);
+  const turnPlan = resolveTurnPlan(
+    models,
+    providers,
+    config,
+    Array.isArray(images) && images.length > 0,
+  );
   const modelsList = models.join(', ');
 
   // Use passed title or generate if not provided

package/src/utils/modelRouting.js

@@ -44,6 +44,49 @@ export function resolveAutoModel(model, providerName) {
   return getDefaultModelForProvider(providerName);
 }
 
+/**
+ * Provider-specific setup hints appended to "Provider X is not available."
+ * errors so users know how to enable a provider. Keyed by registry name.
+ */
+const PROVIDER_SETUP_HINTS = {
+  'gemini-cli':
+    'Install the Antigravity CLI and run `agy` once to log in (https://antigravity.google)',
+};
+
+/**
+ * Build the "provider not available" error message with an optional setup hint.
+ * @param {string} providerName - Provider registry name
+ * @returns {string}
+ */
+export function getProviderUnavailableMessage(providerName) {
+  const base = `Provider ${providerName} is not available. Check API key configuration.`;
+  const hint = PROVIDER_SETUP_HINTS[providerName];
+  return hint ? `${base} ${hint}` : base;
+}
+
+/**
+ * Whether a provider's default model supports image inputs. Used by the "auto"
+ * selection paths to skip text-only providers (gemini-cli, copilot) when the
+ * request includes images. Providers without a resolvable config are treated as
+ * image-capable (fail open — they surface their own errors downstream).
+ * @param {object} providerInstance - Provider implementation
+ * @param {string} providerName - Provider registry name
+ * @returns {boolean}
+ */
+export function providerSupportsImages(providerInstance, providerName) {
+  if (!providerInstance || typeof providerInstance.getModelConfig !== 'function') {
+    return true;
+  }
+  try {
+    const defaultModel = getDefaultModelForProvider(providerName);
+    const modelConfig = providerInstance.getModelConfig(defaultModel);
+    if (!modelConfig) return true;
+    return modelConfig.supportsImages !== false;
+  } catch {
+    return true;
+  }
+}
+
 /**
  * Map model name to provider name
  * @param {string} model - Model name
@@ -80,6 +123,13 @@ export function mapModelToProvider(model, providers) {
     return 'gemini-cli';
   }
 
+  // Check gemini: prefix (e.g., gemini:flash, gemini:pro) - routes to Antigravity
+  // CLI provider. Must be before the google flash/pro keyword rule below so it
+  // wins over Google API routing. Bare gemini-pro/gemini-flash still hit google.
+  if (modelLower.startsWith('gemini:')) {
+    return 'gemini-cli';
+  }
+
   // Check Claude SDK (exact match only - routes to SDK provider instead of Anthropic API)
   if (
     modelLower === 'claude' ||