fix: render sanitized webchat message-tool text

Eva (agent) · Eva (agent) · commit 45e0d6de92ac · 2026-05-13T05:12:25.000+07:00
diff --git a/extensions/codex/src/app-server/dynamic-tools.test.ts b/extensions/codex/src/app-server/dynamic-tools.test.ts
@@ -354,6 +354,41 @@ describe("createCodexDynamicToolBridge", () => {
     ]);
   });
 
+  it("records sanitized message text from successful message tool result details", async () => {
+    const tool = createTool({
+      name: "message",
+      execute: vi.fn(async () =>
+        textToolResult("Sent.", {
+          ok: true,
+          status: "ok",
+          deliveryStatus: "sent",
+          delivery: "webchat-session",
+          message: "Visible reply from Codex.",
+        }),
+      ),
+    });
+    const bridge = createCodexDynamicToolBridge({
+      tools: [tool],
+      signal: new AbortController().signal,
+    });
+
+    const result = await handleMessageToolCall(bridge, {
+      action: "send",
+      message: "<think>internal scratchpad</think>Visible reply from Codex.",
+    });
+
+    expect(result).toEqual(expectInputText("Sent."));
+    expect(bridge.telemetry.didSendViaMessagingTool).toBe(true);
+    expect(bridge.telemetry.messagingToolSentTexts).toEqual(["Visible reply from Codex."]);
+    expect(bridge.telemetry.messagingToolSentTargets).toEqual([
+      {
+        tool: "message",
+        provider: "message",
+        text: "Visible reply from Codex.",
+      },
+    ]);
+  });
+
   it("does not record messaging side effects when the send fails", async () => {
     const tool = createTool({
       name: "message",
diff --git a/extensions/codex/src/app-server/dynamic-tools.ts b/extensions/codex/src/app-server/dynamic-tools.ts
@@ -279,7 +279,9 @@ function collectToolTelemetry(params: {
     return;
   }
   params.telemetry.didSendViaMessagingTool = true;
-  const text = readFirstString(params.args, ["text", "message", "body", "content"]);
+  const text =
+    readToolResultDetailString(params.result, ["text", "message", "body", "content"]) ??
+    readFirstString(params.args, ["text", "message", "body", "content"]);
   if (text) {
     params.telemetry.messagingToolSentTexts.push(text);
   }
@@ -372,6 +374,16 @@ function readFirstString(record: Record<string, unknown>, keys: string[]): strin
   return undefined;
 }
 
+function readToolResultDetailString(
+  result: AgentToolResult<unknown> | undefined,
+  keys: string[],
+): string | undefined {
+  if (!isRecord(result?.details)) {
+    return undefined;
+  }
+  return readFirstString(result.details, keys);
+}
+
 function collectMediaUrls(record: Record<string, unknown>): string[] {
   const urls: string[] = [];
   for (const key of ["mediaUrl", "media_url", "imageUrl", "image_url"]) {
diff --git a/src/agents/tools/message-tool.test.ts b/src/agents/tools/message-tool.test.ts
@@ -516,6 +516,32 @@ describe("message tool agent routing", () => {
     });
   });
 
+  it("sanitizes same-session WebChat visible reply text", async () => {
+    const tool = createMessageTool({
+      config: {} as never,
+      currentChannelProvider: "webchat",
+      currentChannelId: "webchat-session-1",
+      sourceReplyDeliveryMode: "message_tool_only",
+      runMessageAction: mocks.runMessageAction as never,
+    });
+
+    const result = await tool.execute("1", {
+      action: "send",
+      message: "<think>internal scratchpad</think>Actual visible reply after tools.",
+    });
+
+    expect(mocks.runMessageAction).not.toHaveBeenCalled();
+    expect(result.details).toMatchObject({
+      ok: true,
+      status: "ok",
+      deliveryStatus: "sent",
+      delivery: "webchat-session",
+      channel: "webchat",
+      to: "webchat-session-1",
+      message: "Actual visible reply after tools.",
+    });
+  });
+
   it("keeps explicit external message-tool sends on the outbound path from WebChat", async () => {
     mockSendResult({ channel: "telegram", to: "telegram:123" });
 
