Merge 73b475b into 2ba622c

maweibin · web-flow · commit 259d8a3729c2 · 2026-07-07T12:09:50.000Z
diff --git a/src/tui/tui-event-handlers.test.ts b/src/tui/tui-event-handlers.test.ts
@@ -2664,3 +2664,14 @@ describe("tui-event-handlers: streaming watchdog", () => {
     handlers.dispose?.();
   });
 });
+
+describe("abort diagnostic truncation", () => {
+  it("does not split surrogate pairs", async () => {
+    const { truncateUtf16Safe } = await import("@openclaw/normalization-core/utf16-slice");
+    const content = "x".repeat(158) + "🚀tail";
+    const bad = content.slice(0, 159);
+    expect(bad.endsWith("\uD83D")).toBe(true);
+    const good = truncateUtf16Safe(content, 159);
+    expect(good).toBe("x".repeat(158));
+  });
+});
diff --git a/src/tui/tui-event-handlers.ts b/src/tui/tui-event-handlers.ts
@@ -1,8 +1,9 @@
-// Handles TUI keyboard, paste, backend, and command events.
 import { normalizeLowercaseStringOrEmpty } from "@openclaw/normalization-core/string-coerce";
 import { classifyFailoverReason, isAuthErrorMessage } from "../agents/embedded-agent-helpers.js";
 import { parseAgentSessionKey } from "../sessions/session-key-utils.js";
 import { formatRawAssistantErrorForUi } from "../shared/assistant-error-format.js";
+// Handles TUI keyboard, paste, backend, and command events.
+import { truncateUtf16Safe } from "../utils.js";
 import {
   asString,
   extractTextFromMessage,
@@ -53,7 +54,7 @@ function formatAbortDiagnostic(value: string | undefined): string | undefined {
     return undefined;
   }
   return diagnostic.length > MAX_ABORT_DIAGNOSTIC_LENGTH
-    ? `${diagnostic.slice(0, MAX_ABORT_DIAGNOSTIC_LENGTH - 1)}…`
+    ? `${truncateUtf16Safe(diagnostic, MAX_ABORT_DIAGNOSTIC_LENGTH - 1)}…`
     : diagnostic;
 }
 
