@@ -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", () => {