opencode-pollinations-plugin 6.1.0-beta.5 → 6.1.0-beta.7

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) {
@@ -587,10 +656,18 @@ export async function handleChatCompletion(req, res, bodyRaw) {
         if (authHeader)
             headers['Authorization'] = authHeader;
         // 5. Forward (Global Fetch with Retry)
+        // BEDROCK COMPATIBILITY: Apply transformation BEFORE first request
+        const isBedrockModel = actualModel.includes('nova') ||
+            actualModel.includes('amazon') ||
+            actualModel.includes('chickytutor');
+        const finalProxyBody = isBedrockModel ? sanitizeForBedrock(proxyBody) : proxyBody;
+        if (isBedrockModel) {
+            log(`[Proxy] Applied Bedrock shim for ${actualModel} (Initial Request)`);
+        }
         const fetchRes = await fetchWithRetry(targetUrl, {
             method: 'POST',
             headers: headers,
-            body: JSON.stringify(proxyBody)
+            body: JSON.stringify(finalProxyBody)
         });
         res.statusCode = fetchRes.status;
         fetchRes.headers.forEach((val, key) => {
@@ -647,20 +724,20 @@ export async function handleChatCompletion(req, res, bodyRaw) {
                         log(`[SafetyNet] Adjusted max_tokens to 4000 for ${actualModel}`);
                     }
                 }
-                // BEDROCK COMPATIBILITY FIX (BUG 1)
+                // BEDROCK COMPATIBILITY SHIM (BUG 1 - Proper Transform)
                 const isBedrockModel = actualModel.includes('nova') ||
                     actualModel.includes('amazon') ||
                     actualModel.includes('chickytutor');
-                if (isBedrockModel && retryBody.tools) {
-                    delete retryBody.tools;
-                    log(`[SafetyNet] Tools removed for Bedrock model: ${actualModel}`);
-                    emitStatusToast('warning', '⚠️ Tools désactivés (Bedrock incompatible)', 'Fallback');
+                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.5",
+    "version": "6.1.0-beta.7",
     "description": "Native Pollinations.ai Provider Plugin for OpenCode",
     "publisher": "pollinations",
     "repository": {