Add AI content and proposed content tracking to file state objects across conflict and truncated handlers

Author: robertpiosik

apps/editor/src/commands/apply-chat-response-command/handlers/conflict-markers-handler.ts

@@ -140,7 +140,9 @@ export const handle_conflict_markers = async (
             file_path: file.file_path,
             content: rename_source_content,
             workspace_name: file.workspace_name,
-            file_path_to_restore: file.renamed_from
+            file_path_to_restore: file.renamed_from,
+            ai_content: file.content,
+            proposed_content: new_content
           })
         } catch (error) {
           failed_files.push(file)
@@ -164,7 +166,9 @@ export const handle_conflict_markers = async (
           original_states.push({
             file_path: file.file_path,
             content: original_content,
-            workspace_name: file.workspace_name
+            workspace_name: file.workspace_name,
+            ai_content: file.content,
+            proposed_content: current_content
           })
 
           Logger.info({
@@ -205,7 +209,8 @@ export const handle_conflict_markers = async (
             file_path: file.file_path,
             content: '',
             file_state: 'new',
-            workspace_name: file.workspace_name
+            workspace_name: file.workspace_name,
+            proposed_content: content_to_write
           })
         } catch (error) {
           failed_files.push(file)
@@ -237,7 +242,9 @@ export const handle_conflict_markers = async (
           original_states.push({
             file_path: file.file_path,
             content: original_content,
-            workspace_name: file.workspace_name
+            workspace_name: file.workspace_name,
+            ai_content: file.content,
+            proposed_content: final_content
           })
         } catch (error: any) {
           Logger.error({

apps/editor/src/commands/apply-chat-response-command/handlers/truncated-handler.ts

@@ -104,7 +104,9 @@ export const handle_truncated_edit = async (
       original_states.push({
         file_path: file.file_path,
         content: original_content,
-        workspace_name: file.workspace_name
+        workspace_name: file.workspace_name,
+        ai_content: file.content,
+        proposed_content: new_content
       })
 
       Logger.info({

apps/editor/src/commands/apply-chat-response-command/response-processor.ts

@@ -251,9 +251,7 @@ export const process_chat_response = async (
         if (result.diff_application_method && result.original_states) {
           for (const state of result.original_states) {
             state.diff_application_method = result.diff_application_method
-            if (result.diff_application_method == 'search_and_replace') {
-              state.ai_content = patch.content
-            }
+            state.ai_content = patch.content
           }
         }
         if (result.original_states) {