fix(gateway): avoid whatsapp fallback for internal runs

src/gateway/server-methods/agent.ts

@@ -155,13 +155,14 @@ export const agentHandlers: GatewayRequestHandlers = {
         ? sessionEntry.lastTo.trim()
         : "";
 
+    const wantsDelivery = request.deliver === true;
+
     const resolvedProvider = (() => {
       if (requestedProvider === "last") {
         // WebChat is not a deliverable surface. Treat it as "unset" for routing,
         // so VoiceWake and CLI callers don't get stuck with deliver=false.
-        return lastProvider && lastProvider !== "webchat"
-          ? lastProvider
-          : "whatsapp";
+        if (lastProvider && lastProvider !== "webchat") return lastProvider;
+        return wantsDelivery ? "whatsapp" : "webchat";
       }
       if (
         requestedProvider === "whatsapp" ||
@@ -173,9 +174,8 @@ export const agentHandlers: GatewayRequestHandlers = {
       ) {
         return requestedProvider;
       }
-      return lastProvider && lastProvider !== "webchat"
-        ? lastProvider
-        : "whatsapp";
+      if (lastProvider && lastProvider !== "webchat") return lastProvider;
+      return wantsDelivery ? "whatsapp" : "webchat";
     })();
 
     const resolvedTo = (() => {

src/gateway/server.agent.test.ts

@@ -103,11 +103,56 @@ describe("gateway server agent", () => {
     const call = spy.mock.calls.at(-1)?.[0] as Record<string, unknown>;
     expect(call.sessionKey).toBe("agent:main:subagent:abc");
     expect(call.sessionId).toBe("sess-sub");
+    expectProviders(call, "webchat");
+    expect(call.deliver).toBe(false);
+    expect(call.to).toBeUndefined();
 
     ws.close();
     await server.close();
   });
 
+  test("agent falls back to whatsapp when delivery requested and no last provider exists", async () => {
+    testState.allowFrom = ["+1555"];
+    const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-gw-"));
+    testState.sessionStorePath = path.join(dir, "sessions.json");
+    await fs.writeFile(
+      testState.sessionStorePath,
+      JSON.stringify(
+        {
+          main: {
+            sessionId: "sess-main-missing-provider",
+            updatedAt: Date.now(),
+          },
+        },
+        null,
+        2,
+      ),
+      "utf-8",
+    );
+
+    const { server, ws } = await startServerWithClient();
+    await connectOk(ws);
+
+    const res = await rpcReq(ws, "agent", {
+      message: "hi",
+      sessionKey: "main",
+      deliver: true,
+      idempotencyKey: "idem-agent-missing-provider",
+    });
+    expect(res.ok).toBe(true);
+
+    const spy = vi.mocked(agentCommand);
+    const call = spy.mock.calls.at(-1)?.[0] as Record<string, unknown>;
+    expectProviders(call, "whatsapp");
+    expect(call.to).toBe("+1555");
+    expect(call.deliver).toBe(true);
+    expect(call.sessionId).toBe("sess-main-missing-provider");
+
+    ws.close();
+    await server.close();
+    testState.allowFrom = undefined;
+  });
+
   test("agent routes main last-channel whatsapp", async () => {
     const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-gw-"));
     testState.sessionStorePath = path.join(dir, "sessions.json");