Skip to content

fix(conflict): extract fenced file content from chatty LLM resolution replies#82

Merged
tzone85 merged 1 commit into
mainfrom
fix/conflict-extract-fenced-content
Jun 24, 2026
Merged

fix(conflict): extract fenced file content from chatty LLM resolution replies#82
tzone85 merged 1 commit into
mainfrom
fix/conflict-extract-fenced-content

Conversation

@tzone85

@tzone85 tzone85 commented Jun 24, 2026

Copy link
Copy Markdown
Owner

Ports vortex-dispatch #91 — the conflict resolver was writing the LLM's whole chat reply (preamble + fenced block + postamble) into the resolved file, corrupting e.g. package.json into invalid JSON. extractResolvedFileContent returns only the fenced block's contents. Unit test + full suite green.

🤖 Generated with Claude Code

… replies

Ports vortex-dispatch #91. The conflict resolver wrote the LLM's raw reply to
the resolved file via stripCodeFences (which only trims leading/trailing
fences). When the model wrapped the file in a ```fenced block with chatter, the
whole reply got written — corrupting a real build's package.json into invalid
JSON. extractResolvedFileContent now returns only the first fenced block's
contents. Applied at both resolution sites; unit test pins the corrupting shape.
Build + full suite green.
@tzone85 tzone85 merged commit 98a3f64 into main Jun 24, 2026
@tzone85 tzone85 deleted the fix/conflict-extract-fenced-content branch June 24, 2026 05:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant