@bogyie/opencode-kiro-plugin 0.2.1 → 0.2.3

package/README.md

@@ -10,16 +10,7 @@ After the package is published to npm, add it directly to your OpenCode config:
 
 ```jsonc
 {
-  "plugin": ["@bogyie/opencode-kiro-plugin"],
-  "provider": {
-    "kiro": {
-      "models": {
-        "sonnet": {
-          "name": "Sonnet alias"
-        }
-      }
-    }
-  }
+  "plugin": ["@bogyie/opencode-kiro-plugin"]
 }
 ```
 
@@ -34,16 +25,7 @@ Then add the plugin to your OpenCode config. See [examples/opencode.jsonc](examp
 
 ```jsonc
 {
-  "plugin": ["file:/absolute/path/to/opencode-kiro-plugin"],
-  "provider": {
-    "kiro": {
-      "models": {
-        "sonnet": {
-          "name": "Sonnet alias"
-        }
-      }
-    }
-  }
+  "plugin": ["file:/absolute/path/to/opencode-kiro-plugin"]
 }
 ```
 
@@ -85,14 +67,14 @@ 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`.
 
 ## Model Churn Handling
 
-The resolver intentionally avoids a hard whitelist. Fallback presets are used for OpenCode UI metadata and cache bootstrap only.
+The resolver intentionally avoids a hard whitelist. By default, the plugin reads the current Kiro CLI model list with `kiro-cli chat --list-models --format json`. Bundled presets are only used as UI metadata and as a fallback when discovery is unavailable.
 
 Useful options:
 
@@ -104,13 +86,13 @@ Useful options:
       {
         "modelCacheTtlSeconds": 21600,
         "modelDiscovery": "auto",
-        "modelDiscoveryCommand": ["kiro-cli", "models", "--json"],
+        "modelDiscoveryCommand": ["kiro-cli", "chat", "--list-models", "--format", "json"],
         "modelAliases": {
-          "sonnet": "claude-sonnet-4.6",
-          "opus": "claude-opus-4.6"
+          "sonnet": "claude-sonnet-5",
+          "opus": "claude-opus-4.8"
         },
         "extraModels": {
-          "claude-opus-4-9": {
+          "claude-opus-4.9": {
             "name": "Claude Opus 4.9",
             "limit": { "context": 1000000, "output": 64000 },
             "modalities": { "input": ["text", "image", "pdf"], "output": ["text"] },
@@ -138,9 +120,11 @@ Resolution order:
 6. Hidden/manual model mapping
 7. Optimistic pass-through unless disabled
 
-This keeps new Kiro model ids usable before the package is updated. Use `extraModels` when a new model should appear in OpenCode's model picker immediately. Set `disableModelPassThrough: true` only when you need strict model governance.
+This keeps new Kiro model ids visible before the package is updated. Use `extraModels` only when a new model should appear in OpenCode's model picker but is not yet listed by your installed Kiro CLI. Set `disableModelPassThrough: true` only when you need strict model governance.
+
+The plugin injects `provider.kiro` automatically. You only need to add `provider.kiro.models` yourself when overriding OpenCode model-picker metadata, such as a display name or context limit. Use plugin `modelAliases` for aliases that should resolve one requested model id to another.
 
-`modelDiscoveryCommand` is optional and intentionally not guessed by default because Kiro CLI model-list flags may vary by version. When configured, stdout can be a JSON array, `{ "models": [...] }`, `{ "data": [...] }`, or one model id per line.
+`modelDiscoveryCommand` defaults to `["kiro-cli", "chat", "--list-models", "--format", "json"]`. Set `modelDiscovery` to `"off"` to skip runtime discovery. Discovery stdout can be a JSON array, `{ "models": [...] }`, `{ "data": [...] }`, Kiro CLI list-models JSON, Kiro CLI plain list output, or one model id per line.
 
 ## Troubleshooting
 

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/config.d.ts

@@ -22,6 +22,7 @@ export interface KiroPluginOptions {
 }
 export declare const DEFAULT_PROVIDER_ID = "kiro";
 export declare const DEFAULT_REGION = "us-east-1";
+export declare const DEFAULT_MODEL_DISCOVERY_COMMAND: readonly ["kiro-cli", "chat", "--list-models", "--format", "json"];
 export declare const DEFAULT_MODEL_CACHE_TTL_SECONDS: number;
 export declare const DEFAULT_MAX_ATTEMPTS = 3;
 export declare function loadOptions(raw?: unknown): KiroPluginOptions;

package/dist/config.js

@@ -1,5 +1,6 @@
 export const DEFAULT_PROVIDER_ID = "kiro";
 export const DEFAULT_REGION = "us-east-1";
+export const DEFAULT_MODEL_DISCOVERY_COMMAND = ["kiro-cli", "chat", "--list-models", "--format", "json"];
 export const DEFAULT_MODEL_CACHE_TTL_SECONDS = 6 * 60 * 60;
 export const DEFAULT_MAX_ATTEMPTS = 3;
 const BACKENDS = new Set(["auto", "fetch", "cli-chat", "acp"]);
@@ -53,13 +54,14 @@ export function loadOptions(raw = {}) {
     const profileArn = optionalString(input.profileArn);
     const userAgent = optionalString(input.userAgent);
     const agentMode = optionalString(input.agentMode);
+    const modelDiscoveryCommand = "modelDiscoveryCommand" in input ? stringArray(input.modelDiscoveryCommand) : [...DEFAULT_MODEL_DISCOVERY_COMMAND];
     return {
         providerID: typeof input.providerID === "string" && input.providerID ? input.providerID : DEFAULT_PROVIDER_ID,
         region: typeof input.region === "string" && input.region ? input.region : DEFAULT_REGION,
         ...(endpoint ? { endpoint } : {}),
         backend,
         modelDiscovery,
-        modelDiscoveryCommand: stringArray(input.modelDiscoveryCommand),
+        modelDiscoveryCommand,
         modelCacheTtlSeconds: positiveNumber(input.modelCacheTtlSeconds, DEFAULT_MODEL_CACHE_TTL_SECONDS),
         ...(requestTimeoutMs ? { requestTimeoutMs } : {}),
         maxAttempts: positiveInteger(input.maxAttempts, DEFAULT_MAX_ATTEMPTS),

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/model-discovery.js

@@ -6,6 +6,9 @@ function record(value) {
 function stringValue(value) {
     return typeof value === "string" && value.trim() ? value.trim() : undefined;
 }
+function positiveNumberValue(value) {
+    return typeof value === "number" && Number.isFinite(value) && value > 0 ? value : undefined;
+}
 function fromItem(item) {
     if (typeof item === "string") {
         const id = normalizeModelName(item);
@@ -14,16 +17,25 @@ function fromItem(item) {
     const object = record(item);
     if (!object)
         return undefined;
-    const id = stringValue(object.id) ?? stringValue(object.modelId) ?? stringValue(object.model) ?? stringValue(object.name);
+    const id = stringValue(object.id) ??
+        stringValue(object.modelId) ??
+        stringValue(object.model_id) ??
+        stringValue(object.model) ??
+        stringValue(object.model_name) ??
+        stringValue(object.name);
     if (!id)
         return undefined;
     const normalized = normalizeModelName(id);
     if (!normalized)
         return undefined;
     const name = stringValue(object.name) ?? stringValue(object.displayName) ?? stringValue(object.label);
+    const contextLimit = positiveNumberValue(object.contextLimit) ?? positiveNumberValue(object.context_window_tokens);
+    const outputLimit = positiveNumberValue(object.outputLimit) ?? positiveNumberValue(object.output_limit_tokens);
     return {
         id: normalized,
         ...(name ? { name } : {}),
+        ...(contextLimit ? { contextLimit } : {}),
+        ...(outputLimit ? { outputLimit } : {}),
         raw: item,
     };
 }
@@ -34,13 +46,18 @@ function fromJson(value) {
     if (!object)
         return [];
     const items = object.models ?? object.data ?? object.items;
-    return Array.isArray(items) ? fromJson(items) : [];
+    if (Array.isArray(items))
+        return fromJson(items);
+    const configuredModel = object["chat.defaultModel"] ?? object.defaultModel ?? object.model;
+    return configuredModel ? fromJson([configuredModel]) : [];
 }
 function fromLines(raw) {
     return raw
         .split(/\r?\n/)
         .map((line) => line.trim())
-        .filter((line) => line && !line.includes(" ") && !line.includes("\t"))
+        .map((line) => line.replace(/^\*\s*/, ""))
+        .map((line) => /^\S+/.exec(line)?.[0] ?? "")
+        .filter((line) => line === "auto" || /[.-]/.test(line))
         .map(fromItem)
         .filter((item) => item !== undefined);
 }

package/dist/models.js

@@ -7,31 +7,61 @@ export const FALLBACK_MODELS = {
         modalities: TEXT_IMAGE_PDF,
         tool_call: true,
     },
+    "claude-fable-5": {
+        name: "Claude Fable 5",
+        limit: { context: 1_000_000, output: 64_000 },
+        modalities: TEXT_IMAGE_PDF,
+        tool_call: true,
+    },
+    "claude-sonnet-5": {
+        name: "Claude Sonnet 5",
+        limit: { context: 1_000_000, output: 64_000 },
+        modalities: TEXT_IMAGE_PDF,
+        tool_call: true,
+    },
     "claude-sonnet-4": {
-        name: "Claude Sonnet 4",
+        name: "Claude Sonnet 4.0",
         limit: { context: 200_000, output: 64_000 },
         modalities: TEXT_IMAGE_PDF,
         tool_call: true,
     },
-    "claude-sonnet-4-5": {
+    "claude-sonnet-4.5": {
         name: "Claude Sonnet 4.5",
         limit: { context: 200_000, output: 64_000 },
         modalities: TEXT_IMAGE_PDF,
         tool_call: true,
     },
-    "claude-sonnet-4-6": {
+    "claude-sonnet-4.6": {
         name: "Claude Sonnet 4.6",
         limit: { context: 1_000_000, output: 64_000 },
         modalities: TEXT_IMAGE_PDF,
         tool_call: true,
     },
-    "claude-opus-4-8": {
+    "claude-opus-4.8": {
         name: "Claude Opus 4.8",
+        limit: { context: 1_000_000, output: 128_000 },
+        modalities: TEXT_IMAGE_PDF,
+        tool_call: true,
+    },
+    "claude-opus-4.7": {
+        name: "Claude Opus 4.7",
+        limit: { context: 1_000_000, output: 64_000 },
+        modalities: TEXT_IMAGE_PDF,
+        tool_call: true,
+    },
+    "claude-opus-4.6": {
+        name: "Claude Opus 4.6",
         limit: { context: 1_000_000, output: 64_000 },
         modalities: TEXT_IMAGE_PDF,
         tool_call: true,
     },
-    "claude-haiku-4-5": {
+    "claude-opus-4.5": {
+        name: "Claude Opus 4.5",
+        limit: { context: 200_000, output: 64_000 },
+        modalities: TEXT_IMAGE_PDF,
+        tool_call: true,
+    },
+    "claude-haiku-4.5": {
         name: "Claude Haiku 4.5",
         limit: { context: 200_000, output: 64_000 },
         modalities: { input: ["text", "image"], output: ["text"] },

package/dist/plugin.js

@@ -21,6 +21,14 @@ function discoveredProviderModels(cache) {
         model.id,
         {
             name: model.name ?? model.id,
+            ...(model.contextLimit || model.outputLimit
+                ? {
+                    limit: {
+                        context: model.contextLimit ?? 200_000,
+                        output: model.outputLimit ?? 64_000,
+                    },
+                }
+                : {}),
         },
     ]));
 }

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/docs/e2e-validation.md

@@ -152,7 +152,7 @@ Before publishing, verify that new model ids can be used without a code release:
         "modelAliases": {
           "new-model": "new-model-id"
         },
-        "modelDiscoveryCommand": ["kiro-cli", "models", "--json"]
+        "modelDiscoveryCommand": ["kiro-cli", "chat", "--list-models", "--format", "json"]
       }
     ]
   ]
@@ -161,7 +161,7 @@ Before publishing, verify that new model ids can be used without a code release:
 
 Checks:
 
-- If your installed `kiro-cli` has a model-list command, set `modelDiscoveryCommand` to that command and confirm discovered models appear in provider metadata.
+- Confirm `kiro-cli chat --list-models --format json` succeeds and discovered models appear in provider metadata.
 - The model appears in OpenCode provider metadata.
 - The alias resolves to the configured id.
 - Unknown models still pass through when `disableModelPassThrough` is false.

package/examples/opencode.jsonc

@@ -13,15 +13,15 @@
         // "agentMode": "vibe",
         "modelCacheTtlSeconds": 21600,
         "modelDiscovery": "auto",
-        "modelDiscoveryCommand": [],
+        "modelDiscoveryCommand": ["kiro-cli", "chat", "--list-models", "--format", "json"],
         "maxAttempts": 3,
         "requestTimeoutMs": 120000,
         "modelAliases": {
-          "sonnet": "claude-sonnet-4.6",
-          "opus": "claude-opus-4.6"
+          "sonnet": "claude-sonnet-5",
+          "opus": "claude-opus-4.8"
         },
         "extraModels": {
-          "claude-opus-4-9": {
+          "claude-opus-4.9": {
             "name": "Claude Opus 4.9",
             "limit": { "context": 1000000, "output": 64000 },
             "modalities": { "input": ["text", "image", "pdf"], "output": ["text"] },
@@ -34,14 +34,5 @@
         "trustAllTools": false
       }
     ]
-  ],
-  "provider": {
-    "kiro": {
-      "models": {
-        "sonnet": {
-          "name": "Claude Sonnet via Kiro"
-        }
-      }
-    }
-  }
+  ]
 }

package/package.json

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