@magpie-community/opencode-qoder-auth 0.2.10 → 0.2.12

package/index.mjs

@@ -708,8 +708,13 @@ function failure(status, text) {
   } catch {}
   msg ||= STATUS_CODES[status] ?? `HTTP ${status}`
   // a refused chat is the built-in's 401, which never marked the account
-  // lapsed: only a refused refresh did (errorResponse says kept)
-  if (status === 401 || status === 403) return { status: 401, message: "the sign-in lapsed — sign in again" }
+  // lapsed: only a refused refresh did (errorResponse says kept). Qoder's
+  // own words go with it: a 401 right after signing in isn't a lapsed
+  // sign-in, and its reason is what says what is (Yayoi_no_yume on X).
+  if (status === 401 || status === 403) {
+    const said = msg && msg !== STATUS_CODES[status] ? ` (Qoder said ${status}: ${msg.slice(0, 300)})` : ""
+    return { status: 401, message: "the sign-in lapsed — sign in again" + said }
+  }
   if (status === 429 || msg.toLowerCase().includes("quota")) return { status: 429, message: "usage limit reached: " + msg }
   return { status, message: msg }
 }
@@ -1314,6 +1319,9 @@ const makePlugin = (site) => async ({ client }) => {
   }
   // each account's listing, the model configs a request carries
   const listings = new Map()
+  // A public and a VPC account can name the same uid but have different
+  // catalogs. Keep each deployment's listing apart.
+  const listingKey = (cred) => `${cred.vpc ?? ""}\0${cred.uid}`
   // the accounts fresh renewed: the built-in took the lapse mark off on a
   // renewed job token (qoderPersist), whatever the request then met
   const renewals = new WeakSet()
@@ -1322,7 +1330,7 @@ const makePlugin = (site) => async ({ client }) => {
   // says "renewed" for it
   const unsaid = new Set()
   const renewed = (cred) => {
-    const was = unsaid.delete(cred.uid)
+    const was = unsaid.delete(listingKey(cred))
     return renewals.has(cred) || was
   }
 
@@ -1343,10 +1351,11 @@ const makePlugin = (site) => async ({ client }) => {
     })
 
   const models = async (cred, again = false) => {
-    let l = listings.get(cred.uid)
+    const key = listingKey(cred)
+    let l = listings.get(key)
     if (!l || again) {
       l = modelInfos(await fetchListing(siteOf(site, cred), cred))
-      listings.set(cred.uid, l)
+      listings.set(key, l)
     }
     return l
   }
@@ -1559,7 +1568,7 @@ const makePlugin = (site) => async ({ client }) => {
           if (e?.expired) throw Object.assign(new Error(e.message), { signIn: "expired" })
           return provider.models
         }
-        if (renewals.has(cred)) unsaid.add(cred.uid)
+        if (renewals.has(cred)) unsaid.add(listingKey(cred))
         try {
           const ms = await models(cred, true)
           if (!ms.length) return provider.models

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magpie-community/opencode-qoder-auth",
-  "version": "0.2.10",
+  "version": "0.2.12",
   "description": "Qoder subscriptions in OpenCode and magpie: Qoder (qoder.com) and Qoder CN (qoder.cn)",
   "type": "module",
   "main": "./index.mjs",