fix: filter delivery-mirror entries from consumer history paths

vincentkoc · vincentkoc · commit 3b99a1a159da · 2026-04-28T18:53:20.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ Docs: https://docs.openclaw.ai
 
 ### Fixes
 
+- Sessions/WebChat: filter OpenClaw delivery-mirror transcript artifacts from LLM context, `chat.history`, and `sessions.get` so internal delivery audit rows do not appear as duplicate assistant messages. Carries forward #40716. Thanks @kiyoakii.
 - NVIDIA/NIM: persist the `NVIDIA_API_KEY` provider marker and mark bundled NVIDIA Chat Completions models as string-content compatible, so NIM models load from `models.json` and OpenAI-compatible subagent calls send plain text content. Fixes #73013 and #50107; refs #73014. Thanks @bautrey, @iot2edge, @ifearghal, and @futhgar.
 - Channels/Discord: let text-only configs drop the `GuildVoiceStates` gateway intent and expose a bounded `/gateway/bot` metadata timeout with rate-limited fallback logs, reducing idle CPU and warning floods. Fixes #73709 and #73585. Thanks @sanchezm86 and @trac3r00.
 - CLI/plugins: use plugin metadata snapshots for install slot selection and add opt-in plugin lifecycle timing traces, so plugin install avoids runtime-loading the plugin registry for metadata-only decisions. Thanks @shakkernerd.
diff --git a/docs/gateway/protocol.md b/docs/gateway/protocol.md
@@ -398,8 +398,8 @@ enumeration of `src/gateway/server-methods/*.ts`.
     - `sessions.abort` aborts active work for a session.
     - `sessions.patch` updates session metadata/overrides.
     - `sessions.reset`, `sessions.delete`, and `sessions.compact` perform session maintenance.
-    - `sessions.get` returns the full stored session row.
-    - Chat execution still uses `chat.history`, `chat.send`, `chat.abort`, and `chat.inject`. `chat.history` is display-normalized for UI clients: inline directive tags are stripped from visible text, plain-text tool-call XML payloads (including `<tool_call>...</tool_call>`, `<function_call>...</function_call>`, `<tool_calls>...</tool_calls>`, `<function_calls>...</function_calls>`, and truncated tool-call blocks) and leaked ASCII/full-width model control tokens are stripped, pure silent-token assistant rows such as exact `NO_REPLY` / `no_reply` are omitted, and oversized rows can be replaced with placeholders.
+    - `sessions.get` returns the stored session messages after omitting internal OpenClaw delivery-mirror transcript artifacts.
+    - Chat execution still uses `chat.history`, `chat.send`, `chat.abort`, and `chat.inject`. `chat.history` is display-normalized for UI clients: inline directive tags are stripped from visible text, plain-text tool-call XML payloads (including `<tool_call>...</tool_call>`, `<function_call>...</function_call>`, `<tool_calls>...</tool_calls>`, `<function_calls>...</function_calls>`, and truncated tool-call blocks) and leaked ASCII/full-width model control tokens are stripped, internal OpenClaw delivery-mirror transcript artifacts and pure silent-token assistant rows such as exact `NO_REPLY` / `no_reply` are omitted, and oversized rows can be replaced with placeholders.
 
   </Accordion>
 
diff --git a/docs/web/webchat.md b/docs/web/webchat.md
@@ -32,9 +32,10 @@ Status: the macOS/iOS SwiftUI chat UI talks directly to the Gateway WebSocket.
   payloads (including `<tool_call>...</tool_call>`,
   `<function_call>...</function_call>`, `<tool_calls>...</tool_calls>`,
   `<function_calls>...</function_calls>`, and truncated tool-call blocks), and
-  leaked ASCII/full-width model control tokens are stripped from visible text,
-  and assistant entries whose whole visible text is only the exact silent
-  token `NO_REPLY` / `no_reply` are omitted.
+  leaked ASCII/full-width model control tokens are stripped from visible text.
+  Internal OpenClaw delivery-mirror transcript artifacts and assistant entries
+  whose whole visible text is only the exact silent token `NO_REPLY` /
+  `no_reply` are omitted.
 - Reasoning-flagged reply payloads (`isReasoning: true`) are excluded from WebChat assistant content, transcript replay text, and audio content blocks, so thinking-only payloads do not surface as visible assistant messages or playable audio.
 - `chat.inject` appends an assistant note directly to the transcript and broadcasts it to the UI (no agent run).
 - Aborted runs can keep partial assistant output visible in the UI.
diff --git a/src/agents/pi-embedded-runner/tool-result-context-guard.ts b/src/agents/pi-embedded-runner/tool-result-context-guard.ts
@@ -1,5 +1,5 @@
 import type { AgentMessage } from "@mariozechner/pi-agent-core";
-import { isDeliveryMirrorMessage } from "../../config/sessions/transcript.js";
+import { filterDeliveryMirrorMessages } from "../../config/sessions/transcript.js";
 import type { ContextEngine, ContextEngineRuntimeContext } from "../../context-engine/types.js";
 import {
   CHARS_PER_TOKEN_ESTIMATE,
@@ -320,9 +320,7 @@ export function installToolResultContextGuard(params: {
       : messages;
 
     const sourceMessages = Array.isArray(transformed) ? transformed : messages;
-    const visibleMessages = sourceMessages.some(isDeliveryMirrorMessage)
-      ? sourceMessages.filter((msg) => !isDeliveryMirrorMessage(msg))
-      : sourceMessages;
+    const visibleMessages = filterDeliveryMirrorMessages(sourceMessages);
     const contextMessages = toolResultsNeedTruncation({
       messages: visibleMessages,
       maxSingleToolResultChars,
diff --git a/src/config/sessions/sessions.test.ts b/src/config/sessions/sessions.test.ts
@@ -18,7 +18,7 @@ import { evaluateSessionFreshness, resolveSessionResetPolicy } from "./reset.js"
 import { resolveAndPersistSessionFile } from "./session-file.js";
 import { clearSessionStoreCacheForTest, loadSessionStore, updateSessionStore } from "./store.js";
 import { useTempSessionsFixture } from "./test-helpers.js";
-import { isDeliveryMirrorMessage } from "./transcript.js";
+import { filterDeliveryMirrorMessages, isDeliveryMirrorMessage } from "./transcript.js";
 import { mergeSessionEntry, mergeSessionEntryWithPolicy, type SessionEntry } from "./types.js";
 
 describe("session path safety", () => {
@@ -653,3 +653,42 @@ describe("isDeliveryMirrorMessage", () => {
     ).toBe(false);
   });
 });
+
+describe("filterDeliveryMirrorMessages", () => {
+  it("removes only OpenClaw delivery-mirror assistant messages", () => {
+    const visibleAssistant = {
+      role: "assistant",
+      provider: "anthropic",
+      model: "delivery-mirror",
+      content: [{ type: "text", text: "visible" }],
+    };
+    const mirrorAssistant = {
+      role: "assistant",
+      provider: "openclaw",
+      model: "delivery-mirror",
+      content: [{ type: "text", text: "mirror" }],
+    };
+    const userMessage = {
+      role: "user",
+      content: [{ type: "text", text: "hello" }],
+    };
+
+    expect(filterDeliveryMirrorMessages([userMessage, mirrorAssistant, visibleAssistant])).toEqual([
+      userMessage,
+      visibleAssistant,
+    ]);
+  });
+
+  it("preserves array identity when there are no delivery-mirror messages", () => {
+    const messages = [
+      {
+        role: "assistant",
+        provider: "anthropic",
+        model: "claude-3",
+        content: [{ type: "text", text: "visible" }],
+      },
+    ];
+
+    expect(filterDeliveryMirrorMessages(messages)).toBe(messages);
+  });
+});
diff --git a/src/config/sessions/transcript.ts b/src/config/sessions/transcript.ts
@@ -172,6 +172,12 @@ export function isDeliveryMirrorMessage(msg: unknown): boolean {
   return msg.role === "assistant" && msg.provider === "openclaw" && msg.model === "delivery-mirror";
 }
 
+export function filterDeliveryMirrorMessages<T>(messages: T[]): T[] {
+  return messages.some(isDeliveryMirrorMessage)
+    ? messages.filter((message) => !isDeliveryMirrorMessage(message))
+    : messages;
+}
+
 export async function appendAssistantMessageToSessionTranscript(params: {
   agentId?: string;
   sessionKey: string;
diff --git a/src/gateway/server-methods/chat.ts b/src/gateway/server-methods/chat.ts
@@ -13,7 +13,7 @@ import { stageSandboxMedia } from "../../auto-reply/reply/stage-sandbox-media.js
 import type { MsgContext, TemplateContext } from "../../auto-reply/templating.js";
 import { extractCanvasFromText } from "../../chat/canvas-render.js";
 import { resolveSessionFilePath } from "../../config/sessions.js";
-import { isDeliveryMirrorMessage } from "../../config/sessions/transcript.js";
+import { filterDeliveryMirrorMessages } from "../../config/sessions/transcript.js";
 import type { OpenClawConfig } from "../../config/types.openclaw.js";
 import { formatErrorMessage } from "../../infra/errors.js";
 import { jsonUtf8Bytes } from "../../infra/json-utf8-bytes.js";
@@ -1670,7 +1670,7 @@ export const chatHandlers: GatewayRequestHandlers = {
       provider: resolvedSessionModel.provider,
       localMessages,
     });
-    const visibleMessages = rawMessages.filter((msg) => !isDeliveryMirrorMessage(msg));
+    const visibleMessages = filterDeliveryMirrorMessages(rawMessages);
     const hardMax = 1000;
     const defaultLimit = 200;
     const requested = typeof limit === "number" ? limit : defaultLimit;
diff --git a/src/gateway/server-methods/sessions.ts b/src/gateway/server-methods/sessions.ts
@@ -19,7 +19,7 @@ import {
   type SessionEntry,
   updateSessionStore,
 } from "../../config/sessions.js";
-import { isDeliveryMirrorMessage } from "../../config/sessions/transcript.js";
+import { filterDeliveryMirrorMessages } from "../../config/sessions/transcript.js";
 import type { OpenClawConfig } from "../../config/types.openclaw.js";
 import {
   hasInternalHookListeners,
@@ -1605,7 +1605,7 @@ export const sessionsHandlers: GatewayRequestHandlers = {
       return;
     }
     const allMessages = readSessionMessages(entry.sessionId, storePath, entry.sessionFile);
-    const filtered = allMessages.filter((msg) => !isDeliveryMirrorMessage(msg));
+    const filtered = filterDeliveryMirrorMessages(allMessages);
     const messages = limit < filtered.length ? filtered.slice(-limit) : filtered;
     respond(true, { messages }, undefined);
   },
