Skip to content

Commit 6a64db1

Browse files
committed
fix(cursor): synthesize done on clean EOF after assistant output
1 parent 564c055 commit 6a64db1

2 files changed

Lines changed: 74 additions & 1 deletion

File tree

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,7 @@ class LiveCursorTransport implements CursorTransport {
428428
// close; safe to read after a stream failure because open() owns the only writer before run().
429429
private turnStartedAt = 0;
430430
private framesReceived = 0;
431+
private sawAssistantText = false;
431432
private firstFrameAt?: number;
432433
private firstFrameLogged = false;
433434
/** Stable session identifier sent as x-session-id; mirrors IDE session semantics. */
@@ -769,6 +770,7 @@ class LiveCursorTransport implements CursorTransport {
769770
): void {
770771
this.turnStartedAt = Date.now();
771772
this.framesReceived = 0;
773+
this.sawAssistantText = false;
772774
this.firstFrameAt = undefined;
773775
this.firstFrameLogged = false;
774776
const dialHost = cursorHostLabel(this.input.provider.baseUrl || "https://api2.cursor.sh");
@@ -1026,6 +1028,23 @@ class LiveCursorTransport implements CursorTransport {
10261028
settler.settleFail(new Error("Cursor stream ended before any response frame (unexpected EOF)"));
10271029
return;
10281030
}
1031+
if (state.terminated || this.expectedClose) {
1032+
releaseBacklogLease();
1033+
settler.settleFinish();
1034+
return;
1035+
}
1036+
if (state.openToolCalls.size > 0) {
1037+
for (const event of finalizeTurnEvents(state)) push(event);
1038+
releaseBacklogLease();
1039+
settler.settleFinish();
1040+
return;
1041+
}
1042+
if (this.framesReceived > 0 && this.sawAssistantText) {
1043+
for (const event of finalizeTurnEvents(state)) push(event);
1044+
releaseBacklogLease();
1045+
settler.settleFinish();
1046+
return;
1047+
}
10291048
releaseBacklogLease();
10301049
settler.settleFinish();
10311050
}, (err) => {
@@ -1100,6 +1119,7 @@ class LiveCursorTransport implements CursorTransport {
11001119
const awaitedNativeArgsBeforeMapping = update?.case === "toolCallCompleted"
11011120
&& state.openToolCalls.get(update.value.callId)?.awaitingNativeArgs === true;
11021121
const mapped = mapCursorProtobufServerMessage(message, state);
1122+
if (mapped.some(event => event.type === "text")) this.sawAssistantText = true;
11031123
const beganAwaitingNativeClientToolArgs = update?.case === "toolCallCompleted"
11041124
&& !awaitedNativeArgsBeforeMapping
11051125
&& state.openToolCalls.get(update.value.callId)?.awaitingNativeArgs === true;

‎tests/cursor-hardening.test.ts‎

Lines changed: 54 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@ import { describe, expect, spyOn, test } from "bun:test";
44
import {
55
AgentServerMessageSchema,
66
GetUsableModelsResponseSchema,
7+
KvServerMessageSchema,
78
ModelDetailsSchema,
9+
TextDeltaUpdateSchema,
10+
InteractionUpdateSchema,
811
} from "../src/adapters/cursor/gen/agent_pb";
9-
import { encodeConnectFrame } from "../src/adapters/cursor/framing";
12+
import { CONNECT_FLAG_END_STREAM, encodeConnectFrame } from "../src/adapters/cursor/framing";
1013
import { fetchCursorUsableModels } from "../src/adapters/cursor/live-models";
1114
import { armTimeoutDestroyFallback, createLiveCursorTransport, createTerminalSettler } from "../src/adapters/cursor/live-transport";
1215
import { createTestTranslatorBudget } from "./helpers/translator-budget";
@@ -371,6 +374,56 @@ describe("Cursor timeout destroy fallback", () => {
371374
});
372375

373376
describe("Cursor live transport unexpected EOF", () => {
377+
test("synthesizes done after assistant text on clean Connect EOF without turnEnded", async () => {
378+
const textFrame = encodeConnectFrame(toBinary(AgentServerMessageSchema, create(AgentServerMessageSchema, {
379+
message: {
380+
case: "interactionUpdate",
381+
value: create(InteractionUpdateSchema, {
382+
message: {
383+
case: "textDelta",
384+
value: create(TextDeltaUpdateSchema, { text: "hello" }),
385+
},
386+
}),
387+
},
388+
})));
389+
const kvFrame = encodeConnectFrame(toBinary(AgentServerMessageSchema, create(AgentServerMessageSchema, {
390+
message: {
391+
case: "kvServerMessage",
392+
value: create(KvServerMessageSchema, { id: 7 }),
393+
},
394+
})));
395+
const connectEnd = encodeConnectFrame(new TextEncoder().encode("{}"), {
396+
flags: CONNECT_FLAG_END_STREAM,
397+
});
398+
399+
await withDiscoveryServer(stream => {
400+
stream.respond({ ":status": 200, "content-type": "application/connect+proto" });
401+
stream.end(Buffer.from(new Uint8Array([...textFrame, ...kvFrame, ...connectEnd])));
402+
}, async baseUrl => {
403+
const transport = createLiveCursorTransport({
404+
provider: { adapter: "cursor", baseUrl, apiKey: "test-token" },
405+
translatorBudget: createTestTranslatorBudget(),
406+
firstFrameTimeoutMs: 2_000,
407+
});
408+
const messages: Array<{ type: string }> = [];
409+
try {
410+
for await (const message of transport.run({
411+
modelId: "composer-2",
412+
conversationId: "cursor_clean_eof_test",
413+
system: [],
414+
messages: [{ role: "user", content: "hello" }],
415+
})) {
416+
messages.push(message);
417+
}
418+
} finally {
419+
await transport.close?.();
420+
}
421+
422+
expect(messages).toContainEqual({ type: "text", text: "hello" });
423+
expect(messages.at(-1)).toMatchObject({ type: "done" });
424+
});
425+
});
426+
374427
test("zero-frame stream end surfaces as a transport error, not success", async () => {
375428
// Real h2c peer that accepts the request stream and immediately ends it with no
376429
// response frames — the shape the WP4 reviewer reproduced as a silent success.

0 commit comments

Comments
 (0)