@zhafron/opencode-kiro-auth 1.2.2 → 1.2.4

package/dist/plugin/request.js

@@ -2,6 +2,7 @@ import * as crypto from 'crypto';
 import * as os from 'os';
 import { KIRO_CONSTANTS } from '../constants.js';
 import { resolveKiroModel } from './models.js';
+import * as logger from './logger.js';
 export function transformToCodeWhisperer(url, body, model, auth, think = false, budget = 20000) {
     const req = typeof body === 'string' ? JSON.parse(body) : body;
     const { messages, tools, system, conversationId } = req;
@@ -268,6 +269,33 @@ export function transformToCodeWhisperer(url, body, model, auth, think = false,
             ctx.tools = cwTools;
         if (Object.keys(ctx).length)
             uim.userInputMessageContext = ctx;
+        const hasToolsInHistory = historyHasToolCalling(history);
+        if (hasToolsInHistory) {
+            const toolNamesInHistory = extractToolNamesFromHistory(history);
+            if (toolNamesInHistory.size > 0) {
+                const existingTools = uim.userInputMessageContext?.tools || [];
+                const existingToolNames = new Set(existingTools.map((t) => t.toolSpecification?.name).filter(Boolean));
+                const missingToolNames = Array.from(toolNamesInHistory).filter((name) => !existingToolNames.has(name));
+                if (missingToolNames.length > 0) {
+                    logger.log(`[Kiro] Adding ${missingToolNames.length} missing tool definitions: ${missingToolNames.join(', ')}`);
+                    const placeholderTools = missingToolNames.map((name) => ({
+                        toolSpecification: {
+                            name,
+                            description: 'Tool',
+                            inputSchema: {
+                                json: {
+                                    type: 'object',
+                                    properties: {}
+                                }
+                            }
+                        }
+                    }));
+                    if (!uim.userInputMessageContext)
+                        uim.userInputMessageContext = {};
+                    uim.userInputMessageContext.tools = [...existingTools, ...placeholderTools];
+                }
+            }
+        }
     }
     const machineId = crypto
         .createHash('sha256')
@@ -332,9 +360,7 @@ export function mergeAdjacentMessages(msgs) {
     return merged;
 }
 export function convertToolsToCodeWhisperer(tools) {
-    return tools
-        .filter((t) => !['web_search', 'websearch'].includes((t.name || t.function?.name || '').toLowerCase()))
-        .map((t) => ({
+    return tools.map((t) => ({
         toolSpecification: {
             name: t.name || t.function?.name,
             description: (t.description || t.function?.description || '').substring(0, 9216),
@@ -366,3 +392,19 @@ function deduplicateToolResults(trs) {
     }
     return u;
 }
+function historyHasToolCalling(history) {
+    return history.some((h) => h.assistantResponseMessage?.toolUses ||
+        h.userInputMessage?.userInputMessageContext?.toolResults);
+}
+function extractToolNamesFromHistory(history) {
+    const toolNames = new Set();
+    for (const h of history) {
+        if (h.assistantResponseMessage?.toolUses) {
+            for (const tu of h.assistantResponseMessage.toolUses) {
+                if (tu.name)
+                    toolNames.add(tu.name);
+            }
+        }
+    }
+    return toolNames;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhafron/opencode-kiro-auth",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "description": "OpenCode plugin for AWS Kiro (CodeWhisperer) providing access to Claude models",
   "type": "module",
   "main": "dist/index.js",