@magpie-community/opencode-cursor-auth 0.2.7 → 0.2.9

package/index.mjs

@@ -723,17 +723,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
 }
@@ -1896,6 +1899,12 @@ async function* decode(stream, { send, blobs, tools, estimate, close, stepUsage,
   let said = 0
   // wrote: the reply's text alone; a turn of thinking only says nothing
   let wrote = 0
+  // what the Run sent, for an empty reply to name (#60): the thinking's
+  // length, Cursor's own tools it asked for and was refused, and updates
+  // and messages this doesn't read
+  const seen = { thinking: 0, refused: new Map(), updates: new Map(), messages: new Map() }
+  const count = (m, k) => m.set(k, (m.get(k) ?? 0) + 1)
+  const empty = (how) => ({ error: { status: 502, message: "an empty reply" + emptyWhy(how, seen, ended ? usage : null) } })
   let usage = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, reasoning: 0 }
   // counted: the step's usage is the dashboard's events, its own counted
   // with it or by a later step (ledger), never guessed
@@ -1941,7 +1950,7 @@ async function* decode(stream, { send, blobs, tools, estimate, close, stepUsage,
       if (f.end) {
         const e = failure(200, f.data)
         if (e.status < 200 || e.status > 299) yield { error: e }
-        else if (wrote === 0 && calls === 0) yield { error: { status: 502, message: "an empty reply" } }
+        else if (wrote === 0 && calls === 0) yield empty(endFrame(f.data))
         else yield await settled()
         return
       }
@@ -1966,6 +1975,7 @@ async function* decode(stream, { send, blobs, tools, estimate, close, stepUsage,
                   const t = pbStr(uf, 1)
                   if (t) {
                     said += t.length
+                    seen.thinking += t.length
                     yield { reasoning: t }
                   }
                   break
@@ -1976,7 +1986,7 @@ async function* decode(stream, { send, blobs, tools, estimate, close, stepUsage,
                   if (calls === 0) {
                     // nothing written and nothing called: an empty reply,
                     // which the client asks again, not a finished turn
-                    yield wrote === 0 ? { error: { status: 502, message: "an empty reply" } } : await settled()
+                    yield wrote === 0 ? empty("Cursor ended the turn") : await settled()
                     return
                   }
                   break
@@ -1987,12 +1997,14 @@ async function* decode(stream, { send, blobs, tools, estimate, close, stepUsage,
                     return
                   }
                   break
+                default:
+                  count(seen.updates, u.num)
               }
             }
             break
           case 2: {
             // exec_server_message: the server asks the client to run something
-            const call = exec(m.data, tools, send, closeExec)
+            const call = exec(m.data, tools, send, closeExec, seen.refused)
             if (call) {
               said += call.args.length
               yield { tool: { index: calls++, ...call } }
@@ -2021,6 +2033,8 @@ async function* decode(stream, { send, blobs, tools, estimate, close, stepUsage,
             }
             break
           }
+          default:
+            count(seen.messages, m.num)
         }
       }
     }
@@ -2038,10 +2052,33 @@ async function* decode(stream, { send, blobs, tools, estimate, close, stepUsage,
   }
 }
 
+// endFrame is how a Run's Connect end frame that said no error reads in
+// an empty reply's words: its JSON, cut short, or that it was empty.
+function endFrame(data) {
+  const t = Buffer.from(data ?? []).toString("utf8").trim()
+  if (!t || t === "{}") return "the Run's stream ended (an empty end frame)"
+  return `the Run's stream ended (end frame: ${t.length > 300 ? t.slice(0, 300) + "…" : t})`
+}
+
+// emptyWhy is what an empty reply says of what came before it (#60): how
+// it ended, the thinking, the turn's own count of output, Cursor's own
+// tools refused, and what Cursor sent that isn't read. Field numbers are
+// agent.v1's, so a report names the message that wasn't understood.
+function emptyWhy(how, seen, usage) {
+  const list = (m) => [...m].map(([k, n]) => (n > 1 ? `#${k} ×${n}` : `#${k}`)).join(", ")
+  const parts = [how]
+  parts.push(seen.thinking ? `after ${seen.thinking} chars of thinking, no text and no tool call` : "with no thinking, no text and no tool call")
+  if (usage) parts.push(`Cursor counted ${usage.output} output tokens`)
+  if (seen.refused.size) parts.push(`Cursor's own tools asked for and refused: ${list(seen.refused)}`)
+  if (seen.updates.size) parts.push(`updates not read: ${list(seen.updates)}`)
+  if (seen.messages.size) parts.push(`messages not read: ${list(seen.messages)}`)
+  return ` (${parts.join("; ")}; try again)`
+}
+
 // exec answers what the server asks the client to run: a call of the
 // caller's tools is returned, the list of them is given, and anything else
 // is refused.
-function exec(msg, tools, send, closeExec) {
+function exec(msg, tools, send, closeExec, refused) {
   const es = fields(msg)
   const id = pbNum(es, 1)
   const execID = pbStr(es, 15)
@@ -2080,6 +2117,8 @@ function exec(msg, tools, send, closeExec) {
     }
   }
   // a shell, a file read or an edit of Cursor's own: never run
+  const kind = es.find((e) => e.num !== 1 && e.num !== 15)?.num ?? 0
+  refused?.set(kind, (refused.get(kind) ?? 0) + 1)
   send(pb().bytes(5, pb().bytes(2, pb().varint(1, id).str(2, "not available"))).done())
   closeExec(id)
   return null

package/package.json

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