@magpie-community/opencode-kiro-auth 0.1.3 → 0.1.5

package/index.mjs

@@ -188,11 +188,14 @@ async function saveBack(c) {
 
 // ---- tokens --------------------------------------------------------------------
 
+// EXPIRED is the built-in's words for a sign-in Kiro refused, or one with
+// nothing to refresh it.
 const EXPIRED = "Kiro's sign-in has expired; sign in again"
+const EXPIRED_CLI = EXPIRED + " with `kiro-cli login` or the Kiro IDE"
 
 // gone is an error saying the sign-in itself is gone — refused, or never
-// there — which alone answers a request with the 401 magpie marks the
-// account lapsed on; a refresh that timed out or met a 5xx may pass.
+// there. The built-in marked no Kiro account lapsed, not even then, nor
+// cleared one: every answer and usage read says the account is kept.
 const gone = (msg) => Object.assign(new Error(msg), { gone: true })
 const fresh = (c) => c.method === "apikey" || !c.expires || c.expires - Date.now() > 2 * 60 * 1000
 
@@ -206,8 +209,8 @@ async function post(url, contentType, body, headers = {}) {
   }
   const text = await res.text()
   if (!res.ok) {
-    if ([400, 401, 403].includes(res.status)) throw gone(EXPIRED)
-    throw new Error(`refreshing Kiro's sign-in: ${res.status}`)
+    if ([400, 401, 403].includes(res.status)) throw gone(EXPIRED_CLI)
+    throw new Error(`refreshing Kiro's sign-in: ${res.status} ${STATUS_TEXT[res.status] ?? ""}`.trimEnd()) // Go's res.Status
   }
   return JSON.parse(text)
 }
@@ -223,7 +226,7 @@ async function refresh(c) {
       if (n && n.dbKey === c.dbKey && n.access !== c.access && fresh(n)) return n
     }
   }
-  if (!c.refresh) throw gone(EXPIRED)
+  if (!c.refresh) throw gone(EXPIRED_CLI)
   let out
   switch (c.method) {
     case "social": {
@@ -246,9 +249,9 @@ async function refresh(c) {
       break
     }
     default:
-      throw gone(EXPIRED)
+      throw gone("Kiro's sign-in has expired")
   }
-  if (!out.access) throw gone(EXPIRED)
+  if (!out.access) throw gone(EXPIRED_CLI)
   const n = { ...c, access: out.access, expires: Date.now() + (out.expiresIn > 0 ? out.expiresIn : 3600) * 1000 }
   if (out.refresh) n.refresh = out.refresh
   await saveBack(n)
@@ -315,7 +318,7 @@ async function profileOf(c) {
       signal: AbortSignal.timeout(20_000),
     })
     if (!res.ok) {
-      const msg = `Kiro didn't take the API key: ${res.status}`
+      const msg = `Kiro didn't take the API key: ${res.status} ${STATUS_TEXT[res.status] ?? ""}`.trimEnd()
       throw res.status === 401 || res.status === 403 ? gone(msg) : new Error(msg)
     }
     const arn = (await res.json().catch(() => null))?.profile?.arn
@@ -431,7 +434,7 @@ function account(client) {
         if (stale && c && read.access !== c.access && fresh(read)) stale = false // the owner refreshed it already
         c = read
         if (!fresh(c) || stale) {
-          if (c.method === "apikey") throw gone("Kiro turned down the API key")
+          if (c.method === "apikey") throw gone("Kiro turned down the API key saved on the provider")
           c = await refresh(c)
           await save(auth, c)
         }
@@ -712,7 +715,7 @@ function failure(status, body) {
     const e = JSON.parse(body)
     if (e?.message) msg = e.message + (e.reason ? ` (${e.reason})` : "")
   } catch {}
-  msg ||= `HTTP ${status}`
+  msg ||= STATUS_TEXT[status] ?? ""
   if (msg.includes("CONTENT_LENGTH_EXCEEDS_THRESHOLD") || msg.toLowerCase().includes("input is too long"))
     return { status: 400, message: "input is too long for the model's context: " + msg }
   if (msg.includes("INSUFFICIENT_MODEL_CAPACITY")) return { status: 503, message: msg }
@@ -723,12 +726,23 @@ function failure(status, body) {
 const ERROR_TYPES = { 400: "invalid_request_error", 401: "authentication_error", 402: "billing_error", 403: "permission_error",
   404: "not_found_error", 413: "request_too_large", 429: "rate_limit_error", 503: "overloaded_error", 529: "overloaded_error" }
 const errorType = (status) => ERROR_TYPES[status] ?? "api_error"
+// Each failure says X-Magpie-Sign-In: kept, as the built-in never marked
+// an account lapsed (see gone).
 const errorResponse = (status, message) =>
   new Response(JSON.stringify({ type: "error", error: { type: errorType(status), message } }), {
     status,
-    headers: { "Content-Type": "application/json" },
+    headers: { "Content-Type": "application/json", "X-Magpie-Sign-In": "kept" },
   })
 
+// kept is res saying the account is kept: a success too, which the
+// built-in never took for a sign-in come back.
+function kept(res) {
+  if (res.headers.has("X-Magpie-Sign-In")) return res
+  const headers = new Headers(res.headers)
+  headers.set("X-Magpie-Sign-In", "kept")
+  return new Response(res.body, { status: res.status, statusText: res.statusText, headers })
+}
+
 // ---- the reply: an AWS event stream → Messages ---------------------------------------
 
 // frames reads an AWS event stream: each message its length, its headers'
@@ -952,6 +966,19 @@ async function* events(body, model, budget) {
   yield { kind: "stop", reason, usage }
 }
 
+// finished is the message's blocks with each call's arguments read.
+function finished(content) {
+  for (const b of content)
+    if (b.type === "tool_use") {
+      try {
+        b.input = b.input ? JSON.parse(b.input) : {}
+      } catch {
+        b.input = {}
+      }
+    }
+  return content
+}
+
 const anthropicUsage = (u) => ({
   input_tokens: u.input,
   output_tokens: u.output,
@@ -959,6 +986,16 @@ const anthropicUsage = (u) => ({
   cache_creation_input_tokens: u.cacheWrite,
 })
 
+// quotaWords are magpie's (internal/gateway/fallback.go): how a vendor says
+// "out of quota" or "slow down".
+const QUOTA_WORDS = /quota|insufficient|balance|credit|billing|exceeded|rate.?limit|usage.?limit|limit.?reached|hit your .*limit|limit.{0,24}resets|too many requests|overloaded|余额|额度|欠费|限流|频率|套餐|用量|上限/i
+
+// failedBefore is the reply to an error before any of the answer, as
+// magpie's built-in relay gives it: a status, not a stream, so another
+// account can take over — a 429 when it reads as a quota or rate limit,
+// else a 502.
+const failedBefore = (text) => errorResponse(QUOTA_WORDS.test(text) ? 429 : 502, text)
+
 // reply answers the Messages request from Kiro's events: a stream of
 // Messages' events, or one message.
 async function reply(it, model, stream) {
@@ -982,23 +1019,24 @@ async function reply(it, model, stream) {
       } else if (e.kind === "toolStart") add({ type: "tool_use", id: e.id, name: e.name, input: "" })
       else if (e.kind === "toolArgs") {
         if (last?.type === "tool_use") last.input += e.text
-      } else if (e.kind === "error") return errorResponse(502, e.text)
-      else if (e.kind === "stop") {
-        for (const b of content)
-          if (b.type === "tool_use") {
-            try {
-              b.input = b.input ? JSON.parse(b.input) : {}
-            } catch {
-              b.input = {}
-            }
-          }
-        return Response.json({ id, type: "message", role: "assistant", model, content, stop_reason: e.reason, stop_sequence: null,
+      } else if (e.kind === "error") {
+        // with none of the answer said, a status; else what was said
+        if (!content.length) return failedBefore(e.text)
+        return Response.json({ id, type: "message", role: "assistant", model, content: finished(content), stop_reason: "end_turn",
+          stop_sequence: null, usage: anthropicUsage({ input: 0, output: 0, cacheRead: 0, cacheWrite: 0 }) })
+      } else if (e.kind === "stop") {
+        return Response.json({ id, type: "message", role: "assistant", model, content: finished(content), stop_reason: e.reason, stop_sequence: null,
           usage: anthropicUsage(e.usage) })
       }
     }
     return errorResponse(502, "the reply ended before it was complete")
   }
 
+  // an error before any of the answer is a status, as the built-in's
+  const head = await it.next()
+  if (head.value?.kind === "error") return failedBefore(head.value.text)
+  let pending = head
+
   const enc = new TextEncoder()
   const sse = (type, data) => enc.encode(`event: ${type}\ndata: ${JSON.stringify({ type, ...data })}\n\n`)
   let index = -1
@@ -1022,7 +1060,8 @@ async function reply(it, model, stream) {
         open = kind
         ctl.enqueue(sse("content_block_start", { index, content_block: block }))
       }
-      const r = await it.next()
+      const r = pending ?? (await it.next())
+      pending = null
       if (r.done) return ctl.close()
       const e = r.value
       switch (e.kind) {
@@ -1062,7 +1101,9 @@ async function reply(it, model, stream) {
 }
 
 // generate answers a Messages request through Kiro's API: once more,
-// refreshed, when Kiro turns the token down (403).
+// refreshed, when Kiro turns the token down (403). As the built-in: no
+// credentials is a 401, a failed refresh after the 403 a 502; none marks
+// the account.
 async function generate(creds, auth, req, signal) {
   const model = String(req.model ?? "auto")
   const budget = thinking(req, model)
@@ -1070,7 +1111,7 @@ async function generate(creds, auth, req, signal) {
   try {
     a = await creds(auth)
   } catch (e) {
-    return errorResponse(e?.gone ? 401 : 502, e.message)
+    return errorResponse(401, e.message)
   }
   let res
   try {
@@ -1084,7 +1125,7 @@ async function generate(creds, auth, req, signal) {
     try {
       a = await creds(auth, true)
     } catch (e) {
-      return errorResponse(e?.gone ? 401 : 502, e.message)
+      return errorResponse(502, e.message)
     }
     try {
       res = await sendKiro(a, buildKiro(req, model, a.profile, budget), signal)
@@ -1094,10 +1135,11 @@ async function generate(creds, auth, req, signal) {
     }
   }
   if (!res.ok) {
+    // Kiro's own 401 is passed on, as the built-in did, the sign-in kept
     const f = failure(res.status, (await res.text()).slice(0, 1 << 20))
     return errorResponse(f.status, f.message)
   }
-  return reply(events(res.body, model, budget), model, req.stream === true)
+  return kept(await reply(events(res.body, model, budget), model, req.stream === true))
 }
 
 // ---- signing in ----------------------------------------------------------------------
@@ -1304,14 +1346,15 @@ export async function KiroAuthPlugin({ client } = {}) {
           },
         }
       },
-      // the account's credits, as magpie's built-in showed them
+      // the account's credits, as magpie's built-in showed them; a read,
+      // clean or failed, marked the built-in's account nothing
       async usage(getAuth) {
         const auth = await getAuth()
-        if (!(auth?.type === "api" && auth.key) && auth?.type !== "oauth") return { error: "not signed in" }
+        if (!(auth?.type === "api" && auth.key) && auth?.type !== "oauth") return { error: "not signed in", signIn: "kept" }
         try {
-          return usageOf(await usageLimits(await creds(auth), true))
+          return { ...usageOf(await usageLimits(await creds(auth), true)), signIn: "kept" }
         } catch (e) {
-          return { error: e.message }
+          return { error: e.message, signIn: "kept" }
         }
       },
       methods: [
@@ -1348,4 +1391,4 @@ export async function KiroAuthPlugin({ client } = {}) {
 }
 
 // for tests
-export const _internal = { usageOf, buildKiro, events, reply, failure, toolID, thinking, readCLI, readIDE, regionOf, planName, frames }
+export const _internal = { generate, refresh, usageOf, buildKiro, events, reply, failure, toolID, thinking, readCLI, readIDE, regionOf, planName, frames }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magpie-community/opencode-kiro-auth",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Kiro subscriptions (Free, Pro, Pro+, Power) in OpenCode and magpie",
   "type": "module",
   "main": "./index.mjs",