@magpie-community/opencode-workbuddy-auth 0.2.20 → 0.2.22

package/README.md

@@ -359,7 +359,10 @@ credit packs) and platform rewards (gifted and activity credits,
 against plan_bonus, addon and benefit); a summary without them is split
 by package code as WorkBuddy's client does. Only one of the two stops the
 account, since WorkBuddy serves it while any credits are left: the extra
-window is set aside until the plan's credits are spent. A summary with
+window is set aside until the plan's credits are spent, then the plan's
+is. Extra credits only the detail lists carry (a China-site free
+account's summary can list the plan's base alone) are their own "Extra
+credits" window by the same rule (ferock on Discord). A summary with
 only one kind keeps the one "Credits" window (akic404 on Discord; since
 0.2.16 the plan's bonus is extra too, Jiabubu on Discord).
 

package/index.mjs

@@ -15,7 +15,6 @@ import { homedir } from "node:os"
 import { isAbsolute, join } from "node:path"
 import { gzipSync } from "node:zlib"
 
-const APP_VERSION = "2.0.0" // the version WorkBuddy's sign-in page is opened with
 const POLL_MS = 1000
 const SIGN_IN_MS = 5 * 60 * 1000
 const EARLY_MS = 60 * 1000 // a token this close to its end is refreshed before a request
@@ -1755,7 +1754,12 @@ async function browserSignIn(site) {
   if (!state?.state || !state?.authUrl) throw new Error(`${site.name} gave no sign-in page`)
   const url = new URL(state.authUrl)
   if (url.protocol !== "https:") throw new Error(`${site.name}'s sign-in page isn't https`)
-  url.searchParams.set("version", APP_VERSION)
+  // the desktop app's own version, as WorkBuddy desktop opens it
+  // (openAuthUrl: version = CLIENT_INFO_PLUGIN_VERSION, the app's version).
+  // The China build's page hides 企业微信 (WeCom) for a version under 5.8.0
+  // (its signin-callback chunk: platform workbuddy and version >= "5.8.0"),
+  // so the 2.0.0 sent before offered no WeCom sign-in (shenyebuwu on Discord)
+  url.searchParams.set("version", site.app)
   url.searchParams.set("loginSessionId", hex())
   return {
     url: url.toString(),
@@ -3899,24 +3903,30 @@ function makePlugin(site) {
               const aside = extra ? (stops === credits ? extra : credits) : null
               if (aside) Object.assign(aside, runsOutOf(sum, packages, Date.now(), (code) => ofPlan(code) === (aside === credits)) ?? {})
               // the summary of the plan's credits alone: the extra ones
-              // only the detail lists have (listedExtra) are their window,
-              // always set aside. Whether WorkBuddy spends them once the
-              // plan's are gone isn't seen, so the plan's window stops the
-              // account as it did before.
+              // only the detail lists have (listedExtra) are their window.
+              // As with the summary's split (usageOf), one of the two stops
+              // the account: the plan's, until its credits are spent with
+              // extra ones left. WorkBuddy goes on serving such an account on
+              // its extra credits (ferock on Discord, a China-site account
+              // at "500 / 500" moved off while its extra ones were left).
               const kinds = !extra && kindsOf(sum, site)
               const more = kinds && kinds.plan.total > 0 && kinds.extra.total === 0 ? listedExtra(sum, packages, site) : null
               if (more) {
                 const { runsOutAt, runsOut, ...counts } = more
-                const w = { ...creditWindow("Extra credits", counts), aside: true, ...(runsOutAt ? { runsOutAt, runsOut } : {}) }
+                const w = { ...creditWindow("Extra credits", counts), ...(runsOutAt ? { runsOutAt, runsOut } : {}) }
+                const planSpent = credits.amount >= credits.limit && counts.used < counts.total
+                if (planSpent) credits.aside = true
+                else w.aside = true
                 out.windows.splice(out.windows.indexOf(credits) + 1, 0, w)
-                // and, as with the split's, the soonest of them to lapse is
+                // and, as with the split's, the soonest credits to lapse are
                 // the account's too, on the window that stops it: routing
                 // reads none set aside, so an account whose extra credits
                 // expire first went unknown to it (Kayphoon on Discord)
-                const at = runsOutAt ? Date.parse(runsOutAt) : 0
-                const was = credits.runsOutAt ? Date.parse(credits.runsOutAt) : 0
-                if (at > 0 && (!was || at < was)) Object.assign(credits, { runsOutAt, runsOut })
-                else if (at > 0 && at === was) credits.runsOut = (credits.runsOut ?? 0) + runsOut
+                const [stops, other] = planSpent ? [w, credits] : [credits, w]
+                const at = other.runsOutAt ? Date.parse(other.runsOutAt) : 0
+                const was = stops.runsOutAt ? Date.parse(stops.runsOutAt) : 0
+                if (at > 0 && (!was || at < was)) Object.assign(stops, { runsOutAt: other.runsOutAt, runsOut: other.runsOut })
+                else if (at > 0 && at === was) stops.runsOut = (stops.runsOut ?? 0) + other.runsOut
               }
             } catch {}
           }

package/package.json

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