@bogyie/opencode-kiro-plugin 0.3.18 → 0.3.20

package/dist/auth.d.ts

@@ -77,6 +77,7 @@ export interface KiroLoginFlowOptions {
     readonly login?: KiroCliLoginOptions;
 }
 export declare const KIRO_LOGIN_URL = "https://view.awsapps.com/start";
+export declare const KIRO_LOCAL_TRANSPORT_KEY = "kiro-plugin-local-transport";
 export declare const DEFAULT_KIRO_CLI_DB_PATH: string;
 export declare const DEFAULT_KIRO_CLI_TOKEN_KEYS: readonly ["kirocli:odic:token", "codewhisperer:odic:token"];
 export declare function runCommand(command: string, args: ReadonlyArray<string>, options?: CommandRunOptions): Promise<CommandResult>;

package/dist/auth.js

@@ -6,6 +6,7 @@ import { join } from "node:path";
 import { promisify } from "node:util";
 const execFileAsync = promisify(execFile);
 export const KIRO_LOGIN_URL = "https://view.awsapps.com/start";
+export const KIRO_LOCAL_TRANSPORT_KEY = "kiro-plugin-local-transport";
 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 KIRO_DEVICE_AUTH_KEY_PREFIX = "kiro-device:";
@@ -445,7 +446,7 @@ function loginMethodSelection(method) {
         case "github":
             return "\x1B[B\x1B[B\r";
         case "organization":
-            return "\x1B[B\x1B[B\x1B[B\r";
+            return "";
     }
 }
 function loginMethodPromptSeen(output) {
@@ -455,6 +456,9 @@ function loginMethodPromptSeen(output) {
         output.includes("Use with GitHub") ||
         output.includes("Use with Your Organization"));
 }
+function loginPromptReady(output) {
+    return Boolean(extractKiroLoginCode(output) || firstLoginUrl(output));
+}
 export function startKiroCliLogin(optionsOrSpawner, spawner) {
     const resolved = loginOptionsAndSpawner(optionsOrSpawner, spawner);
     const child = resolved.spawner("kiro-cli", kiroCliLoginArgs(resolved.options));
@@ -463,8 +467,12 @@ export function startKiroCliLogin(optionsOrSpawner, spawner) {
     let exitCode = null;
     let selectedLoginMethod = false;
     const maybeSelectLoginMethod = () => {
-        if (!resolved.options.method || selectedLoginMethod || !loginMethodPromptSeen(output))
+        if (!resolved.options.method ||
+            resolved.options.method === "organization" ||
+            selectedLoginMethod ||
+            !loginMethodPromptSeen(output)) {
             return;
+        }
         child.stdin?.write(loginMethodSelection(resolved.options.method));
         selectedLoginMethod = true;
     };
@@ -494,23 +502,21 @@ export function startKiroCliLogin(optionsOrSpawner, spawner) {
         async waitForPrompt(timeoutMs = 15_000) {
             const deadline = Date.now() + timeoutMs;
             while (Date.now() < deadline) {
-                if (extractKiroLoginCode(output))
-                    return true;
-                if (firstLoginUrl(output))
+                if (loginPromptReady(output))
                     return true;
                 if (exited && exitCode !== 0)
                     return false;
                 await delay(100);
             }
-            return Boolean(extractKiroLoginCode(output) || firstLoginUrl(output));
+            return loginPromptReady(output);
         },
         async waitForAuth(runner = runCommand) {
             const deadline = Date.now() + 10 * 60 * 1000;
             while (Date.now() < deadline) {
                 const auth = await detectAuth(process.env, runner);
-                if (auth.authenticated)
+                if (auth.authenticated && (!loginPromptReady(output) || exited))
                     return true;
-                if (exited && exitCode !== 0)
+                if (exited && exitCode !== 0 && !loginPromptReady(output))
                     return false;
                 await delay(2000);
             }
@@ -625,7 +631,10 @@ export async function resolveApiKey(auth, env = process.env) {
         return env.KIRO_API_KEY;
     try {
         const credential = await auth();
-        return credential.key || credential.access || "";
+        if (credential.type === "api")
+            return credential.key || credential.access || "";
+        const key = credential.key || credential.access || "";
+        return key === KIRO_LOCAL_TRANSPORT_KEY || isKiroDeviceAuthKey(key) ? key : "";
     }
     catch {
         return "";

package/dist/plugin.js

@@ -1,6 +1,6 @@
 import { tool } from "@opencode-ai/plugin";
 import { KiroAcpTransport } from "./acp-transport.js";
-import { credentialFromKiroDeviceAuthKey, detectAuth, isKiroDeviceAuthKey, readKiroCliSessionCredential, resolveApiKey, startKiroCliLoginOnce, runKiroLoginFlowOnce, } from "./auth.js";
+import { credentialFromKiroDeviceAuthKey, detectAuth, isKiroDeviceAuthKey, KIRO_LOCAL_TRANSPORT_KEY, readKiroCliSessionCredential, resolveApiKey, startKiroCliLoginOnce, runKiroLoginFlowOnce, } from "./auth.js";
 import { KiroCliChatTransport } from "./cli-transport.js";
 import { loadOptions } from "./config.js";
 import { createKiroFetch } from "./fetch-adapter.js";
@@ -70,7 +70,7 @@ export function effectiveBackend(options, accessToken) {
         return "cli-chat";
     if (options.backend === "fetch")
         return "fetch";
-    if (apiKey && apiKey !== "kiro-plugin-local-transport")
+    if (apiKey && apiKey !== KIRO_LOCAL_TRANSPORT_KEY)
         return "fetch";
     return "fetch";
 }
@@ -107,7 +107,7 @@ function localTransport(options, accessToken, behavior = {}) {
                 login,
             });
         }
-        return new KiroRestTransport(fetchTransportOptions(options, apiKey === "kiro-plugin-local-transport" ? undefined : apiKey), {
+        return new KiroRestTransport(fetchTransportOptions(options, apiKey === KIRO_LOCAL_TRANSPORT_KEY ? undefined : apiKey), {
             login,
         });
     }
@@ -238,7 +238,7 @@ export function createKiroPlugin() {
                     await refreshModels(true).catch(() => []);
                     return {
                         type: "success",
-                        key: "kiro-plugin-local-transport",
+                        key: KIRO_LOCAL_TRANSPORT_KEY,
                         metadata: {
                             source: "kiro-cli-device-flow",
                         },
@@ -300,7 +300,7 @@ export function createKiroPlugin() {
                     const apiKey = await resolveApiKey(auth);
                     const server = await ensureLocalServer();
                     return {
-                        apiKey: apiKey || "kiro-plugin-local-transport",
+                        apiKey: apiKey || KIRO_LOCAL_TRANSPORT_KEY,
                         baseURL: server.baseURL,
                     };
                 },

package/package.json

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