@magpie-community/opencode-cursor-auth 0.2.18 → 0.2.19

package/index.mjs

@@ -2656,12 +2656,12 @@ async function answerOf(auth, chat, signal, session = "") {
       let response = native ? await runNative({ ...args, native }) : await runOnce(args)
       const rebuild = async () => {
         const fallback = await runOnce(args)
-        fallback.diagnostic = "stateless; bootstrap=imported-history; reason=missing-batch-count"
+        fallback.diagnostic = "stateless; bootstrap=imported-history; reason=" + (response.error?.continuityReason || "missing-batch-count")
         return fallback
       }
-      // A missing native batch count may be retried once, only before Chat
-      // output is exposed or any native result was submitted. Never repeat an
-      // uncertain tool result write or duplicate a progressive stream's output.
+      // A missing or conflicting native batch count may be retried once,
+      // only before Chat output is exposed or any native result was submitted.
+      // Never repeat an uncertain tool write or progressive stream output.
       if (response.error?.retentionIneligible && !signal?.aborted) response = await rebuild()
       else if (native) response.rebuild = rebuild
       response.diagnostic ??= "stateless; bootstrap=imported-history; reason=" + (prepared.fallback || "retention capacity or reservation unavailable")
@@ -2719,8 +2719,10 @@ async function answerOf(auth, chat, signal, session = "") {
       for await (const e of events) {
         if (e.error) {
           if (!e.error.retentionIneligible || !r.rebuild || signal?.aborted) return errorResponse(e.error)
+          const reason = e.error.continuityReason
           r = await r.rebuild()
           if (r.error) return errorResponse(r.error)
+          if (reason) r.diagnostic = "stateless; bootstrap=imported-history; reason=" + reason
           events = r.events
           responseHeaders["X-Magpie-Cursor-Continuity"] = r.diagnostic
           retry = true

package/native-session.mjs

@@ -675,7 +675,13 @@ class NativeSession {
   }
   listed(count) {
     if (!Number.isSafeInteger(count) || count < 1) invalid("invalid native tool count", 502)
-    if (this.segment.expected != null && this.segment.expected !== count) invalid("inconsistent native tool count", 502)
+    if (this.segment.expected != null && this.segment.expected !== count) {
+      // Conflicting counts leave the native step boundary ambiguous. Retire
+      // this owner; Chat may rebuild from history only if no native result
+      // was submitted to this Run.
+      this.fail({ status: 502, message: "inconsistent native tool count", retentionIneligible: !this.resultSubmitted, continuityReason: "inconsistent-batch-count" })
+      return
+    }
     this.segment.expected = count
     if (this.state === "awaiting-results") return // an identical retransmission
     this.waitForBatch()
@@ -876,7 +882,10 @@ class NativeSession {
                 } else if (u.num === 14) {
                   if (!this.segment.content && !this.segment.calls.length) invalid("an empty reply (Cursor ended the turn without text or a tool call)", 502)
                   this.terminalSeen(uf)
-                } else if (u.num === 27) this.listed(num(uf, 1))
+                } else if (u.num === 27) {
+                  this.listed(num(uf, 1))
+                  if (this.error) return
+                }
               }
               break
             case 2: {

package/package.json

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