fix(apply_diff): exclude exact REPLACE marker from merge conflict check #4922
+36
−5
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes Kilo-Org#4779 Previously, the display path for global skills used "~/.kilocode" which caused issues on Windows when the AI model tried to read the skill file. The tilde (~) is not automatically expanded to the home directory on Windows, resulting in malformed paths like: e:\Projects\Temp\test_skill\\~\\.kilocode\skills\skill-creator\SKILL.md This fix uses `os.homedir()` to get the actual home directory path instead of using the tilde shorthand. This ensures the path works correctly when the AI model tries to read the file on all platforms, especially Windows. Changes: - Modified `getDisplayPath()` in `skills.ts` to use `os.homedir()` for global skills instead of `~/.kilocode` - Added imports for `os` and `path` modules - Updated JSDoc comments to reflect the new behavior Co-Authored-By: Claude <[email protected]>
Fixes Kilo-Org#4703 Previously, the code attempted to access `vscode.lm.selectChatModels` directly without checking if `vscode.lm` exists. This caused a runtime error "Cannot read properties of undefined (reading 'selectChatModels')" when using the vscode-lm provider in CLI context, where the VS Code Language Model API is not available. This fix adds checks for `vscode.lm` existence before using it: 1. In `createClient()` - throws a clear error message indicating that vscode-lm provider is only available in VS Code extension, not CLI 2. In `getVsCodeLmModels()` - returns an empty array with a warning Changes: - Added check in `createClient()` method to throw descriptive error when `vscode.lm` is undefined - Added check in `getVsCodeLmModels()` function to return empty array when `vscode.lm` is undefined Co-Authored-By: Claude <[email protected]>
Fixes Kilo-Org#4680 Previously, the validation logic incorrectly flagged the tool's own required closing marker `>>>>>>> REPLACE` as a "special marker" in the diff content, causing the error: "ERROR: Special marker '>>>>>>> REPLACE' found in your diff content" This prevented the apply_diff tool from working correctly even when the diff was properly formatted. The root cause was that the validation checked if lines start with the REPLACE_PREFIX (`>>>>>>>`) to catch git merge conflict markers, but this also caught the legitimate `>>>>>>> REPLACE` closing marker that is part of the tool's own syntax. Changes: - Modified the validation in `validateMarkerSequencing()` to exclude the exact `>>>>>>> REPLACE` marker from the merge conflict check - Added condition `&& marker !== REPLACE` to both START and AFTER_SEARCH state checks for REPLACE_PREFIX This allows the `>>>>>>> REPLACE` marker to be recognized as the valid closing delimiter for diff blocks while still catching actual git merge conflict markers. Co-Authored-By: Claude <[email protected]>
|
Ari4ka
approved these changes
Jan 11, 2026
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #4680
Summary
Previously, the validation logic incorrectly flagged the tool's own required closing marker
>>>>>>> REPLACEas a "special marker" in the diff content, causing the error:This prevented the apply_diff tool from working correctly even when the diff was properly formatted.
Root Cause
The validation checked if lines start with the REPLACE_PREFIX (
>>>>>>>) to catch git merge conflict markers, but this also caught the legitimate>>>>>>> REPLACEclosing marker that is part of the tool's own syntax.Changes
validateMarkerSequencing()to exclude the exact>>>>>>> REPLACEmarker from the merge conflict check&& marker !== REPLACEto both START and AFTER_SEARCH state checks for REPLACE_PREFIXThis allows the
>>>>>>> REPLACEmarker to be recognized as the valid closing delimiter for diff blocks while still catching actual git merge conflict markers.Test Plan
Co-Authored-By: Claude [email protected]