@bogyie/opencode-kiro-plugin 0.2.9 → 0.2.11

package/dist/kiro-rest-transport.js

@@ -15,6 +15,12 @@ function conversationId(request) {
     return `opencode-${hash.toString(16)}-${Date.now().toString(36)}`;
 }
 export function toKiroRestPayload(request, profileArn) {
+    const toolResults = request.toolResults.map((item) => ({
+        toolUseId: item.toolUseId,
+        content: [{ text: item.content }],
+        status: "success",
+        ...(item.toolName ? { toolName: item.toolName } : {}),
+    }));
     const history = [
         ...(request.system
             ? [
@@ -36,6 +42,15 @@ export function toKiroRestPayload(request, profileArn) {
             ? {
                 assistantResponseMessage: {
                     content: turn.content,
+                    ...(turn.toolUses && turn.toolUses.length > 0
+                        ? {
+                            toolUses: turn.toolUses.map((toolUse) => ({
+                                toolUseId: toolUse.toolUseId,
+                                name: toolUse.name,
+                                input: toolUse.input,
+                            })),
+                        }
+                        : {}),
                 },
             }
             : {
@@ -45,6 +60,20 @@ export function toKiroRestPayload(request, profileArn) {
                     origin: "AI_EDITOR",
                 },
             }),
+        ...(toolResults.length > 0
+            ? [
+                {
+                    userInputMessage: {
+                        content: "",
+                        modelId: request.modelId,
+                        origin: "AI_EDITOR",
+                        userInputMessageContext: {
+                            toolResults,
+                        },
+                    },
+                },
+            ]
+            : []),
     ];
     const tools = request.tools.map((item) => ({
         toolSpecification: {
@@ -53,16 +82,9 @@ export function toKiroRestPayload(request, profileArn) {
             inputSchema: { json: item.inputSchema },
         },
     }));
-    const toolResults = request.toolResults.map((item) => ({
-        toolUseId: item.toolUseId,
-        content: [{ text: item.content }],
-        status: "success",
-        ...(item.toolName ? { toolName: item.toolName } : {}),
-    }));
-    const userInputMessageContext = tools.length > 0 || toolResults.length > 0
+    const userInputMessageContext = tools.length > 0
         ? {
             ...(tools.length > 0 ? { tools } : {}),
-            ...(toolResults.length > 0 ? { toolResults } : {}),
         }
         : undefined;
     const inferenceConfig = request.modelOptions.maxTokens !== undefined || request.modelOptions.temperature !== undefined

package/dist/kiro-transport.js

@@ -49,6 +49,12 @@ export function createCodeWhispererClient(options) {
 export function toGenerateAssistantResponseInput(request, options = {}) {
     const content = request.prompt;
     const modelFields = additionalModelRequestFields(request);
+    const toolResults = request.toolResults.map((item) => ({
+        toolUseId: item.toolUseId,
+        content: [{ text: item.content }],
+        status: "SUCCESS",
+        ...(item.toolName ? { toolName: item.toolName } : {}),
+    }));
     return {
         ...(options.profileArn ? { profileArn: options.profileArn } : {}),
         agentMode: options.agentMode ?? DEFAULT_AGENT_MODE,
@@ -70,6 +76,15 @@ export function toGenerateAssistantResponseInput(request, options = {}) {
                     ? {
                         assistantResponseMessage: {
                             content: turn.content,
+                            ...(turn.toolUses && turn.toolUses.length > 0
+                                ? {
+                                    toolUses: turn.toolUses.map((toolUse) => ({
+                                        toolUseId: toolUse.toolUseId,
+                                        name: toolUse.name,
+                                        input: toolUse.input,
+                                    })),
+                                }
+                                : {}),
                         },
                     }
                     : {
@@ -78,6 +93,19 @@ export function toGenerateAssistantResponseInput(request, options = {}) {
                             origin: "AI_EDITOR",
                         },
                     }),
+                ...(toolResults.length > 0
+                    ? [
+                        {
+                            userInputMessage: {
+                                content: "",
+                                origin: "AI_EDITOR",
+                                userInputMessageContext: {
+                                    toolResults,
+                                },
+                            },
+                        },
+                    ]
+                    : []),
             ],
             currentMessage: {
                 userInputMessage: {
@@ -101,7 +129,7 @@ export function toGenerateAssistantResponseInput(request, options = {}) {
                             })),
                         }
                         : {}),
-                    userInputMessageContext: request.tools.length > 0 || request.toolResults.length > 0
+                    userInputMessageContext: request.tools.length > 0
                         ? {
                             ...(request.tools.length > 0
                                 ? {
@@ -114,16 +142,6 @@ export function toGenerateAssistantResponseInput(request, options = {}) {
                                     })),
                                 }
                                 : {}),
-                            ...(request.toolResults.length > 0
-                                ? {
-                                    toolResults: request.toolResults.map((item) => ({
-                                        toolUseId: item.toolUseId,
-                                        content: [{ text: item.content }],
-                                        status: "SUCCESS",
-                                        ...(item.toolName ? { toolName: item.toolName } : {}),
-                                    })),
-                                }
-                                : {}),
                         }
                         : undefined,
                 },

package/dist/request-adapter.d.ts

@@ -78,6 +78,12 @@ export interface KiroDocumentBlock {
 export interface KiroConversationTurn {
     readonly role: "user" | "assistant" | "tool";
     readonly content: string;
+    readonly toolUses?: ReadonlyArray<KiroConversationToolUse>;
+}
+export interface KiroConversationToolUse {
+    readonly toolUseId: string;
+    readonly name: string;
+    readonly input: unknown;
 }
 export interface KiroToolSpec {
     readonly name: string;

package/dist/request-adapter.js

@@ -108,18 +108,6 @@ function toolSpecs(tools) {
         inputSchema: tool.function.parameters ?? { type: "object", properties: {} },
     }));
 }
-function requestedToolCallIds(messages) {
-    const ids = new Set();
-    for (const message of messages) {
-        if (message.role !== "assistant")
-            continue;
-        for (const toolCall of message.tool_calls ?? []) {
-            if (toolCall.id)
-                ids.add(toolCall.id);
-        }
-    }
-    return ids;
-}
 function toolNameById(messages) {
     const names = new Map();
     for (const message of messages) {
@@ -133,13 +121,27 @@ function toolNameById(messages) {
     return names;
 }
 function toolResults(messages) {
-    const requested = requestedToolCallIds(messages);
     const names = toolNameById(messages);
+    const nonSystemMessages = messages.filter((message) => message.role !== "system");
+    const trailingTools = [];
+    let index = nonSystemMessages.length - 1;
+    while (index >= 0 && nonSystemMessages[index]?.role === "tool") {
+        const message = nonSystemMessages[index];
+        if (message)
+            trailingTools.unshift(message);
+        index -= 1;
+    }
+    if (trailingTools.length === 0)
+        return [];
+    const previous = nonSystemMessages[index];
+    if (!previous || previous.role !== "assistant")
+        return [];
+    const activeToolIds = new Set((previous.tool_calls ?? []).map((toolCall) => toolCall.id).filter((id) => Boolean(id)));
+    if (activeToolIds.size === 0)
+        return [];
     const results = new Map();
-    for (const message of messages) {
-        if (message.role !== "tool" || !message.tool_call_id)
-            continue;
-        if (requested.size > 0 && !requested.has(message.tool_call_id))
+    for (const message of trailingTools) {
+        if (!message.tool_call_id || !activeToolIds.has(message.tool_call_id))
             continue;
         const toolName = message.name ?? names.get(message.tool_call_id);
         results.set(message.tool_call_id, {
@@ -150,6 +152,51 @@ function toolResults(messages) {
     }
     return [...results.values()];
 }
+function trailingToolMessageIndexes(messages) {
+    const indexes = new Set();
+    for (let index = messages.length - 1; index >= 0; index -= 1) {
+        const message = messages[index];
+        if (!message || message.role === "system")
+            continue;
+        if (message.role !== "tool")
+            break;
+        indexes.add(index);
+    }
+    return indexes;
+}
+function previousAssistantIndexForTrailingTools(messages, trailingIndexes) {
+    if (trailingIndexes.size === 0)
+        return undefined;
+    for (let index = messages.length - 1; index >= 0; index -= 1) {
+        const message = messages[index];
+        if (!message || message.role === "system" || trailingIndexes.has(index))
+            continue;
+        return message.role === "assistant" ? index : undefined;
+    }
+    return undefined;
+}
+function toolUses(message) {
+    return (message.tool_calls ?? [])
+        .map((toolCall) => {
+        if (!toolCall.id || !toolCall.function?.name)
+            return undefined;
+        let input = {};
+        if (toolCall.function.arguments) {
+            try {
+                input = JSON.parse(toolCall.function.arguments);
+            }
+            catch {
+                input = toolCall.function.arguments;
+            }
+        }
+        return {
+            toolUseId: toolCall.id,
+            name: toolCall.function.name,
+            input,
+        };
+    })
+        .filter((item) => item !== undefined);
+}
 function finiteNumber(value) {
     return typeof value === "number" && Number.isFinite(value) ? value : undefined;
 }
@@ -184,28 +231,42 @@ export async function readOpenAIRequest(input, init) {
 }
 export function toKiroGenerateRequest(request, resolver) {
     const resolved = resolver.resolve(request.model);
+    const activeToolResults = toolResults(request.messages);
+    const activeTrailingToolIndexes = activeToolResults.length > 0 ? trailingToolMessageIndexes(request.messages) : new Set();
+    const activeToolUseAssistantIndex = previousAssistantIndexForTrailingTools(request.messages, activeTrailingToolIndexes);
     const system = request.messages
         .filter((message) => message.role === "system")
         .map((message) => textFromContent(message.content))
         .filter(Boolean)
         .join("\n\n");
-    const turns = request.messages
-        .filter((message) => message.role !== "system")
-        .map((message) => {
+    const turns = [];
+    for (const [index, message] of request.messages.entries()) {
+        if (message.role === "system" || activeTrailingToolIndexes.has(index))
+            continue;
         const content = textFromContent(message.content);
-        return content ? { role: message.role, content } : undefined;
-    })
-        .filter((item) => item !== undefined);
-    const current = turns.at(-1);
-    const history = turns.slice(0, -1);
-    const currentMessage = request.messages.filter((message) => message.role !== "system").at(-1);
+        const assistantToolUses = message.role === "assistant" && index === activeToolUseAssistantIndex ? toolUses(message) : [];
+        if (!content && assistantToolUses.length === 0)
+            continue;
+        turns.push({
+            role: message.role,
+            content,
+            ...(assistantToolUses.length > 0 ? { toolUses: assistantToolUses } : {}),
+        });
+    }
+    const current = activeToolResults.length > 0 ? undefined : turns.at(-1);
+    const history = activeToolResults.length > 0 ? turns : turns.slice(0, -1);
+    const currentMessage = request.messages
+        .map((message, index) => ({ message, index }))
+        .filter(({ message, index }) => message.role !== "system" && !activeTrailingToolIndexes.has(index))
+        .map(({ message }) => message)
+        .at(-1);
     const media = mediaFromContent(currentMessage?.content);
     return {
         modelId: resolved.internalID,
         prompt: current?.content ?? "",
         history,
         tools: toolSpecs(request.tools),
-        toolResults: toolResults(request.messages),
+        toolResults: activeToolResults,
         images: media.images,
         documents: media.documents,
         modelOptions: modelOptions(request),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bogyie/opencode-kiro-plugin",
-  "version": "0.2.9",
+  "version": "0.2.11",
   "description": "OpenCode plugin for using Kiro as a provider adapter",
   "type": "module",
   "main": "dist/index.js",