Skip to content

fix(openai-chat): keep captured usage on an invalid negotiated completion #7849

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lidge-jun merged 2 commits into from
Oct 28, 2026
Merged

fix(openai-chat): keep captured usage on an invalid negotiated completion #7849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d91a2e
fix(openai-chat): keep captured usage on an invalid negotiated comple…
xubenqiang Oct 27, 2026
4945dd4
fix(openai-chat): keep the usage branch within the file-size cap
lidge-jun Oct 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/adapters/openai-chat.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,7 @@ export function createOpenAIChatAdapter(provider: OcxProviderConfig): ProviderAd
const completion = completedBlocksEnabled
? observeCompletedToolBlock(call, rawToolCall.x_opencodex_completed, indexKey, idDelta, rawFunction !== undefined)
: "ordinary";
if (completion === "invalid") return yield* terminateWithError({ type: "error", message: "invalid negotiated tool completion sequence" });
if (completion === "invalid") return yield* terminateWithError({ type: "error", message: "invalid negotiated tool completion sequence", ...(pendingUsage !== undefined ? { usage: pendingUsage } : {}) });
if (completion === "completed") continue;
if (!call) {
call = {
Expand Down
13 changes: 13 additions & 0 deletions tests/adapters/openai/openai-chat-parallel-stream.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,19 @@ describe("negotiated block-stop tool completion", () => {
expect(assembled(out)).toHaveLength(1);
expect(out.at(-1)?.type).toBe("error");
});
test("an invalid completion sequence still reports the usage already captured", async () => {
const out = await events([
chunkOf([call(0, "call_a")]),
chunkOf([marker(0, "call_a")]),
{ choices: [], usage: { prompt_tokens: 11, completion_tokens: 7, total_tokens: 18 } },
chunkOf([{ index: 0, function: { arguments: " " } }]),
chunkOf([], "tool_calls"),
]);
const error = out.at(-1);
expect(error?.type).toBe("error");
expect(error?.message).toContain("invalid negotiated tool completion sequence");
expect(error?.usage).toEqual({ inputTokens: 11, outputTokens: 7 });
});
test("root input calls stay buffered for existing freeform reconciliation", async () => {
const out = await events([chunkOf([call(0, "call_a", '{"input":"pwd"}')]), chunkOf([marker(0, "call_a")]), tail, chunkOf([], "tool_calls")]);
expect(out.findIndex(e => e.type === "text_delta")).toBeLessThan(out.findIndex(e => e.type === "tool_call_start"));
Expand Down
Loading