Update file state management to include proposed_content and ai_content while prioritizing proposed content during file processing and preview generation

- we seem to have a race condition causing line added/removed count to be "+0 -0"

Author: robertpiosik

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

@@ -224,9 +224,17 @@ export const apply_chat_response_command = (params: {
               try {
                 if (fs.existsSync(sanitized_file_path)) {
                   file_exists = true
-                  const document =
-                    await vscode.workspace.openTextDocument(sanitized_file_path)
-                  current_content = document.getText()
+                  if (state.proposed_content !== undefined) {
+                    current_content = state.proposed_content
+                  } else {
+                    const document =
+                      await vscode.workspace.openTextDocument(
+                        sanitized_file_path
+                      )
+                    current_content = document.getText()
+                  }
+                } else if (state.proposed_content !== undefined) {
+                  current_content = state.proposed_content
                 }
               } catch (error) {
                 continue

apps/editor/src/commands/apply-chat-response-command/handlers/active-editor-intelligent-update-handler.ts

@@ -174,7 +174,9 @@ export const handle_active_editor_intelligent_update = async (params: {
       {
         file_path: target_file_path,
         content: original_content,
-        workspace_name: file_item.workspace_name
+        workspace_name: file_item.workspace_name,
+        ai_content: file_item.content,
+        proposed_content: final_content
       }
     ]
   } catch (error: any) {

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

@@ -140,7 +140,8 @@ export const handle_fast_replace = async (params: {
               file_path: file.file_path,
               content: original_content,
               workspace_name: file.workspace_name,
-              file_state: 'deleted'
+              file_state: 'deleted',
+              proposed_content: ''
             })
             Logger.info({
               function_name: 'handle_fast_replace',
@@ -197,7 +198,9 @@ export const handle_fast_replace = async (params: {
             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
           })
 
           continue
@@ -224,11 +227,6 @@ export const handle_fast_replace = async (params: {
           const file_uri = vscode.Uri.file(safe_path)
           const document = await vscode.workspace.openTextDocument(file_uri)
           const original_content = document.getText()
-          original_states.push({
-            file_path: file.file_path,
-            content: original_content,
-            workspace_name: file.workspace_name
-          })
           let final_content = file.content
           if (
             original_content.endsWith('\n') &&
@@ -237,6 +235,14 @@ export const handle_fast_replace = async (params: {
             final_content += '\n'
           }
 
+          original_states.push({
+            file_path: file.file_path,
+            content: original_content,
+            workspace_name: file.workspace_name,
+            ai_content: file.content,
+            proposed_content: final_content
+          })
+
           const edit = new vscode.WorkspaceEdit()
           edit.replace(
             document.uri,
@@ -259,7 +265,9 @@ export const handle_fast_replace = async (params: {
             file_path: file.file_path,
             content: '',
             file_state: 'new',
-            workspace_name: file.workspace_name
+            workspace_name: file.workspace_name,
+            ai_content: file.content,
+            proposed_content: file.content
           })
           const directory = path.dirname(safe_path)
           if (!fs.existsSync(directory)) {

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

@@ -76,7 +76,8 @@ export const process_chat_response = async (
         return {
           ...state,
           ai_content: file_in_preview?.ai_content,
-          proposed_content: file_in_preview?.proposed_content,
+          proposed_content:
+            file_in_preview?.proposed_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/utils/preview/file-preparer.ts

@@ -35,7 +35,10 @@ export const prepare_files_from_original_states = async (params: {
     try {
       if (fs.existsSync(sanitized_file_path)) {
         file_exists = true
-        current_content = fs.readFileSync(sanitized_file_path, 'utf8')
+        current_content =
+          state.proposed_content ?? fs.readFileSync(sanitized_file_path, 'utf8')
+      } else if (state.proposed_content !== undefined) {
+        current_content = state.proposed_content
       }
     } catch (error) {
       continue

packages/ui/src/components/editor/panel/ResponsePreview/ResponsePreview.tsx

@@ -150,8 +150,7 @@ export const ResponsePreview: FC<Props> = (props) => {
     error_count,
     is_fixing_all,
     has_attempted_auto_fix,
-    files_in_preview,
-    props.on_fix_all_failed
+    files_in_preview
   ])
 
   const get_status_text = (file: FileInPreview) => {