fix: preserve fallback approval runtime auth

shakkernerd · shakkernerd · commit da401341b685 · 2026-06-08T14:49:01.000+01:00
diff --git a/src/agents/tools/gateway.test.ts b/src/agents/tools/gateway.test.ts
@@ -364,6 +364,21 @@ describe("gateway tool defaults", () => {
     expect(call.deviceIdentity).toEqual(mocks.deviceIdentity);
   });
 
+  it("keeps the local approval runtime token for remote mode without a remote URL", async () => {
+    mocks.configState.value = {
+      gateway: {
+        mode: "remote",
+      },
+    };
+    mocks.callGateway.mockResolvedValueOnce({ decision: "allow-once" });
+
+    await callGatewayTool("exec.approval.waitDecision", {}, { id: "approval-id" });
+
+    const call = capturedGatewayCall();
+    expect(call).not.toHaveProperty("deviceIdentity");
+    expect(call.approvalRuntimeToken).toEqual(expect.any(String));
+  });
+
   it("does not send the local approval runtime token to env-selected gateways", async () => {
     process.env.OPENCLAW_GATEWAY_URL = "wss://gateway.example";
     mocks.callGateway.mockResolvedValueOnce({ decision: "allow-once" });
diff --git a/src/agents/tools/gateway.ts b/src/agents/tools/gateway.ts
@@ -117,7 +117,13 @@ function resolveDefaultGatewayTarget(params: {
     // so loopback alone must not grant local approval-runtime authority.
     return "remote";
   }
-  return params.cfg.gateway?.mode === "remote" ? "remote" : "local";
+  if (
+    params.cfg.gateway?.mode === "remote" &&
+    normalizeOptionalString(params.cfg.gateway.remote?.url)
+  ) {
+    return "remote";
+  }
+  return "local";
 }
 
 function validateGatewayUrlOverrideForAgentTools(params: {

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,13 @@ function resolveDefaultGatewayTarget(params: {`
`117`	`117`	`// so loopback alone must not grant local approval-runtime authority.`
`118`	`118`	`return "remote";`
`119`	`119`	`}`
`120`		`- return params.cfg.gateway?.mode === "remote" ? "remote" : "local";`
	`120`	`+ if (`
	`121`	`+ params.cfg.gateway?.mode === "remote" &&`
	`122`	`+ normalizeOptionalString(params.cfg.gateway.remote?.url)`
	`123`	`+ ) {`
	`124`	`+ return "remote";`
	`125`	`+ }`
	`126`	`+ return "local";`
`121`	`127`	`}`
`122`	`128`
`123`	`129`	`function validateGatewayUrlOverrideForAgentTools(params: {`