Skip to content

[BUG] Edit tools don't normalize Unicode (NFC vs NFD) causing edit failures on macOS #31786

Description

@LifetimeVip

Description

Both V1 and V2 edit tools do not normalize Unicode before comparing file content with oldString. On macOS where files are often stored in NFD (decomposed) form, while AI-generated text is NFC (precomposed), Unicode canonically-equivalent characters like é (U+00E9) vs e + combining accent (U+0065 U+0301) will not match, causing edit failures.

Affected Files

  • packages/core/src/tool/edit.ts:164 - countOccurrences uses indexOf without normalization
  • packages/core/src/tool/edit.ts:187 - replace uses string comparison without normalization
  • packages/opencode/src/tool/edit.ts:132 - replace() function uses indexOf without normalization

Inconsistency

packages/opencode/src/patch/index.ts:486 already has NFC normalization for apply_patch:

return tryMatch(lines, pattern, startIndex, (a, b) => a.normalize("NFC") === b.normalize("NFC"), eof)

The edit tools should have the same normalization for consistency.

Steps to reproduce

  1. On macOS, create a file with decomposed Unicode (e.g., touch $(echo '\u00e9' | iconv -f UTF-8 -t UTF-8-MAC))
  2. Ask the AI to edit text containing accented characters
  3. The AI's NFC-formatted oldString won't match the file's NFD content
  4. Edit fails with "oldString not found"

OpenCode version

1.17.3

Metadata

Metadata

Assignees

Labels

No labels
No labels

Type

No type

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions