Repository navigation
fix(cursor,xai): stop grok-4.6 mid-turn tool-result echoes from sticking #5098
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -62,8 +62,70 @@ export function lookupCursorThreadConversation( | |
| return entry.conversationId; | ||
| } | ||
|
|
||
| const conversationRewrites = new Map<string, { to: string; updatedAt: number }>(); | ||
|
Contributor
There was a problem hiding this comment. 🔒 Security & Privacy | 🛡️ Analyzed with Security Review | 🟡 Minor | ⚡ Quick win 🧩 Analysis chain🏁 Script executed: #!/bin/bash
printf '%s\n' '--- thread continuity ---'
cat -n src/adapters/cursor/thread-continuity.ts | sed -n '55,135p'
printf '%s\n' '--- request builder ---'
cat -n src/adapters/cursor/request-builder.ts | sed -n '340,385p'
printf '%s\n' '--- identity scope references ---'
rg -n -C 3 '_cursorIdentityScope|cursorIdentityScope' src/adapters/cursor.ts src/adapters/cursor src | head -n 240Repository: lidge-jun/opencodex Length of output: 23726 Reachability: External Reachability pathScope conversation rewrites by Cursor identity.
🤖 Prompt for AI AgentsSources: Coding guidelines, Path instructions |
||
|
|
||
| function pruneConversationRewrites(at: number): void { | ||
| for (const [key, entry] of conversationRewrites) { | ||
| if (at - entry.updatedAt > OVERRIDE_TTL_MS) conversationRewrites.delete(key); | ||
| else break; // Map iterates insertion order; refreshed entries are moved to the end | ||
| } | ||
| while (conversationRewrites.size > OVERRIDE_MAX_ENTRIES) { | ||
| const oldest = conversationRewrites.keys().next().value; | ||
| if (oldest === undefined) break; | ||
| conversationRewrites.delete(oldest); | ||
| } | ||
| } | ||
|
|
||
| function rememberRewriteEntry(from: string, to: string, at: number): void { | ||
| conversationRewrites.delete(from); | ||
| conversationRewrites.set(from, { to, updatedAt: at }); | ||
| } | ||
|
|
||
| /** | ||
| * Remember that a poisoned Cursor conversation id was rotated away. | ||
| * | ||
| * Codex Desktop often restores the pre-remint id from providerState on the next | ||
| * Responses request and may omit x-codex-parent-thread-id. Thread-owner | ||
| * lookup then misses, and the next turn resumes the same Cursor conversation. | ||
| * Rewriting the old wire id itself survives that restore path. | ||
| */ | ||
| export function rememberCursorConversationRewrite( | ||
| fromConversationId: string, | ||
| toConversationId: string, | ||
| ): void { | ||
| if (!fromConversationId || !toConversationId || fromConversationId === toConversationId) return; | ||
| const at = now(); | ||
| rememberRewriteEntry(fromConversationId, toConversationId, at); | ||
| const redirected: string[] = []; | ||
| for (const [from, entry] of conversationRewrites) { | ||
| if (from !== fromConversationId && entry.to === fromConversationId) redirected.push(from); | ||
| } | ||
| for (const from of redirected) rememberRewriteEntry(from, toConversationId, at); | ||
| pruneConversationRewrites(at); | ||
| } | ||
|
|
||
| /** Follow a remint chain; missing or expired entries return the input id. */ | ||
| export function resolveCursorConversationRewrite(conversationId: string): string { | ||
| const at = now(); | ||
| const seen = new Set<string>(); | ||
| let current = conversationId; | ||
| while (!seen.has(current)) { | ||
| const entry = conversationRewrites.get(current); | ||
| if (!entry) break; | ||
| if (at - entry.updatedAt > OVERRIDE_TTL_MS) { | ||
| conversationRewrites.delete(current); | ||
| break; | ||
| } | ||
| rememberRewriteEntry(current, entry.to, at); | ||
| seen.add(current); | ||
| current = entry.to; | ||
| } | ||
| return current; | ||
| } | ||
|
|
||
| export function clearCursorThreadContinuityForTests(): void { | ||
| overrides.clear(); | ||
| conversationRewrites.clear(); | ||
| } | ||
|
|
||
| /** Max conversation-id remints after the first surfaced overflow per retained scope. */ | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| import { CursorMidstreamEchoObserver, stripAssistantEchoedToolEnvelope } from "../adapters/cursor/envelope-echo"; | ||
| import { replaceSseDataPayload, sseDataPayload, type SseBlockRewrite } from "./sse-payload-rewrite"; | ||
|
|
||
| function isRecord(value: unknown): value is Record<string, unknown> { | ||
| return !!value && typeof value === "object" && !Array.isArray(value); | ||
| } | ||
|
|
||
| function stripOutputTextFields(value: unknown): boolean { | ||
| let stripped = false; | ||
| if (Array.isArray(value)) { | ||
| for (const item of value) stripped = stripOutputTextFields(item) || stripped; | ||
| return stripped; | ||
| } | ||
| if (!isRecord(value)) return false; | ||
| if (typeof value.text === "string") { | ||
| const next = stripAssistantEchoedToolEnvelope(value.text); | ||
| if (next !== value.text) { | ||
| value.text = next; | ||
| stripped = true; | ||
| } | ||
| } | ||
| if (typeof value.delta === "string") { | ||
| const next = stripAssistantEchoedToolEnvelope(value.delta); | ||
| if (next !== value.delta) { | ||
| value.delta = next; | ||
| stripped = true; | ||
| } | ||
| } | ||
| for (const nested of Object.values(value)) { | ||
| stripped = stripOutputTextFields(nested) || stripped; | ||
| } | ||
| return stripped; | ||
| } | ||
|
|
||
| /** Strip a whole-line [Tool Result] echo from a completed Responses JSON body. */ | ||
| export function stripGrokUpstreamEnvelopeEchoFromResponsesJson(json: string): string { | ||
| try { | ||
| const parsed = JSON.parse(json) as unknown; | ||
| if (!stripOutputTextFields(parsed)) return json; | ||
| return JSON.stringify(parsed); | ||
| } catch { | ||
| return json; | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Drop grok-4.6 mid-turn [Tool Result] envelopes on the xAI Responses SSE path. | ||
| * Cursor already quarantines this on protobuf; xAI relays SSE verbatim, so the | ||
| * same paste otherwise lands in Codex as a successful final answer. | ||
| */ | ||
| export function createGrokUpstreamEnvelopeEchoBlockRewrite(): SseBlockRewrite { | ||
| const observer = new CursorMidstreamEchoObserver(); | ||
| let suppress = false; | ||
| const rewrite: SseBlockRewrite = (block) => { | ||
| const payload = sseDataPayload(block); | ||
| if (payload === null || payload === "[DONE]") return [block]; | ||
| let event: unknown; | ||
| try { | ||
| event = JSON.parse(payload); | ||
| } catch { | ||
| return [block]; | ||
| } | ||
| if (!isRecord(event) || typeof event.type !== "string") return [block]; | ||
| if (event.type === "response.output_text.delta" && typeof event.delta === "string") { | ||
| if (suppress) return []; | ||
| observer.feed(event.delta); | ||
| const kept = stripAssistantEchoedToolEnvelope(event.delta); | ||
| const found = observer.findings().length > 0 || kept !== event.delta; | ||
|
Comment on lines
+66
to
+68
Contributor
There was a problem hiding this comment. 🎯 Functional Correctness | 🟠 Major | ⚡ Quick win Buffer a possible marker prefix before you forward it. A marker can span logical Keep an uncommitted suffix that can still be an 🤖 Prompt for AI Agents |
||
| if (!found) return [block]; | ||
| suppress = true; | ||
| if (!kept || kept === event.delta) return []; | ||
| event.delta = kept; | ||
| return [replaceSseDataPayload(block, JSON.stringify(event))]; | ||
| } | ||
| if (suppress && event.type === "response.output_text.delta") return []; | ||
| if (event.type === "response.output_text.done" && typeof event.text === "string") { | ||
| const kept = stripAssistantEchoedToolEnvelope(event.text); | ||
| if (kept === event.text) return [block]; | ||
| event.text = kept; | ||
| return [replaceSseDataPayload(block, JSON.stringify(event))]; | ||
| } | ||
| if (event.type === "response.completed" || event.type === "response.output_item.done") { | ||
| if (stripOutputTextFields(event)) { | ||
| return [replaceSseDataPayload(block, JSON.stringify(event))]; | ||
| } | ||
| } | ||
| return [block]; | ||
| }; | ||
| return rewrite; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🎯 Functional Correctness | 🟠 Major | 🏗️ Heavy lift
Buffer fragmented midstream markers before emitting text.
This code strips only the current
text_delta. A stream can split[Tool Result]into"[Tool "and"Result]\n...".Line 317 cannot strip either fragment. If
midstreamObserverdetects the combined marker, the first fragment has already reached the client. If it does not detect the combined marker, the full envelope reaches the client across multiple deltas.Hold the unresolved marker prefix until it diverges from every marker. Emit only the confirmed safe prefix. Add a regression test that splits the marker across deltas after leading prose.
Based on learnings, “never assume a 1:1 mapping between emitted stream chunks and logical frames/events.”
🤖 Prompt for AI Agents
Source: Learnings