Skip to content

Use Claude Code with your ChatGPT, Kimi, Cursor or Grok subscription via a local Anthropic-compatible proxy

Rust

dedupe cursor sse framing

Raine Virta15882e3be599
diff --git a/src/providers/cursor/sse-framing.ts b/src/providers/cursor/sse-framing.ts
index 309ffd3..b75401f 100644
--- a/src/providers/cursor/sse-framing.ts
+++ b/src/providers/cursor/sse-framing.ts
@@ -12,9 +12,10 @@ interface CursorSseFramingOptions {
export interface CursorSseFramer {
emitThinkingDelta(text: string): void;
emitTextDelta(text: string): void;
- emitFinalMessage(stopReason: CursorSseStopReason, usage?: CursorUsage): void;
+ recordUsage(usage: CursorUsage): void;
+ emitFinalMessage(stopReason: CursorSseStopReason): void;
emitError(error: unknown): void;
- emitToolPauseMessage(usage: CursorUsage | undefined, emitToolUse: (index: number) => void): void;
+ emitToolPauseMessage(emitToolUse: (index: number) => void): void;
closeOpenBlocks(): void;
ensureStart(): void;
nextContentBlockIndex(): number;
@@ -27,6 +28,7 @@ export function createCursorSseFramer(opts: CursorSseFramingOptions): CursorSseF
let nextIndex = 0;
let thinkingIndex = -1;
let textIndex = -1;
+ let finalUsage: CursorUsage | undefined;
const emit = (event: string, data: unknown) => {
opts.emit(event, data);
@@ -93,13 +95,13 @@ export function createCursorSseFramer(opts: CursorSseFramingOptions): CursorSseF
}
};
- const emitFinalMessage = (stopReason: CursorSseStopReason, usage?: CursorUsage) => {
+ const emitFinalMessage = (stopReason: CursorSseStopReason) => {
ensureStart();
closeOpenBlocks();
emit("message_delta", {
type: "message_delta",
delta: { stop_reason: stopReason, stop_sequence: null },
- usage: opts.mapUsage(usage),
+ usage: opts.mapUsage(finalUsage),
});
emit("message_stop", { type: "message_stop" });
};
@@ -125,6 +127,9 @@ export function createCursorSseFramer(opts: CursorSseFramingOptions): CursorSseF
delta: { type: "text_delta", text },
});
},
+ recordUsage(usage) {
+ finalUsage = usage;
+ },
emitFinalMessage,
emitError(error) {
ensureStart();
@@ -134,12 +139,12 @@ export function createCursorSseFramer(opts: CursorSseFramingOptions): CursorSseF
error: { type: "api_error", message: String(error) },
});
},
- emitToolPauseMessage(usage, emitToolUse) {
+ emitToolPauseMessage(emitToolUse) {
closeOpenBlocks();
ensureStart();
const index = nextContentBlockIndex();
emitToolUse(index);
- emitFinalMessage("tool_use", usage);
+ emitFinalMessage("tool_use");
},
closeOpenBlocks,
ensureStart,
diff --git a/src/providers/cursor/tool-bridge.ts b/src/providers/cursor/tool-bridge.ts
index a918494..e31921f 100644
--- a/src/providers/cursor/tool-bridge.ts
+++ b/src/providers/cursor/tool-bridge.ts
@@ -18,7 +18,6 @@ import {
type CursorReadExec,
type CursorShellStreamExec,
type CursorStreamEvent,
- type CursorUsage,
type CursorWriteExec,
} from "./client.ts";
import type { CursorProto } from "./proto-loader.ts";
@@ -156,31 +155,46 @@ export function createCursorShellToolBridge(opts: {
for (const waiter of state.waiters.splice(0)) waiter(tool);
};
+ const createPendingTool = <T extends PendingNativeTool>(
+ append: CursorAppendMessage,
+ build: (base: {
+ toolUseId: string;
+ startedAt: number;
+ append: CursorAppendMessage;
+ resolve(result: CursorNativeToolResult): void;
+ result: Promise<CursorNativeToolResult>;
+ }) => T,
+ ): T => {
+ const toolUseId = `call_cursor_${crypto.randomUUID().replace(/-/g, "")}`;
+ let resolve!: (result: CursorNativeToolResult) => void;
+ const result = new Promise<CursorNativeToolResult>((r) => {
+ resolve = r;
+ });
+ return build({
+ toolUseId,
+ startedAt: Date.now(),
+ append,
+ resolve,
+ result,
+ });
+ };
+
return {
async readHandler(exec, append) {
const { path } = cursorReadArgs(exec);
- const toolUseId = `call_cursor_${crypto.randomUUID().replace(/-/g, "")}`;
- let resolve!: (result: CursorNativeToolResult) => void;
- const result = new Promise<CursorNativeToolResult>((r) => {
- resolve = r;
- });
- const tool: PendingReadTool = {
+ const tool = createPendingTool<PendingReadTool>(append, (base) => ({
kind: "Read",
- toolUseId,
exec,
path,
- startedAt: Date.now(),
- append,
- resolve,
- result,
- };
+ ...base,
+ }));
opts.traffic?.writeJsonEvent("038-cursor-tool-bridge-pause", {
kind: tool.kind,
- toolUseId,
+ toolUseId: tool.toolUseId,
path,
});
notifyTool(tool);
- const readResult = await result;
+ const readResult = await tool.result;
await appendCursorReadResult(
exec,
buildCursorReadResultFromNativeToolResult(readResult),
@@ -188,39 +202,30 @@ export function createCursorShellToolBridge(opts: {
);
opts.traffic?.writeJsonEvent("038-cursor-tool-bridge-resume", {
kind: tool.kind,
- toolUseId,
+ toolUseId: tool.toolUseId,
isError: readResult.isError,
contentChars: readResult.content.length,
});
},
async shellStreamHandler(exec, append) {
const { command, workingDirectory, timeoutMs } = cursorShellStreamArgs(exec);
- const toolUseId = `call_cursor_${crypto.randomUUID().replace(/-/g, "")}`;
- let resolve!: (result: CursorNativeToolResult) => void;
- const result = new Promise<CursorNativeToolResult>((r) => {
- resolve = r;
- });
- const tool: PendingShellTool = {
+ const tool = createPendingTool<PendingShellTool>(append, (base) => ({
kind: "Bash",
- toolUseId,
exec,
command,
workingDirectory,
timeoutMs,
- startedAt: Date.now(),
- append,
- resolve,
- result,
- };
+ ...base,
+ }));
opts.traffic?.writeJsonEvent("038-cursor-tool-bridge-pause", {
kind: tool.kind,
- toolUseId,
+ toolUseId: tool.toolUseId,
command,
workingDirectory,
timeoutMs,
});
notifyTool(tool);
- const shellResult = await result;
+ const shellResult = await tool.result;
await appendCursorShellStreamResult(
exec,
buildCursorShellStreamResultFromNativeToolResult(
@@ -232,41 +237,32 @@ export function createCursorShellToolBridge(opts: {
);
opts.traffic?.writeJsonEvent("038-cursor-tool-bridge-resume", {
kind: tool.kind,
- toolUseId,
+ toolUseId: tool.toolUseId,
isError: shellResult.isError,
contentChars: shellResult.content.length,
});
},
async writeHandler(exec, append) {
const { path, content } = cursorWriteArgs(exec);
- const toolUseId = `call_cursor_${crypto.randomUUID().replace(/-/g, "")}`;
- let resolve!: (result: CursorNativeToolResult) => void;
- const result = new Promise<CursorNativeToolResult>((r) => {
- resolve = r;
- });
- const tool: PendingWriteTool = {
+ const tool = createPendingTool<PendingWriteTool>(append, (base) => ({
kind: "Write",
- toolUseId,
exec,
path,
content,
- startedAt: Date.now(),
- append,
- resolve,
- result,
- };
+ ...base,
+ }));
opts.traffic?.writeJsonEvent("038-cursor-tool-bridge-pause", {
kind: tool.kind,
- toolUseId,
+ toolUseId: tool.toolUseId,
path,
contentChars: content.length,
});
notifyTool(tool);
- const writeResult = await result;
+ const writeResult = await tool.result;
await appendCursorWriteResult(exec, buildCursorWriteResultFromNativeToolResult(writeResult), append);
opts.traffic?.writeJsonEvent("038-cursor-tool-bridge-resume", {
kind: tool.kind,
- toolUseId,
+ toolUseId: tool.toolUseId,
isError: writeResult.isError,
contentChars: writeResult.content.length,
});
@@ -321,7 +317,6 @@ function streamBridgeUntilToolOrEnd(
return new ReadableStream<Uint8Array>({
async start(controller) {
let closed = false;
- let finalUsage: CursorUsage | undefined;
const emit = (event: string, data: unknown) => {
if (closed || signal?.aborted || controller.desiredSize === null) return false;
@@ -338,7 +333,7 @@ function streamBridgeUntilToolOrEnd(
});
const emitToolUseAndPause = (tool: PendingNativeTool) => {
- framing.emitToolPauseMessage(finalUsage, (index) => {
+ framing.emitToolPauseMessage((index) => {
const input = toolUseInput(tool);
emit("content_block_start", {
type: "content_block_start",
@@ -360,7 +355,7 @@ function streamBridgeUntilToolOrEnd(
};
const emitMessageEnd = () => {
- framing.emitFinalMessage("end_turn", finalUsage);
+ framing.emitFinalMessage("end_turn");
};
const emitStreamError = (err: unknown) => {
@@ -396,7 +391,7 @@ function streamBridgeUntilToolOrEnd(
framing.emitTextDelta(event.text);
break;
case "usage":
- finalUsage = event.usage;
+ framing.recordUsage(event.usage);
break;
case "end":
break;
diff --git a/src/providers/cursor/translate/response.ts b/src/providers/cursor/translate/response.ts
index f9dedf8..9c4472d 100644
--- a/src/providers/cursor/translate/response.ts
+++ b/src/providers/cursor/translate/response.ts
@@ -130,7 +130,6 @@ export function translateCursorStream(
});
try {
- let finalUsage: CursorUsage | undefined;
for await (const event of decodeCursorStream(upstream, opts.proto, { traffic: opts.traffic, log: opts.log })) {
opts.traffic?.writeJsonEvent("040-cursor-event", event);
if (opts.signal?.aborted) return;
@@ -145,13 +144,13 @@ export function translateCursorStream(
framing.emitTextDelta(event.text);
break;
case "usage":
- finalUsage = event.usage;
+ framing.recordUsage(event.usage);
break;
case "end":
break;
}
}
- framing.emitFinalMessage("end_turn", finalUsage);
+ framing.emitFinalMessage("end_turn");
} catch (err) {
opts.log.warn("cursor stream error", { err: String(err) });
framing.emitError(err);