fix: validate session spawn timeout · openclaw/openclaw@9a4aa43

Recent Commits to openclaw:main

steipete · 2026-05-29 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -446,6 +446,24 @@ describe("sessions_spawn tool", () => {`
`446`	`446`	`expect(spawnArgs.runTimeoutSeconds).toBe(2);`
`447`	`447`	`});`
`448`	`448`
	`449`	`+it.each([`
	`450`	`+[{ runTimeoutSeconds: 1.5 }, "runTimeoutSeconds must be a non-negative integer"],`
	`451`	`+[{ runTimeoutSeconds: -1 }, "runTimeoutSeconds must be a non-negative integer"],`
	`452`	`+[{ timeoutSeconds: "1sec" }, "timeoutSeconds must be a non-negative integer"],`
	`453`	`+])("rejects invalid timeout override %o", async (params, message) => {`
	`454`	`+const tool = createSessionsSpawnTool({`
	`455`	`+agentSessionKey: "agent:main:main",`
	`456`	`+});`
	`457`	`+`
	`458`	`+await expect(`
	`459`	`+tool.execute("call-invalid-timeout", {`
	`460`	`+task: "do thing",`
	`461`	`+ ...params,`
	`462`	`+}),`
	`463`	`+).rejects.toThrow(message);`
	`464`	`+expect(hoisted.spawnSubagentDirectMock).not.toHaveBeenCalled();`
	`465`	`+});`
	`466`	`+`
`449`	`467`	`it("passes inherited workspaceDir from tool context, not from tool args", async () => {`
`450`	`468`	`const tool = createSessionsSpawnTool({`
`451`	`469`	`agentSessionKey: "agent:main:main",`

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ import type { AnyAgentTool } from "./common.js";`
`35`	`35`	`import {`
`36`	`36`	`jsonResult,`
`37`	`37`	`normalizeToolModelOverride,`
	`38`	`+readNonNegativeIntegerParam,`
`38`	`39`	`readStringParam,`
`39`	`40`	`ToolInputError,`
`40`	`41`	`} from "./common.js";`
`@@ -169,9 +170,9 @@ function createSessionsSpawnToolSchema(params: {`
`169`	`170`	`model: Type.Optional(Type.String()),`
`170`	`171`	`thinking: Type.Optional(Type.String()),`
`171`	`172`	`cwd: Type.Optional(Type.String()),`
`172`		`-runTimeoutSeconds: Type.Optional(Type.Number({ minimum: 0 })),`
	`173`	`+runTimeoutSeconds: Type.Optional(Type.Integer({ minimum: 0 })),`
`173`	`174`	`// Back-compat: older callers used timeoutSeconds for this tool.`
`174`		`-timeoutSeconds: Type.Optional(Type.Number({ minimum: 0 })),`
	`175`	`+timeoutSeconds: Type.Optional(Type.Integer({ minimum: 0 })),`
`175`	`176`	`...(params.threadAvailable`
`176`	`177`	`? {`
`177`	`178`	`thread: Type.Optional(`
`@@ -342,17 +343,10 @@ export function createSessionsSpawnTool(`
`342`	`343`	`if (runtime === "acp" && context === "fork") {`
`343`	`344`	`throw new Error('context="fork" is only supported for runtime="subagent".');`
`344`	`345`	`}`
`345`		`-// Back-compat: older callers used timeoutSeconds for this tool.`
`346`		`-const timeoutSecondsCandidate =`
`347`		`-typeof params.runTimeoutSeconds === "number"`
`348`		`- ? params.runTimeoutSeconds`
`349`		`- : typeof params.timeoutSeconds === "number"`
`350`		`- ? params.timeoutSeconds`
`351`		`- : undefined;`
`352`	`346`	`const runTimeoutSeconds =`
`353`		`-typeof timeoutSecondsCandidate === "number" && Number.isFinite(timeoutSecondsCandidate)`
`354`		`- ? Math.max(0, Math.floor(timeoutSecondsCandidate))`
`355`		`- : undefined;`
	`347`	`+readNonNegativeIntegerParam(params, "runTimeoutSeconds") ??`
	`348`	`+// Back-compat: older callers used timeoutSeconds for this tool.`
	`349`	`+readNonNegativeIntegerParam(params, "timeoutSeconds");`
`356`	`350`	`const thread = params.thread === true;`
`357`	`351`	`const attachments = Array.isArray(params.attachments)`
`358`	`352`	`? (params.attachments as Array<{`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main