fix(agents): preserve null node payloads

vincentkoc · vincentkoc · commit ffbd02fe8ed9 · 2026-06-02T06:03:06.000+02:00
diff --git a/src/agents/tools/nodes-tool-commands.ts b/src/agents/tools/nodes-tool-commands.ts
@@ -179,5 +179,7 @@ async function invokeNodeCommandPayload(params: {
     params: params.commandParams ?? {},
     idempotencyKey: crypto.randomUUID(),
   });
-  return raw?.payload ?? {};
+  return raw && typeof raw === "object" && Object.hasOwn(raw, "payload")
+    ? raw.payload
+    : {};
 }
diff --git a/src/agents/tools/nodes-tool.test.ts b/src/agents/tools/nodes-tool.test.ts
@@ -462,6 +462,19 @@ describe("createNodesTool screen_record duration guardrails", () => {
     });
   });
 
+  it("preserves explicit null location_get payloads from node.invoke", async () => {
+    gatewayMocks.callGatewayTool.mockResolvedValue({ payload: null });
+    const tool = createNodesTool();
+
+    const result = await tool.execute("call-location-null", {
+      action: "location_get",
+      node: "macbook",
+    });
+
+    expect(result.details).toBeNull();
+    expect(result.content).toEqual([{ type: "text", text: "null" }]);
+  });
+
   it("uses operator.pairing plus operator.admin to approve exec-capable node pair requests", async () => {
     mockNodePairApproveFlow({
       requiredApproveScopes: ["operator.pairing", "operator.admin"],

Original file line number	Diff line number	Diff line change
`@@ -179,5 +179,7 @@ async function invokeNodeCommandPayload(params: {`
`179`	`179`	`params: params.commandParams ?? {},`
`180`	`180`	`idempotencyKey: crypto.randomUUID(),`
`181`	`181`	`});`
`182`		`- return raw?.payload ?? {};`
	`182`	`+ return raw && typeof raw === "object" && Object.hasOwn(raw, "payload")`
	`183`	`+ ? raw.payload`
	`184`	`+ : {};`
`183`	`185`	`}`