fix(nextcloud-talk): sanitize inbound replies

steipete · miorbnli · steipete · commit 2b61d491c3b5 · 2026-07-10T11:53:27.000-04:00
Co-authored-by: liyuanbin &lt;li.yuanbin1@xydigit.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,7 @@ Docs: https://docs.openclaw.ai
 
 ### Fixes
 
+- **Nextcloud Talk assistant replies:** strip internal tool-trace banners and XML scaffolding from both direct sends and inbound-triggered replies while preserving ordinary prose and code examples. (#101712) Thanks @Pick-cat.
 - **Lean local model shell access:** keep `exec` directly visible beside the default structured Tool Search controls so coding-tuned local models can use their shell fallback instead of searching for missing domain tools. (#87587) Thanks @vincentkoc.
 - **OAuth refresh contention diagnostics:** keep local lock paths out of user-facing refresh failures and avoid duplicate failure prefixes while preserving structured provider and profile classification. (#83383) Thanks @vincentkoc.
 - **Exec approval prompts:** keep background-disabled fallback warnings out of pending gateway/node approvals and show them only after a command actually runs in the foreground. (#78184) Thanks @vincentkoc.
diff --git a/extensions/nextcloud-talk/src/channel.ts b/extensions/nextcloud-talk/src/channel.ts
@@ -1,14 +1,14 @@
 // Nextcloud Talk plugin module implements channel behavior.
 import { describeWebhookAccountSnapshot } from "openclaw/plugin-sdk/account-helpers";
 import { createChatChannelPlugin } from "openclaw/plugin-sdk/channel-core";
-import { sanitizeAssistantVisibleText } from "openclaw/plugin-sdk/text-chunking";
 import { createLoggedPairingApprovalNotifier } from "openclaw/plugin-sdk/channel-pairing";
 import { createAllowlistProviderRouteAllowlistWarningCollector } from "openclaw/plugin-sdk/channel-policy";
 import {
   buildWebhookChannelStatusSummary,
   createComputedAccountStatusAdapter,
   createDefaultChannelRuntimeState,
 } from "openclaw/plugin-sdk/status-helpers";
+import { sanitizeAssistantVisibleText } from "openclaw/plugin-sdk/text-chunking";
 import { resolveNextcloudTalkAccount, type ResolvedNextcloudTalkAccount } from "./accounts.js";
 import { nextcloudTalkApprovalAuth } from "./approval-auth.js";
 import { probeNextcloudTalkBotResponseFeature } from "./bot-preflight.js";
diff --git a/extensions/nextcloud-talk/src/inbound.behavior.test.ts b/extensions/nextcloud-talk/src/inbound.behavior.test.ts
@@ -1,7 +1,7 @@
 // Nextcloud Talk tests cover inbound.behavior plugin behavior.
 import { createPluginRuntimeMock } from "openclaw/plugin-sdk/channel-test-helpers";
 import { beforeEach, describe, expect, it, vi } from "vitest";
-import type { PluginRuntime, RuntimeEnv } from "../runtime-api.js";
+import type { OutboundReplyPayload, PluginRuntime, RuntimeEnv } from "../runtime-api.js";
 import type { ResolvedNextcloudTalkAccount } from "./accounts.js";
 import { handleNextcloudTalkInbound } from "./inbound.js";
 import { setNextcloudTalkRuntime } from "./runtime.js";
@@ -101,6 +101,23 @@ function requireFirstSendMessageCall(): [unknown, unknown, unknown] {
   return call as [unknown, unknown, unknown];
 }
 
+type CapturedReplyDelivery = {
+  preparePayload: (payload: OutboundReplyPayload) => OutboundReplyPayload;
+  deliver: (payload: OutboundReplyPayload) => Promise<void>;
+};
+
+function requireFirstReplyDelivery(mock: ReturnType<typeof vi.fn>): CapturedReplyDelivery {
+  const assembledRequest = requireFirstMockArg(mock, "Nextcloud Talk assembled request") as {
+    delivery?: Partial<CapturedReplyDelivery>;
+  };
+  const preparePayload = assembledRequest.delivery?.preparePayload;
+  const deliver = assembledRequest.delivery?.deliver;
+  if (!preparePayload || !deliver) {
+    throw new Error("expected Nextcloud Talk reply delivery hooks");
+  }
+  return { preparePayload, deliver };
+}
+
 function createAccount(
   overrides?: Partial<ResolvedNextcloudTalkAccount>,
 ): ResolvedNextcloudTalkAccount {
@@ -307,4 +324,98 @@ describe("nextcloud-talk inbound behavior", () => {
     ) as { replyPipeline?: unknown };
     expect(assembledRequest.replyPipeline).toEqual({});
   });
+
+  it("sanitizes inbound replies before local delivery while preserving reply metadata", async () => {
+    const coreRuntime = createPluginRuntimeMock();
+    setNextcloudTalkRuntime(coreRuntime as unknown as PluginRuntime);
+    createChannelPairingControllerMock.mockReturnValue({
+      readStoreForDmPolicy: vi.fn(async () => []),
+      issueChallenge: vi.fn(),
+    });
+    sendMessageNextcloudTalkMock.mockResolvedValue(undefined);
+
+    const config = { channels: { "nextcloud-talk": {} } } as CoreConfig;
+    await handleNextcloudTalkInbound({
+      message: createMessage(),
+      account: createAccount({
+        config: {
+          dmPolicy: "allowlist",
+          allowFrom: ["user-1"],
+          groupPolicy: "allowlist",
+          groupAllowFrom: [],
+        },
+      }),
+      config,
+      runtime: createRuntimeEnv(),
+    });
+
+    const delivery = requireFirstReplyDelivery(
+      coreRuntime.channel.inbound.dispatchReply as ReturnType<typeof vi.fn>,
+    );
+    const cases = [
+      {
+        text: "Done.\n⚠️ 🛠️ `search repos (agent)` failed",
+        expected: "Done.",
+      },
+      {
+        text: '<tool_call>{"name":"exec"}</tool_call>Meeting notes sent.',
+        expected: "Meeting notes sent.",
+      },
+      {
+        text: [
+          "Checking now.",
+          "<function_response>",
+          'Searching for: "agenda"',
+          "</function_response>",
+          "Meeting notes sent.",
+        ].join("\n"),
+        expected: "Checking now.\n\nMeeting notes sent.",
+      },
+      {
+        text: "The agenda has 3 open action items.",
+        expected: "The agenda has 3 open action items.",
+      },
+    ];
+    for (const testCase of cases) {
+      expect(delivery.preparePayload({ text: testCase.text })).toEqual({
+        text: testCase.expected,
+      });
+    }
+
+    const mediaOnlyPayload = { mediaUrl: "https://example.com/a.png" };
+    expect(delivery.preparePayload(mediaOnlyPayload)).toBe(mediaOnlyPayload);
+
+    const preparedPayload = delivery.preparePayload({
+      text: "Done.\n⚠️ 🛠️ `search repos (agent)` failed",
+      mediaUrls: ["https://example.com/a.png"],
+      replyToId: "reply-1",
+    });
+    await delivery.deliver(preparedPayload);
+    await delivery.deliver(
+      delivery.preparePayload({
+        text: '<tool_call>{"name":"exec"}</tool_call>Meeting notes sent.',
+      }),
+    );
+
+    expect(sendMessageNextcloudTalkMock).toHaveBeenCalledTimes(2);
+    expect(requireFirstSendMessageCall()).toEqual([
+      "room-1",
+      "Done.\n\nAttachment: https://example.com/a.png",
+      {
+        cfg: config,
+        accountId: "default",
+        replyTo: "reply-1",
+      },
+    ]);
+    expect(sendMessageNextcloudTalkMock).toHaveBeenNthCalledWith(
+      2,
+      "room-1",
+      "Meeting notes sent.",
+      {
+        cfg: config,
+        accountId: "default",
+        replyTo: undefined,
+      },
+    );
+  });
 });
diff --git a/extensions/nextcloud-talk/src/inbound.ts b/extensions/nextcloud-talk/src/inbound.ts
@@ -8,6 +8,7 @@ import {
   normalizeOptionalString,
   normalizeStringEntries,
 } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { sanitizeAssistantVisibleText } from "openclaw/plugin-sdk/text-chunking";
 import {
   GROUP_POLICY_BLOCKED_LABEL,
   resolveAllowlistProviderRuntimeGroupPolicy,
@@ -361,6 +362,13 @@ export async function handleNextcloudTalkInbound(params: {
     dispatchReplyWithBufferedBlockDispatcher:
       core.channel.reply.dispatchReplyWithBufferedBlockDispatcher,
     delivery: {
+      preparePayload: (payload) =>
+        payload.text === undefined
+          ? payload
+          : {
+              ...payload,
+              text: sanitizeAssistantVisibleText(payload.text),
+            },
       deliver: async (payload) => {
         await deliverNextcloudTalkReply({
           cfg: config,
diff --git a/extensions/nextcloud-talk/src/outbound-tool-trace-sanitize.test.ts b/extensions/nextcloud-talk/src/outbound-tool-trace-sanitize.test.ts
@@ -1,23 +1,45 @@
-// Nextcloud Talk outbound must strip assistant internal tool-trace scaffolding,
-// matching the sibling channel fixes tracked under #90684 (Slack / Signal /
-// Matrix / Telegram / Google Chat / QQBot / IRC / SMS / Feishu / LINE).
+// Nextcloud Talk outbound must strip assistant internal tool-trace scaffolding
+// before delivery, matching the shared channel sanitizer contract.
 import { describe, expect, it } from "vitest";
 import { nextcloudTalkPlugin } from "./channel.js";
 
+function sanitizeOutboundText(text: string): string {
+  const sanitizeText = nextcloudTalkPlugin.outbound?.sanitizeText;
+  if (!sanitizeText) {
+    throw new Error("Expected Nextcloud Talk outbound sanitizeText hook");
+  }
+  return sanitizeText({ text, payload: { text } });
+}
+
 describe("nextcloud-talk outbound sanitizeText", () => {
   it("strips internal tool-trace banners before outbound delivery", () => {
     const text = "Done.\n⚠️ 🛠️ `search repos (agent)` failed";
+    expect(sanitizeOutboundText(text)).toBe("Done.");
+  });
 
-    expect(
-      nextcloudTalkPlugin.outbound?.sanitizeText?.({ text, payload: { text } }),
-    ).toBe("Done.");
+  it("strips XML tool-call scaffolding leaked into assistant text", () => {
+    const text = '<tool_call>{"name":"exec"}</tool_call>Meeting notes sent.';
+    expect(sanitizeOutboundText(text)).toBe("Meeting notes sent.");
+  });
+
+  it("strips multiline tool-response scaffolding leaked into assistant text", () => {
+    const text = [
+      "Checking now.",
+      "<function_response>",
+      'Searching for: "agenda"',
+      "</function_response>",
+      "Meeting notes sent.",
+    ].join("\n");
+    expect(sanitizeOutboundText(text)).toBe("Checking now.\n\nMeeting notes sent.");
   });
 
   it("preserves ordinary assistant prose while sanitizing", () => {
-    const text = "The pipeline has 3 open deals.";
+    const text = "The agenda has 3 open action items.";
+    expect(sanitizeOutboundText(text)).toBe(text);
+  });
 
-    expect(
-      nextcloudTalkPlugin.outbound?.sanitizeText?.({ text, payload: { text } }),
-    ).toBe(text);
+  it("preserves internal trace examples inside fenced code", () => {
+    const text = ["Example:", "```", "⚠️ 🛠️ `search repos (agent)` failed", "```"].join("\n");
+    expect(sanitizeOutboundText(text)).toBe(text);
   });
 });
