fix(gateway): activate source-reply delivery for direct webchat turns (#96840)

ly-wang19 · ly-wang19 · commit 0cd5cbd05364 · 2026-06-28T17:20:58.000+08:00
diff --git a/src/gateway/tool-resolution.test.ts b/src/gateway/tool-resolution.test.ts
@@ -43,6 +43,21 @@ describe("resolveGatewayScopedTools", () => {
     expect(result.tools.some((tool) => tool.name === "message")).toBe(false);
   });
 
+  it("force-allows the message tool for direct webchat turns so targetless send projects to the same chat (#96840)", () => {
+    const result = resolveGatewayScopedTools({
+      cfg: { tools: { profile: "minimal" } } as OpenClawConfig,
+      sessionKey: "agent:main:webchat:forge-main",
+      messageProvider: "webchat",
+      inboundEventKind: "user_request",
+      surface: "loopback",
+    });
+
+    const messageTool = result.tools.find((tool) => tool.name === "message");
+    expect(messageTool?.description).toContain(
+      "visible replies to the current source conversation",
+    );
+  });
+
   it("force-allows the message tool for routed webchat room-event turns", () => {
     const result = resolveGatewayScopedTools({
       cfg: { tools: { profile: "minimal" } } as OpenClawConfig,
diff --git a/src/gateway/tool-resolution.ts b/src/gateway/tool-resolution.ts
@@ -81,9 +81,18 @@ export function resolveGatewayScopedTools(params: {
   const providerProfilePolicy = resolveToolProfilePolicy(providerProfile);
   const gatewayRequestedTools = params.gatewayRequestedTools ?? [];
   const messageProvider = params.messageProvider?.trim().toLowerCase();
+  // Activate source-reply delivery for:
+  //   - non-webchat room-event turns (existing), or
+  //   - direct WebChat turns (`message(action="send")` without a target should
+  //     project into the same chat rather than fail). WebChat room-event turns
+  //     keep automatic delivery because the WebChat harness already projects
+  //     those — see the "keeps webchat room-event turns on automatic source
+  //     delivery" regression test.
+  const isWebchatSession = messageProvider === "webchat";
+  const isRoomEvent = params.inboundEventKind === "room_event";
   const sourceReplyDeliveryMode: SourceReplyDeliveryMode | undefined =
     params.sourceReplyDeliveryMode ??
-    (params.inboundEventKind === "room_event" && messageProvider !== "webchat"
+    ((isRoomEvent && !isWebchatSession) || (isWebchatSession && !isRoomEvent)
       ? "message_tool_only"
       : undefined);
   const runtimeAlsoAllow = sourceReplyDeliveryMode === "message_tool_only" ? ["message"] : [];
