fix(nodes-tool): add run invoke timeout (PR #433, thanks @sircrumpet)

This commit is contained in:
Peter Steinberger
2026-01-08 00:17:44 +00:00
parent b34fc0aaed
commit e35845dd49
4 changed files with 55 additions and 0 deletions

View File

@@ -88,3 +88,49 @@ describe("nodes camera_snap", () => {
});
});
});
describe("nodes run", () => {
beforeEach(() => {
callGateway.mockReset();
});
it("passes invoke and command timeouts", async () => {
callGateway.mockImplementation(async ({ method, params }) => {
if (method === "node.list") {
return { nodes: [{ nodeId: "mac-1" }] };
}
if (method === "node.invoke") {
expect(params).toMatchObject({
nodeId: "mac-1",
command: "system.run",
timeoutMs: 45_000,
params: {
command: ["echo", "hi"],
cwd: "/tmp",
env: { FOO: "bar" },
timeoutMs: 12_000,
},
});
return {
payload: { stdout: "", stderr: "", exitCode: 0, success: true },
};
}
throw new Error(`unexpected method: ${String(method)}`);
});
const tool = createClawdbotTools().find(
(candidate) => candidate.name === "nodes",
);
if (!tool) throw new Error("missing nodes tool");
await tool.execute("call1", {
action: "run",
node: "mac-1",
command: ["echo", "hi"],
cwd: "/tmp",
env: ["FOO=bar"],
commandTimeoutMs: 12_000,
invokeTimeoutMs: 45_000,
});
});
});

View File

@@ -158,6 +158,7 @@ const NodesToolSchema = Type.Union([
cwd: Type.Optional(Type.String()),
env: Type.Optional(Type.Array(Type.String())),
commandTimeoutMs: Type.Optional(Type.Number()),
invokeTimeoutMs: Type.Optional(Type.Number()),
needsScreenRecording: Type.Optional(Type.Boolean()),
}),
]);
@@ -534,6 +535,11 @@ export function createNodesTool(): AnyAgentTool {
Number.isFinite(params.commandTimeoutMs)
? params.commandTimeoutMs
: undefined;
const invokeTimeoutMs =
typeof params.invokeTimeoutMs === "number" &&
Number.isFinite(params.invokeTimeoutMs)
? params.invokeTimeoutMs
: undefined;
const needsScreenRecording =
typeof params.needsScreenRecording === "boolean"
? params.needsScreenRecording
@@ -548,6 +554,7 @@ export function createNodesTool(): AnyAgentTool {
timeoutMs: commandTimeoutMs,
needsScreenRecording,
},
timeoutMs: invokeTimeoutMs,
idempotencyKey: crypto.randomUUID(),
})) as { payload?: unknown };
return jsonResult(raw?.payload ?? {});