fix(sandbox): keep redacted session keys UTF-16 safe (#102969)

mushuiyu886 · steipete · web-flow · commit b714fdb3ae47 · 2026-07-09T18:31:21.000+01:00
* fix(sandbox): keep redacted session keys UTF-16 safe

* test(sandbox): cover UTF-16 redaction boundaries

---------

Co-authored-by: Peter Steinberger &lt;steipete@gmail.com&gt;
diff --git a/src/agents/sandbox/runtime-status.ts b/src/agents/sandbox/runtime-status.ts
@@ -4,6 +4,7 @@
  * Resolves whether a session is sandboxed and explains policy blocks before tool execution.
  */
 import { normalizeOptionalLowercaseString } from "@openclaw/normalization-core/string-coerce";
+import { sliceUtf16Safe, truncateUtf16Safe } from "@openclaw/normalization-core/utf16-slice";
 import { formatCliCommand } from "../../cli/command-format.js";
 import {
   canonicalizeMainSessionAlias,
@@ -110,7 +111,7 @@ function redactSessionKey(value: string): string {
   if (trimmed.length <= 12) {
     return "(redacted)";
   }
-  return `${sanitizeForSingleLineDisplay(trimmed.slice(0, 6))}…${sanitizeForSingleLineDisplay(trimmed.slice(-6))}`;
+  return `${sanitizeForSingleLineDisplay(truncateUtf16Safe(trimmed, 6))}…${sanitizeForSingleLineDisplay(sliceUtf16Safe(trimmed, -6))}`;
 }
 
 function shellEscapeSingleArg(value: string): string {
diff --git a/src/agents/sandbox/tool-policy.test.ts b/src/agents/sandbox/tool-policy.test.ts
@@ -305,6 +305,57 @@ describe("sandbox/tool-policy", () => {
     );
   });
 
+  it.each([
+    {
+      boundary: "prefix",
+      sessionKey: `abcde\u{1f600}middle123456`,
+      expectedLabel: "abcde…123456",
+    },
+    {
+      boundary: "suffix",
+      sessionKey: `abcdefmiddle\u{1f600}12345`,
+      expectedLabel: "abcdef…12345",
+    },
+    {
+      boundary: "both",
+      sessionKey: `abcde\u{1f600}middle\u{1f600}12345`,
+      expectedLabel: "abcde…12345",
+    },
+  ])("keeps redacted session keys UTF-16 safe at the $boundary boundary", ({
+    sessionKey,
+    expectedLabel,
+  }) => {
+    const cfg: OpenClawConfig = {
+      agents: {
+        defaults: {
+          sandbox: { mode: "all", scope: "agent" },
+        },
+      },
+      tools: {
+        sandbox: {
+          tools: {
+            deny: ["browser"],
+          },
+        },
+      },
+    };
+
+    const message = formatSandboxToolPolicyBlockedMessage({
+      cfg,
+      sessionKey,
+      toolName: "browser",
+    });
+
+    const sessionLine = message?.split("\n").find((line) => line.startsWith("Session: "));
+    const sessionLabel = sessionLine?.slice("Session: ".length);
+    expect(sessionLabel).toBe(expectedLabel);
+    expect(sessionLabel?.length).toBeLessThanOrEqual(13);
+    expect(sessionLabel).not.toMatch(
+      /[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/u,
+    );
+    expect(message).toContain(`openclaw sandbox explain --session '${sessionKey}'`);
+  });
+
   it("avoids terminal injection for control-character session keys", () => {
     const sessionKey = "agent:main:abcde\n12345";
     const cfg: OpenClawConfig = {
