Incorporate current_content into OriginalFileState to improve file processing and history tracking during preview generation

Author: robertpiosik

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

@@ -267,6 +267,8 @@ export const apply_chat_response_command = (params: {
                 lines_removed: diff_stats.lines_removed,
                 diff_application_method: state.diff_application_method,
                 content: current_content,
+                proposed_content:
+                  state.proposed_content ?? state.ai_content ?? current_content,
                 is_checked: true,
                 apply_failed: state.apply_failed,
                 ai_content: state.ai_content,
@@ -290,6 +292,7 @@ export const apply_chat_response_command = (params: {
                   lines_added: 0,
                   lines_removed: deleted_diff_stats.lines_removed,
                   content: '',
+                  proposed_content: '',
                   is_checked: true
                 })
               }

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

@@ -78,6 +78,7 @@ export const process_chat_response = async (
           ai_content: file_in_preview?.ai_content,
           proposed_content:
             file_in_preview?.proposed_content ?? file_in_preview?.content,
+          current_content: file_in_preview?.content,
           is_checked: file_in_preview?.is_checked,
           apply_failed: file_in_preview?.apply_failed,
           applied_with_intelligent_update:

apps/editor/src/commands/apply-chat-response-command/types/original-file-state.ts

@@ -10,6 +10,7 @@ export type OriginalFileState = {
   is_checked?: boolean
   ai_content?: string
   proposed_content?: string
+  current_content?: string
   apply_failed?: boolean
   applied_with_intelligent_update?: boolean
 }

apps/editor/src/commands/apply-chat-response-command/utils/preview/file-preparer.ts

@@ -36,7 +36,11 @@ export const prepare_files_from_original_states = async (params: {
       if (fs.existsSync(sanitized_file_path)) {
         file_exists = true
         current_content =
-          state.proposed_content ?? fs.readFileSync(sanitized_file_path, 'utf8')
+          state.current_content ??
+          state.proposed_content ??
+          fs.readFileSync(sanitized_file_path, 'utf8')
+      } else if (state.current_content !== undefined) {
+        current_content = state.current_content
       } else if (state.proposed_content !== undefined) {
         current_content = state.proposed_content
       }
@@ -45,7 +49,10 @@ export const prepare_files_from_original_states = async (params: {
     }
 
     let new_content_for_diff = current_content
-    if (state.is_checked === false && state.ai_content !== undefined) {
+    if (state.is_checked === false && state.current_content !== undefined) {
+      current_content = state.current_content
+      new_content_for_diff = state.content
+    } else if (state.is_checked === false && state.ai_content !== undefined) {
       current_content = state.ai_content
       new_content_for_diff = state.content
     }