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

package/dist/server/proxy.js

@@ -124,7 +124,9 @@ function sanitizeForBedrock(body) {
     if (!body)
         return body;
     const sanitized = JSON.parse(JSON.stringify(body)); // Deep clone
-    // 1. Sanitize toolUseId in all messages
+    // 1. Sanitize toolUseId in all messages AND detect tool history
+    let hasToolHistory = false;
+    const toolNamesFromHistory = [];
     if (sanitized.messages && Array.isArray(sanitized.messages)) {
         for (const msg of sanitized.messages) {
             if (msg.content && Array.isArray(msg.content)) {
@@ -132,31 +134,44 @@ function sanitizeForBedrock(body) {
                     // Handle toolUse blocks
                     if (block.toolUse && block.toolUse.toolUseId) {
                         block.toolUse.toolUseId = sanitizeToolUseId(block.toolUse.toolUseId);
+                        hasToolHistory = true;
+                        if (block.toolUse.name)
+                            toolNamesFromHistory.push(block.toolUse.name);
                     }
                     // Handle toolResult blocks
                     if (block.toolResult && block.toolResult.toolUseId) {
                         block.toolResult.toolUseId = sanitizeToolUseId(block.toolResult.toolUseId);
+                        hasToolHistory = true;
                     }
-                    // Handle OpenAI-style tool_calls
+                    // Handle OpenAI-style tool_use in content array
                     if (block.type === 'tool_use' && block.id) {
                         block.id = sanitizeToolUseId(block.id);
+                        hasToolHistory = true;
+                        if (block.name)
+                            toolNamesFromHistory.push(block.name);
                     }
                 }
             }
             // Handle assistant tool_calls array (OpenAI format)
             if (msg.tool_calls && Array.isArray(msg.tool_calls)) {
+                hasToolHistory = true;
                 for (const tc of msg.tool_calls) {
                     if (tc.id)
                         tc.id = sanitizeToolUseId(tc.id);
+                    if (tc.function?.name)
+                        toolNamesFromHistory.push(tc.function.name);
                 }
             }
             // Handle tool role message (OpenAI format)
-            if (msg.role === 'tool' && msg.tool_call_id) {
-                msg.tool_call_id = sanitizeToolUseId(msg.tool_call_id);
+            if (msg.role === 'tool') {
+                hasToolHistory = true;
+                if (msg.tool_call_id) {
+                    msg.tool_call_id = sanitizeToolUseId(msg.tool_call_id);
+                }
             }
         }
     }
-    // 2. Add toolConfig if tools present but toolConfig missing
+    // 2. Add toolConfig if tools present 
     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)
@@ -179,6 +194,30 @@ function sanitizeForBedrock(body) {
             };
         }
     }
+    // 3. CRITICAL: If no tools BUT history has tool calls, inject shim toolConfig
+    else if (hasToolHistory && !sanitized.tool_config && !sanitized.toolConfig) {
+        // Bedrock requires toolConfig when history contains toolUse/toolResult
+        // Create shim tools from the tool names we found in history
+        const uniqueToolNames = [...new Set(toolNamesFromHistory)];
+        sanitized.tool_config = {
+            tools: uniqueToolNames.length > 0
+                ? uniqueToolNames.map(name => ({
+                    toolSpec: {
+                        name: name,
+                        description: 'Tool inferred from conversation history (Bedrock compatibility shim)',
+                        inputSchema: { json: { type: 'object', properties: {} } }
+                    }
+                }))
+                : [{
+                        toolSpec: {
+                            name: '_bedrock_shim_tool',
+                            description: 'Internal shim to satisfy Bedrock toolConfig requirement',
+                            inputSchema: { json: { type: 'object', properties: {} } }
+                        }
+                    }]
+        };
+        log(`[Bedrock Shim] Injected toolConfig with ${uniqueToolNames.length || 1} shim tool(s) for history compatibility`);
+    }
     return sanitized;
 }
 const MAX_RETRIES = 3;
@@ -656,10 +695,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) => {

package/package.json

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