@magpie-community/opencode-cursor-auth 0.2.31 → 0.2.32

package/README.md

@@ -240,6 +240,11 @@ go without the list for 5 minutes instead of each waiting for it again.
 ## Usage
 
 magpie shows Cursor Models, Other Models and Total for the billing period.
+A plan of Cursor's merged billing (`GetPlanInfo`'s `isMerged`, the newer
+plans) has no Other Models pool: its included usage is one allowance every
+model draws on, as the dashboard's "Weekly usage limit" shows it. magpie
+shows that as one window, Weekly (Monthly on a monthly plan), for every
+model.
 Accounts with a Grok Bot allowance also show its usage and reset time;
 active trials are labelled separately. A spent Bot allowance doesn't stop
 Cursor requests.
@@ -273,8 +278,8 @@ In magpie, open the Cursor provider, turn on **Included usage only** under
 applies to every Cursor account, and takes effect at each account's next
 usage reading.
 
-When on, Cursor Models and Other Models (an Enterprise account's allowance)
-are what keep an account in routing: once one is used up, magpie moves its
+When on, Cursor Models and Other Models (a merged plan's Weekly, an
+Enterprise account's allowance) are what keep an account in routing: once one is used up, magpie moves its
 models to the next account until the period resets, even when on-demand
 could still pay for them. On-demand and Total are still shown but never
 keep an account in routing. Use it when on-demand is a shared or paid pool

package/index.mjs

@@ -316,18 +316,27 @@ async function whoIs(tok) {
 
 // plans are the plan each token's account is on, as `cursor-agent about`
 // names it (GetPlanInfo's planName, magpie's card title), asked again after
-// an hour.
+// an hour. merged is GetPlanInfo's isMerged: a plan of Cursor's merged
+// (xAI) billing, whose included usage is one allowance for every model,
+// most of them a week long (includedUsagePeriod), and has no Other Models
+// pool (majiang_ai on X). The dashboard's usage page shows such a plan one
+// meter, the period's totalPercentUsed. period is "weekly", "monthly" or
+// "" (not said). A reply that couldn't be read keeps the last one, else
+// says nothing: undefined merged, which the pools are kept for.
 const plans = new Map()
 const PLAN_TTL = 3600_000
+const PERIODS = { INCLUDED_USAGE_PERIOD_WEEKLY: "weekly", INCLUDED_USAGE_PERIOD_MONTHLY: "monthly", 1: "monthly", 2: "weekly" }
 async function planOf(tok) {
   const had = plans.get(tok)
-  if (had && Date.now() - had.at < PLAN_TTL) return had.plan
+  if (had && Date.now() - had.at < PLAN_TTL) return had
   try {
-    const plan = String((await unary(API, "aiserver.v1.DashboardService/GetPlanInfo", tok))?.planInfo?.planName ?? "").trim()
-    if (plan) plans.set(tok, { plan, at: Date.now() })
-    return plan || had?.plan || ""
+    const info = await unary(API, "aiserver.v1.DashboardService/GetPlanInfo", tok)
+    const plan = String(info?.planInfo?.planName ?? "").trim()
+    const got = { plan: plan || had?.plan || "", merged: info?.isMerged === true, period: PERIODS[info?.planInfo?.includedUsagePeriod] ?? "", at: Date.now() }
+    if (plan || got.merged) plans.set(tok, got)
+    return got
   } catch {
-    return had?.plan ?? ""
+    return had ?? { plan: "" }
   }
 }
 
@@ -617,7 +626,9 @@ async function enterpriseUsage(tok, includedOnly = false) {
 // the pools are the allowance whatever on-demand allows, and On-demand is
 // shown only. An Enterprise account's period has no planUsage; its
 // allowance comes from usage-summary instead.
-async function usage(tok, ids, includedOnly = false) {
+// plan is planOf's answer, asked alongside (a promise): a merged plan's
+// included usage is one window, Weekly on a weekly plan, for every model.
+async function usage(tok, ids, includedOnly = false, plan = undefined) {
   const [res, hard] = await Promise.all([
     fetch(API + "/aiserver.v1.DashboardService/GetCurrentPeriodUsage", {
       method: "POST",
@@ -661,6 +672,19 @@ async function usage(tok, ids, includedOnly = false) {
       : od.kind === "unlimited"
         ? [{ name: "On-demand", used: 0, display: dollars(od.usedDollars), ...resets, aside: true }]
         : []
+  // A merged plan has no pools: its included usage is one allowance every
+  // model draws on, which the dashboard shows as the period's
+  // totalPercentUsed, autoPercentUsed the same and apiPercentUsed 0 always.
+  const info = await plan
+  if (info?.merged === true) {
+    const weekly = info.period === "weekly"
+    return {
+      windows: [
+        { name: weekly ? "Weekly" : info.period === "monthly" ? "Monthly" : "Included", used: num(u.totalPercentUsed), ...resets, ...(weekly ? { span: 604800 } : {}), ...pooled },
+        ...onDemand,
+      ],
+    }
+  }
   // the two pools fit the line; the total goes in its tooltip
   return {
     windows: [
@@ -3233,7 +3257,7 @@ export async function CursorAuthPlugin(input) {
           key: INCLUDED_ONLY,
           label: "Included usage only",
           description:
-            "Keeps an account in routing only while its included usage lasts: once Cursor Models or Other Models is used up, magpie moves those models to the next account until the period resets, even if on-demand could pay. On-demand and Total are still shown but never keep an account in routing.",
+            "Keeps an account in routing only while its included usage lasts: once an included pool (Cursor Models, Other Models, a newer plan's Weekly) is used up, magpie moves its models to the next account until it resets, even if on-demand could pay. On-demand and Total never keep an account in routing.",
         },
       ],
       // magpie's: how much of the plan's included usage is gone (the plan
@@ -3246,7 +3270,8 @@ export async function CursorAuthPlugin(input) {
         } catch (e) {
           return { error: e.message, windows: [], signIn: "kept" }
         }
-        const [u, plan, bot] = await Promise.all([usage(tok, Object.keys(provider?.models ?? {}), includedOnly()), planOf(tok), botUsage(tok)])
+        const info = planOf(tok)
+        const [u, { plan }, bot] = await Promise.all([usage(tok, Object.keys(provider?.models ?? {}), includedOnly(), info), info, botUsage(tok)])
         // Bot goes among magpie's three menu-bar rings: before Total, and
         // before an On-demand with no limit, which is only a dollar figure on
         // a ring that never fills (magpie #2213, Morganwan90). An On-demand

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magpie-community/opencode-cursor-auth",
-  "version": "0.2.31",
+  "version": "0.2.32",
   "description": "Cursor subscriptions (Pro, Pro+, Ultra, Teams) in OpenCode and magpie, through the API cursor-agent talks to",
   "type": "module",
   "main": "./index.mjs",