github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-04-19 11:28:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(gateway): scope zod input mapping to explicit tool-input errors

Browse Source
This commit is contained in:
Tak Hoffman
2026-03-06 18:42:34 -06:00
parent fc617945ff
commit 6d466c26f1
2 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/gateway/tools-invoke-http.test.ts
View File

@@ -118,9 +118,19 @@ vi.mock("../agents/openclaw-tools.js", () => {
throw toolAuthorizationError("mode forbidden"); throw toolAuthorizationError("mode forbidden");
} }
if (mode === "zod") { if (mode === "zod") {
const err = new Error("invalid tool payload") as Error & { issues?: unknown[] }; const err = new Error("invalid tool payload") as Error & {
issues?: unknown[];
toolInputError?: boolean;
};
err.name = "ZodError"; err.name = "ZodError";
err.issues = [{ path: ["amount"], message: "Required", code: "invalid_type" }]; err.issues = [{ path: ["amount"], message: "Required", code: "invalid_type" }];
err.toolInputError = true;
throw err;
}
if (mode === "zod-internal") {
const err = new Error("schema mismatch") as Error & { issues?: unknown[] };
err.name = "ZodError";
err.issues = [{ path: ["result"], message: "Invalid", code: "invalid_type" }];
throw err; throw err;
} }
if (mode === "crash") { if (mode === "crash") {
@@ -546,7 +556,7 @@ describe("POST /tools/invoke", () => {
expect(resMain.status).toBe(200); expect(resMain.status).toBe(200);
}); });
it("maps tool input/auth/schema errors to 400/403 and unexpected execution errors to 500", async () => { it("maps tool input/auth errors and explicit schema-input errors to 400/403", async () => {
cfg = { cfg = {
...cfg, ...cfg,
agents: { agents: {
@@ -587,6 +597,17 @@ describe("POST /tools/invoke", () => {
expect(zodBody.error?.type).toBe("tool_error"); expect(zodBody.error?.type).toBe("tool_error");
expect(zodBody.error?.message).toBe("invalid tool payload"); expect(zodBody.error?.message).toBe("invalid tool payload");
const internalZodRes = await invokeToolAuthed({
tool: "tools_invoke_test",
args: { mode: "zod-internal" },
sessionKey: "main",
});
expect(internalZodRes.status).toBe(500);
const internalZodBody = await internalZodRes.json();
expect(internalZodBody.ok).toBe(false);
expect(internalZodBody.error?.type).toBe("tool_error");
expect(internalZodBody.error?.message).toBe("tool execution failed");
const crashRes = await invokeToolAuthed({ const crashRes = await invokeToolAuthed({
tool: "tools_invoke_test", tool: "tools_invoke_test",
args: { mode: "crash" }, args: { mode: "crash" },

10
src/gateway/tools-invoke-http.ts
View File

@@ -118,10 +118,14 @@ function resolveToolInputErrorStatus(err: unknown): number | null {
return typeof status === "number" ? status : 400; return typeof status === "number" ? status : 400;
} }
// Some tool implementations throw raw ZodError objects on malformed model/tool payloads. // Some tool implementations throw raw ZodError objects on malformed model/tool payloads.
// Treat these as user-input validation failures (400), not internal server failures (500). // Only map to 400 when explicitly marked as tool-input validation; otherwise preserve 500.
if (typeof err === "object" && err !== null) { if (typeof err === "object" && err !== null) {
const record = err as { name?: unknown; issues?: unknown }; const record = err as { name?: unknown; issues?: unknown; toolInputError?: unknown };
if (record.name === "ZodError" && Array.isArray(record.issues)) { if (
record.name === "ZodError" &&
Array.isArray(record.issues) &&
record.toolInputError === true
) {
return 400; return 400;
} }
} }