Skip to content

Commit 47bbffb

Browse files
yansigitcursoragent
andcommitted
fix(cursor): tighten review findings for Desktop vision promote
Scope transparent developer suffixes to multi_agent_mode, reuse that continuation helper for invalid_argument retry gating, omit oversized prepared images instead of failing the turn, and rebuild text messages after JPEG prep so omission markers reach activePromptText. Co-authored-by: Cursor <[email protected]>
1 parent a76c091 commit 47bbffb

8 files changed

Lines changed: 167 additions & 15 deletions

File tree

‎docs-site/src/content/docs/reference/configuration/providers.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -272,9 +272,10 @@ selection on every request. They remain available when live discovery omits `def
272272

273273
Native Cursor vision uses `SelectedImage` (JPEG soft-cap + `blobIdWithData`) for models that can see
274274
images natively — Claude, Gemini, GPT, Kimi, and Grok among them. `auto` and `composer-*` stay on
275-
the curated `noVisionModels` list and use the vision describe sidecar instead. Trailing non-image
276-
`developer` injections (Codex Desktop multi-agent guidance after `view_image`) are transparent for
277-
SelectedImage promotion so the continuation still carries the image and promote nudge.
275+
the curated `noVisionModels` list and use the vision describe sidecar instead. Trailing
276+
`<multi_agent_mode>` developer injections (Codex Desktop collab guidance after `view_image`)
277+
are transparent for SelectedImage promotion so the continuation still carries the image and
278+
promote nudge.
278279

279280
After pulling Cursor vision fixes, run `ocx ensure` so the proxy PID is the workspace `src/cli`
280281
binary rather than a stale install. Stale `providers.cursor.noVisionModels` stamps that list every

‎src/adapters/cursor.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { isCursorBenignCancelError, isCursorInvalidArgumentError, safeCursorErro
77
import { isCursorExternalWireModel } from "./cursor/discovery";
88
import { createCursorKvStore, type CursorKvStore } from "./cursor/kv-store";
99
import { mapCursorServerMessage } from "./cursor/message-mapper";
10+
import { cursorIsTrailingToolResultContinuation } from "./cursor/images";
1011
import { createCursorRequest } from "./cursor/request-builder";
1112
import {
1213
createLiveCursorTransport,
@@ -111,7 +112,9 @@ export function createCursorAdapter(provider: OcxProviderConfig, deps: CursorAda
111112
_parsed._cursorConversationId = request.conversationId;
112113
let emittedOutput = false;
113114
let replayUnsafe = false;
114-
const lastRawIsToolResult = _parsed.context.messages.at(-1)?.role === "toolResult";
115+
// Desktop multi_agent developer suffixes trail toolResult; treat those as continuations
116+
// so invalid_argument does not force a fresh conversation mid tool resume.
117+
const lastRawIsToolResult = cursorIsTrailingToolResultContinuation(_parsed.context.messages);
115118

116119
const runOnce = async (activeRequest: ReturnType<typeof createCursorRequest>) => {
117120
await runCursorTurnWithRetry(

‎src/adapters/cursor/images.ts‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -296,9 +296,8 @@ export async function resolveCursorImages(
296296
...(options?.details?.[i] ? { detail: options.details[i] } : {}),
297297
});
298298
if (outcome.status === "omitted") continue;
299-
if (outcome.image.data.byteLength > MAX_CURSOR_IMAGE_BYTES) {
300-
throw new CursorImageError("Image input is too large (max 1 MiB). Resize and retry.");
301-
}
299+
// Match prepareCursorImageDataUrl: drop the attachment rather than failing the turn.
300+
if (outcome.image.data.byteLength > MAX_CURSOR_IMAGE_BYTES) continue;
302301
out.push(outcome.image);
303302
}
304303
return out;
@@ -561,14 +560,25 @@ export function extractTrailingToolResultImageParts(
561560
return { parts, omittedOlder };
562561
}
563562

563+
function developerMessagePlainText(content: OcxMessage["content"] | string): string {
564+
if (typeof content === "string") return content;
565+
if (!Array.isArray(content)) return "";
566+
return content
567+
.map(part => (part.type === "text" ? part.text : ""))
568+
.filter(text => text.length > 0)
569+
.join("\n");
570+
}
571+
564572
/**
565-
* Trailing non-image developer messages (Codex Desktop multi-agent guidance) are
566-
* transparent for Cursor vision / tool-continuation detection so `view_image`
567-
* still promotes onto SelectedImage.
573+
* Codex Desktop multi-agent guidance injected after tool results is transparent for
574+
* Cursor vision / tool-continuation detection so `view_image` still promotes onto
575+
* SelectedImage. Other developer turns (terminal-guard, web-search nudges, etc.) are not.
568576
*/
569577
export function isTransparentCursorVisionSuffix(message: OcxMessage): boolean {
570578
if (message.role !== "developer") return false;
571-
return extractCursorImageParts(message.content).length === 0;
579+
if (extractCursorImageParts(message.content).length > 0) return false;
580+
const text = developerMessagePlainText(message.content);
581+
return text.includes("<multi_agent_mode>") && text.includes("</multi_agent_mode>");
572582
}
573583

574584
/** Drop trailing transparent developers; returns the same array reference when unchanged. */

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import {
1414
} from "../../lib/translator-budget";
1515
import { activePromptText, prepareCursorRunRequest } from "./protobuf-request";
1616
import { prepareCursorRawMessages, resolveActiveCursorImages, cursorIsTrailingToolResultContinuation } from "./images";
17+
import { cursorRequestMessagesFromRaw } from "./request-builder";
1718
import {
1819
createCursorContextUsageTracker,
1920
createCursorProtobufEventState,
@@ -571,9 +572,14 @@ class LiveCursorTransport implements CursorTransport {
571572
storeCheckpoints: request.contextUsageStoreCheckpoints !== false,
572573
});
573574
// JPEG soft-cap rewrite for attach + view_image tool-result data URLs before encode.
575+
// Rebuild text messages from the prepared raw channel so omission markers replace
576+
// stale pre-rewrite content that activePromptText would otherwise prefer.
574577
const rawMessages = await prepareCursorRawMessages(request.rawMessages);
578+
const messages = rawMessages === request.rawMessages
579+
? request.messages
580+
: cursorRequestMessagesFromRaw(rawMessages);
575581
const selectedImages = await resolveActiveCursorImages(rawMessages, signal);
576-
const preparedRequest = { ...request, rawMessages, selectedImages };
582+
const preparedRequest = { ...request, messages, rawMessages, selectedImages };
577583
// Build the payload once. The estimate is only worth deriving when there is no
578584
// carry-forward to fall back on — with a carry present it would never be used (#373).
579585
const prepared = prepareCursorRunRequest(preparedRequest, {

‎src/adapters/cursor/request-builder.ts‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,19 @@ function requestMessage(message: OcxMessage): CursorRequestMessage | undefined {
215215
}
216216
}
217217

218+
/**
219+
* Rebuild the text `messages` channel from prepared `rawMessages` so omission markers
220+
* and JPEG-rewritten tool results stay visible to {@link activePromptText}.
221+
*/
222+
export function cursorRequestMessagesFromRaw(
223+
messages: readonly OcxMessage[] | undefined,
224+
): CursorRequestMessage[] {
225+
if (!messages?.length) return [];
226+
return messages
227+
.map(requestMessage)
228+
.filter((message): message is CursorRequestMessage => !!message);
229+
}
230+
218231
export function generatedCursorConversationId(): string {
219232
return `cursor_${crypto.randomUUID().replace(/-/g, "")}`;
220233
}
@@ -265,9 +278,7 @@ export function createCursorRequest(
265278
parsed: OcxParsedRequest,
266279
options: CreateCursorRequestOptions = {},
267280
): CursorRunRequest {
268-
const messages = parsed.context.messages
269-
.map(requestMessage)
270-
.filter((message): message is CursorRequestMessage => !!message);
281+
const messages = cursorRequestMessagesFromRaw(parsed.context.messages);
271282
const activeText = [...messages].reverse().find(message => message.role === "user" || message.role === "developer")?.content ?? "";
272283
const visibleTools = cursorToolsForActivePrompt(parsed.context.tools, activeText, parsed.options.toolChoice);
273284
const budget = applyCursorToolBudget(visibleTools, parsed.options.toolChoice);

‎tests/cursor-adapter.test.ts‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,67 @@ describe("Cursor adapter live transport", () => {
235235
expect(events.filter(event => event.type === "error")).toHaveLength(1);
236236
});
237237

238+
test("does not retry invalid_argument when multi_agent developer trails toolResult", async () => {
239+
const seen: string[] = [];
240+
let attempts = 0;
241+
const adapter = createCursorAdapter({
242+
...provider,
243+
apiKey: "cursor-token",
244+
}, {
245+
createTransport: () => ({
246+
async *run(request) {
247+
attempts += 1;
248+
seen.push(request.conversationId);
249+
throw Object.assign(
250+
new Error("Cursor invalid request: Cursor Connect error invalid_argument: Error"),
251+
{ code: "invalid_argument" },
252+
);
253+
},
254+
writeClient() {},
255+
}),
256+
});
257+
258+
const events: AdapterEvent[] = [];
259+
const body: OcxParsedRequest = {
260+
modelId: "cursor/gpt-5.6-sol",
261+
context: {
262+
messages: [
263+
{ role: "user", content: "read a file", timestamp: 1 },
264+
{
265+
role: "assistant",
266+
model: "cursor/gpt-5.6-sol",
267+
timestamp: 2,
268+
content: [{ type: "toolCall", id: "call_1", name: "read_file", namespace: "mcp__fs", arguments: { path: "a.txt" } }],
269+
},
270+
{
271+
role: "toolResult",
272+
toolCallId: "call_1",
273+
toolName: "read_file",
274+
toolNamespace: "mcp__fs",
275+
content: "FILE CONTENTS HERE",
276+
isError: false,
277+
timestamp: 3,
278+
},
279+
{
280+
role: "developer",
281+
content: "<multi_agent_mode>Preferred sub-agent: model \"cursor/gpt-5.6-sol\"</multi_agent_mode>",
282+
timestamp: 4,
283+
},
284+
],
285+
},
286+
stream: false,
287+
options: { reasoning: "xhigh" },
288+
_cursorConversationId: "cursor_corrupt_desktop",
289+
};
290+
291+
await adapter.runTurn?.(body, { headers: new Headers() }, event => events.push(event));
292+
293+
expect(attempts).toBe(1);
294+
expect(seen).toEqual(["cursor_corrupt_desktop"]);
295+
expect(body._cursorConversationId).toBe("cursor_corrupt_desktop");
296+
expect(events.filter(event => event.type === "error")).toHaveLength(1);
297+
});
298+
238299
test("retries external-model invalid_argument on plain-user continuations too", async () => {
239300
const seen: string[] = [];
240301
let attempts = 0;

‎tests/cursor-images.test.ts‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ import {
2525
handleCursorNativeKv,
2626
resetCursorBlobStateForTests,
2727
} from "../src/adapters/cursor/native-exec";
28+
import { cursorRequestMessagesFromRaw } from "../src/adapters/cursor/request-builder";
29+
import { activePromptText } from "../src/adapters/cursor/protobuf-request";
2830
import {
2931
AgentClientMessageSchema,
3032
GetBlobArgsSchema,
@@ -274,6 +276,25 @@ describe("Cursor image resolver", () => {
274276
expect(resolved[0]?.data.byteLength).toBeGreaterThan(0);
275277
});
276278

279+
test("non-multi_agent developer after toolResult is not transparent", async () => {
280+
const messages = [
281+
{ role: "user" as const, content: "first", timestamp: 1 },
282+
{
283+
role: "toolResult" as const,
284+
toolCallId: "call_view",
285+
toolName: "view_image",
286+
content: [{ type: "image" as const, imageUrl: PNG_DATA_URL }],
287+
isError: false,
288+
timestamp: 2,
289+
},
290+
{ role: "developer" as const, content: "Answer with the forced web-search result only.", timestamp: 3 },
291+
];
292+
expect(isTransparentCursorVisionSuffix(messages[2]!)).toBe(false);
293+
expect(stripTrailingTransparentDeveloperMessages(messages)).toBe(messages);
294+
const resolved = await resolveActiveCursorImages(messages);
295+
expect(resolved).toEqual([]);
296+
});
297+
277298
test("user message after toolResult is not transparent (does not promote stale tool images)", async () => {
278299
const resolved = await resolveActiveCursorImages([
279300
{ role: "user", content: "first", timestamp: 1 },
@@ -514,4 +535,24 @@ describe("Cursor image resolver", () => {
514535
if (user?.role !== "user" || typeof user.content === "string") throw new Error("expected parts");
515536
expect(user.content).toEqual([{ type: "text", text: CURSOR_VISION_IMAGE_OMITTED }]);
516537
});
538+
539+
test("cursorRequestMessagesFromRaw surfaces omission text after prepare", async () => {
540+
const bmpUrl = `data:image/bmp;base64,${Buffer.from([0x42, 0x4d, 0, 0]).toString("base64")}`;
541+
const raw = await prepareCursorRawMessages([
542+
{
543+
role: "user",
544+
content: [{ type: "image", imageUrl: bmpUrl }],
545+
timestamp: 1,
546+
},
547+
]);
548+
const messages = cursorRequestMessagesFromRaw(raw);
549+
expect(messages).toEqual([{ role: "user", content: CURSOR_VISION_IMAGE_OMITTED }]);
550+
expect(activePromptText({
551+
modelId: "grok-4.5",
552+
conversationId: "cursor_test",
553+
system: [],
554+
messages,
555+
rawMessages: raw,
556+
})).toBe(CURSOR_VISION_IMAGE_OMITTED);
557+
});
517558
});

‎tests/cursor-request-builder.test.ts‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,25 @@ describe("Cursor request builder", () => {
253253
expect(request.messages.at(-1)?.role).toBe("user");
254254
});
255255

256+
test("omits assistant messages that carry only tool calls", () => {
257+
const request = createCursorRequest({
258+
...base,
259+
context: {
260+
messages: [
261+
{ role: "user", content: "read it", timestamp: 1 },
262+
{
263+
role: "assistant",
264+
model: "cursor/composer-2.5",
265+
content: [{ type: "toolCall", id: "call_1", name: "read_file", arguments: { path: "a.txt" } }],
266+
timestamp: 2,
267+
},
268+
],
269+
},
270+
});
271+
272+
expect(request.messages).toEqual([{ role: "user", content: "read it" }]);
273+
});
274+
256275
test("preserves Responses tools and tool choice for Cursor request context", () => {
257276
const tool = {
258277
name: "read_file",

0 commit comments

Comments
 (0)