fix(cli): keep session key truncation UTF-16 safe

steipete · steipete · commit f4fa56da1449 · 2026-07-09T17:53:44.000+01:00
diff --git a/src/commands/sessions-table.test.ts b/src/commands/sessions-table.test.ts
@@ -0,0 +1,14 @@
+// Sessions table tests cover shared fixed-width cell formatting.
+import { describe, expect, it } from "vitest";
+import { formatSessionKeyCell, SESSION_KEY_PAD } from "./sessions-table.js";
+
+describe("formatSessionKeyCell", () => {
+  it("keeps both truncation boundaries UTF-16 safe", () => {
+    const key = `${"a".repeat(15)}😀middle😀${"z".repeat(5)}`;
+
+    const rendered = formatSessionKeyCell(key, false);
+
+    expect(rendered).toBe(`${"a".repeat(15)}...${"z".repeat(5)}`.padEnd(SESSION_KEY_PAD));
+    expect(rendered).toHaveLength(SESSION_KEY_PAD);
+  });
+});
diff --git a/src/commands/sessions-table.ts b/src/commands/sessions-table.ts
@@ -4,6 +4,7 @@
  * Cleanup and listing commands use the same row shape and fixed-width cells so
  * terminal output stays aligned across commands.
  */
+import { sliceUtf16Safe, truncateUtf16Safe } from "@openclaw/normalization-core/utf16-slice";
 import { theme } from "../../packages/terminal-core/src/theme.js";
 import type { SessionEntry } from "../config/sessions.js";
 import { formatTimeAgo } from "../infra/format-time/format-relative.ts";
@@ -108,7 +109,7 @@ function truncateSessionKey(key: string): string {
   // Keep both the stable prefix and suffix; the tail often contains direct
   // recipient or runtime identifiers that distinguish otherwise similar keys.
   const head = Math.max(4, SESSION_KEY_PAD - 10);
-  return `${key.slice(0, head)}...${key.slice(-6)}`;
+  return `${truncateUtf16Safe(key, head)}...${sliceUtf16Safe(key, -6)}`;
 }
 
 /** Formats a session key cell for table output. */
