@magpie-community/opencode-zcode-auth 0.1.26 → 0.1.27

package/README.md

@@ -25,12 +25,14 @@ over Anthropic's Messages API. Provider id: `zcode`.
     agent's system prompt at the end of the third (a fourth block is
     refused, #343), the day in a `<system-reminder>` turn before the agent's
     turns, and the sign-in's device id in `metadata.user_id`. GLM Coding
-    Plan and team requests go as the agent sent them. One it still turns
-    away (a 405, the block page or code 3012) comes back with what to do
-    about it, as magpie's built-in said: "ZCode's Start Plan still turned
-    this request away, though magpie sends it as the ZCode app does; …
-    Use an account with a GLM Coding Plan, or add another provider to this
-    group".
+    Plan and team requests go as the agent sent them. zcode.z.ai also
+    answers 405 code 3012 to every request of an account its risk control
+    blocked, ZCode's own app's included (plugins#348). That answer comes
+    back as ZCode's words, then "ZCode's risk control blocked this account
+    for unusual activity (code 3012); …", which magpie reads as the account
+    restricted: it rests, and the group's other providers are used. Only
+    ZCode support lifts such a block. A block page from ZCode's edge
+    firewall says this network's address was blocked instead.
   - The Start Plan's token can't be refreshed. When it runs out, sign in
     again.
 - **ZCode: a team's GLM Coding Plan**

package/index.mjs

@@ -1438,39 +1438,51 @@ function model(m, url) {
 }
 
 // ---- the Start Plan's requests ----------------------------------------------------
-// zcode.z.ai serves the Start Plan only to what looks like ZCode's own
-// request, and turns others away with 405 "request has been blocked due to
-// unusual activity" (code 3012). A Start Plan request goes as the plugin
+// zcode.z.ai answers 405 "request has been blocked due to unusual
+// activity" (code 3012) to a request that doesn't look like ZCode's own
+// (#343: the agent's system prompt as a fourth block), and to every
+// request of an account its risk control blocked, ZCode's own app's too
+// (plugins#348). A Start Plan request goes as the plugin
 // the plan serves (ARNO's "Freeflow", provider zcode-start) sends it: its
 // headers (startHeaders) and its body (dress). The texts are prompt.mjs.
 
-// START_BLOCKED is what the Start Plan still turning a request away means,
-// word for word magpie's provider.ZCodeStartBlockedHint (#425), which
-// magpie's Routing page knows and says in the user's language. It is put
-// in place of the block page, whose words magpie would otherwise read as a
-// network firewall's (provider.BlockedHint).
-const START_BLOCKED = "ZCode's Start Plan still turned this request away, though magpie sends it as the ZCode app does; it can be a network block of this IP, or ZCode checking for something new. Use an account with a GLM Coding Plan, or add another provider to this group"
-const EDGE_BLOCKED = /request has been blocked|errors\.aliyun\.com/i
-const START_REFUSED = /unusual activity|"code"\s*:\s*"?3012\b/i
-
-// startRefused says a Start Plan answer is that refusal, as the built-in's
-// zcodeStartExplain read it: a 405, a block page or code 3012.
-const startRefused = (status, text) => status >= 400 && (status === 405 || EDGE_BLOCKED.test(text) || START_REFUSED.test(text))
-
-// startBlocked is the refusal's answer as the built-in passed it on: what
-// the vendor said (its status for a block page), then START_BLOCKED.
+// START_RESTRICTED is what ZCode's 3012, "request has been blocked due to
+// unusual activity", means: ZCode's risk control blocked the account
+// (ZCode's support says so, and ZCode's own app gets the same 405 on such
+// an account, plugins#348), not that the request was sent wrong. Word for
+// word magpie's provider.ZCodeRestrictedHint: the gateway reads it as the
+// account restricted, rests it and asks the group's next member, and the
+// Routing page says it in the user's language.
+const START_RESTRICTED = "ZCode's risk control blocked this account for unusual activity (code 3012); it rests, and the group's other providers are used. If the ZCode app fails on this account too, only ZCode support can lift the block"
+// START_EDGE is what a block page from ZCode's edge firewall (Aliyun's)
+// means: this network's address, not the account. Word for word magpie's
+// provider.BlockedHint.
+const START_EDGE = "the provider's network firewall blocked requests from this IP; wait a while, or switch to another network or proxy"
+const EDGE_PAGE = /errors\.aliyun\.com|<html/i
+const START_REFUSED = /unusual activity|request has been blocked|"code"\s*:\s*"?3012\b/i
+
+// startRefused says a Start Plan answer is a refusal: a 405, a block page
+// or code 3012.
+const startRefused = (status, text) => status >= 400 && (status === 405 || START_REFUSED.test(text))
+
+// startBlocked is the refusal's answer: what the vendor said (its status
+// for a block page), then what it means. A block page is the network's;
+// anything else, ZCode's JSON 3012 or a bare 405, the account's.
 function startBlocked(res, text) {
+  const page = EDGE_PAGE.test(text)
   let said = ""
-  if (!EDGE_BLOCKED.test(text)) {
+  if (!page) {
     try {
       const v = JSON.parse(text)
       said = first(v?.error?.message, typeof v?.error === "string" ? v.error : "", v?.message, v?.msg)
+      const code = v?.code ?? v?.error?.code
+      if (said && code != null && !String(said).includes(String(code))) said = `${said} (${res.status}, code ${code})`
     } catch {}
   }
   said ||= `${res.status} ${STATUS_TEXT[res.status] ?? res.statusText}`.trim()
   const h = new Headers(res.headers)
   h.set("content-type", "application/json")
-  const error = { type: "permission_error", message: `${said} — ${START_BLOCKED}` }
+  const error = { type: "permission_error", message: `${said} — ${page ? START_EDGE : START_RESTRICTED}` }
   return new Response(JSON.stringify({ type: "error", error }), { status: res.status, statusText: res.statusText, headers: h })
 }
 
@@ -1900,7 +1912,7 @@ export async function ZCodeAuthPlugin({ client }) {
             }
             let res = await fetch(url, { ...opts, headers: h })
             // the Start Plan turning the request away says what to do about
-            // it, as the built-in's zcodeStartExplain did
+            // it: the account blocked, or the network
             if (start && res.status >= 400) {
               const text = await res.text()
               if (startRefused(res.status, text)) return kept(startBlocked(res, text))

package/package.json

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