cursor-opencode-provider 0.6.0 → 0.6.2

package/README.md

@@ -368,8 +368,12 @@ bun run typecheck    # type-check without emit
 bun test             # run unit tests
 bun run test:node-http2 # Node-specific HTTP/2 detach regression
 bun run test:watch   # watch mode
+bun run generate:pricing  # refresh src/pricing-data.ts from Cursor docs
+bun run check:pricing     # fixture coverage for known model ids
 ```
 
+Before any version bump or `v*` tag, run `generate:pricing` and `check:pricing` and commit mapping/`pricing-data.ts` updates. Publish CI regenerates rates from the live docs; an unmapped Cursor display name fails the job.
+
 ## Architecture
 
 ```

package/dist/context/plugins.js

@@ -16,6 +16,7 @@ async function listLocalPlugins(dir) {
     catch {
         return [];
     }
+    entries.sort();
     for (const name of entries) {
         if (!/\.(m?[jt]s)$/.test(name))
             continue;

package/dist/context/rules.js

@@ -109,6 +109,7 @@ async function expandGlob(pattern, workspaceRoot) {
         catch {
             return;
         }
+        entries.sort();
         for (const name of entries) {
             if (name === "node_modules" || name === ".git")
                 continue;

package/dist/context/skills.js

@@ -63,6 +63,7 @@ async function scanSkillsRoot(root, out) {
     catch {
         return;
     }
+    entries.sort();
     for (const name of entries) {
         const skillMd = path.join(root, name, "SKILL.md");
         if (!(await exists(skillMd)))

package/dist/language-model.js

@@ -625,12 +625,18 @@ async function startSession(modelId, token, callOptions, options, startOptions)
     // Compaction must not reuse the prior conversation; its first normal turn
     // must also rebase so the summary-agent checkpoint cannot replace the normal
     // system prompt and OpenCode's newly compacted history.
+    const lifecycle = !allowTools && !isCompaction && !recovery;
     let bound = resuming
         ? { conversationId: resumeRecovery.conversationId, reset: false, previousId: undefined }
-        : bindConversationId(sessionKey, { reset: resetState.reset || recovery?.kind === "rebase" });
-    let conversationState = resuming
-        ? resumeRecovery.checkpoint
-        : (bound.reset ? undefined : getCheckpoint(bound.conversationId));
+        : bindConversationId(sessionKey, {
+            reset: resetState.reset || recovery?.kind === "rebase",
+            ephemeral: lifecycle,
+        });
+    let conversationState = lifecycle
+        ? undefined
+        : resuming
+            ? resumeRecovery.checkpoint
+            : (bound.reset ? undefined : getCheckpoint(bound.conversationId));
     let checkpointGraph = conversationState
         ? inspectConversationBlobGraph(bound.conversationId, conversationState)
         : { count: 0, bytes: 0, complete: true };
@@ -685,12 +691,13 @@ async function startSession(modelId, token, callOptions, options, startOptions)
     const interactionGuidance = buildOpenCodeInteractionGuidance(cursorTools, isCompaction, workspaceRoot);
     // After an approved SwitchMode, inject the Cursor CLI-shaped mode reminder
     // (same <system_reminder> contract the CLI uses after flipping unifiedMode).
-    const modeReminder = isCompaction
+    const startedWithCheckpoint = !!conversationState;
+    const modeReminder = isCompaction || startedWithCheckpoint || lifecycle
         ? undefined
         : takeActiveCursorModeReminder(sessionKey, {
             advertisedTools: cursorTools.map((tool) => tool.name),
         });
-    const kickoffWarning = isCompaction
+    const kickoffWarning = isCompaction || startedWithCheckpoint || lifecycle
         ? undefined
         : takePlanExecutionKickoffWarning(sessionKey);
     const systemPrompt = [
@@ -898,7 +905,7 @@ async function startSession(modelId, token, callOptions, options, startOptions)
             displayToolCalls: 0,
             execRequests: 0,
         },
-        openCodeSessionId: sessionKey,
+        openCodeSessionId: lifecycle ? undefined : sessionKey,
         postCompactionRebase: isCompaction,
         toolCatalog: snapshotToolCatalog(sessionKey),
         stream,
@@ -1700,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
@@ -2790,6 +2800,9 @@ export function spanEndParts(opts) {
         out.push({ type: "text-end", id: opts.textId });
     return out;
 }
+function toolsInFixedOrder(tools) {
+    return tools.map((tool) => ({ ...tool })).sort((left, right) => (left.name ?? "").localeCompare(right.name ?? ""));
+}
 /** Exported for tests — false for compaction/summary (no tools) and toolChoice none. */
 export function computeAllowTools(toolCount, toolChoice) {
     return toolCount > 0 && toolChoice?.type !== "none";
@@ -2797,7 +2810,7 @@ export function computeAllowTools(toolCount, toolChoice) {
 export async function resolveTurnToolState(input) {
     const { sessionKey, incomingTools, isCompaction } = input;
     if (sessionKey && incomingTools.length > 0) {
-        rememberToolCatalog(sessionKey, incomingTools.map((tool) => ({ ...tool })));
+        rememberToolCatalog(sessionKey, toolsInFixedOrder(incomingTools));
     }
     // Advertisement and permission are deliberately independent.
     //
@@ -2818,12 +2831,12 @@ export async function resolveTurnToolState(input) {
     // still refuse execution and cannot duplicate the real turn's side effects.
     let advertisedTools;
     if (incomingTools.length > 0) {
-        advertisedTools = incomingTools;
+        advertisedTools = toolsInFixedOrder(incomingTools);
     }
     else if (sessionKey) {
         const cached = toolCatalogBySession.get(sessionKey)
             ?? await waitForSiblingToolCatalog(sessionKey, input.abortSignal);
-        advertisedTools = cached.map((tool) => ({ ...tool }));
+        advertisedTools = toolsInFixedOrder(cached);
     }
     else {
         // Without a session key there is no safe sibling-correlation key. Preserve

package/dist/protocol/conversation-bind.d.ts

@@ -24,6 +24,7 @@ export declare function peekConversationId(sessionKey: string): string;
  */
 export declare function bindConversationId(sessionKey: string | undefined, opts?: {
     reset?: boolean;
+    ephemeral?: boolean;
 }): {
     conversationId: string;
     reset: boolean;

package/dist/protocol/conversation-bind.js

@@ -76,6 +76,9 @@ export function peekConversationId(sessionKey) {
  * mint a new id so TurnEnded cache_read cannot keep overflowing OpenCode.
  */
 export function bindConversationId(sessionKey, opts) {
+    if (opts?.ephemeral) {
+        return { conversationId: crypto.randomUUID(), reset: false };
+    }
     if (!sessionKey) {
         return { conversationId: crypto.randomUUID(), reset: !!opts?.reset };
     }

package/dist/protocol/struct.js

@@ -249,7 +249,7 @@ export function encodeJsonAsValue(v) {
     }
     else if (typeof v === "object") {
         const st = [];
-        for (const [key, val] of Object.entries(v)) {
+        for (const [key, val] of Object.entries(v).sort(([left], [right]) => left.localeCompare(right))) {
             if (val === undefined)
                 continue;
             const entry = [];

package/dist/protocol/tools.js

@@ -57,7 +57,9 @@ export function resolveToolServerIdentity(opencodeName, defaultServer = "opencod
  * reconstructed in `mcpRealToolName`.
  */
 export function toolsToDescriptors(tools, providerIdentifier = "opencode", knownMcpServers = []) {
-    return tools.map((t) => {
+    return [...tools]
+        .sort((left, right) => left.name.localeCompare(right.name))
+        .map((t) => {
         const id = resolveToolServerIdentity(t.sourceName ?? t.name, providerIdentifier, knownMcpServers);
         const collisionSafeAlias = COLLISION_SAFE_ALIASES.has(t.name);
         return {

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.0",
+  "version": "0.6.2",
   "description": "Use Cursor subscription models from OpenCode via Cursor's Connect-RPC agent protocol",
   "type": "module",
   "license": "MIT",