fix(onboard-skills): keep emoji / surrogate pairs intact during skill description truncation

maweibin · claude · maweibin · commit 76fa2dc67cba · 2026-07-07T19:43:31.000+08:00
Use truncateUtf16Safe() instead of .slice() to count full code points,
preventing lone surrogates in onboarding skill summary output.

Co-Authored-By: Claude Opus 4.8 &lt;noreply@anthropic.com&gt;
diff --git a/src/commands/onboard-skills.test.ts b/src/commands/onboard-skills.test.ts
@@ -1,4 +1,5 @@
 // Onboard skills tests cover skill setup prompts, package manager config, and skip behavior.
+import { truncateUtf16Safe } from "@openclaw/normalization-core/utf16-slice";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import type { OpenClawConfig } from "../config/config.js";
 import type { RuntimeEnv } from "../runtime.js";
@@ -509,4 +510,12 @@ describe("setupSkills", () => {
     expect(prompter.text).not.toHaveBeenCalled();
     expect(prompter.multiselect).not.toHaveBeenCalled();
   });
+
+  it("does not split surrogate pairs when truncating skill install failure text", () => {
+    const suffix = "🚀tail";
+    const content = "x".repeat(139) + suffix;
+    const result = truncateUtf16Safe(content, 139) + "…";
+    expect(result).toBe("x".repeat(139) + "…");
+    expect(result).not.toContain(suffix.slice(0, 1));
+  });
 });
diff --git a/src/commands/onboard-skills.ts b/src/commands/onboard-skills.ts
@@ -1,3 +1,4 @@
+import { truncateUtf16Safe } from "@openclaw/normalization-core/utf16-slice";
 /**
  * Interactive skill dependency setup for onboarding.
  *
@@ -47,7 +48,7 @@ function summarizeInstallFailure(message: string): string | undefined {
     return undefined;
   }
   const maxLen = 140;
-  return cleaned.length > maxLen ? `${cleaned.slice(0, maxLen - 1)}…` : cleaned;
+  return cleaned.length > maxLen ? `${truncateUtf16Safe(cleaned, maxLen - 1)}…` : cleaned;
 }
 
 function formatSkillHint(skill: {
@@ -61,7 +62,7 @@ function formatSkillHint(skill: {
     return "install";
   }
   const maxLen = 90;
-  return combined.length > maxLen ? `${combined.slice(0, maxLen - 1)}…` : combined;
+  return combined.length > maxLen ? `${truncateUtf16Safe(combined, maxLen - 1)}…` : combined;
 }
 
 const SKIP_REASON_LABELS = {

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+import { truncateUtf16Safe } from "@openclaw/normalization-core/utf16-slice";`
`1`	`2`	`/**`
`2`	`3`	`* Interactive skill dependency setup for onboarding.`
`3`	`4`	`*`
`@@ -47,7 +48,7 @@ function summarizeInstallFailure(message: string): string \| undefined {`
`47`	`48`	`return undefined;`
`48`	`49`	`}`
`49`	`50`	`const maxLen = 140;`
`50`		- return cleaned.length > maxLen ? `${cleaned.slice(0, maxLen - 1)}…` : cleaned;
	`51`	+ return cleaned.length > maxLen ? `${truncateUtf16Safe(cleaned, maxLen - 1)}…` : cleaned;
`51`	`52`	`}`
`52`	`53`
`53`	`54`	`function formatSkillHint(skill: {`
`@@ -61,7 +62,7 @@ function formatSkillHint(skill: {`
`61`	`62`	`return "install";`
`62`	`63`	`}`
`63`	`64`	`const maxLen = 90;`
`64`		- return combined.length > maxLen ? `${combined.slice(0, maxLen - 1)}…` : combined;
	`65`	+ return combined.length > maxLen ? `${truncateUtf16Safe(combined, maxLen - 1)}…` : combined;
`65`	`66`	`}`
`66`	`67`
`67`	`68`	`const SKIP_REASON_LABELS = {`