xonecas.io
64875
Mc

mini-coder / commit 888184d

fix(llm-api): drop empty assistant messages after GPT commentary strip

When all parts of an assistant message are commentary, filtering
produced content:[] which causes an API validation error on replay.
Now the entire message is dropped instead, along with any orphaned
tool-result messages that immediately follow it (same pattern as
sanitizeGeminiToolMessages).

Also add tests for both new cases and extract shared test helpers
(commentaryAssistantMessage, expectOnlyUserMessages) to eliminate
the resulting jscpd clones.

xonecas2026-03-11 888184dc3bcfa780e5fd987572ffdc0ae3197eb5 parent b06efc6

2 files changed

src/llm-api/turn.test.ts+52−0
@@ -360,6 +360,58 @@ describe("stripGPTCommentaryFromHistory", () => {
360360 messages,
361361 );
362362 });
363+
364+ const commentaryAssistantMessage = {
365+ role: "assistant",
366+ content: [
367+ {
368+ type: "text",
369+ text: "to=functions.shell json{}",
370+ providerOptions: { openai: { phase: "commentary" } },
371+ },
372+ ],
373+ } as unknown as CoreMessage;
374+
375+ function expectOnlyUserMessages(result: CoreMessage[]) {
376+ expect(result).toHaveLength(2);
377+ expect(result[0]).toEqual({ role: "user", content: "go" });
378+ expect(result[1]).toEqual({ role: "user", content: "next" });
379+ }
380+
381+ test("drops assistant message whose entire content is commentary", () => {
382+ const messages: CoreMessage[] = [
383+ { role: "user", content: "go" },
384+ commentaryAssistantMessage,
385+ { role: "user", content: "next" },
386+ ];
387+
388+ const result = stripGPTCommentaryFromHistory(messages, "openai/gpt-5.4");
389+ expectOnlyUserMessages(result);
390+ });
391+
392+ test("drops commentary-only assistant message and its orphaned tool-result message", () => {
393+ const orphanedToolResult = {
394+ role: "tool",
395+ content: [
396+ {
397+ type: "tool-result",
398+ toolCallId: "t1",
399+ toolName: "shell",
400+ output: { text: "result" },
401+ },
402+ ],
403+ } as unknown as CoreMessage;
404+
405+ const messages: CoreMessage[] = [
406+ { role: "user", content: "go" },
407+ commentaryAssistantMessage,
408+ orphanedToolResult,
409+ { role: "user", content: "next" },
410+ ];
411+
412+ const result = stripGPTCommentaryFromHistory(messages, "openai/gpt-5.4");
413+ expectOnlyUserMessages(result);
414+ });
363415 });
364416
365417 describe("applyContextPruning", () => {
src/llm-api/turn.ts+33−6
@@ -422,17 +422,44 @@ export function stripGPTCommentaryFromHistory(
422422 if (!isOpenAIGPT(modelString)) return messages;
423423
424424 let mutated = false;
425- const result = messages.map((message) => {
425+ const result: CoreMessage[] = [];
426+ let skipToolResults = false;
427+
428+ for (const message of messages) {
429+ // If the previous assistant message was fully dropped, skip any
430+ // immediately-following tool-result messages that would be orphaned.
431+ if (skipToolResults) {
432+ if (message.role === "tool") {
433+ mutated = true;
434+ continue;
435+ }
436+ skipToolResults = false;
437+ }
438+
426439 if (message.role !== "assistant" || !Array.isArray(message.content)) {
427- return message;
440+ result.push(message);
441+ continue;
428442 }
443+
429444 const filtered = message.content.filter(
430445 (part) => !isCommentaryTextPart(part),
431446 );
432- if (filtered.length === message.content.length) return message;
433- mutated = true;
434- return { ...message, content: filtered } as CoreMessage;
435- });
447+
448+ if (filtered.length === message.content.length) {
449+ // Nothing stripped — keep as-is.
450+ result.push(message);
451+ } else if (filtered.length === 0) {
452+ // All parts were commentary: drop the entire message and any
453+ // tool-result messages that immediately follow it.
454+ mutated = true;
455+ skipToolResults = true;
456+ } else {
457+ // Some parts stripped but message still has content — keep it.
458+ mutated = true;
459+ result.push({ ...message, content: filtered } as CoreMessage);
460+ }
461+ }
462+
436463 return mutated ? result : messages;
437464 }