@magpie-community/opencode-zcode-auth 0.1.2 → 0.1.4

package/index.mjs

@@ -39,7 +39,6 @@ const MODELS = [
   { id: "GLM-5-Turbo", context: 200_000, output: 64_000, efforts: ["none", "high"] },
 ]
 const START_MODELS = MODELS.filter((m) => m.id !== "GLM-5.3")
-const OUTPUT = 131_072 // when ZCode's config names none
 
 const SITES = {
   zai: { name: "Z.ai", api: ZAI_API, base: ZAI_BASE, subscribe: "z.ai/subscribe" },
@@ -121,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
@@ -237,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
   }
@@ -975,7 +976,8 @@ const entry = (m) => ({
   tool_call: true,
   attachment: !!m.image,
   modalities: { input: m.image ? ["text", "image"] : ["text"], output: ["text"] },
-  limit: { context: m.context || 200_000, output: m.output || OUTPUT },
+  // what ZCode's config names, else 0 (unknown), as magpie's built-in
+  limit: { context: m.context || 0, output: m.output || 0 },
   cost: { input: 0, output: 0, cache_read: 0, cache_write: 0 },
   variants: variants(m.efforts),
 })
@@ -1093,15 +1095,33 @@ 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 {
           if (isTeam(s)) {
             let key = s.key
@@ -1112,12 +1132,12 @@ export async function ZCodeAuthPlugin({ client }) {
                 await client?.auth?.set?.({ path: { id: provider?.id ?? PROVIDER }, body: next }).catch?.(() => {})
               }
             }
-            return await teamUsage(s, key)
+            return saved(await teamUsage(s, key))
           }
-          if (await onStart(s)) return await startUsage(s)
-          return await codingUsage(s)
+          if (await onStart(s)) return saved(await startUsage(s))
+          return saved(await codingUsage(s))
         } catch (e) {
-          return { error: e?.message ?? String(e) }
+          return saved({ error: e?.message ?? String(e) })
         }
       },
       methods: [
@@ -1145,4 +1165,4 @@ export async function ZCodeAuthPlugin({ client }) {
 }
 
 // for tests
-export const _internal = { limitWindows, termOf, startUsage, routes, teamKeys, ownSignIn, stateOf }
+export const _internal = { entry, limitWindows, termOf, startUsage, routes, teamKeys, ownSignIn, stateOf }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magpie-community/opencode-zcode-auth",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "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",