@magpie-community/opencode-cursor-auth 0.2.8 → 0.2.10

package/README.md

@@ -140,7 +140,10 @@ team or personal spend limit, as `cursor-agent`'s usage view shows it) also
 shows On-demand: its spend, and its limit when it has one. Cursor keeps
 serving such an account past the included usage, so magpie doesn't count
 it used up when Cursor Models or Other Models reach 100%; it does when the
-on-demand spend reaches its limit.
+on-demand spend reaches its limit. A team member with no limit of their
+own spends the team's pool: On-demand shows the pool's spend and limit,
+with the member's own spend beside it, and the account is used up when
+the pool is.
 
 Sign in to the Cursor account linked in Grok Bot. A linked SuperGrok
 subscription grants Bot access without a paid Cursor plan; see

package/index.mjs

@@ -385,7 +385,10 @@ function firstParty(model) {
 // period's spendLimitUsage (cents) and, where that sets no limit of the
 // user's, GetHardLimit's reply (dollars; undefined when it couldn't be
 // read). kind is "fixed" (up to limitDollars), "unlimited", "disabled" or
-// "unavailable" (not known).
+// "unavailable" (not known). A team member with no limit of their own
+// spends the team's pool, which cursor-agent's view calls unlimited but
+// which runs out at pooledLimit for the whole team (magpie #1868): that is
+// a fixed limit on the pool's spend, with the member's own in mineDollars.
 function onDemandOf(data, hard) {
   const s = data?.spendLimitUsage
   const usedDollars = Number(s?.individualUsed ?? 0) / 100
@@ -397,8 +400,11 @@ function onDemandOf(data, hard) {
         : { kind: "disabled", usedDollars }
   if (s?.limitType === "team") {
     if (own) return own
-    if (hard) return hard.noUsageBasedAllowed || !(Number(hard.hardLimit) > 0) ? { kind: "disabled", usedDollars } : { kind: "unlimited", usedDollars }
-    return Number(s.pooledLimit ?? 0) > 0 ? { kind: "unlimited", usedDollars } : { kind: "unavailable", usedDollars }
+    if (hard && (hard.noUsageBasedAllowed || !(Number(hard.hardLimit) > 0))) return { kind: "disabled", usedDollars }
+    // pooledLimit and pooledRemaining come as int64 strings, pooledUsed as a number
+    const pool = Number(s.pooledLimit ?? 0)
+    if (pool > 0) return { kind: "fixed", usedDollars: Number(s.pooledUsed ?? 0) / 100, limitDollars: pool / 100, mineDollars: usedDollars }
+    return hard ? { kind: "unlimited", usedDollars } : { kind: "unavailable", usedDollars }
   }
   if (!hard) return own ?? { kind: "unavailable", usedDollars }
   if (hard.noUsageBasedAllowed) return { kind: "disabled", usedDollars }
@@ -422,7 +428,8 @@ async function hardLimit(tok) {
   }
 }
 
-const dollars = (n) => "$" + n.toFixed(2)
+// dollars, thousands grouped: a team's pool runs to six figures ($451,200.00)
+const dollars = (n) => "$" + n.toLocaleString("en-US", { minimumFractionDigits: 2, maximumFractionDigits: 2 })
 
 // usage is the account's windows this billing period; an enterprise plan
 // reports spend instead, and gets none. ids are the models it can be
@@ -430,7 +437,8 @@ const dollars = (n) => "$" + n.toFixed(2)
 // may spend on-demand once its included usage is gone (fottencity on
 // Discord: a team that pays for more) is still served when the pools are
 // spent, so they are shown aside, and its On-demand spend is what can run
-// out: at its limit, or never when it has none.
+// out: at its limit (a team member with none of their own: the team's
+// pool), or never when it has none.
 async function usage(tok, ids) {
   const [res, hard] = await Promise.all([
     fetch(API + "/aiserver.v1.DashboardService/GetCurrentPeriodUsage", {
@@ -467,7 +475,7 @@ async function usage(tok, ids) {
   const pooled = od.kind === "fixed" || od.kind === "unlimited" ? { aside: true } : {}
   const onDemand =
     od.kind === "fixed"
-      ? [{ name: "On-demand", used: Math.max(0, Math.min(100, (100 * od.usedDollars) / od.limitDollars)), display: `${dollars(od.usedDollars)} / ${dollars(od.limitDollars)}`, ...resets }]
+      ? [{ name: "On-demand", used: Math.max(0, Math.min(100, (100 * od.usedDollars) / od.limitDollars)), display: `${dollars(od.usedDollars)} / ${dollars(od.limitDollars)}` + (od.mineDollars === undefined ? "" : ` (you: ${dollars(od.mineDollars)})`), ...resets }]
       : od.kind === "unlimited"
         ? [{ name: "On-demand", used: 0, display: dollars(od.usedDollars), ...resets, aside: true }]
         : []
@@ -723,17 +731,20 @@ function pick(entry, effort, fast, seed) {
 // without thinking stops at high), the variant with those parameters at the
 // nearest effort it has, not the default's id with parameters that
 // contradict it (claude-opus-5-thinking-high with thinking=false). Where
-// the default differs from what is asked in the effort alone, the effort
-// goes as asked, as for a listed model.
+// the default differs from what is asked in the effort alone, and no
+// variant at all is named for that effort, the effort goes as asked, as for
+// a listed model (claude-opus-5-5-xhigh). When another branch has it, the
+// default's own branch stops short there, and its nearest goes (#55).
 function branch(entry, want) {
   if (!entry.pid || entry.pid === "thinking") return undefined
+  const level = (x) => (x === "extra-high" ? "xhigh" : x)
   const def = valuesOf(entry.def)
-  if (Object.keys(want).every((k) => k === entry.pid || k === "context" || def[k] === undefined || def[k] === want[k])) return undefined
+  const named = entry.variants.some((v) => level(valuesOf(v)[entry.pid]) === level(want[entry.pid]))
+  if (!named && Object.keys(want).every((k) => k === entry.pid || k === "context" || def[k] === undefined || def[k] === want[k])) return undefined
   const vs = entry.variants.filter((v) => {
     const have = valuesOf(v)
     return entry.pid in have && Object.keys(want).every((k) => k === entry.pid || have[k] === undefined || have[k] === want[k])
   })
-  const level = (x) => (x === "extra-high" ? "xhigh" : x)
   const at = fitEffort(level(want[entry.pid]), vs.map((v) => level(valuesOf(v)[entry.pid])))
   return at ? vs.find((v) => level(valuesOf(v)[entry.pid]) === at) : undefined
 }

package/package.json

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