Improve diff parsing logic to handle new file modifications and filter out false-positive file paths in conversational text

Author: robertpiosik

apps/editor/src/commands/apply-chat-response-command/utils/clipboard-parser/parsers/diff-parser/diff-parser.ts

@@ -748,7 +748,16 @@ const merge_diffs_per_file = (items: DiffParserItem[]): DiffParserItem[] => {
             (l.startsWith(' ') && !l.startsWith('  '))
         )
 
-        if (!existing_has_real_hunks) {
+        const existing_is_new_file = existing_lines.some(
+          (l) => l === '--- /dev/null'
+        )
+        const incoming_is_modification =
+          !item.content.includes('--- /dev/null') && item.content.includes('@@')
+
+        if (
+          !existing_has_real_hunks ||
+          (existing_is_new_file && incoming_is_modification)
+        ) {
           existing_diff.content = item.content
         } else {
           const new_lines = item.content.replace(/\n$/, '').split('\n')

apps/editor/src/commands/apply-chat-response-command/utils/clipboard-parser/parsers/diff-parser/helpers/block-utils.ts

@@ -28,6 +28,19 @@ export const find_file_path_before_block = (params: {
         continue
       }
 
+      if (!prev_line.startsWith('###')) {
+        const line_without_path = prev_line
+          .replace('`' + extracted + '`', '')
+          .replace(extracted, '')
+          .trim()
+        const remaining_words = line_without_path
+          .split(/\s+/)
+          .filter((w) => /[a-zA-Z]{2,}/.test(w))
+        if (remaining_words.length >= 5) {
+          continue
+        }
+      }
+
       const { workspace_name } = extract_workspace_and_path({
         raw_file_path: extracted,
         is_single_root_folder_workspace: params.is_single_root