@bogyie/opencode-kiro-plugin 0.3.4 → 0.3.5

package/dist/auth.js

@@ -96,11 +96,59 @@ export async function readKiroCliSessionCredential(options = {}, runner = runCom
 function delay(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
-function firstUrl(text) {
-    return /https?:\/\/[^\s"'<>]+/.exec(text)?.[0];
+function urls(text) {
+    return text.match(/https?:\/\/[^\s"'<>]+/g) ?? [];
+}
+function isLocalCallbackUrl(value) {
+    try {
+        const url = new URL(value);
+        const hostname = url.hostname.toLowerCase();
+        return ((hostname === "localhost" || hostname === "127.0.0.1" || hostname === "::1" || hostname === "[::1]") &&
+            url.pathname.includes("/callback"));
+    }
+    catch {
+        return false;
+    }
+}
+function loginUrlFromLocalCallbackUrl(value) {
+    if (!isLocalCallbackUrl(value))
+        return undefined;
+    try {
+        const issuerUrl = new URL(value).searchParams.get("issuer_url");
+        if (!issuerUrl || isLocalCallbackUrl(issuerUrl))
+            return undefined;
+        const parsed = new URL(issuerUrl);
+        return parsed.protocol === "https:" || parsed.protocol === "http:" ? parsed.toString() : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+function isKiroSigninUrl(value) {
+    try {
+        const url = new URL(value);
+        return url.hostname.toLowerCase() === "app.kiro.dev" && url.pathname === "/signin";
+    }
+    catch {
+        return false;
+    }
+}
+function firstLoginUrl(text) {
+    const candidates = urls(text);
+    const kiroSigninUrl = candidates.find(isKiroSigninUrl);
+    if (kiroSigninUrl)
+        return kiroSigninUrl;
+    for (const url of candidates) {
+        const callbackLoginUrl = loginUrlFromLocalCallbackUrl(url);
+        if (callbackLoginUrl)
+            return callbackLoginUrl;
+        if (!isLocalCallbackUrl(url))
+            return url;
+    }
+    return undefined;
 }
 export function extractKiroLoginUrl(output) {
-    return firstUrl(output) ?? KIRO_LOGIN_URL;
+    return firstLoginUrl(output) ?? KIRO_LOGIN_URL;
 }
 export function extractKiroLoginCode(output) {
     return /\b[A-Z0-9]{4}-[A-Z0-9]{4}\b/.exec(output)?.[0] ?? /\b[A-Z0-9]{8,}\b/.exec(output)?.[0];
@@ -136,13 +184,13 @@ export function startKiroCliLogin(spawner = (command, args) => spawn(command, [.
             while (Date.now() < deadline) {
                 if (extractKiroLoginCode(output))
                     return true;
-                if (firstUrl(output))
+                if (firstLoginUrl(output))
                     return true;
                 if (exited && exitCode !== 0)
                     return false;
                 await delay(100);
             }
-            return Boolean(extractKiroLoginCode(output) || firstUrl(output));
+            return Boolean(extractKiroLoginCode(output) || firstLoginUrl(output));
         },
         async waitForAuth(runner = runCommand) {
             const deadline = Date.now() + 10 * 60 * 1000;

package/package.json

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