opencode-pollinations-plugin 6.1.0-beta.4 → 6.1.0-beta.6

package/dist/server/commands.js

@@ -2,7 +2,7 @@ import * as https from 'https';
 import { loadConfig, saveConfig } from './config.js';
 import { getQuotaStatus } from './quota.js';
 import { emitStatusToast } from './toast.js';
-import { getDetailedUsage } from './pollinations-api.js';
+import { getDetailedUsage, getAggregatedModels } from './pollinations-api.js';
 import { generatePollinationsConfig } from './generate-config.js';
 function checkEndpoint(ep, key) {
     return new Promise((resolve) => {
@@ -145,7 +145,7 @@ export async function handleCommand(command) {
         case 'connect':
             return await handleConnectCommand(args);
         case 'fallback':
-            return handleFallbackCommand(args);
+            return await handleFallbackCommand(args);
         case 'config':
             return handleConfigCommand(args);
         case 'help':
@@ -265,7 +265,7 @@ async function handleUsageCommand(args) {
         return { handled: true, error: `Erreur: ${e}` };
     }
 }
-function handleFallbackCommand(args) {
+async function handleFallbackCommand(args) {
     let targetMode = args[0];
     const targetModel = args[1];
     if (!targetMode || !targetModel) {
@@ -280,20 +280,21 @@ function handleFallbackCommand(args) {
     if (targetMode !== 'economy' && targetMode !== 'pro') {
         return { handled: true, error: 'Target mode invalide (economy ou pro)' };
     }
-    // Validate Model
-    const KNOWN_MODELS = [
-        "openai", "openai-fast", "openai-large", "qwen-coder", "mistral", "openai-audio", "gemini", "gemini-fast",
-        "deepseek", "grok", "gemini-search", "chickytutor", "midijourney", "claude-fast", "claude", "claude-large",
-        "perplexity-fast", "perplexity-reasoning", "kimi", "gemini-large", "gemini-legacy", "nova-fast", "glm", "minimax",
-        "nomnom", "gpt-5-nano", "gpt-5.2", "openai-reasoning", "qwen3-coder", "deepseek-v3", "deepseek-reasoning",
-        "gemini-2.5-flash-lite", "claude-sonnet-4.5", "claude-sonnet", "amazon-nova-micro", "nova", "nova-micro"
-    ];
-    // Tolerant check (if missing from known list, warn but allow if looks valid pattern? No, strict warn is better as requested)
-    if (!KNOWN_MODELS.includes(targetModel)) {
-        return {
-            handled: true,
-            error: `⚠️ Modèle inconnu: "${targetModel}".\nModèles valides: ${KNOWN_MODELS.slice(0, 5).join(', ')}... (voir doc)`
-        };
+    // DYNAMIC MODEL VALIDATION (BUG 2 FIX)
+    try {
+        const { data: models } = await getAggregatedModels();
+        const validIds = models.map(m => m.id.replace(/^pollinations\/(free|enter)\//, ''));
+        if (!validIds.includes(targetModel)) {
+            const suggestions = validIds.slice(0, 10).join(', ');
+            return {
+                handled: true,
+                error: `⚠️ Modèle inconnu: "${targetModel}".\nExemples valides: ${suggestions}...`
+            };
+        }
+    }
+    catch (e) {
+        // Fail-open si API down
+        console.warn('[Fallback] Model validation failed, allowing:', e);
     }
     const config = loadConfig();
     const updates = { fallbacks: { ...config.fallbacks } };

package/dist/server/proxy.js

@@ -112,6 +112,75 @@ function truncateTools(tools, limit = 120) {
         return tools;
     return tools.slice(0, limit);
 }
+// --- BEDROCK COMPATIBILITY SHIM ---
+// Bedrock requires: 
+// 1. toolUseId matching [a-zA-Z0-9_-]+ (no dots, spaces, special chars)
+// 2. toolConfig present when toolUse/toolResult in messages
+function sanitizeToolUseId(id) {
+    // Replace any char not in [a-zA-Z0-9_-] with underscore
+    return id.replace(/[^a-zA-Z0-9_-]/g, '_');
+}
+function sanitizeForBedrock(body) {
+    if (!body)
+        return body;
+    const sanitized = JSON.parse(JSON.stringify(body)); // Deep clone
+    // 1. Sanitize toolUseId in all messages
+    if (sanitized.messages && Array.isArray(sanitized.messages)) {
+        for (const msg of sanitized.messages) {
+            if (msg.content && Array.isArray(msg.content)) {
+                for (const block of msg.content) {
+                    // Handle toolUse blocks
+                    if (block.toolUse && block.toolUse.toolUseId) {
+                        block.toolUse.toolUseId = sanitizeToolUseId(block.toolUse.toolUseId);
+                    }
+                    // Handle toolResult blocks
+                    if (block.toolResult && block.toolResult.toolUseId) {
+                        block.toolResult.toolUseId = sanitizeToolUseId(block.toolResult.toolUseId);
+                    }
+                    // Handle OpenAI-style tool_calls
+                    if (block.type === 'tool_use' && block.id) {
+                        block.id = sanitizeToolUseId(block.id);
+                    }
+                }
+            }
+            // Handle assistant tool_calls array (OpenAI format)
+            if (msg.tool_calls && Array.isArray(msg.tool_calls)) {
+                for (const tc of msg.tool_calls) {
+                    if (tc.id)
+                        tc.id = sanitizeToolUseId(tc.id);
+                }
+            }
+            // Handle tool role message (OpenAI format)
+            if (msg.role === 'tool' && msg.tool_call_id) {
+                msg.tool_call_id = sanitizeToolUseId(msg.tool_call_id);
+            }
+        }
+    }
+    // 2. Add toolConfig if tools present but toolConfig missing
+    if (sanitized.tools && Array.isArray(sanitized.tools) && sanitized.tools.length > 0) {
+        if (!sanitized.tool_config && !sanitized.toolConfig) {
+            // Build toolConfig from tools array (Bedrock Converse format)
+            sanitized.tool_config = {
+                tools: sanitized.tools.map((t) => {
+                    if (t.function) {
+                        // OpenAI format -> Bedrock format
+                        return {
+                            toolSpec: {
+                                name: t.function.name,
+                                description: t.function.description || '',
+                                inputSchema: {
+                                    json: t.function.parameters || { type: 'object', properties: {} }
+                                }
+                            }
+                        };
+                    }
+                    return t; // Already in Bedrock format
+                })
+            };
+        }
+    }
+    return sanitized;
+}
 const MAX_RETRIES = 3;
 const RETRY_DELAY_MS = 1000;
 function sleep(ms) {
@@ -647,11 +716,20 @@ export async function handleChatCompletion(req, res, bodyRaw) {
                         log(`[SafetyNet] Adjusted max_tokens to 4000 for ${actualModel}`);
                     }
                 }
+                // BEDROCK COMPATIBILITY SHIM (BUG 1 - Proper Transform)
+                const isBedrockModel = actualModel.includes('nova') ||
+                    actualModel.includes('amazon') ||
+                    actualModel.includes('chickytutor');
+                let finalRetryBody = retryBody;
+                if (isBedrockModel) {
+                    finalRetryBody = sanitizeForBedrock(retryBody);
+                    log(`[SafetyNet] Applied Bedrock shim for ${actualModel}`);
+                }
                 // 4. Retry Fetch
                 const retryRes = await fetchWithRetry(targetUrl, {
                     method: 'POST',
                     headers: retryHeaders,
-                    body: JSON.stringify(retryBody)
+                    body: JSON.stringify(finalRetryBody)
                 });
                 if (retryRes.ok) {
                     res.statusCode = retryRes.status;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "opencode-pollinations-plugin",
     "displayName": "Pollinations AI (V5.6)",
-    "version": "6.1.0-beta.4",
+    "version": "6.1.0-beta.6",
     "description": "Native Pollinations.ai Provider Plugin for OpenCode",
     "publisher": "pollinations",
     "repository": {