@bogyie/opencode-kiro-plugin 0.3.15 → 0.3.17

package/README.md

@@ -155,7 +155,7 @@ This keeps new Kiro model ids usable before the package is updated without adver
 
 The plugin injects `provider.kiro` with the `auto` placeholder needed for OpenCode's provider connector. Define `provider.kiro.models` yourself only when you need explicit 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` defaults to `["kiro-cli", "chat", "--list-models", "--format", "json"]`. Set `modelDiscovery` to `"off"` to disable startup discovery and `kiro_refresh_models`; in that mode the plugin uses any stored cache and then the `auto` fallback. Discovery is best-effort and does not start login during OpenCode startup. `/v1/models` also uses only this discovery/cache path: it never invokes the chat transport or login fallback, and returns the cached list or `auto` if discovery fails. Authenticate manually through the connector or let a real chat completion request handle auth failure. A successful connector login also triggers a forced model refresh. 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.
+`modelDiscoveryCommand` defaults to `["kiro-cli", "chat", "--list-models", "--format", "json"]`. Set `modelDiscovery` to `"off"` to disable startup discovery and `kiro_refresh_models`; in that mode the plugin uses any stored cache and then the `auto` fallback. During OpenCode startup, the plugin checks Kiro auth in the blocking `config` hook. If no `KIRO_API_KEY` or active `kiro-cli` session exists, it starts `kiro-cli login --use-device-flow` once and waits for login to finish before model discovery and provider registration continue. `/v1/models` still uses only the discovery/cache path: it never invokes the chat transport or login fallback, and returns the cached list or `auto` if discovery fails. OpenCode title-generation requests also suppress login fallback so startup helper traffic cannot open a second Kiro login window. A successful connector login also triggers a forced model refresh. 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/plugin.js

@@ -12,6 +12,8 @@ import { ModelResolver, normalizeModelName } from "./model-resolver.js";
 import { KiroRestTransport } from "./kiro-rest-transport.js";
 const PLACEHOLDER_MODEL_ID = "auto";
 const PLACEHOLDER_MODEL = { name: "Auto" };
+const OPENCODE_AGENT_HEADER = "x-opencode-kiro-agent";
+const LOGIN_SUPPRESSED_AGENTS = new Set(["title"]);
 function discoveredProviderModels(cache) {
     return Object.fromEntries(cache.all().map((model) => [
         model.id,
@@ -72,14 +74,22 @@ export function effectiveBackend(options, accessToken) {
         return "fetch";
     return "fetch";
 }
-function localTransport(options, accessToken) {
+function shouldLoginOnAuthFailure(init) {
+    const agent = new Headers(init?.headers).get(OPENCODE_AGENT_HEADER);
+    return !agent || !LOGIN_SUPPRESSED_AGENTS.has(agent);
+}
+function localTransport(options, accessToken, behavior = {}) {
     const backend = effectiveBackend(options, accessToken);
-    const login = () => runKiroLoginFlowOnce({
-        login: {
-            ...options.login,
-            useDeviceFlow: true,
-        },
-    });
+    const login = () => {
+        if (behavior.loginOnAuthFailure === false)
+            return Promise.resolve(false);
+        return runKiroLoginFlowOnce({
+            login: {
+                ...options.login,
+                useDeviceFlow: true,
+            },
+        });
+    };
     if (backend === "acp")
         return new KiroAcpTransport(acpTransportOptions(options));
     if (backend === "cli-chat") {
@@ -138,6 +148,8 @@ export function createKiroPlugin() {
         }
         let discovery;
         let lastModelDiscoveryAt = 0;
+        let startupLogin;
+        let startupLoginAttempted = false;
         const refreshModels = async (force = false) => {
             const discoveryIsStale = lastModelDiscoveryAt === 0 || Date.now() - lastModelDiscoveryAt > options.modelCacheTtlSeconds * 1000;
             if (options.modelDiscovery === "off" || options.modelDiscoveryCommand.length === 0 || (!force && !discoveryIsStale)) {
@@ -160,6 +172,29 @@ export function createKiroPlugin() {
             }
             return discovery;
         };
+        const ensureStartupAuthenticated = async () => {
+            const current = await detectAuth().catch(() => undefined);
+            if (current?.authenticated)
+                return true;
+            if (startupLogin)
+                return startupLogin;
+            if (startupLoginAttempted)
+                return false;
+            startupLoginAttempted = true;
+            startupLogin = (async () => {
+                const session = startKiroCliLoginOnce({
+                    ...options.login,
+                    useDeviceFlow: true,
+                });
+                const prompted = await session.waitForPrompt(options.requestTimeoutMs);
+                if (!prompted)
+                    return false;
+                return session.waitForAuth();
+            })().finally(() => {
+                startupLogin = undefined;
+            });
+            return startupLogin;
+        };
         const resolver = new ModelResolver({
             cache: modelCache,
             aliases: options.modelAliases,
@@ -171,7 +206,9 @@ export function createKiroPlugin() {
             if (localServer)
                 return localServer;
             const localFetch = async (input, init) => {
-                const transport = localTransport(options, bearerToken(init));
+                const transport = localTransport(options, bearerToken(init), {
+                    loginOnAuthFailure: shouldLoginOnAuthFailure(init),
+                });
                 return createKiroFetch({
                     resolver,
                     models: async () => {
@@ -215,6 +252,7 @@ export function createKiroPlugin() {
                 localServer = undefined;
             },
             config: async (config) => {
+                await ensureStartupAuthenticated();
                 await refreshModels();
                 config.provider ??= {};
                 config.provider[options.providerID] ??= {};
@@ -343,6 +381,11 @@ export function createKiroPlugin() {
                     }));
                 },
             },
+            "chat.headers": async (input, output) => {
+                if (input.model.providerID !== options.providerID)
+                    return;
+                output.headers[OPENCODE_AGENT_HEADER] = input.agent;
+            },
         };
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bogyie/opencode-kiro-plugin",
-  "version": "0.3.15",
+  "version": "0.3.17",
   "description": "OpenCode plugin for using Kiro as a provider adapter",
   "type": "module",
   "main": "dist/index.js",
@@ -60,6 +60,7 @@
     "type": "plugin",
     "hooks": [
       "auth",
+      "chat.headers",
       "config",
       "provider",
       "tool"