fix(canvas): 云端 Agent - 参数错误有限重试并折叠中间失败

This commit is contained in:
ddCat
2026-09-21 09:30:38 +08:00
parent c80a554c49
commit 6eea2552f8
16 changed files with 396 additions and 15 deletions

View File

@@ -3,6 +3,21 @@ import { renderToStaticMarkup } from "react-dom/server";
import { AgentToolCard } from "@/components/canvas/canvas-cloud-agent-chat-ui";
import { canvasThemes } from "@/lib/canvas-theme";
test("automatic correction is neutral and collapsed, with recovery and exhaustion history", () => {
for (const theme of [canvasThemes.dark, canvasThemes.light]) {
for (const status of ["retrying", "recovered", "exhausted"]) {
const html = renderToStaticMarkup(<AgentToolCard title="canvas_apply_ops" text="缺少操作类型" detail={{ eventType: "tool_failed", retry: { groupId: "run:repair:call", attempt: 1, maxAttempts: 3, status }, retryAttempts: [{ id: "call", text: "缺少操作类型" }] }} theme={theme} />);
expect(html).toContain("data-agent-tool-retry");
expect(html).toContain("<summary");
expect(html).not.toContain("open=");
expect(html).not.toContain("#dc2626");
expect(html).not.toContain("执行失败");
expect(html).toContain("缺少操作类型");
expect(html).toContain(status === "recovered" ? "自动纠正后已恢复" : status === "exhausted" ? "自动纠正未完成" : "自动纠正记录");
}
}
});
test("completed tools keep an accessible status without a duplicate visual badge", () => {
const html = renderToStaticMarkup(<AgentToolCard title="model_list" text="工具执行成功" detail={{ eventType: "tool_completed" }} theme={canvasThemes.dark} />);
expect(html).toContain("已获取可用模型");

View File

@@ -0,0 +1,37 @@
import { expect, test } from "bun:test";
import { agentToolRetry, mergeAgentToolRetry } from "@/lib/canvas/agent-tool-retry";
import type { CloudAgentChatMessage } from "@/components/canvas/canvas-cloud-agent-chat-ui";
function attempt(id: string, count: number, status = "retrying", group = "run:repair:call"): CloudAgentChatMessage {
return { id, role: "tool", title: "canvas_apply_ops", text: "缺少操作类型", detail: { eventType: status === "recovered" ? "tool_completed" : "tool_failed", retry: { groupId: group, attempt: count, maxAttempts: 3, status } } };
}
test("retry attempts merge across unrelated reads without mutating previous state", () => {
const first = mergeAgentToolRetry([], attempt("1", 1));
const messages = [...first, { id: "read", role: "tool" as const, text: "读取画布" }];
const merged = mergeAgentToolRetry(messages, attempt("2", 2));
expect(merged).toHaveLength(2);
expect((merged[0].detail as any).retryAttempts).toHaveLength(2);
expect((first[0].detail as any).retryAttempts).toHaveLength(1);
expect(mergeAgentToolRetry(merged, attempt("2", 2))).toEqual(merged);
});
test("recovery survives replay and subsequent runs get their own groups", () => {
let messages = mergeAgentToolRetry([], attempt("1", 1));
messages = mergeAgentToolRetry(messages, attempt("done", 1, "recovered"));
messages = mergeAgentToolRetry(messages, attempt("1", 1));
expect(agentToolRetry(messages[0].detail)?.status).toBe("recovered");
expect((messages[0].detail as any).retryAttempts).toHaveLength(1);
expect(mergeAgentToolRetry(messages, attempt("next", 1, "retrying", "other:repair:call"))).toHaveLength(2);
});
test("exhaustion is preserved and legacy failures are not hidden", () => {
let messages = mergeAgentToolRetry([], attempt("1", 1));
messages = mergeAgentToolRetry(messages, attempt("3", 3, "exhausted"));
messages = mergeAgentToolRetry(messages, attempt("same-attempt-replay", 3));
messages = mergeAgentToolRetry(messages, attempt("2", 2));
expect(agentToolRetry(messages[0].detail)?.status).toBe("exhausted");
const legacy: CloudAgentChatMessage = { id: "old", role: "tool", text: "失败", detail: { eventType: "tool_failed" } };
expect(mergeAgentToolRetry(messages, legacy)).toBe(messages);
expect(agentToolRetry({ retry: { groupId: "x", attempt: 4, maxAttempts: 3, status: "retrying" } })).toBeUndefined();
});