Merge 39f1ee1 into 363cf04

chengzhichao-xydt · web-flow · commit 5624769204a1 · 2026-07-09T15:08:28.000+08:00
diff --git a/src/agents/provider-http-errors.test.ts b/src/agents/provider-http-errors.test.ts
@@ -6,13 +6,31 @@ import {
   createProviderHttpError,
   extractProviderErrorDetail,
   extractProviderRequestId,
+  formatProviderErrorPayload,
   ProviderHttpError,
   readProviderBinaryResponse,
   readProviderJsonResponse,
   readProviderTextResponse,
   readResponseTextLimited,
 } from "./provider-http-errors.js";
 
+function hasLoneSurrogate(s: string): boolean {
+  for (let i = 0; i < s.length; i += 1) {
+    const c = s.charCodeAt(i);
+    if (c >= 0xd800 && c <= 0xdbff) {
+      if (i + 1 >= s.length || s.charCodeAt(i + 1) < 0xdc00 || s.charCodeAt(i + 1) > 0xdfff) {
+        return true;
+      }
+    }
+    if (c >= 0xdc00 && c <= 0xdfff) {
+      if (i === 0 || s.charCodeAt(i - 1) < 0xd800 || s.charCodeAt(i - 1) > 0xdbff) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
 function createStreamingBinaryResponse(params: {
   chunkCount: number;
   chunkSize: number;
@@ -136,6 +154,21 @@ describe("provider error utils", () => {
     );
   });
 
+  it("does not split UTF-16 surrogate pairs when truncating provider error details", async () => {
+    const message = "a".repeat(218) + "😀" + "suffix";
+    const response = new Response(
+      JSON.stringify({
+        error: { message, code: "utf16_test" },
+      }),
+      { status: 400 },
+    );
+
+    await expect(assertOkOrThrowProviderError(response, "Provider API error")).rejects.toThrow();
+    const detail = formatProviderErrorPayload({ error: { message, code: "utf16_test" } });
+    expect(detail).toContain("utf16_test");
+    expect(hasLoneSurrogate(detail ?? "")).toBe(false);
+  });
+
   it("keeps HTTP status metadata when error body reads fail", async () => {
     const response = {
       ok: false,
diff --git a/src/agents/provider-http-errors.ts b/src/agents/provider-http-errors.ts
@@ -4,6 +4,7 @@
  * Transport adapters use this module to turn provider-specific response bodies,
  * request ids, and binary payload guardrails into stable OpenClaw error shapes.
  */
+import { truncateUtf16Safe } from "@openclaw/normalization-core/utf16-slice";
 export { asFiniteNumber } from "../../packages/normalization-core/src/number-coercion.js";
 import { normalizeOptionalString as trimToUndefined } from "../../packages/normalization-core/src/string-coerce.js";
 import { readResponseWithLimit } from "../infra/http-body.js";
@@ -25,7 +26,7 @@ export function asObject(value: unknown): Record<string, unknown> | undefined {
 
 /** Trims provider error details to a log- and prompt-safe preview length. */
 export function truncateErrorDetail(detail: string, limit = 220): string {
-  return detail.length <= limit ? detail : `${detail.slice(0, limit - 1)}…`;
+  return detail.length <= limit ? detail : `${truncateUtf16Safe(detail, limit - 1)}…`;
 }
 
 /** Redacts secrets before preserving a bounded provider error body preview. */
