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

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,44 @@ function sanitizeForBedrock(body) {
             };
         }
     }
+    // 3. CRITICAL: If no tools BUT history has tool calls, inject shim tools array
+    else if (hasToolHistory) {
+        // Bedrock requires toolConfig when history contains toolUse/toolResult
+        // Pollinations builds toolConfig from the 'tools' array, not from our 'tool_config'
+        // So we MUST inject 'tools' in OpenAI format, not just 'tool_config'
+        const uniqueToolNames = [...new Set(toolNamesFromHistory)];
+        // Build OpenAI-format tools array (this is what Pollinations actually uses!)
+        const shimTools = uniqueToolNames.length > 0
+            ? uniqueToolNames.map(name => ({
+                type: 'function',
+                function: {
+                    name: name,
+                    description: 'Tool inferred from conversation history (Bedrock compatibility shim)',
+                    parameters: { type: 'object', properties: {} }
+                }
+            }))
+            : [{
+                    type: 'function',
+                    function: {
+                        name: '_bedrock_shim_tool',
+                        description: 'Internal shim to satisfy Bedrock toolConfig requirement',
+                        parameters: { type: 'object', properties: {} }
+                    }
+                }];
+        // Inject the tools array (Pollinations format)
+        sanitized.tools = shimTools;
+        // Also set tool_config for direct Bedrock passthrough (belt & suspenders)
+        sanitized.tool_config = {
+            tools: shimTools.map(t => ({
+                toolSpec: {
+                    name: t.function.name,
+                    description: t.function.description,
+                    inputSchema: { json: t.function.parameters }
+                }
+            }))
+        };
+        log(`[Bedrock Shim] Injected ${shimTools.length} shim tool(s) for history compatibility: [${uniqueToolNames.join(', ') || '_bedrock_shim_tool'}]`);
+    }
     return sanitized;
 }
 const MAX_RETRIES = 3;

package/package.json

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