@bogyie/opencode-kiro-plugin 0.3.16 → 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. OpenCode title-generation requests also suppress login fallback so startup helper traffic cannot open a Kiro login window. 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

@@ -148,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)) {
@@ -170,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,
@@ -227,6 +252,7 @@ export function createKiroPlugin() {
                 localServer = undefined;
             },
             config: async (config) => {
+                await ensureStartupAuthenticated();
                 await refreshModels();
                 config.provider ??= {};
                 config.provider[options.providerID] ??= {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bogyie/opencode-kiro-plugin",
-  "version": "0.3.16",
+  "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"