@bogyie/opencode-kiro-plugin 0.2.2 → 0.2.3

package/README.md

@@ -67,7 +67,7 @@ Supported values:
 
 - `auto`: use CodeWhisperer fetch transport when an API key is available; otherwise use CLI chat fallback.
 - `fetch`: require the direct Kiro/CodeWhisperer fetch path. If no usable auth is available, requests fail with a structured backend/auth error.
-- `cli-chat`: call `kiro-cli chat --no-interactive`. This is official and stable, but Kiro CLI does not currently expose a guaranteed per-request model flag.
+- `cli-chat`: call `kiro-cli chat --no-interactive --model <model>`. This is official and stable, and uses the model selected in OpenCode.
 - `acp`: launch `kiro-cli acp`, initialize a session, optionally set the requested model, send the prompt, and collect `AgentMessageChunk` notifications until `TurnEnd`.
 
 `trustAllTools` affects both `cli-chat` and ACP permission handling. In ACP mode, permission requests are rejected by default and allowed only when `trustAllTools: true`.

package/dist/cli-transport.js

@@ -12,6 +12,8 @@ export function cliChatArgs(request, options = {}) {
     return [
         "chat",
         "--no-interactive",
+        "--model",
+        request.modelId,
         ...(options.trustAllTools ? ["--trust-all-tools"] : []),
         promptForCli(request),
     ];
@@ -44,8 +46,12 @@ export class KiroCliChatTransport {
             const authError = result.stderr.toLowerCase().includes("not logged in");
             throw new KiroPluginError(result.stderr.trim() || "kiro-cli chat failed", authError ? "KIRO_AUTH_ERROR" : "KIRO_CLI_FAILED", authError ? 401 : 502);
         }
+        const text = sanitizeCliChatOutput(result.stdout);
+        if (!text) {
+            throw new KiroPluginError(result.stderr.trim() || "kiro-cli chat completed without returning assistant text", "KIRO_EMPTY_RESPONSE", 502);
+        }
         return {
-            text: sanitizeCliChatOutput(result.stdout),
+            text,
             modelId: request.modelId,
         };
     }

package/dist/fetch-adapter.js

@@ -1,4 +1,4 @@
-import { errorResponse, UnsupportedBackendError } from "./errors.js";
+import { errorResponse, KiroPluginError, UnsupportedBackendError } from "./errors.js";
 import { readOpenAIRequest, toKiroGenerateRequest } from "./request-adapter.js";
 import { toOpenAIChatResponse, toOpenAIChatStreamResponse } from "./response-adapter.js";
 const unsupportedTransport = {
@@ -6,12 +6,17 @@ const unsupportedTransport = {
         throw new UnsupportedBackendError();
     },
 };
-async function* streamGeneratedResponse(transport, request) {
-    const response = await transport.generate(request);
+function assertNonEmptyResponse(response) {
+    if (response.text || response.reasoning || (response.toolCalls?.length ?? 0) > 0)
+        return;
+    throw new KiroPluginError("Kiro backend returned an empty response.", "KIRO_EMPTY_RESPONSE", 502);
+}
+async function* responseToStream(response, fallbackModelId) {
+    assertNonEmptyResponse(response);
     if (response.reasoning)
-        yield { type: "reasoning", text: response.reasoning, modelId: response.modelId ?? request.modelId };
+        yield { type: "reasoning", text: response.reasoning, modelId: response.modelId ?? fallbackModelId };
     if (response.text)
-        yield { type: "text", text: response.text, modelId: response.modelId ?? request.modelId };
+        yield { type: "text", text: response.text, modelId: response.modelId ?? fallbackModelId };
     for (const toolCall of response.toolCalls ?? [])
         yield toolCall;
 }
@@ -25,9 +30,12 @@ export function createKiroFetch(options) {
                 return toOpenAIChatStreamResponse(transport.stream(kiroRequest), kiroRequest.modelId);
             }
             if (request.stream === true) {
-                return toOpenAIChatStreamResponse(streamGeneratedResponse(transport, kiroRequest), kiroRequest.modelId);
+                const response = await transport.generate(kiroRequest);
+                assertNonEmptyResponse(response);
+                return toOpenAIChatStreamResponse(responseToStream(response, kiroRequest.modelId), kiroRequest.modelId);
             }
             const response = await transport.generate(kiroRequest);
+            assertNonEmptyResponse(response);
             return toOpenAIChatResponse(response, kiroRequest.modelId);
         }
         catch (error) {

package/dist/response-adapter.js

@@ -1,3 +1,4 @@
+import { KiroPluginError } from "./errors.js";
 export function toOpenAIChatResponse(response, model) {
     const toolCalls = response.toolCalls ?? [];
     return Response.json({
@@ -47,6 +48,7 @@ export function toOpenAIChatStreamResponse(chunks, model) {
                 const toolCallIndexes = new Map();
                 let nextToolCallIndex = 0;
                 let sawToolCall = false;
+                let sawDelta = false;
                 for await (const chunk of chunks) {
                     let delta;
                     if (chunk.type === "tool_call") {
@@ -81,6 +83,7 @@ export function toOpenAIChatStreamResponse(chunks, model) {
                             continue;
                         delta = { content: chunk.text };
                     }
+                    sawDelta = true;
                     controller.enqueue(encoder.encode(sse({
                         id: `kiro-${crypto.randomUUID()}`,
                         object: "chat.completion.chunk",
@@ -95,6 +98,9 @@ export function toOpenAIChatStreamResponse(chunks, model) {
                         ],
                     })));
                 }
+                if (!sawDelta) {
+                    throw new KiroPluginError("Kiro backend returned an empty response stream.", "KIRO_EMPTY_RESPONSE", 502);
+                }
                 controller.enqueue(encoder.encode(sse({ choices: [{ index: 0, delta: {}, finish_reason: sawToolCall ? "tool_calls" : "stop" }] })));
                 controller.enqueue(encoder.encode("data: [DONE]\n\n"));
                 controller.close();

package/package.json

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