@bogyie/opencode-kiro-plugin 0.2.10 → 0.2.12

package/dist/auth.d.ts

@@ -43,6 +43,7 @@ export declare function regionFromProfileArn(profileArn: string | undefined): st
 export declare function readKiroCliSessionCredential(options?: KiroCliSessionCredentialOptions, runner?: CommandRunner): Promise<KiroCliSessionCredential | undefined>;
 export declare function extractKiroLoginUrl(output: string): string;
 export declare function startKiroCliLogin(spawner?: ProcessSpawner): KiroLoginSession;
+export declare function startKiroCliLoginOnce(spawner?: ProcessSpawner): KiroLoginSession;
 export declare function redacted(value: string | undefined): string | undefined;
 export declare function detectAuth(env?: NodeJS.ProcessEnv, runner?: CommandRunner): Promise<AuthDiagnostics>;
 export declare function resolveApiKey(auth: () => Promise<{

package/dist/auth.js

@@ -8,6 +8,9 @@ const execFileAsync = promisify(execFile);
 export const KIRO_LOGIN_URL = "https://view.awsapps.com/start";
 export const DEFAULT_KIRO_CLI_DB_PATH = join(homedir(), "Library", "Application Support", "kiro-cli", "data.sqlite3");
 export const DEFAULT_KIRO_CLI_TOKEN_KEYS = ["kirocli:odic:token", "codewhisperer:odic:token"];
+const LOGIN_REUSE_WINDOW_MS = 2 * 60 * 1000;
+let sharedLoginSession;
+let sharedLoginStartedAt = 0;
 export async function runCommand(command, args, options = {}) {
     try {
         const result = await execFileAsync(command, [...args], { timeout: options.timeoutMs ?? 5000 });
@@ -141,6 +144,34 @@ export function startKiroCliLogin(spawner = (command, args) => spawn(command, [.
         },
     };
 }
+export function startKiroCliLoginOnce(spawner = (command, args) => spawn(command, [...args], { stdio: ["ignore", "pipe", "pipe"] })) {
+    const now = Date.now();
+    if (sharedLoginSession && now - sharedLoginStartedAt < LOGIN_REUSE_WINDOW_MS)
+        return sharedLoginSession;
+    const session = startKiroCliLogin(spawner);
+    const wrapped = {
+        get url() {
+            return session.url;
+        },
+        get instructions() {
+            return session.instructions;
+        },
+        async waitForAuth(runner) {
+            try {
+                return await session.waitForAuth(runner);
+            }
+            finally {
+                if (sharedLoginSession === wrapped) {
+                    sharedLoginSession = undefined;
+                    sharedLoginStartedAt = 0;
+                }
+            }
+        },
+    };
+    sharedLoginSession = wrapped;
+    sharedLoginStartedAt = now;
+    return wrapped;
+}
 export function redacted(value) {
     if (!value)
         return undefined;

package/dist/cli-transport.js

@@ -1,4 +1,4 @@
-import { runCommand, startKiroCliLogin } from "./auth.js";
+import { runCommand, startKiroCliLoginOnce as startSharedKiroCliLoginOnce } from "./auth.js";
 import { KiroPluginError } from "./errors.js";
 import { spawn } from "node:child_process";
 let lastLoginStartAt = 0;
@@ -7,7 +7,7 @@ function startKiroCliLoginOnce() {
     if (now - lastLoginStartAt < 30_000)
         return;
     lastLoginStartAt = now;
-    startKiroCliLogin();
+    startSharedKiroCliLoginOnce();
 }
 export function promptForCli(request) {
     const parts = [

package/dist/index.d.ts

@@ -3,7 +3,7 @@ export type { AcpConnection, AcpNotificationHandler, AcpStdioClientOptions, Json
 export { acpPermissionResponse, KiroAcpTransport } from "./acp-transport.js";
 export type { AcpSessionClient, KiroAcpTransportOptions } from "./acp-transport.js";
 export { createKiroPlugin, effectiveBackend, KiroPlugin } from "./plugin.js";
-export { detectAuth, extractKiroLoginUrl, KIRO_LOGIN_URL, readKiroCliSessionCredential, redacted, regionFromProfileArn, resolveApiKey, startKiroCliLogin, } from "./auth.js";
+export { detectAuth, extractKiroLoginUrl, KIRO_LOGIN_URL, readKiroCliSessionCredential, redacted, regionFromProfileArn, resolveApiKey, startKiroCliLogin, startKiroCliLoginOnce, } from "./auth.js";
 export { cliChatArgs, KiroCliChatTransport, promptForCli } from "./cli-transport.js";
 export { createKiroFetch } from "./fetch-adapter.js";
 export { loadOptions } from "./config.js";

package/dist/index.js

@@ -2,7 +2,7 @@ import { KiroPlugin } from "./plugin.js";
 export { AcpJsonRpcClient, createAcpStdioClient, decodeJsonRpc, encodeJsonRpc } from "./acp-client.js";
 export { acpPermissionResponse, KiroAcpTransport } from "./acp-transport.js";
 export { createKiroPlugin, effectiveBackend, KiroPlugin } from "./plugin.js";
-export { detectAuth, extractKiroLoginUrl, KIRO_LOGIN_URL, readKiroCliSessionCredential, redacted, regionFromProfileArn, resolveApiKey, startKiroCliLogin, } from "./auth.js";
+export { detectAuth, extractKiroLoginUrl, KIRO_LOGIN_URL, readKiroCliSessionCredential, redacted, regionFromProfileArn, resolveApiKey, startKiroCliLogin, startKiroCliLoginOnce, } from "./auth.js";
 export { cliChatArgs, KiroCliChatTransport, promptForCli } from "./cli-transport.js";
 export { createKiroFetch } from "./fetch-adapter.js";
 export { loadOptions } from "./config.js";

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
             ? [
@@ -54,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: {
@@ -62,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,
@@ -87,6 +93,19 @@ export function toGenerateAssistantResponseInput(request, options = {}) {
                             origin: "AI_EDITOR",
                         },
                     }),
+                ...(toolResults.length > 0
+                    ? [
+                        {
+                            userInputMessage: {
+                                content: "",
+                                origin: "AI_EDITOR",
+                                userInputMessageContext: {
+                                    toolResults,
+                                },
+                            },
+                        },
+                    ]
+                    : []),
             ],
             currentMessage: {
                 userInputMessage: {
@@ -110,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
                                 ? {
@@ -123,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/plugin.js

@@ -1,6 +1,6 @@
 import { tool } from "@opencode-ai/plugin";
 import { KiroAcpTransport } from "./acp-transport.js";
-import { detectAuth, resolveApiKey, startKiroCliLogin } from "./auth.js";
+import { detectAuth, resolveApiKey, startKiroCliLoginOnce } from "./auth.js";
 import { KiroCliChatTransport } from "./cli-transport.js";
 import { loadOptions } from "./config.js";
 import { createKiroFetch } from "./fetch-adapter.js";
@@ -170,7 +170,7 @@ export function createKiroPlugin() {
                         type: "oauth",
                         label: "Kiro CLI login",
                         authorize: async () => {
-                            const session = startKiroCliLogin();
+                            const session = startKiroCliLoginOnce();
                             return {
                                 url: session.url,
                                 instructions: session.instructions,

package/dist/request-adapter.js

@@ -164,6 +164,17 @@ function trailingToolMessageIndexes(messages) {
     }
     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) => {
@@ -222,6 +233,7 @@ 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))
@@ -232,7 +244,7 @@ export function toKiroGenerateRequest(request, resolver) {
         if (message.role === "system" || activeTrailingToolIndexes.has(index))
             continue;
         const content = textFromContent(message.content);
-        const assistantToolUses = message.role === "assistant" ? toolUses(message) : [];
+        const assistantToolUses = message.role === "assistant" && index === activeToolUseAssistantIndex ? toolUses(message) : [];
         if (!content && assistantToolUses.length === 0)
             continue;
         turns.push({

package/package.json

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