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

package/index.mjs

@@ -120,7 +120,9 @@ const jwtExpired = (jwt) => {
   const t = jwtExpiry(jwt)
   return t > 0 && Date.now() > t
 }
-const EXPIRED = "ZCode's sign-in has expired; sign in again"
+// EXPIRED is the built-in's words (errZCodeExpired) for a Start Plan
+// sign-in past its end.
+const EXPIRED = "ZCode's sign-in has expired; sign in to ZCode again (or add the account again in magpie)"
 
 const num = (v) => {
   const n = typeof v === "string" ? parseFloat(v) : v
@@ -236,7 +238,7 @@ async function teamKey(s) {
     teamKeys.set(id, { key, at: Date.now() })
     return key
   } catch (e) {
-    const err = new Error(`ZCode's team plan: ${e.message} — sign in again`)
+    const err = new Error(`ZCode's team plan: ${e.message} — sign in to ZCode again`)
     teamKeys.set(id, { err, at: Date.now() })
     throw err
   }
@@ -280,13 +282,18 @@ const isNum = (v) => typeof v === "number" && Number.isFinite(v)
 
 // limitWindows are /api/monitor/usage/quota/limit's limits as windows: what
 // is used of the whole when both are told (the whole less what remains, or
-// the current value), else the percentage given.
+// the current value), else the percentage given. TIME_LIMIT is the month's
+// MCP tool calls, which ZCode shows but never stops the models on, so it is
+// set aside, as is a limit whose whole is told as 0: no cap (an older
+// plan's), which the vendor may still give as 100% used.
 function limitWindows(d) {
   const out = []
   for (const x of d?.limits ?? []) {
     const span = spanOf(Math.trunc(Number(x?.unit) || 0), x?.number)
     const w = { name: windowName(span), used: 0 }
+    if (String(x?.type ?? "").toUpperCase() === "TIME_LIMIT") (w.name = "MCP · Month"), (w.aside = true)
     if (isNum(x?.percentage)) w.used = x.percentage
+    if (x?.usage === 0) (w.used = 0), (w.aside = true)
     if (isNum(x?.usage) && x.usage > 0) {
       const total = x.usage
       if (isNum(x.remaining)) {
@@ -1093,21 +1100,31 @@ export async function ZCodeAuthPlugin({ client }) {
             h.delete("authorization")
             h.set("x-api-key", key)
             h.set("Authorization", "Bearer " + key)
-            return fetch(url, { ...opts, headers: h })
+            const res = await fetch(url, { ...opts, headers: h })
+            // the plan's answer goes on as it came, the account kept: the
+            // built-in never marked a ZCode account lapsed nor cleared one
+            const kept = new Headers(res.headers)
+            kept.delete("content-length")
+            kept.delete("content-encoding")
+            kept.set("X-Magpie-Sign-In", "kept")
+            return new Response(res.body, { status: res.status, statusText: res.statusText, headers: kept })
           },
         }
       },
-      // the plan's allowance, as magpie's built-in showed it
+      // the plan's allowance, as magpie's built-in showed it. Each read
+      // keeps the sign-in (signIn): the built-in's marked no account lapsed,
+      // its expired Start Plan sign-in among them, and cleared none
       async usage(getAuth, provider) {
         const auth = await getAuth()
         const s = stateOf(auth)
-        if (!s) return { error: "not signed in" }
+        if (!s) return { error: "not signed in", signIn: "kept" }
         // every card starts from the plan the sign-in saved, as magpie's
         // built-in did: a reply without a level, a team detail that
         // failed or an error keeps it
         const saved = (out) => {
           const plan = s.plan || auth?.plan
           if (plan && !out.plan) out.plan = plan
+          out.signIn = "kept"
           return out
         }
         try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magpie-community/opencode-zcode-auth",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "OpenCode provider plugin: signs in to Z.ai's or BigModel's (智谱) GLM Coding Plan as ZCode does, including team seats and ZCode's Start Plan",
   "type": "module",
   "main": "./index.mjs",