Skip to content

Commit c1b0b1c

Browse files
authored
Merge pull request #366 from lidge-jun/fix/cursor-external-requested-model
fix(cursor): stable conversation continuity for store:false turns
2 parents 9c02cad + efc13bb commit c1b0b1c

13 files changed

Lines changed: 1037 additions & 84 deletions

‎src/adapters/cursor.ts‎

Lines changed: 44 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
1+
import { createHash } from "node:crypto";
12
import type { AdapterEvent, OcxProviderConfig } from "../types";
23
import type { ProviderAdapter } from "./base";
34
import { cursorExecDeniedMessage, cursorRequestDeclaresFullAccess } from "./cursor/exec-policy";
45
import { isCursorBenignCancelError, isCursorInvalidArgumentError, safeCursorErrorMessage } from "./cursor/cursor-errors";
56
import { isCursorExternalWireModel } from "./cursor/discovery";
67
import { createCursorKvStore, type CursorKvStore } from "./cursor/kv-store";
78
import { mapCursorServerMessage } from "./cursor/message-mapper";
8-
import { createCursorRequest, generatedCursorConversationId } from "./cursor/request-builder";
9+
import { createCursorRequest } from "./cursor/request-builder";
910
import {
1011
createLiveCursorTransport,
1112
CursorMissingCredentialError,
1213
rekeyCursorContextUsage,
14+
resolveCursorToken,
1315
} from "./cursor/live-transport";
16+
import { rememberCursorThreadConversation } from "./cursor/thread-continuity";
1417
import { runCursorTurnWithRetry } from "./cursor/transport-retry";
1518
import {
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) {

‎src/adapters/cursor/live-transport.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -826,6 +826,11 @@ class LiveCursorTransport implements CursorTransport {
826826
return;
827827
}
828828
}
829+
// Native exec/MCP is handled inside this transport and can mutate files/process state
830+
// without emitting a Responses tool event. Mark the turn replay-unsafe before executing so
831+
// an eventual invalid_argument cannot cause the adapter's fresh-conversation fallback to
832+
// run the same local action twice.
833+
push({ type: "local_side_effect" });
829834
const replies = await handleCursorNativeExec(message.message.value, this.execContext);
830835
for (const reply of replies) this.stream.write(encodeConnectFrame(reply));
831836
return;
@@ -916,6 +921,8 @@ function describeCursorServerFrame(message: AgentServerMessage): Record<string,
916921
out.id = message.message.value.id;
917922
} else if (message.message.case === "kvServerMessage") {
918923
out.kv = message.message.value.message.case ?? "unknown";
924+
} else if (message.message.case === "conversationCheckpointUpdate") {
925+
out.usedTokens = message.message.value.tokenDetails?.usedTokens ?? 0;
919926
}
920927
return out;
921928
}

‎src/adapters/cursor/message-mapper.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,8 @@ export function mapCursorServerMessage(
4242
case "exec":
4343
state.writeClient(cursorExecResult(message.requestId, message.execCase));
4444
return [];
45+
case "local_side_effect":
46+
// Internal retry-safety signal only; keep the bridge alive without producing protocol output.
47+
return [{ type: "heartbeat" }];
4548
}
4649
}

0 commit comments

Comments
 (0)