fix(agents): prevent Anthropic 400 'Incorrect role information' error
Add validateAnthropicTurns() to merge consecutive user messages that can occur when steering messages are injected during streaming. This prevents the API from rejecting requests due to improper role alternation. Changes: - Add validateAnthropicTurns() function in pi-embedded-helpers.ts - Integrate validation into sanitization pipeline in pi-embedded-runner.ts - Add user-friendly error message for role ordering errors - Add comprehensive tests for the new validation function
This commit is contained in:
1 parent
bb9a9633a8
commit
c5fa757ef6
3 files changed
+207
-2
No files matched your search
@@ -15,6 +15,7 @@ import {
|
||||
sanitizeGoogleTurnOrdering,
|
||||
sanitizeSessionMessagesImages,
|
||||
sanitizeToolCallId,
|
||||
validateAnthropicTurns,
|
||||
validateGeminiTurns,
|
||||
} from "./pi-embedded-helpers.js";
|
||||
import {
|
||||
@@ -171,6 +172,124 @@ describe("validateGeminiTurns", () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe("validateAnthropicTurns", () => {
|
||||
it("should return empty array unchanged", () => {
|
||||
const result = validateAnthropicTurns([]);
|
||||
expect(result).toEqual([]);
|
||||
});
|
||||
|
||||
it("should return single message unchanged", () => {
|
||||
const msgs: AgentMessage[] = [
|
||||
{
|
||||
role: "user",
|
||||
content: [{ type: "text", text: "Hello" }],
|
||||
},
|
||||
];
|
||||
const result = validateAnthropicTurns(msgs);
|
||||
expect(result).toEqual(msgs);
|
||||
});
|
||||
|
||||
it("should return alternating user/assistant unchanged", () => {
|
||||
const msgs: AgentMessage[] = [
|
||||
{ role: "user", content: [{ type: "text", text: "Question" }] },
|
||||
{
|
||||
role: "assistant",
|
||||
content: [{ type: "text", text: "Answer" }],
|
||||
},
|
||||
{ role: "user", content: [{ type: "text", text: "Follow-up" }] },
|
||||
];
|
||||
const result = validateAnthropicTurns(msgs);
|
||||
expect(result).toEqual(msgs);
|
||||
});
|
||||
|
||||
it("should merge consecutive user messages", () => {
|
||||
const msgs: AgentMessage[] = [
|
||||
{
|
||||
role: "user",
|
||||
content: [{ type: "text", text: "First message" }],
|
||||
timestamp: 1000,
|
||||
},
|
||||
{
|
||||
role: "user",
|
||||
content: [{ type: "text", text: "Second message" }],
|
||||
timestamp: 2000,
|
||||
},
|
||||
];
|
||||
|
||||
const result = validateAnthropicTurns(msgs);
|
||||
|
||||
expect(result).toHaveLength(1);
|
||||
expect(result[0].role).toBe("user");
|
||||
const content = (result[0] as { content: unknown[] }).content;
|
||||
expect(content).toHaveLength(2);
|
||||
expect(content[0]).toEqual({ type: "text", text: "First message" });
|
||||
expect(content[1]).toEqual({ type: "text", text: "Second message" });
|
||||
// Should take timestamp from the newer message
|
||||
expect((result[0] as { timestamp?: number }).timestamp).toBe(2000);
|
||||
});
|
||||
|
||||
it("should merge three consecutive user messages", () => {
|
||||
const msgs: AgentMessage[] = [
|
||||
{ role: "user", content: [{ type: "text", text: "One" }] },
|
||||
{ role: "user", content: [{ type: "text", text: "Two" }] },
|
||||
{ role: "user", content: [{ type: "text", text: "Three" }] },
|
||||
];
|
||||
|
||||
const result = validateAnthropicTurns(msgs);
|
||||
|
||||
expect(result).toHaveLength(1);
|
||||
const content = (result[0] as { content: unknown[] }).content;
|
||||
expect(content).toHaveLength(3);
|
||||
});
|
||||
|
||||
it("should not merge consecutive assistant messages", () => {
|
||||
const msgs: AgentMessage[] = [
|
||||
{ role: "user", content: [{ type: "text", text: "Question" }] },
|
||||
{
|
||||
role: "assistant",
|
||||
content: [{ type: "text", text: "Answer 1" }],
|
||||
},
|
||||
{
|
||||
role: "assistant",
|
||||
content: [{ type: "text", text: "Answer 2" }],
|
||||
},
|
||||
];
|
||||
|
||||
const result = validateAnthropicTurns(msgs);
|
||||
|
||||
// validateAnthropicTurns only merges user messages, not assistant
|
||||
expect(result).toHaveLength(3);
|
||||
});
|
||||
|
||||
it("should handle mixed scenario with steering messages", () => {
|
||||
// Simulates: user asks -> assistant errors -> steering user message injected
|
||||
const msgs: AgentMessage[] = [
|
||||
{ role: "user", content: [{ type: "text", text: "Original question" }] },
|
||||
{
|
||||
role: "assistant",
|
||||
content: [],
|
||||
stopReason: "error",
|
||||
errorMessage: "Overloaded",
|
||||
},
|
||||
{
|
||||
role: "user",
|
||||
content: [{ type: "text", text: "Steering: try again" }],
|
||||
},
|
||||
{ role: "user", content: [{ type: "text", text: "Another follow-up" }] },
|
||||
];
|
||||
|
||||
const result = validateAnthropicTurns(msgs);
|
||||
|
||||
// The two consecutive user messages at the end should be merged
|
||||
expect(result).toHaveLength(3);
|
||||
expect(result[0].role).toBe("user");
|
||||
expect(result[1].role).toBe("assistant");
|
||||
expect(result[2].role).toBe("user");
|
||||
const lastContent = (result[2] as { content: unknown[] }).content;
|
||||
expect(lastContent).toHaveLength(2);
|
||||
});
|
||||
});
|
||||
|
||||
describe("buildBootstrapContextFiles", () => {
|
||||
it("keeps missing markers", () => {
|
||||
const files = [makeFile({ missing: true, content: undefined })];
|
||||
|
||||
Reference in new issue
Block a user