@magpie-community/opencode-cursor-auth 0.2.25 → 0.2.28

package/README.md

@@ -50,8 +50,11 @@ plugin's `fetch` answers them on Cursor's agent API:
   after it go straight to HTTP/1.1 for 10 minutes; a failed connection
   (refused, no network) or a stream the server refused leaves the next Run
   to try HTTP/2 again. A region error over HTTP/1.1 sends the Run back to
-  HTTP/2 at the region's agent host. A BidiAppend with no answer in 60 s
-  (more for a large one) ends the Run, as cursor-agent does.
+  HTTP/2 at the region's agent host. BidiAppends go up numbered in order,
+  up to 16 at a time as cursor-agent sends them (one at a time for a
+  native session's Run, whose tool results must be certain). A BidiAppend
+  with no answer in 60 s (more for a large one) ends the Run, as
+  cursor-agent does.
 - A new Run imports the whole conversation as AI SDK messages kept as blobs
   the server asks for. The caller's tools are MCP tools, listed in the
   system prompt; the model calls them through Cursor's `CallDynamicTool`,
@@ -210,7 +213,10 @@ minutes), the way pi-cursor-sdk lists Cursor's catalog:
   them), fast the request's `service_tier`.
 - An id for a model with thinking that the account lists only without it
   (`claude-haiku-5-5-thinking` when the list has Claude Haiku 5.5 alone),
-  or the other way round, runs as the model the account has.
+  or the other way round, runs as the model the account has. So does a
+  picker model whose default thinks while the account lists it only
+  without thinking (`claude-haiku-5-5`), or the other way round: each of
+  its variant ids goes as the id the account lists.
 - An `@<size>` id the list no longer has (`claude-opus-5-5@1m` when only
   300k is listed, or the model is listed unsized) runs at the model's
   nearest size, in Max Mode when the size asked for is over the model's
@@ -224,6 +230,11 @@ minutes), the way pi-cursor-sdk lists Cursor's catalog:
   and `service_tier` counting as for a listed model. The list doesn't show
   these ids: pick the `@<size>` model for a window that is the model's.
 
+A chat request picks its variant from the same list without waiting for it
+when it needn't: a list past its 10 minutes is used while a new one is
+asked for, requests at once share one ask, and after an ask fails requests
+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.

package/index.mjs

@@ -827,7 +827,14 @@ function modelsOf(picker, ids, listed = []) {
     const def = defaultVariant({ variants })
     const { pid, levels: all } = effortsOf(defs)
     const levels = Object.fromEntries(Object.entries(all).filter(([, value]) => has(pid, value)))
-    const fam = fams.get(familyOf(def?.legacySlug || m.name).family) ?? []
+    // the usable ids of its default's family, else of the same model with
+    // thinking or without it: a Team's picker can default Claude Haiku 5.5
+    // to thinking while cursor-agent lists it as claude-haiku-5-5 alone
+    // (ysm119 on Discord, after 0.2.25), and a variant id it lacks is then
+    // asked as that one, as named() takes such an id
+    const own = familyOf(def?.legacySlug || m.name).family
+    const bare = own.replace(/-thinking$/, "")
+    const fam = fams.get(own) ?? fams.get(bare) ?? fams.get(bare + "-thinking") ?? []
     const base = { run: m.name, title: clean(m.clientDisplayName || m.name), pid, levels, fast: !!defs.fast?.length, variants, def, partial, model: m, fam, ids }
     const contexts = (defs.context ?? []).filter((c) => has("context", c))
     if (contexts.length) {
@@ -974,22 +981,66 @@ function fitEffort(want, levels) {
 // can't give is a failure: magpie keeps the list it had. A usable list it
 // can't give leaves the picker as it is.
 const lists = new Map()
+// listings are the lists being asked for now, by token: callers at once
+// share one ask; listFailed when a token's last ask failed
+const listings = new Map()
+const listFailed = new Map()
 async function usable(tok) {
   const h = createHash("sha256").update(tok).digest("hex")
   const had = lists.get(h)
   if (had && Date.now() - had.at < MODELS_KEEP) return had.raw
-  const [j, listed] = await Promise.all([
-    unary(API, "aiserver.v1.AiService/AvailableModels", tok, { useModelParameters: true, doNotUseMarkdown: true }, 30_000),
-    unary(API, "agent.v1.AgentService/GetUsableModels", tok, {}, 8_000).then(
-      (u) => (Array.isArray(u?.models) ? u.models : []),
-      () => [],
-    ),
-  ])
-  const ids = new Set(listed.flatMap((m) => [m?.modelId, m?.displayModelId]).filter(Boolean))
-  const raw = modelsOf(Array.isArray(j?.models) ? j.models : [], ids.size ? ids : null, listed)
-  if (!raw.length) throw new Error("Cursor listed no models")
-  lists.set(h, { at: Date.now(), raw })
-  return raw
+  return listing(tok, h)
+}
+function listing(tok, h) {
+  let p = listings.get(h)
+  if (p) return p
+  p = (async () => {
+    const [j, listed] = await Promise.all([
+      unary(API, "aiserver.v1.AiService/AvailableModels", tok, { useModelParameters: true, doNotUseMarkdown: true }, 30_000),
+      unary(API, "agent.v1.AgentService/GetUsableModels", tok, {}, 8_000).then(
+        (u) => (Array.isArray(u?.models) ? u.models : []),
+        () => [],
+      ),
+    ])
+    const ids = new Set(listed.flatMap((m) => [m?.modelId, m?.displayModelId]).filter(Boolean))
+    const raw = modelsOf(Array.isArray(j?.models) ? j.models : [], ids.size ? ids : null, listed)
+    if (!raw.length) throw new Error("Cursor listed no models")
+    lists.set(h, { at: Date.now(), raw })
+    listFailed.delete(h)
+    return raw
+  })()
+    .catch((e) => {
+      listFailed.set(h, Date.now())
+      throw e
+    })
+    .finally(() => listings.delete(h))
+  listings.set(h, p)
+  return p
+}
+
+// LIST_RETRY is how long a request goes on without the list after Cursor
+// couldn't give it, before it waits for an ask again.
+const LIST_RETRY = 5 * 60_000
+
+// listFor is the list a chat request picks its variant from. It is asked
+// before the Run, so a request never waits on it when it needn't: a list
+// past MODELS_KEEP is used as it is while a new one is asked for, and
+// after a failed ask the requests go without one for LIST_RETRY, as the
+// failed ask left them, instead of each waiting up to AvailableModels'
+// 30 s again before its Run (ysm119 on Discord: 33–36 s to the first
+// token on every Opus request). Only a token with no list at all, and no
+// failure lately, waits for it.
+async function listFor(tok) {
+  const h = createHash("sha256").update(tok).digest("hex")
+  const had = lists.get(h)
+  if (had && Date.now() - had.at < MODELS_KEEP) return had.raw
+  if (had) {
+    listing(tok, h).catch(() => {})
+    return had.raw
+  }
+  const failed = listFailed.get(h)
+  if (failed && Date.now() - failed < LIST_RETRY) return []
+  return listing(tok, h).catch(() => [])
 }
 
 // named is the model and variant an id the list doesn't have stands for,
@@ -1986,10 +2037,11 @@ async function agentURL(tok, fresh) {
 // had here (h2Blocked), the Runs after it go straight to HTTP/1.1 for
 // H2.retryAfter, or until a region error sends one back (answerOf); a
 // connection that failed (refused, no network) or a stream the server
-// refused leaves the next Run to try HTTP/2 again.
+// refused leaves the next Run to try HTTP/2 again. atOnce is how many
+// BidiAppends openH1 may have on their way at once.
 let h1Until = 0
 const cancelledOpen = () => ({ error: { status: 410, message: "the request was cancelled" }, h2Failed: false })
-async function open(base, headers, signal) {
+async function open(base, headers, signal, atOnce = H1.atOnce) {
   if (signal?.aborted) return cancelledOpen()
   if (Date.now() >= h1Until) {
     const o = await openH2(base, headers, signal)
@@ -2003,7 +2055,7 @@ async function open(base, headers, signal) {
     if (o.blocked) h1Until = Date.now() + H2.retryAfter
   }
   if (signal?.aborted) return cancelledOpen()
-  return openH1(headers, signal)
+  return openH1(headers, signal, atOnce)
 }
 
 const H2 = {
@@ -2070,7 +2122,15 @@ function openH2(base, headers, signal) {
   })
 }
 
-const H1 = { appendWait: 60_000 } // ms a BidiAppend may take before the Run fails, as cursor-agent's appendTimeoutMs
+const H1 = {
+  appendWait: 60_000, // ms a BidiAppend may take before the Run fails, as cursor-agent's appendTimeoutMs
+  // BidiAppends on their way at once, numbered in order, as cursor-agent
+  // keeps them: one at a time, a new Run's history (a blob a message,
+  // hundreds for a long conversation, all asked for at once) took a round
+  // trip to Cursor each before the model could start. A native session's
+  // Run keeps them one at a time (runNative).
+  atOnce: 16,
+}
 
 // connectCode is Connect's code for an HTTP status that came with no
 // Connect error of its own
@@ -2085,7 +2145,7 @@ function connectCode(status) {
 // is a 200 at once; an error Cursor says later, or a call that fails,
 // ends the stream with Connect's end frame, which runOnce reads as the
 // Run's own.
-function openH1(headers, signal) {
+function openH1(headers, signal, atOnce = H1.atOnce) {
   if (signal?.aborted) return Promise.resolve(cancelledOpen())
   const ac = new AbortController()
   const id = headers["x-request-id"]
@@ -2093,15 +2153,23 @@ function openH1(headers, signal) {
   let ended = false
   let seq = 0
   let reader
+  const going = new Set()
   const req = new Duplex({
     read() {},
     write(chunk, _enc, cb) {
       // runOnce writes one whole frame each time
       const msg = Buffer.from(chunk).subarray(5)
       const n = seq++
-      // Keep the write buffered until its append finishes, so callbacks and
-      // drain reflect the pending upload rather than an unbounded promise chain.
-      append(msg, n).then(() => cb(), (e) => cb(e))
+      const p = append(msg, n)
+      going.add(p)
+      const gone = () => going.delete(p)
+      p.then(gone, gone)
+      // Up to atOnce appends go at once; past that the write stays
+      // buffered until one finishes, so callbacks and drain reflect the
+      // pending upload rather than an unbounded promise chain. At one,
+      // a write's callback is its own append answered.
+      if (going.size < atOnce) return cb()
+      Promise.race(going).then(() => cb(), (e) => cb(e))
     },
   })
   const cleanup = () => {
@@ -2128,7 +2196,7 @@ function openH1(headers, signal) {
   }
   // append sends one message up. One that gets no answer by its deadline
   // (more time for a large one) ends the Run, as cursor-agent's
-  // bidi_append_deadline_exceeded does: the messages after it wait on it.
+  // bidi_append_deadline_exceeded does; so does one that fails.
   const append = async (msg, n) => {
     if (ended || ac.signal.aborted) return
     const body = pb().str(1, msg.toString("hex")).bytes(2, pb().str(1, id).done()).varint(3, n).done()
@@ -2364,6 +2432,9 @@ async function runNative({ tok, base, id, tools, conv, convID, signal, maxMode,
       "x-cursor-agent-allowed-tools": "mcp_tool_call,get_mcp_tools_tool_call",
     },
     native.ac.signal,
+    // one at a time: a native session counts a write as done only when
+    // Cursor answered its own append, so a tool result is never uncertain
+    1,
   )
   if (o.error) {
     native.fail(o.error)
@@ -2865,10 +2936,7 @@ async function answerOf(auth, chat, signal, session = "") {
   if (prepared.owner) r = prepared.owner.resume({ ...prepared, estimate: conversation(chat, tools).estimate }, signal)
   const model = String(chat.model ?? "")
   if (!r) {
-    let raw = []
-    try {
-      raw = await usable(tok)
-    } catch {}
+    const raw = await listFor(tok)
     // fast only when asked: a service_tier of priority or fast is on; any
     // other tier, or none, is off, unless the id is a fast one of Cursor's own
     const tier = chat.service_tier
@@ -3099,4 +3167,4 @@ export async function CursorAuthPlugin() {
 }
 
 // for tests
-export const _internal = { keychain, keychainToken, nativeTransport, onDemandOf,resetH1: () => (h1Until = 0), onH1: () => Date.now() < h1Until, resetTeam: () => { teamRead.at = 0; teamRead.info = null }, expireTeam: () => (teamRead.at = 0),H2, H1, h2Blocked, open, openH1, openH2, STEP_WAIT, stepUsage, usageKey, ledger, owed, flights, misses, unreadable, catalog, usable, request, modelsOf, tokensOf, maxRequired, conversationID, usageOf, sessionOf, SESSION, errorResponse, kept, poolBase, conversation, buildRun, decode, exec, fields, pb, pbValue, pbAny, frame, frames, failure, toolsOf, expiry }
+export const _internal = { listFor, lists, keychain, keychainToken, nativeTransport, onDemandOf,resetH1: () => (h1Until = 0), onH1: () => Date.now() < h1Until, resetTeam: () => { teamRead.at = 0; teamRead.info = null }, expireTeam: () => (teamRead.at = 0),H2, H1, h2Blocked, open, openH1, openH2, STEP_WAIT, stepUsage, usageKey, ledger, owed, flights, misses, unreadable, catalog, usable, request, modelsOf, tokensOf, maxRequired, conversationID, usageOf, sessionOf, SESSION, errorResponse, kept, poolBase, conversation, buildRun, decode, exec, fields, pb, pbValue, pbAny, frame, frames, failure, toolsOf, expiry }

package/package.json

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