@magpie-community/opencode-cursor-auth 0.2.38 → 0.2.40

package/README.md

@@ -99,7 +99,10 @@ plugin's `fetch` answers them on Cursor's agent API:
 
 Tool results can continue a retained Run in the same plugin process. The owner
 uses the same session/cache key and first user message as `conversation_id`, so
-Task subagents sharing their parent's session can run independently. Retention
+Task subagents sharing their parent's session can run independently. A new
+user turn whose earlier native calls all have their results gets a retained Run
+of its own, with those calls as imported history; while any of them is still
+pending, the turn goes stateless. Retention
 waits at most 120 seconds for a result batch and 15 minutes for a Run's total
 lifetime. A continuation arriving with less than 10 minutes of that lifetime
 left rebuilds from supplied history on a fresh Run before submitting results
@@ -208,17 +211,36 @@ minutes), the way pi-cursor-sdk lists Cursor's catalog:
   has. A model the usable list has nothing of is the picker's alone
   (GLM-5.3) and is kept whole; so is every model when Cursor can't give
   the usable list.
-- A family the usable list has and the picker doesn't (an account whose
-  picker lacks Claude Opus 5.5 while `cursor-agent models` lists
-  `claude-opus-5-5-low` to `-max`) is listed once under its family id
-  (`claude-opus-5-5`), its efforts as variants, and goes as the usable id
-  those parameters pick, never as the family id Cursor doesn't know. A
-  picker model whose chosen variant isn't one the account can use goes as
-  its family's nearest usable id the same way. Such a family is named
-  without the tier Cursor's names carry ("Claude Opus 5 1M Medium
-  Thinking" is listed as Claude Opus 5 Thinking): the tier is the
-  reasoning level the agent asks for (low to max, as the account has
-  them), fast the request's `service_tier`.
+- The full catalog (`AvailableModels` with `scope: 3`, asked alongside the
+  other two; it also lists the models Cursor hides from an account, Claude
+  from a Pro one) supplies the Anthropic models the picker lacks: each live
+  one (not `isHidden`, not Auto, not chat-only or Tab-only) with a variant
+  the usable list has an id for is listed as the picker's models are, once
+  for each context size (`claude-opus-5-5@300k`, `claude-opus-5-5@1m`; name
+  "Claude Opus 5.5 @ 300k"), thinking a parameter, the efforts the account
+  is served, and the larger size in Max Mode with that `context`. A catalog
+  variant without its own id gets the one of the model's ids that says its
+  effort, thinking and fast; with none or several it is not offered. Only
+  the parameters the model defines are sent (the catalog's variants also
+  carry `cyber=false`, which the picker's don't and cursor-agent never
+  sends). With no effort asked, a model goes at Cursor's default variant
+  (Opus 5 and 4.8: high), as the picker's models do, not at medium as the
+  fallback entries did. The picker's models and every model that is not
+  Anthropic's don't change.
+  An id saved from an earlier list (`claude-opus-5-5`,
+  `claude-opus-4-8-thinking@1m`) runs as the model at the nearest size it
+  has, as a usable id.
+- When Cursor can't give the catalog, a family the usable list has and the
+  picker doesn't (`claude-opus-5-5-low` to `-max`) is listed once under its
+  family id (`claude-opus-5-5`), its efforts as variants, and goes as the
+  usable id those parameters pick, never as the family id Cursor doesn't
+  know; it has no window in the usable list, so 200K is assumed. A picker
+  model whose chosen variant isn't one the account can use goes as its
+  family's nearest usable id the same way. Such a family is named without
+  the tier Cursor's names carry ("Claude Opus 5 1M Medium Thinking" is
+  listed as Claude Opus 5 Thinking): the tier is the reasoning level the
+  agent asks for (low to max, as the account has 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. So does a

package/index.mjs

@@ -1082,6 +1082,69 @@ function modelsOf(picker, ids, listed = []) {
   return out
 }
 
+// slugFor is the id of a variant the full catalog (AvailableModels with
+// scope 3) gives no legacySlug: the one of the model's legacySlugs that says
+// the variant's effort (any, when it has none), thinking and fast; an id
+// with no effort in it (gpt-5.3-codex) stands for the default's effort. With
+// none, or more than one, "": a guess could send an id Cursor refuses.
+function slugFor(m, v) {
+  if (v.legacySlug) return v.legacySlug
+  const have = valuesOf(v)
+  const level = (p) => String(p[EFFORT_PARAMS.find((k) => p[k])] ?? "").replace("extra-high", "xhigh")
+  const effort = level(have)
+  const slugs = (Array.isArray(m.legacySlugs) ? m.legacySlugs : []).filter((id) => typeof id === "string" && id).map((id) => ({ id, ...familyOf(id) }))
+  const says = (s, at) =>
+    (at === null || s.effort === at) &&
+    (have.thinking === undefined || s.family.endsWith("-thinking") === (have.thinking === "true")) &&
+    (have.fast === undefined || s.fast === (have.fast === "true"))
+  let hits = slugs.filter((s) => says(s, effort || null))
+  const def = m.variants.find((x) => x?.isDefaultNonMaxConfig)
+  if (!hits.length && effort && level(valuesOf(def)) === effort) hits = slugs.filter((s) => says(s, ""))
+  return hits.length === 1 ? hits[0].id : ""
+}
+
+// withSlugs is a catalog model with each variant's own id filled in, and
+// only the parameters the model defines: the full catalog is the admin
+// settings one, and carries what the picker's variants don't (cyber=false
+// on Opus 4.7 to 5.5, which cursor-agent never sends). A variant slugFor
+// can't name keeps no id of its own, but never goes without one: served()
+// leaves a variant with no legacySlug in, and one the account can't run
+// would be listed. So it gets a mark no usable id has, and modelsOf lists
+// it as it does a variant the account hasn't got. The variants are never
+// null.
+const NO_ID = "\u0000no-id"
+function withSlugs(m) {
+  const defined = new Set((Array.isArray(m.parameterDefinitions) ? m.parameterDefinitions : []).map((d) => d?.id))
+  const vs = (Array.isArray(m.variants) ? m.variants : [])
+    .filter((v) => v && typeof v === "object" && Array.isArray(v.parameterValues ?? []))
+    .map((v) => ({ ...v, parameterValues: (v.parameterValues ?? []).filter((p) => defined.has(p?.id)) }))
+  const full = { ...m, variants: vs }
+  return { ...full, variants: vs.map((v) => (v.legacySlug ? v : { ...v, legacySlug: slugFor(full, v) || NO_ID })) }
+}
+
+// fromCatalog is the live models of Cursor's full catalog (AvailableModels
+// with scope 3, which also lists the models Cursor hides from some accounts:
+// Claude, from a Pro one) that the picker lacks, as picker models, with only
+// the variants the account can run (withSlugs). modelsOf lists them as it
+// does the picker's: once for each context size, thinking a parameter, the
+// efforts the account is served. Only Anthropic's are taken: the models the
+// picker lists, and every other id of the usable list, stay as they are.
+// Not offered: one the picker has or lists under another name, a hidden one
+// (isHidden: no longer offered), Auto, one the picker leaves out (chat-only,
+// Tab-only, no agent), and one with no variant the account has an id for.
+function fromCatalog(picker, catalog, ids) {
+  const have = new Set(picker.map((m) => m?.name))
+  const out = []
+  for (const m of Array.isArray(catalog) ? catalog : []) {
+    if (!m?.name || have.has(m.name) || m.isHidden || m.name === "default") continue
+    if (m.vendor?.id !== "MODEL_VENDOR_ID_ANTHROPIC") continue
+    if (m.isChatOnly || m.onlySupportsCmdK || m.supportsAgent === false || PICKER_SKIP.has(m.name)) continue
+    const full = withSlugs(m)
+    if (full.variants.some((v) => ids.has(v.legacySlug))) out.push(full)
+  }
+  return out
+}
+
 // fastAt is whether Cursor has a fast variant the account is served at
 // the context size (any, for a model without sizes): what magpie offers
 // fast for, which 0.1.x said with a -fast model of its own.
@@ -1215,15 +1278,23 @@ function listing(tok, h) {
   let p = listings.get(h)
   if (p) return p
   p = (async () => {
-    const [j, listed] = await Promise.all([
+    const [j, listed, catalog] = 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 : []),
         () => [],
       ),
+      // the full catalog, scope 3: the live models the picker lacks (Claude,
+      // on an account Cursor blocks it for); without it the list is the
+      // picker's and the usable list's, as before
+      unary(API, "aiserver.v1.AiService/AvailableModels", tok, { useModelParameters: true, doNotUseMarkdown: true, scope: 3 }, 8_000).then(
+        (c) => (Array.isArray(c?.models) ? c.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)
+    const picker = Array.isArray(j?.models) ? j.models : []
+    const raw = modelsOf(ids.size ? [...picker, ...fromCatalog(picker, catalog, ids)] : picker, 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)
@@ -1330,7 +1401,16 @@ function named(raw, id) {
       return { entry: near, seed: undefined, effort: "", fast: false }
     }
     const old = named(raw, sized[1])
-    if (old) return { ...old, max: !old.entry.size && want > old.entry.context }
+    if (old) {
+      // the name's model at the nearest size it has (claude-opus-4-8-thinking@1m,
+      // an id an earlier list had, is Opus 4.8 at 1m with thinking)
+      const sizes = raw.filter((e) => e.size && e.model === old.entry.model)
+      if (old.entry.size && sizes.length) {
+        const near = sizes.reduce((a, b) => (Math.abs(tokensOf(b.size) - want) < Math.abs(tokensOf(a.size) - want) ? b : a))
+        return { ...old, entry: near }
+      }
+      return { ...old, max: !old.entry.size && want > old.entry.context }
+    }
   }
   return null
 }
@@ -3535,4 +3615,4 @@ export async function CursorAuthPlugin(input) {
 }
 
 // for tests
-export const _internal = { credits, kvReply, 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 }
+export const _internal = { slugFor, fromCatalog, credits, kvReply, 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/native-session.mjs

@@ -796,7 +796,15 @@ export class NativeSessionPool {
     }
     // Pending ancestors, new input, and terminal old handles are ordinary
     // imported history, even while a parent Run is still awaiting its results.
-    if (chat.messages.some((m) => m?.tool_calls?.some((c) => HANDLE.test(c?.id ?? "")))) return fallback("historical native calls")
+    // A fresh user turn whose old native calls all have results imports them
+    // into a NEW owner; those results are never submitted to their old exec.
+    const historical = chat.messages.flatMap((m) => (m?.tool_calls ?? []).filter((c) => HANDLE.test(c?.id ?? "")))
+    if (historical.length) {
+      const answered = new Set(chat.messages.filter((m) => m?.role === "tool").map((m) => m.tool_call_id))
+      const last = chat.messages.at(-1)
+      const freshTurn = last?.role === "user" && !toolAttachment(last)
+      if (!freshTurn || historical.some((c) => !answered.has(c.id))) return fallback("historical native calls")
+    }
     if (selector && this.selectors.has(account + ":" + selector)) return fallback("owner busy")
     return { account, selector, controls, selected: !!selector, chat }
   }

package/package.json

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