From f8bf0413965499532fd309fad0f680b82b88b05a Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Fri, 9 Jan 2026 22:40:32 +0100
Subject: [PATCH] test(gateway): cover internal provider defaults

---
 src/agents/clawdbot-tools.sessions.test.ts  | 14 ++++++-
 src/agents/clawdbot-tools.subagents.test.ts |  6 +++
 src/gateway/server.agent.test.ts            | 44 +++++++++++++++++++++
 src/utils/message-provider.test.ts          | 12 ++++++
 4 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 src/utils/message-provider.test.ts

diff --git a/src/agents/clawdbot-tools.sessions.test.ts b/src/agents/clawdbot-tools.sessions.test.ts
index 1f34ff957..ab56274ea 100644
--- a/src/agents/clawdbot-tools.sessions.test.ts
+++ b/src/agents/clawdbot-tools.sessions.test.ts
@@ -268,7 +268,10 @@ describe("sessions tools", () => {
     );
     expect(agentCalls).toHaveLength(8);
     for (const call of agentCalls) {
-      expect(call.params).toMatchObject({ lane: "nested" });
+      expect(call.params).toMatchObject({
+        lane: "nested",
+        provider: "webchat",
+      });
     }
     expect(
       agentCalls.some(
@@ -394,6 +397,15 @@ describe("sessions tools", () => {
     await new Promise((resolve) => setTimeout(resolve, 0));
     await new Promise((resolve) => setTimeout(resolve, 0));
 
+    const agentCalls = calls.filter((call) => call.method === "agent");
+    expect(agentCalls).toHaveLength(4);
+    for (const call of agentCalls) {
+      expect(call.params).toMatchObject({
+        lane: "nested",
+        provider: "webchat",
+      });
+    }
+
     const replySteps = calls.filter(
       (call) =>
         call.method === "agent" &&
diff --git a/src/agents/clawdbot-tools.subagents.test.ts b/src/agents/clawdbot-tools.subagents.test.ts
index 5c38b1caf..e98bfbe4d 100644
--- a/src/agents/clawdbot-tools.subagents.test.ts
+++ b/src/agents/clawdbot-tools.subagents.test.ts
@@ -169,6 +169,12 @@ describe("subagents", () => {
     expect(first?.provider).toBe("discord");
     expect(first?.sessionKey?.startsWith("agent:main:subagent:")).toBe(true);
     expect(childSessionKey?.startsWith("agent:main:subagent:")).toBe(true);
+    const second = agentCalls[1]?.params as
+      | { provider?: string; deliver?: boolean; lane?: string }
+      | undefined;
+    expect(second?.lane).toBe("nested");
+    expect(second?.deliver).toBe(false);
+    expect(second?.provider).toBe("webchat");
 
     expect(sendParams.provider).toBe("discord");
     expect(sendParams.to).toBe("channel:req");
diff --git a/src/gateway/server.agent.test.ts b/src/gateway/server.agent.test.ts
index 7ef045cbc..0b2095b7c 100644
--- a/src/gateway/server.agent.test.ts
+++ b/src/gateway/server.agent.test.ts
@@ -375,6 +375,50 @@ describe("gateway server agent", () => {
     await server.close();
   });
 
+  test("agent uses webchat for internal runs when last provider is webchat", async () => {
+    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-webchat-internal",
+            updatedAt: Date.now(),
+            lastProvider: "webchat",
+            lastTo: "+1555",
+          },
+        },
+        null,
+        2,
+      ),
+      "utf-8",
+    );
+
+    const { server, ws } = await startServerWithClient();
+    await connectOk(ws);
+
+    const res = await rpcReq(ws, "agent", {
+      message: "hi",
+      sessionKey: "main",
+      provider: "last",
+      deliver: false,
+      idempotencyKey: "idem-agent-webchat-internal",
+    });
+    expect(res.ok).toBe(true);
+
+    const spy = vi.mocked(agentCommand);
+    const call = spy.mock.calls.at(-1)?.[0] as Record<string, unknown>;
+    expectProviders(call, "webchat");
+    expect(call.to).toBeUndefined();
+    expect(call.deliver).toBe(false);
+    expect(call.bestEffortDeliver).toBe(true);
+    expect(call.sessionId).toBe("sess-main-webchat-internal");
+
+    ws.close();
+    await server.close();
+  });
+
   test(
     "agent ack response then final response",
     { timeout: 8000 },
diff --git a/src/utils/message-provider.test.ts b/src/utils/message-provider.test.ts
new file mode 100644
index 000000000..ecccf7613
--- /dev/null
+++ b/src/utils/message-provider.test.ts
@@ -0,0 +1,12 @@
+import { describe, expect, it } from "vitest";
+
+import { resolveGatewayMessageProvider } from "./message-provider.js";
+
+describe("message-provider", () => {
+  it("normalizes gateway message providers and rejects unknown values", () => {
+    expect(resolveGatewayMessageProvider("discord")).toBe("discord");
+    expect(resolveGatewayMessageProvider(" imsg ")).toBe("imessage");
+    expect(resolveGatewayMessageProvider("teams")).toBe("msteams");
+    expect(resolveGatewayMessageProvider("nope")).toBeUndefined();
+  });
+});