Refactor FileInReview type to include is_checked status directly, removing the need for a separate CheckedFileInReview type in the UI layer and ensuring file review state is consistently tracked across the application

Author: robertpiosik

packages/shared/src/types/file-in-review.ts

@@ -1,5 +1,6 @@
 export type FileInReview = {
   file_path: string
+  is_checked: boolean
   workspace_name?: string
   is_new?: boolean
   is_deleted?: boolean

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

@@ -7,7 +7,7 @@ import { Checkbox } from '../../common/Checkbox'
 import { IconButton } from '../IconButton/IconButton'
 
 type Props = {
-  files: (FileInReview & { is_checked: boolean })[]
+  files: FileInReview[]
   has_multiple_workspaces: boolean
   on_discard: () => void
   on_approve: (files: FileInReview[]) => void
@@ -46,9 +46,7 @@ export const ResponseReview: FC<Props> = ({
   const fallback_count = files.filter((f) => f.is_fallback).length
 
   const sorted_files = useMemo(() => {
-    const get_sort_score = (
-      file: FileInReview & { is_checked: boolean }
-    ): number => {
+    const get_sort_score = (file: FileInReview): number => {
       if (file.diff_fallback_method == 'search_and_replace') {
         return 0
       }

packages/vscode/src/commands/apply-chat-response-command/apply-chat-response-command.ts

@@ -24,6 +24,7 @@ export const apply_chat_response_command = (
   return vscode.commands.registerCommand(
     'codeWebChat.applyChatResponse',
     async (args?: CommandArgs) => {
+      console.log('xxx', args)
       if (!vscode.workspace.workspaceFolders?.length) {
         vscode.window.showErrorMessage(
           dictionary.error_message.NO_WORKSPACE_FOLDER_OPEN
@@ -132,7 +133,8 @@ export const apply_chat_response_command = (
               is_fallback: state.is_fallback,
               is_replaced: state.is_replaced,
               diff_fallback_method: state.diff_fallback_method,
-              content: current_content
+              content: current_content,
+              is_checked: true
             })
           }
 

packages/vscode/src/commands/apply-chat-response-command/handlers/restore-review-handler.ts

@@ -80,135 +80,138 @@ export const handle_restore_review = async (
       content: original_content,
       is_new: !file_exists,
       workspace_name: file.workspace_name,
-      is_deleted: file.is_deleted
+      is_deleted: file.is_deleted,
+      is_checked: file.is_checked
     })
 
-    if (file.is_deleted) {
-      if (file_exists) {
-        try {
-          const tabs_to_close: vscode.Tab[] = []
-          for (const tab_group of vscode.window.tabGroups.all) {
-            tabs_to_close.push(
-              ...tab_group.tabs.filter((tab) => {
-                const tab_uri = (tab.input as any)?.uri as
-                  | vscode.Uri
-                  | undefined
-                return tab_uri && tab_uri.fsPath === safe_path
-              })
+    if (file.is_checked !== false) {
+      if (file.is_deleted) {
+        if (file_exists) {
+          try {
+            const tabs_to_close: vscode.Tab[] = []
+            for (const tab_group of vscode.window.tabGroups.all) {
+              tabs_to_close.push(
+                ...tab_group.tabs.filter((tab) => {
+                  const tab_uri = (tab.input as any)?.uri as
+                    | vscode.Uri
+                    | undefined
+                  return tab_uri && tab_uri.fsPath === safe_path
+                })
+              )
+            }
+
+            if (tabs_to_close.length > 0) {
+              await vscode.window.tabGroups.close(tabs_to_close)
+            }
+
+            fs.unlinkSync(safe_path)
+            Logger.info({
+              function_name: 'handle_restore_review',
+              message: 'File deleted',
+              data: safe_path
+            })
+            await remove_directory_if_empty({
+              dir_path: path.dirname(safe_path),
+              workspace_root
+            })
+          } catch (error) {
+            Logger.error({
+              function_name: 'handle_restore_review',
+              message: 'Error deleting file',
+              data: { safe_path, error }
+            })
+            vscode.window.showErrorMessage(
+              `Failed to delete file: ${file.file_path}`
             )
           }
+        }
+      } else if (file.content !== undefined) {
+        // Create or update
+        if (file_exists) {
+          try {
+            const file_uri = vscode.Uri.file(safe_path)
+            const document = await vscode.workspace.openTextDocument(file_uri)
+            const editor = await vscode.window.showTextDocument(document)
+            let final_content = file.content
+            if (
+              original_content.endsWith('\n') &&
+              !final_content.endsWith('\n')
+            ) {
+              final_content += '\n'
+            }
+            await editor.edit((edit) => {
+              edit.replace(
+                new vscode.Range(
+                  document.positionAt(0),
+                  document.positionAt(document.getText().length)
+                ),
+                final_content
+              )
+            })
 
-          if (tabs_to_close.length > 0) {
-            await vscode.window.tabGroups.close(tabs_to_close)
+            await document.save()
+            Logger.info({
+              function_name: 'handle_restore_review',
+              message: 'Existing file replaced and saved',
+              data: safe_path
+            })
+          } catch (error) {
+            Logger.error({
+              function_name: 'handle_restore_review',
+              message: 'Error updating file',
+              data: { safe_path, error }
+            })
+            vscode.window.showErrorMessage(
+              `Failed to update file: ${file.file_path}`
+            )
           }
-
-          fs.unlinkSync(safe_path)
-          Logger.info({
-            function_name: 'handle_restore_review',
-            message: 'File deleted',
-            data: safe_path
-          })
-          await remove_directory_if_empty({
-            dir_path: path.dirname(safe_path),
-            workspace_root
-          })
-        } catch (error) {
-          Logger.error({
-            function_name: 'handle_restore_review',
-            message: 'Error deleting file',
-            data: { safe_path, error }
-          })
-          vscode.window.showErrorMessage(
-            `Failed to delete file: ${file.file_path}`
-          )
-        }
-      }
-    } else if (file.content !== undefined) {
-      // Create or update
-      if (file_exists) {
-        try {
-          const file_uri = vscode.Uri.file(safe_path)
-          const document = await vscode.workspace.openTextDocument(file_uri)
-          const editor = await vscode.window.showTextDocument(document)
-          let final_content = file.content
-          if (
-            original_content.endsWith('\n') &&
-            !final_content.endsWith('\n')
-          ) {
-            final_content += '\n'
+        } else {
+          // New file
+          const directory = path.dirname(safe_path)
+          if (!fs.existsSync(directory)) {
+            try {
+              fs.mkdirSync(directory, { recursive: true })
+              Logger.info({
+                function_name: 'handle_restore_review',
+                message: 'Directory created',
+                data: directory
+              })
+            } catch (error) {
+              Logger.error({
+                function_name: 'handle_restore_review',
+                message: 'Failed to create directory',
+                data: { directory, error, file_path: file.file_path }
+              })
+              vscode.window.showErrorMessage(
+                dictionary.error_message.FAILED_TO_CREATE_DIRECTORY(
+                  file.file_path
+                )
+              )
+              continue
+            }
           }
-          await editor.edit((edit) => {
-            edit.replace(
-              new vscode.Range(
-                document.positionAt(0),
-                document.positionAt(document.getText().length)
-              ),
-              final_content
-            )
-          })
 
-          await document.save()
-          Logger.info({
-            function_name: 'handle_restore_review',
-            message: 'Existing file replaced and saved',
-            data: safe_path
-          })
-        } catch (error) {
-          Logger.error({
-            function_name: 'handle_restore_review',
-            message: 'Error updating file',
-            data: { safe_path, error }
-          })
-          vscode.window.showErrorMessage(
-            `Failed to update file: ${file.file_path}`
-          )
-        }
-      } else {
-        // New file
-        const directory = path.dirname(safe_path)
-        if (!fs.existsSync(directory)) {
           try {
-            fs.mkdirSync(directory, { recursive: true })
+            fs.writeFileSync(safe_path, file.content)
             Logger.info({
               function_name: 'handle_restore_review',
-              message: 'Directory created',
-              data: directory
+              message: 'New file created',
+              data: safe_path
             })
+            const document = await vscode.workspace.openTextDocument(safe_path)
+            await vscode.window.showTextDocument(document, { preview: false })
           } catch (error) {
             Logger.error({
               function_name: 'handle_restore_review',
-              message: 'Failed to create directory',
-              data: { directory, error, file_path: file.file_path }
+              message: 'Failed to write new file',
+              data: { safe_path, error, file_path: file.file_path }
             })
             vscode.window.showErrorMessage(
-              dictionary.error_message.FAILED_TO_CREATE_DIRECTORY(
-                file.file_path
-              )
+              dictionary.error_message.FAILED_TO_WRITE_FILE(file.file_path)
             )
             continue
           }
         }
-
-        try {
-          fs.writeFileSync(safe_path, file.content)
-          Logger.info({
-            function_name: 'handle_restore_review',
-            message: 'New file created',
-            data: safe_path
-          })
-          const document = await vscode.workspace.openTextDocument(safe_path)
-          await vscode.window.showTextDocument(document, { preview: false })
-        } catch (error) {
-          Logger.error({
-            function_name: 'handle_restore_review',
-            message: 'Failed to write new file',
-            data: { safe_path, error, file_path: file.file_path }
-          })
-          vscode.window.showErrorMessage(
-            dictionary.error_message.FAILED_TO_WRITE_FILE(file.file_path)
-          )
-          continue
-        }
       }
     }
   }

packages/vscode/src/commands/apply-chat-response-command/response-processor.ts

@@ -46,15 +46,23 @@ export const process_chat_response = async (
   if (args?.files_with_content) {
     const result = await handle_restore_review(args.files_with_content)
     if (result.success && result.original_states) {
+      const augmented_states = result.original_states.map((state) => {
+        const file_in_review = args?.files_with_content!.find(
+          (f) =>
+            f.file_path === state.file_path &&
+            f.workspace_name === state.workspace_name
+        )
+        return { ...state, ai_content: file_in_review?.content }
+      })
       update_undo_button_state({
         context,
         panel_provider,
-        states: result.original_states,
+        states: augmented_states,
         applied_content: chat_response,
         original_editor_state: args?.original_editor_state
       })
       return {
-        original_states: result.original_states,
+        original_states: augmented_states,
         chat_response
       }
     }

packages/vscode/src/commands/apply-chat-response-command/types/original-file-state.ts

@@ -10,4 +10,6 @@ export type OriginalFileState = {
   diff_fallback_method?: 'recount' | 'search_and_replace'
   is_replaced?: boolean
   is_deleted?: boolean
+  is_checked?: boolean
+  ai_content?: string
 }

packages/vscode/src/commands/apply-chat-response-command/utils/review/file-preparer.ts

@@ -40,6 +40,12 @@ export const prepare_files_from_original_states = async (params: {
       continue
     }
 
+    let new_content_for_diff = current_content
+    if (state.is_checked === false && state.ai_content !== undefined) {
+      current_content = state.ai_content
+      new_content_for_diff = state.content
+    }
+
     const hash = crypto
       .createHash('md5')
       .update(sanitized_file_path)
@@ -49,7 +55,7 @@ export const prepare_files_from_original_states = async (params: {
 
     const diff_stats = get_diff_stats({
       original_content: state.content,
-      new_content: current_content
+      new_content: new_content_for_diff
     })
     const is_deleted =
       state.is_deleted ||
@@ -65,7 +71,8 @@ export const prepare_files_from_original_states = async (params: {
       lines_removed: diff_stats.lines_removed,
       is_fallback: state.is_fallback,
       is_replaced: state.is_replaced,
-      diff_fallback_method: state.diff_fallback_method
+      diff_fallback_method: state.diff_fallback_method,
+      is_checked: state.is_checked ?? true
     }
 
     prepared_files.push({
@@ -109,7 +116,8 @@ export const prepare_files_from_original_states = async (params: {
         is_new: false,
         is_deleted: true,
         lines_added: restored_diff_stats.lines_added,
-        lines_removed: restored_diff_stats.lines_removed
+        lines_removed: restored_diff_stats.lines_removed,
+        is_checked: state.is_checked ?? true
       }
 
       prepared_files.push({