fix: preserve webchat external-origin message delivery

Eva (agent) · Eva (agent) · commit d34e6ee76d4f · 2026-05-13T05:12:29.000+07:00
diff --git a/src/auto-reply/reply/dispatch-from-config.test.ts b/src/auto-reply/reply/dispatch-from-config.test.ts
@@ -4960,6 +4960,50 @@ describe("sendPolicy deny — suppress delivery, not processing (#53328)", () =>
     expect(firstFinalReplyPayload(dispatcher)?.text).toBe("visible webchat reply");
   });
 
+  it("keeps harness message-tool delivery for explicit external WebChat origins", async () => {
+    setNoAbort();
+    registerAgentHarness({
+      id: "codex",
+      label: "Codex",
+      deliveryDefaults: { sourceVisibleReplies: "message_tool" },
+      supports: () => ({ supported: true, priority: 100 }),
+      runAttempt: vi.fn(async () => ({}) as never),
+    });
+    sessionStoreMocks.currentEntry = {
+      sessionId: "s1",
+      updatedAt: 0,
+      agentHarnessId: "codex",
+      sendPolicy: "allow",
+    };
+    const dispatcher = createDispatcher();
+    const replyResolver = vi.fn(async (_ctx: MsgContext, opts?: GetReplyOptions) => {
+      expect(opts?.sourceReplyDeliveryMode).toBe("message_tool_only");
+      return { text: "external reply should use message tool" } satisfies ReplyPayload;
+    });
+
+    const result = await dispatchReplyFromConfig({
+      ctx: buildTestCtx({
+        ChatType: "direct",
+        CommandSource: undefined,
+        From: "webchat:user",
+        To: "webchat:main",
+        Provider: "webchat",
+        Surface: "webchat",
+        OriginatingChannel: "imessage",
+        OriginatingTo: "imessage:+15550001111",
+        ExplicitDeliverRoute: true,
+        SessionKey: "agent:main:main",
+      }),
+      cfg: emptyConfig,
+      dispatcher,
+      replyResolver,
+    });
+
+    expect(replyResolver).toHaveBeenCalledTimes(1);
+    expect(result.queuedFinal).toBe(false);
+    expect(dispatcher.sendFinalReply).not.toHaveBeenCalled();
+  });
+
   it("falls back to automatic group/channel delivery when the message tool is unavailable", async () => {
     setNoAbort();
     const dispatcher = createDispatcher();
diff --git a/src/auto-reply/reply/dispatch-from-config.ts b/src/auto-reply/reply/dispatch-from-config.ts
@@ -296,10 +296,17 @@ const createShouldEmitVerboseProgress = (params: {
   };
 };
 
-const isInternalWebchatSourceContext = (ctx: FinalizedMsgContext): boolean =>
-  normalizeMessageChannel(ctx.Provider) === INTERNAL_MESSAGE_CHANNEL ||
-  normalizeMessageChannel(ctx.Surface) === INTERNAL_MESSAGE_CHANNEL ||
-  normalizeMessageChannel(ctx.OriginatingChannel) === INTERNAL_MESSAGE_CHANNEL;
+const isInternalWebchatSourceContext = (ctx: FinalizedMsgContext): boolean => {
+  const provider = normalizeMessageChannel(ctx.Provider);
+  const surface = normalizeMessageChannel(ctx.Surface);
+  const originatingChannel = normalizeMessageChannel(ctx.OriginatingChannel);
+  const currentSurfaceIsWebchat =
+    provider === INTERNAL_MESSAGE_CHANNEL || surface === INTERNAL_MESSAGE_CHANNEL;
+  if (!currentSurfaceIsWebchat) {
+    return false;
+  }
+  return !originatingChannel || originatingChannel === INTERNAL_MESSAGE_CHANNEL;
+};
 
 const resolveHarnessSourceVisibleRepliesDefault = (params: {
   cfg: OpenClawConfig;
