Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions packages/opencode/src/provider/provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { Config } from "../config/config"
import { mapValues, mergeDeep, omit, pickBy, sortBy } from "remeda"
import { NoSuchModelError, type Provider as SDK } from "ai"
import { Log } from "../util/log"
import { sanitizeSurrogates } from "../util/sanitize-surrogates"
import { BunProc } from "../bun"
import { Plugin } from "../plugin"
import { ModelsDev } from "./models"
Expand Down Expand Up @@ -1093,6 +1094,10 @@ export namespace Provider {
}
}

if (typeof opts.body === "string") {
opts.body = sanitizeSurrogates(opts.body)
}

return fetchFn(input, {
...opts,
// @ts-ignore see here: https://github.com/oven-sh/bun/issues/16682
Expand Down
38 changes: 38 additions & 0 deletions packages/opencode/src/util/sanitize-surrogates.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import { describe, test, expect } from "bun:test"
import { sanitizeSurrogates } from "./sanitize-surrogates"

describe("sanitizeSurrogates", () => {
test("replaces lone high surrogate", () => {
expect(sanitizeSurrogates("\uD800")).toBe("\uFFFD")
})

test("replaces lone low surrogate", () => {
expect(sanitizeSurrogates("\uDC00")).toBe("\uFFFD")
})

test("preserves valid surrogate pair", () => {
const emoji = "\uD83D\uDE00"
expect(sanitizeSurrogates(emoji)).toBe(emoji)
})

test("preserves normal text", () => {
expect(sanitizeSurrogates("hello world")).toBe("hello world")
})

test("preserves Korean text", () => {
expect(sanitizeSurrogates("안녕하세요")).toBe("안녕하세요")
})

test("preserves empty string", () => {
expect(sanitizeSurrogates("")).toBe("")
})

test("replaces surrogate in middle", () => {
expect(sanitizeSurrogates("hello\uD800world")).toBe("hello\uFFFDworld")
})

test("result is well-formed", () => {
const result = sanitizeSurrogates("test\uD800\uDBFF\uDC00data\uDFFF")
expect(result.isWellFormed()).toBe(true)
})
})
6 changes: 6 additions & 0 deletions packages/opencode/src/util/sanitize-surrogates.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
export function sanitizeSurrogates(s: string): string {
if (typeof s !== "string" || s.length === 0) return s
if (typeof s.isWellFormed === "function" && s.isWellFormed()) return s
if (typeof s.toWellFormed === "function") return s.toWellFormed()
return s.replace(/[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/g, "\uFFFD")
}
Loading