fix: complete UTF-16-safe restart and chat boundaries

steipete · steipete · commit e5bab02257c8 · 2026-07-07T17:07:28.000+01:00
diff --git a/src/gateway/server-methods/restart.test.ts b/src/gateway/server-methods/restart.test.ts
@@ -95,6 +95,18 @@ describe("gateway.restart.request handler", () => {
     expectRestartRequest(false);
   });
 
+  it("backs off before an emoji that crosses the reason limit", async () => {
+    mockScheduledRestart({ safe: true, summary: "safe to restart now" });
+
+    await invokeRestartRequest({ reason: "x".repeat(199) + "🧠tail" });
+
+    expect(requestSafeGatewayRestart).toHaveBeenCalledWith({
+      reason: "x".repeat(199),
+      delayMs: 0,
+      skipDeferral: false,
+    });
+  });
+
   it("rejects non-object params without scheduling a restart", async () => {
     const respond = await invokeRestartRequest("operator");
 
diff --git a/src/gateway/server-methods/restart.ts b/src/gateway/server-methods/restart.ts
@@ -1,4 +1,5 @@
 // Gateway RPC handlers for safe gateway restart requests and preflight state.
+import { truncateUtf16Safe } from "@openclaw/normalization-core/utf16-slice";
 import { ErrorCodes, errorShape } from "../../../packages/gateway-protocol/src/index.js";
 import {
   createSafeGatewayRestartPreflight,
@@ -13,7 +14,9 @@ function isRestartRequestParams(value: unknown): value is Record<string, unknown
 function normalizeReason(value: unknown): string | undefined {
   // Restart reasons are operator-visible log context, not payload storage.
   // Trim and cap them before passing through to the coordinator.
-  return typeof value === "string" && value.trim() ? value.trim().slice(0, 200) : undefined;
+  return typeof value === "string" && value.trim()
+    ? truncateUtf16Safe(value.trim(), 200)
+    : undefined;
 }
 
 function normalizeSkipDeferral(value: unknown): boolean {
diff --git a/src/infra/infra-runtime.test.ts b/src/infra/infra-runtime.test.ts
@@ -136,6 +136,15 @@ describe("infra runtime", () => {
       await vi.runAllTimersAsync();
     });
 
+    it("backs off before an emoji that crosses the restart reason limit", () => {
+      const restart = scheduleGatewaySigusr1Restart({
+        delayMs: 0,
+        reason: "x".repeat(199) + "🧠tail",
+      });
+
+      expect(restart.reason).toBe("x".repeat(199));
+    });
+
     it("tracks external restart policy", () => {
       expect(isGatewaySigusr1RestartExternallyAllowed()).toBe(false);
       setGatewaySigusr1RestartPolicy({ allowExternal: true });
diff --git a/src/infra/restart-intent.test.ts b/src/infra/restart-intent.test.ts
@@ -141,6 +141,15 @@ describe("gateway restart intent", () => {
     expect(fs.existsSync(legacyIntentPath(env))).toBe(false);
   });
 
+  it("backs off before an emoji that crosses the persisted reason limit", () => {
+    const env = createIntentEnv();
+    insertIntentRow(env, { reason: "x".repeat(199) + "🧠tail" });
+
+    expect(consumeGatewayRestartIntentPayloadSync(env)).toEqual({
+      reason: "x".repeat(199),
+    });
+  });
+
   it("overwrites the previous pending intent row", () => {
     const env = createIntentEnv();
     expect(
diff --git a/src/infra/restart.ts b/src/infra/restart.ts
@@ -843,10 +843,7 @@ export function scheduleGatewaySigusr1Restart(opts?: {
       ? Math.floor(opts.delayMs)
       : 2000;
   const delayMs = Math.min(Math.max(delayMsRaw, 0), 60_000);
-  const reason =
-    typeof opts?.reason === "string" && opts.reason.trim()
-      ? truncateUtf16Safe(opts.reason.trim(), 200)
-      : undefined;
+  const reason = normalizeRestartIntentReason(opts?.reason);
   const hasSigusr1Listener = process.listenerCount("SIGUSR1") > 0;
   const mode = hasSigusr1Listener ? "emit" : process.platform === "win32" ? "supervisor" : "signal";
   const nowMs = Date.now();
diff --git a/ui/src/pages/chat/chat-view.test.ts b/ui/src/pages/chat/chat-view.test.ts
@@ -4049,6 +4049,24 @@ describe("right-click Reply", () => {
     expect(target.senderLabel).toBe("User");
   });
 
+  it("backs off before an emoji that crosses the reply target limit", () => {
+    const onSetReply = vi.fn();
+    const container = renderChatView({ onSetReply });
+    const section = container.querySelector<HTMLElement>(".card.chat");
+    const group = document.createElement("div");
+    group.className = "chat-group";
+    const bubble = document.createElement("div");
+    bubble.className = "chat-bubble";
+    bubble.dataset.messageText = "x".repeat(499) + "🧠tail";
+    group.appendChild(bubble);
+    section!.querySelector(".chat-thread-inner")!.appendChild(group);
+
+    bubble.dispatchEvent(new MouseEvent("contextmenu", { bubbles: true, cancelable: true }));
+    document.querySelector<HTMLButtonElement>(".chat-reply-context-menu button")!.click();
+
+    expect(onSetReply.mock.calls[0][0].text).toBe("x".repeat(499));
+  });
+
   it("keeps the native context menu when Reply is unavailable", () => {
     const container = renderChatView();
     const section = container.querySelector<HTMLElement>(".card.chat");
@@ -4129,6 +4147,20 @@ describe("right-click Reply", () => {
     expect(dismiss).not.toBeNull();
   });
 
+  it("backs off before an emoji that crosses the reply preview limit", () => {
+    const container = renderChatView({
+      replyTarget: {
+        messageId: "msg-emoji",
+        text: "x".repeat(119) + "🧠tail",
+        senderLabel: "User",
+      },
+    });
+
+    expect(container.querySelector(".chat-reply-preview__text")?.textContent).toBe(
+      `${"x".repeat(119)}...`,
+    );
+  });
+
   it("calls onClearReply when dismiss button is clicked", () => {
     const onClearReply = vi.fn();
     const container = renderChatView({
diff --git a/ui/src/pages/chat/components/chat-composer.ts b/ui/src/pages/chat/components/chat-composer.ts
@@ -1,5 +1,5 @@
-import { truncateUtf16Safe } from "@openclaw/normalization-core/utf16-slice";
 // Chat-owned composer, queue, status, context, and run controls.
+import { truncateUtf16Safe } from "@openclaw/normalization-core/utf16-slice";
 import { html, nothing, type TemplateResult } from "lit";
 import { ifDefined } from "lit/directives/if-defined.js";
 import { ref } from "lit/directives/ref.js";
diff --git a/ui/src/pages/chat/components/chat-thread.ts b/ui/src/pages/chat/components/chat-thread.ts
@@ -1,5 +1,5 @@
-import { truncateUtf16Safe } from "@openclaw/normalization-core/utf16-slice";
 // Chat-owned message thread presentation and thread-local interaction state.
+import { truncateUtf16Safe } from "@openclaw/normalization-core/utf16-slice";
 import { html, nothing, type TemplateResult } from "lit";
 import { guard } from "lit/directives/guard.js";
 import { ref } from "lit/directives/ref.js";
