1+ import { createHash } from "node:crypto" ;
12import type { AdapterEvent , OcxProviderConfig } from "../types" ;
23import type { ProviderAdapter } from "./base" ;
34import { cursorExecDeniedMessage , cursorRequestDeclaresFullAccess } from "./cursor/exec-policy" ;
45import { isCursorBenignCancelError , isCursorInvalidArgumentError , safeCursorErrorMessage } from "./cursor/cursor-errors" ;
56import { isCursorExternalWireModel } from "./cursor/discovery" ;
67import { createCursorKvStore , type CursorKvStore } from "./cursor/kv-store" ;
78import { mapCursorServerMessage } from "./cursor/message-mapper" ;
8- import { createCursorRequest , generatedCursorConversationId } from "./cursor/request-builder" ;
9+ import { createCursorRequest } from "./cursor/request-builder" ;
910import {
1011 createLiveCursorTransport ,
1112 CursorMissingCredentialError ,
1213 rekeyCursorContextUsage ,
14+ resolveCursorToken ,
1315} from "./cursor/live-transport" ;
16+ import { rememberCursorThreadConversation } from "./cursor/thread-continuity" ;
1417import { runCursorTurnWithRetry } from "./cursor/transport-retry" ;
1518import {
1619 createDisabledCursorTransport ,
@@ -77,16 +80,36 @@ export function createCursorAdapter(provider: OcxProviderConfig, deps: CursorAda
7780 const makeTransport = deps . createTransport ?? createLiveCursorTransport ;
7881 const kv = deps . kv ?? createCursorKvStore ( ) ;
7982 const rekeyContextUsage = deps . rekeyContextUsage ?? rekeyCursorContextUsage ;
80- _parsed . _cursorConversationId ??= generatedCursorConversationId ( ) ;
83+ // Namespace thread→conversation derivation by the authenticated Cursor credential so
84+ // shared-proxy tenants with different Cursor accounts cannot collide on a parent thread id.
85+ // Prefer an already-set auth scope (e.g. Codex pool account) when present.
86+ if ( ! _parsed . _cursorIdentityScope ) {
87+ try {
88+ const token = resolveCursorToken ( provider , incoming . headers ) ;
89+ _parsed . _cursorIdentityScope = createHash ( "sha256" )
90+ . update ( "ocx:cursor:acct:" )
91+ . update ( token )
92+ . digest ( "hex" )
93+ . slice ( 0 , 16 ) ;
94+ } catch {
95+ /* Missing credential is handled by the live transport path below. */
96+ }
97+ }
8198 const previousConversationId = _parsed . _cursorConversationId ;
8299 let request = createCursorRequest ( _parsed ) ;
83- // Keep remembered conversation id in sync when the request builder mints a fresh id
84- // for external-model tool-result continuations (stateless replay).
85- if ( request . conversationId !== previousConversationId ) {
100+ // The builder may derive a stable provider id from the client thread when Responses state
101+ // is unavailable. Rekey only existing state; there is nothing to migrate on a fresh turn,
102+ // and isolated helper/compaction turns must never inherit or donate the parent's usage state.
103+ if (
104+ previousConversationId
105+ && request . conversationId !== previousConversationId
106+ && _parsed . _cursorIsolateConversation !== true
107+ ) {
86108 rekeyContextUsage ( previousConversationId , request . conversationId ) ;
87109 }
88110 _parsed . _cursorConversationId = request . conversationId ;
89111 let emittedOutput = false ;
112+ let replayUnsafe = false ;
90113 const lastRawIsToolResult = _parsed . context . messages . at ( - 1 ) ?. role === "toolResult" ;
91114
92115 const runOnce = async ( activeRequest : ReturnType < typeof createCursorRequest > ) => {
@@ -104,6 +127,7 @@ export function createCursorAdapter(provider: OcxProviderConfig, deps: CursorAda
104127 emit ( { type : "error" , message : "Cursor turn was aborted." } ) ;
105128 return ;
106129 }
130+ if ( message . type === "local_side_effect" ) replayUnsafe = true ;
107131 const events = mapCursorServerMessage ( message , {
108132 kv,
109133 writeClient : clientMessage => {
@@ -121,14 +145,15 @@ export function createCursorAdapter(provider: OcxProviderConfig, deps: CursorAda
121145 try {
122146 await runOnce ( request ) ;
123147 } catch ( err ) {
124- // One-shot fallback: only for external-model tool-result continuations that fail
125- // with Connect invalid_argument before any non-heartbeat output was forwarded.
126- // Replaying after text/tool events would duplicate output.
148+ // One-shot fallback for external-model Connect invalid_argument before any
149+ // non-heartbeat output. Retries apply only to safe plain-user turns; tool-result
150+ // resumes, local exec/MCP side effects, and already-emitted output fail closed .
127151 if (
128152 ! isCursorInvalidArgumentError ( err )
129153 || ! isCursorExternalWireModel ( request . modelId )
130- || ! lastRawIsToolResult
154+ || lastRawIsToolResult
131155 || emittedOutput
156+ || replayUnsafe
132157 || incoming . abortSignal ?. aborted
133158 ) {
134159 throw err ;
@@ -138,6 +163,16 @@ export function createCursorAdapter(provider: OcxProviderConfig, deps: CursorAda
138163 request = createCursorRequest ( _parsed , { forceFreshConversation : true } ) ;
139164 rekeyContextUsage ( failedConversationId , request . conversationId ) ;
140165 _parsed . _cursorConversationId = request . conversationId ;
166+ // Persist recovery for store:false clients that only send a parent thread id, so the
167+ // next turn does not recompute the stale deterministic thread hash. Isolated helper /
168+ // compaction turns must not park their throwaway id under the parent thread key.
169+ if ( _parsed . _clientThreadId && _parsed . _cursorIsolateConversation !== true ) {
170+ rememberCursorThreadConversation (
171+ _parsed . _clientThreadId ,
172+ request . conversationId ,
173+ _parsed . _cursorIdentityScope ,
174+ ) ;
175+ }
141176 await runOnce ( request ) ;
142177 }
143178 } catch ( err ) {
0 commit comments