cursor-opencode-provider 0.6.1 → 0.6.3

package/README.md

@@ -338,7 +338,7 @@ const model = cursor.languageModel("composer-2.5")
 // model implements AI SDK LanguageModelV3 (doStream / doGenerate)
 ```
 
-Pass either `accessToken` (JWT from OAuth or key exchange) or `apiKey` (raw `crsr_...` key). Optional: `apiBaseURL`, `agentBaseURL`, `cacheDir`, `headers`, `telemetryEnabled`, `retry`, and `continuation`. `cacheDir` pins the host cache root for model/version caches and Cursor project metadata; when omitted, the provider uses an injected structural host path bridge or the native OpenCode XDG cache described in [Paths](#paths-host-cache). Transient failures resume from the latest checkpoint produced by that Run, matching Cursor CLI; without an eligible checkpoint, retries remain limited to replay-safe attempts so completed text or tool work is not duplicated. Pending-tool inactivity is renewed by OpenCode activity from the session or its descendants. The older `baseURL` option is still accepted as a legacy alias for `agentBaseURL`.
+Pass either `accessToken` (JWT from OAuth or key exchange) or `apiKey` (raw `crsr_...` key). Optional: `apiBaseURL`, `agentBaseURL`, `cacheDir`, `headers`, `telemetryEnabled`, `retry`, and `continuation`. `cacheDir` pins the host cache root for model/version caches and Cursor project metadata; when omitted, the provider uses an injected structural host path bridge or the native OpenCode XDG cache described in [Paths](#paths-host-cache). Transient failures resume from the latest checkpoint produced by that Run, matching Cursor CLI; without an eligible checkpoint, retries remain limited to replay-safe attempts so completed text or tool work is not duplicated. Once that budget is spent, or replay is unsafe, the terminal error does not re-arm OpenCode's outer retry loop. Pending-tool inactivity is renewed by OpenCode activity from the session or its descendants. The older `baseURL` option is still accepted as a legacy alias for `agentBaseURL`.
 
 ## Environment variables
 

package/dist/errors.d.ts

@@ -43,6 +43,16 @@ export declare class CursorAuthError extends CursorProviderError {
         cause?: unknown;
     });
 }
+/**
+ * OpenCode's SessionRetry treats several substrings in provider error messages
+ * as always-retryable — notably bare "unavailable" and "exhausted", plus a
+ * broader regex set (resource_exhausted, service unavailable, …).
+ *
+ * When this provider has already spent its Run retry budget, or has decided a
+ * replay would be unsafe, the host-facing message must not re-arm that loop.
+ * Keep the real gRPC/HTTP code on structured fields (`code`, `grpcStatus`).
+ */
+export declare function sanitizeHostTerminalMessage(message: string): string;
 export declare class CursorRetryExhaustedError extends CursorProviderError {
     readonly attempts: number;
     constructor(attempts: number, last: CursorProviderError);

package/dist/errors.js

@@ -69,10 +69,30 @@ export class CursorAuthError extends CursorProviderError {
         this.name = "CursorAuthError";
     }
 }
+/**
+ * OpenCode's SessionRetry treats several substrings in provider error messages
+ * as always-retryable — notably bare "unavailable" and "exhausted", plus a
+ * broader regex set (resource_exhausted, service unavailable, …).
+ *
+ * When this provider has already spent its Run retry budget, or has decided a
+ * replay would be unsafe, the host-facing message must not re-arm that loop.
+ * Keep the real gRPC/HTTP code on structured fields (`code`, `grpcStatus`).
+ */
+export function sanitizeHostTerminalMessage(message) {
+    return message
+        .replace(/\bresource[_\s-]?exhausted\b/gi, "capacity_limit")
+        .replace(/\bservice[_\s-]?unavailable\b/gi, "capacity_limit")
+        .replace(/\bunavailable\b/gi, "capacity_limit")
+        .replace(/\boverloaded\b/gi, "capacity_limit")
+        .replace(/\bretry exhausted\b/gi, "retries finished")
+        .replace(/\bexhausted\b/gi, "finished");
+}
 export class CursorRetryExhaustedError extends CursorProviderError {
     attempts;
     constructor(attempts, last) {
-        super(`Cursor retry exhausted after ${attempts} attempts: ${last.message}`, {
+        // Host-facing text must not contain OpenCode SessionRetry trigger words
+        // ("unavailable", "exhausted", …). Structured fields keep the real code.
+        super(`Cursor Run failed after ${attempts} attempts: ${sanitizeHostTerminalMessage(last.message)}`, {
             origin: last.origin,
             transient: false,
             replaySafe: false,
@@ -184,7 +204,7 @@ export function toCursorProviderError(error, options = { replaySafe: false }) {
     });
 }
 export function retrySuppressedError(cause, reason, attempt, maxAttempts) {
-    const subject = cause.message.replace(/^Cursor Run stream /, "Cursor stream ");
+    const subject = sanitizeHostTerminalMessage(cause.message.replace(/^Cursor Run stream /, "Cursor stream "));
     return new CursorProviderError(`${subject} ${reason}; automatic retry unsafe (attempt ${attempt}/${maxAttempts})`, {
         origin: cause.origin,
         transient: false,

package/dist/language-model.js

@@ -1707,7 +1707,10 @@ export async function pump(session, controller, ids, abortSignal) {
         const counters = te ? cursorUsageCountersFromTurnEnded(te) : undefined;
         const usage = settledUsage ?? (te
             ? tokenDetails
-                ? buildLanguageModelV3UsageFromCounters(counters, { contextTotalTokens: tokenDetails.usedTokens })
+                ? buildLanguageModelV3UsageFromCounters(counters, {
+                    contextTotalTokens: tokenDetails.usedTokens,
+                    priorContextTokens: session.cacheDiagnostics?.priorTokenDetails?.usedTokens,
+                })
                 : emptyLanguageModelV3Usage()
             : emptyLanguageModelV3Usage());
         const providerMetadata = te

package/dist/usage.d.ts

@@ -10,6 +10,8 @@ export type CursorUsageCounters = {
 export type CursorUsageOptions = {
     /** Cursor checkpoint occupancy, including the current turn's output. */
     contextTotalTokens?: number;
+    /** Previous turn's occupancy. When Cursor's cache read covers this window, do not dilute the hit by multi-step TurnEnded aggregates. */
+    priorContextTokens?: number;
 };
 export type CursorCacheDiagnosticStats = {
     sessionKey?: string;

package/dist/usage.js

@@ -32,9 +32,17 @@ export function buildLanguageModelV3UsageFromCounters(counters, options = {}) {
     // TurnEnded can aggregate several internal model calls, so its absolute input
     // and cache counts can exceed the final checkpoint occupancy. Preserve the
     // cache proportions while normalizing the partition to Cursor's context total.
-    const cacheRead = rawInput > 0
+    const proportionalRead = rawInput > 0
         ? Math.min(input, Math.round(input * rawCacheRead / rawInput))
         : 0;
+    const priorContext = options.priorContextTokens;
+    const prefixRead = typeof priorContext === "number"
+        && Number.isFinite(priorContext)
+        && priorContext > 0
+        && rawCacheRead >= priorContext
+        ? Math.min(input, Math.trunc(priorContext))
+        : 0;
+    const cacheRead = Math.min(input, Math.max(proportionalRead, prefixRead));
     const cacheWrite = rawInput > 0
         ? Math.min(input - cacheRead, Math.round(input * rawCacheWrite / rawInput))
         : 0;
@@ -170,9 +178,13 @@ export function formatTurnUsageValidation(counters, usage, tokenDetails, context
         : undefined;
     const rawCached = counters.cacheRead + counters.cacheWrite;
     const sentCached = cacheRead + cacheWrite;
+    const proportionalCached = counters.inputTokens > 0 && input > 0
+        ? Math.round(input * rawCached / counters.inputTokens)
+        : 0;
     const cacheRatioMatch = tokenDetails
         ? counters.inputTokens > 0 && input > 0
             ? Math.abs(rawCached / counters.inputTokens - sentCached / input) <= 1 / input
+                || (sentCached >= proportionalCached && sentCached <= input)
             : rawCached === 0 && sentCached === 0
         : undefined;
     const status = input === inputParts &&

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cursor-opencode-provider",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "description": "Use Cursor subscription models from OpenCode via Cursor's Connect-RPC agent protocol",
   "type": "module",
   "license": "MIT",