@magpie-community/opencode-workbuddy-auth 0.1.18 → 0.1.20

package/README.md

@@ -99,6 +99,15 @@ models to each shape below and Kimi's, GPT's, Gemini's and GLM's to some:
   (`.`, `:`, `/`, a space, CJK) is sent with `_` there, and the model's
   calls come back under the tool's own name.
 
+WorkBuddy AI's `gemini-3.8-flash` answers 400 "the conversation must end
+with a user message" (11153) to a chat whose tool results are followed by
+the user's message, as magpie sends Claude Code's reminders, words typed
+mid-task and a tool's images. Such a chat goes again with an empty
+assistant message between the results and the user's message, which it
+serves; a model that refused it once gets it that way from then on, until
+the plugin restarts. A chat ending with the assistant's message (a prefill)
+is refused as before.
+
 ## Models
 
 When you are signed in, the models are the ones WorkBuddy's product config
@@ -134,6 +143,12 @@ client reads. The daily Free Plan slice isn't counted: it ends at the same
 midnight on every account. magpie's smart routing spends the account whose
 credits run out first.
 
+An enterprise (team) account's resource summary lists no packages. Its
+credits are read from the enterprise meter
+(`/billing/meter/get-enterprise-user-usage`), the one WorkBuddy's own usage
+page reads: the cycle's credits used of its limit, and when the cycle
+resets (magpie #1904).
+
 ## Not here
 
 magpie's built-in WorkBuddy does more than this package:

package/index.mjs

@@ -1056,6 +1056,25 @@ function usageOf(sum, plan) {
   return out
 }
 
+// enterpriseUsageOf is an enterprise (team) account's credits, from
+// /billing/meter/get-enterprise-user-usage, the meter WorkBuddy's own usage
+// page (www.workbuddy.cn/profile/usage) reads for one (magpie #1904,
+// CnsMaple): the resource summary answers such an account with no
+// packages at all. It counts the cycle's credits flat — credit used of
+// limitNum — and when the cycle began and resets (UTC+8). null when it
+// grants none.
+function enterpriseUsageOf(u) {
+  const limit = capacity(u?.limitNum)
+  if (!(limit > 0)) return null
+  const used = capacity(u?.credit)
+  const w = { name: "Credits", used: (100 * used) / limit, display: `${compact(used)} / ${compact(limit)}`, amount: used, limit, unit: "credits" }
+  const at = (v) => (typeof v === "string" && /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/.test(v.trim()) ? Date.parse(v.trim().replace(" ", "T") + "+08:00") : 0)
+  const reset = at(u?.cycleResetTime), start = at(u?.cycleStartTime)
+  if (reset > 0) w.resetsAt = new Date(reset).toISOString()
+  if (reset > start && start > 0) w.span = (reset - start) / 1000
+  return w
+}
+
 // The packages' codes, as WorkBuddy's own client lists them when it asks
 // for each package's credits (its COMMODITY_CODES): the API refuses a
 // detail list without them (10001 "PackageCodes required").
@@ -1243,7 +1262,37 @@ async function liveModels(site, a) {
 
 // ---- the plugins --------------------------------------------------------------
 
+// AFTER_TOOLS_REFUSED is WorkBuddy's 400 code 11153, "the conversation must
+// end with a user message", which WorkBuddy AI's gemini-3.8-flash answers to a
+// chat whose tool results are followed by the user's message (#113): Claude
+// Code's reminders, a user's words sent mid-task, a tool's images, which
+// magpie hands over in a user message after the results. It does end with a
+// user message; the same chat with any other message between them is served.
+// The code is matched whole, as with 14018.
+const AFTER_TOOLS_REFUSED = /must end with a user message|["']code["']\s*:\s*["']?11153(?![\d.])/i
+
+// replyAfterTools is a chat ending with tool results then the user's
+// message(s), with an empty assistant message between them, as if the model
+// had said nothing after the results. Tried with a real WorkBuddy AI
+// account on 2026-10-14: gemini-3.8-flash serves it and follows the user's
+// message as a user's, where folded into the tool's result it was read as
+// the tool's output and its ask left undone. null for any other chat — one
+// ending with the assistant's message is a prefill, refused as it is.
+function replyAfterTools(body) {
+  const b = chatOf(body)
+  const msgs = b?.messages
+  if (!Array.isArray(msgs)) return null
+  let i = msgs.length - 1
+  while (i >= 0 && msgs[i]?.role === "user") i--
+  if (i === msgs.length - 1 || i < 0 || msgs[i]?.role !== "tool") return null
+  msgs.splice(i + 1, 0, { role: "assistant", content: "" })
+  return JSON.stringify(b)
+}
+
 function makePlugin(site) {
+  // the models of this site that refused tool results then the user's
+  // message, for this run: their next chats go with replyAfterTools at once
+  const endsAfterTools = new Set()
   return async ({ client }) => ({
     config: async (config) => {
       config.provider ??= {}
@@ -1309,7 +1358,22 @@ function makePlugin(site) {
             const fit = fitted(body)
             body = normalizeToolChoice(fit.body)
             attend(headers, body, session)
-            const res = await fetch(req ? req.url : input, { ...init, method: init?.method ?? req?.method, headers, body })
+            const send = (b) => fetch(req ? req.url : input, { ...init, method: init?.method ?? req?.method, headers, body: b })
+            // a model known to turn tool results then the user's message away
+            // gets the empty reply between them up front (see endsAfterTools)
+            const model = chatOf(body)?.model
+            const quiet = endsAfterTools.has(model) ? replyAfterTools(body) : null
+            let res = await send(quiet ?? body)
+            if (res.status === 400 && !quiet) {
+              const text = await res.text()
+              const again = AFTER_TOOLS_REFUSED.test(text) ? replyAfterTools(body) : null
+              if (again) {
+                endsAfterTools.add(model)
+                res = await send(again)
+              } else {
+                res = new Response(text, { status: res.status, statusText: res.statusText, headers: res.headers })
+              }
+            }
             return res.status >= 400 ? explained(res) : kept(await renamed(res, fit.names))
           },
         }
@@ -1325,6 +1389,17 @@ function makePlugin(site) {
           // the meter has no /v2 prefix, on either site
           const sum = await meter(site, a, "/billing/meter/get-user-resource-summary")
           const out = usageOf(sum, auth.plan)
+          // an enterprise account's summary has no packages: its credits
+          // are the enterprise meter's (#1904). A personal account's
+          // refusal of it (10001 "uid or enterpriseID is empty") leaves
+          // the card as the summary said.
+          if (!out.windows.length) {
+            let ent = null
+            try {
+              ent = enterpriseUsageOf(await meter(site, a, "/billing/meter/get-enterprise-user-usage"))
+            } catch {}
+            if (ent) return { plan: auth.plan || "Enterprise", windows: [ent], signIn: "kept" }
+          }
           // when the credits left run out, for routing to spend them first;
           // a list that can't be read leaves it unknown, the card stands
           const credits = out.windows.find((w) => w.name === "Credits")
@@ -1438,4 +1513,4 @@ export const WorkBuddyAuthPlugin = makePlugin(SITES.workbuddy)
 export const WorkBuddyAIAuthPlugin = makePlugin(SITES["workbuddy-ai"])
 
 // for tests
-export const _internal = { notDesktop, textOnly, runsOutOf, packagesOf, endOf, enterpriseHeaders, enterpriseOf, liveModels, browserSignIn, withSystem, normalizeToolChoice, fitTools, fitted, renamed, unflagged, usageOf, desktopHeld, explained, REFUSED_HINT, RESTRICTED_HINT, EXHAUSTED_HINT, freeCredits, creditsOf, fresh, SITES, renewing, renewed, SESSION, attend, turnKey, conversationKey, signatureOf }
+export const _internal = { replyAfterTools, AFTER_TOOLS_REFUSED, enterpriseUsageOf, notDesktop, textOnly, runsOutOf, packagesOf, endOf, enterpriseHeaders, enterpriseOf, liveModels, browserSignIn, withSystem, normalizeToolChoice, fitTools, fitted, renamed, unflagged, usageOf, desktopHeld, explained, REFUSED_HINT, RESTRICTED_HINT, EXHAUSTED_HINT, freeCredits, creditsOf, fresh, SITES, renewing, renewed, SESSION, attend, turnKey, conversationKey, signatureOf }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magpie-community/opencode-workbuddy-auth",
-  "version": "0.1.18",
+  "version": "0.1.20",
   "description": "OpenCode provider plugins for WorkBuddy's plans: WorkBuddy (CodeBuddy, copilot.tencent.com) and WorkBuddy AI (www.workbuddy.ai)",
   "type": "module",
   "main": "./index.mjs",