klbr/khoj
1
0
Fork 0
mirror of https://github.com/khoaliber/khoj.git synced 2026-03-02 13:18:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix to allow khoj to delete content in obsidian write mode

Browse Source 
Previous regex and replacement logic did not allow replace block to be
empty
This commit is contained in:
Debanjum
2025-08-20 16:40:05 -07:00
parent 7645cbea3b
commit 82dc7b115b
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/interface/obsidian/src/interact_with_files.ts
View File

@@ -432,8 +432,16 @@ For context, the user is currently working on the following files:
} }
// Try parse SEARCH/REPLACE format for complete edit blocks // Try parse SEARCH/REPLACE format for complete edit blocks
// Regex: file_path\n<<<<<<< SEARCH\nsearch_content\n=======\nreplacement_content\n>>>>>>> REPLACE // Supports empty SEARCH (new file / replace whole file) and empty REPLACE (deletion)
const newFormatRegex = /^([^\n]+)\n<<<<<<< SEARCH\n([\s\S]*?)\n=======\n([\s\S]*?)\n>>>>>>> REPLACE\s*$/; // Regex structure:
// file_path (group 1)
// <<<<<<< SEARCH literal marker
// search_content (group 2, can be empty)
// ======= divider
// replacement_content (group 3, can be empty => deletion)
// >>>>>>> REPLACE end marker
// Note: The trailing newline before the end marker is optional to allow zero-length replacement
const newFormatRegex = /^([^\n]+)\n<<<<<<< SEARCH\n([\s\S]*?)\n=======\n([\s\S]*?)\n?>>>>>>> REPLACE\s*$/;
const newFormatMatch = newFormatRegex.exec(cleanContent); const newFormatMatch = newFormatRegex.exec(cleanContent);
let editData: EditBlock | null = null; let editData: EditBlock | null = null;
@@ -458,14 +466,14 @@ For context, the user is currently working on the following files:
error = { error = {
type: 'missing_field', type: 'missing_field',
message: 'Missing "find" field markers', message: 'Missing "find" field markers',
details: 'The "find" field is required and should contain the content to find in the file' details: 'The "find" field is required. It should contain the content to find in the file or be empty for new files'
}; };
} }
else if (editData && !editData.replace) { else if (editData && editData.replace === undefined) {
error = { error = {
type: 'missing_field', type: 'missing_field',
message: 'Missing "replace" field in edit block', message: 'Missing "replace" field in edit block',
details: 'The "replace" field is required and should contain the replacement text' details: 'The "replace" field is required. It should contain the content to replace or be empty to indicate deletion'
}; };
} }