Enable applying changes from response history and update the review UI to track file content and stats changes during review

Author: robertpiosik

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

@@ -8,4 +8,5 @@ export type FileInReview = {
   is_fallback?: boolean
   is_replaced?: boolean
   diff_fallback_method?: 'recount' | 'search_and_replace'
+  content?: string
 }

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

@@ -34,6 +34,7 @@ import {
   delete_checkpoint,
   promote_temporary_checkpoint
 } from '../checkpoints-command/actions'
+import { FileInReview } from '@shared/types/file-in-review'
 
 let ongoing_review_cleanup_promise: Promise<void> | null = null
 
@@ -382,6 +383,7 @@ export const apply_chat_response_command = (
         file_path: string
         position: { line: number; character: number }
       }
+      files_with_content?: FileInReview[]
     }) => {
       if (!vscode.workspace.workspaceFolders?.length) {
         vscode.window.showErrorMessage(
@@ -442,6 +444,16 @@ export const apply_chat_response_command = (
           is_single_root_folder_workspace
         })
 
+        if (args?.files_with_content) {
+          clipboard_content = {
+            type: 'files',
+            files: args.files_with_content as ClipboardFile[]
+          }
+        }
+
+        console.log('xxx', args?.files_with_content)
+        console.log('xxx', clipboard_content)
+
         if (
           clipboard_content.type == 'code-completion' &&
           clipboard_content.code_completion
@@ -949,59 +961,79 @@ export const apply_chat_response_command = (
 
       try {
         if (review_data) {
-          let total_lines_added = 0
-          let total_lines_removed = 0
+          if (!args?.files_with_content) {
+            let total_lines_added = 0
+            let total_lines_removed = 0
+            const files_for_history: FileInReview[] = []
+
+            const workspace_map = new Map<string, string>()
+            vscode.workspace.workspaceFolders!.forEach((folder) => {
+              workspace_map.set(folder.name, folder.uri.fsPath)
+            })
+            const default_workspace =
+              vscode.workspace.workspaceFolders![0].uri.fsPath
+
+            for (const state of review_data.original_states) {
+              let workspace_root = default_workspace
+              if (
+                state.workspace_name &&
+                workspace_map.has(state.workspace_name)
+              ) {
+                workspace_root = workspace_map.get(state.workspace_name)!
+              }
 
-          const workspace_map = new Map<string, string>()
-          vscode.workspace.workspaceFolders!.forEach((folder) => {
-            workspace_map.set(folder.name, folder.uri.fsPath)
-          })
-          const default_workspace =
-            vscode.workspace.workspaceFolders![0].uri.fsPath
+              const sanitized_file_path = create_safe_path(
+                workspace_root,
+                state.file_path
+              )
+              if (!sanitized_file_path) {
+                continue
+              }
 
-          for (const state of review_data.original_states) {
-            let workspace_root = default_workspace
-            if (
-              state.workspace_name &&
-              workspace_map.has(state.workspace_name)
-            ) {
-              workspace_root = workspace_map.get(state.workspace_name)!
-            }
+              let current_content = ''
+              try {
+                if (fs.existsSync(sanitized_file_path)) {
+                  current_content = fs.readFileSync(sanitized_file_path, 'utf8')
+                }
+              } catch (error) {
+                continue
+              }
 
-            const sanitized_file_path = create_safe_path(
-              workspace_root,
-              state.file_path
-            )
-            if (!sanitized_file_path) {
-              continue
-            }
+              const diff_stats = get_diff_stats({
+                original_content: state.content,
+                new_content: current_content
+              })
 
-            let current_content = ''
-            try {
-              if (fs.existsSync(sanitized_file_path)) {
-                current_content = fs.readFileSync(sanitized_file_path, 'utf8')
-              }
-            } catch (error) {
-              continue
+              total_lines_added += diff_stats.lines_added
+              total_lines_removed += diff_stats.lines_removed
+
+              const is_deleted =
+                !state.is_new && current_content === '' && state.content !== ''
+
+              files_for_history.push({
+                file_path: state.file_path,
+                workspace_name: state.workspace_name,
+                is_new: state.is_new,
+                is_deleted,
+                lines_added: diff_stats.lines_added,
+                lines_removed: diff_stats.lines_removed,
+                is_fallback: state.is_fallback,
+                is_replaced: state.is_replaced,
+                diff_fallback_method: state.diff_fallback_method,
+                content: current_content
+              })
             }
 
-            const diff_stats = get_diff_stats({
-              original_content: state.content,
-              new_content: current_content
+            view_provider.send_message({
+              command: 'NEW_RESPONSE_RECEIVED',
+              response: review_data.chat_response,
+              raw_instructions: args?.raw_instructions,
+              lines_added: total_lines_added,
+              lines_removed: total_lines_removed,
+              files: files_for_history
             })
-
-            total_lines_added += diff_stats.lines_added
-            total_lines_removed += diff_stats.lines_removed
           }
 
-          view_provider.send_message({
-            command: 'NEW_RESPONSE_RECEIVED',
-            response: review_data.chat_response,
-            raw_instructions: args?.raw_instructions,
-            lines_added: total_lines_added,
-            lines_removed: total_lines_removed
-          })
-
           const changes_accepted = await handle_code_review_and_cleanup({
             original_states: review_data.original_states,
             chat_response: review_data.chat_response,

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

@@ -9,10 +9,11 @@ import { create_safe_path } from '@/utils/path-sanitizer'
 import { ViewProvider } from '@/views/panel/backend/panel-provider'
 import { OriginalFileState } from '@/commands/apply-chat-response-command/types/original-file-state'
 import { remove_directory_if_empty } from './file-operations'
+import { FileInReview } from '@shared/types/file-in-review'
 
 export type CodeReviewDecision =
   | { jump_to: { file_path: string; workspace_name?: string } }
-  | { accepted_files: Omit<ReviewableFile, 'content'>[] }
+  | { accepted_files: FileInReview[] }
 
 export type CodeReviewResult = {
   decision: CodeReviewDecision
@@ -32,17 +33,8 @@ export let toggle_file_review_state:
     }) => Promise<void>)
   | undefined
 
-type ReviewableFile = {
-  file_path: string
+type ReviewableFile = FileInReview & {
   content: string
-  workspace_name?: string
-  is_new?: boolean
-  is_deleted?: boolean
-  lines_added: number
-  lines_removed: number
-  is_fallback?: boolean
-  is_replaced?: boolean
-  diff_fallback_method?: 'recount' | 'search_and_replace'
 }
 
 type PreparedFile = {
@@ -488,6 +480,14 @@ export const review = async (params: {
       } else {
         deleted_file_in_review.reviewable_file.is_deleted = true
         deleted_file_in_review.reviewable_file.content = ''
+        const diff_stats = get_diff_stats({
+          original_content: deleted_file_in_review.original_content,
+          new_content: ''
+        })
+        deleted_file_in_review.reviewable_file.lines_added =
+          diff_stats.lines_added
+        deleted_file_in_review.reviewable_file.lines_removed =
+          diff_stats.lines_removed
         params.view_provider.send_message({
           command: 'UPDATE_FILE_IN_REVIEW',
           file: deleted_file_in_review.reviewable_file

packages/vscode/src/views/panel/backend/panel-provider.ts

@@ -384,7 +384,8 @@ export class ViewProvider implements vscode.WebviewViewProvider {
               'codeWebChat.applyChatResponse',
               {
                 response: message.response,
-                raw_instructions: message.raw_instructions
+                raw_instructions: message.raw_instructions,
+                files_with_content: message.files
               }
             )
           } else if (message.command == 'EXECUTE_COMMAND') {

packages/vscode/src/views/panel/frontend/Main/Main.tsx

@@ -16,6 +16,7 @@ import {
 import { ApiToolConfiguration } from '@/views/panel/types/messages'
 import { post_message } from '../utils/post_message'
 import { Configurations as UiConfigurations } from '@ui/components/editor/panel/Configurations'
+import { FileInReview } from '@shared/types/file-in-review'
 
 type Props = {
   scroll_reset_key: number
@@ -25,6 +26,7 @@ type Props = {
     created_at: number
     lines_added: number
     lines_removed: number
+    files?: FileInReview[]
   }[]
   selected_history_item_created_at?: number
   on_selected_history_item_change: (created_at: number) => void
@@ -563,11 +565,13 @@ export const Main: React.FC<Props> = (props) => {
   const handle_response_history_item_click = (item: {
     response: string
     raw_instructions?: string
+    files?: FileInReview[]
   }) => {
     post_message(props.vscode, {
       command: 'APPLY_RESPONSE_FROM_HISTORY',
       response: item.response,
-      raw_instructions: item.raw_instructions
+      raw_instructions: item.raw_instructions,
+      files: item.files
     })
   }
 

packages/vscode/src/views/panel/frontend/Main/MainView/MainView.tsx

@@ -23,6 +23,7 @@ import { WEB_MODES, API_MODES } from './modes'
 import { Footer } from './components/Footer'
 import { Header } from './components/Header'
 import cn from 'classnames'
+import { FileInReview } from '@shared/types/file-in-review'
 
 dayjs.extend(relativeTime)
 
@@ -95,10 +96,12 @@ type Props = {
     created_at: number
     lines_added: number
     lines_removed: number
+    files?: FileInReview[]
   }[]
   on_response_history_item_click: (item: {
     response: string
     raw_instructions?: string
+    files?: FileInReview[]
   }) => void
   selected_history_item_created_at?: number
   on_selected_history_item_change: (created_at: number) => void

packages/vscode/src/views/panel/frontend/hooks/use-panel.ts

@@ -17,6 +17,7 @@ type ResponseHistoryItem = {
   created_at: number
   lines_added: number
   lines_removed: number
+  files?: FileInReview[]
 }
 
 export const use_panel = (vscode: any) => {
@@ -52,6 +53,8 @@ export const use_panel = (vscode: any) => {
   const [response_history, set_response_history] = useState<
     ResponseHistoryItem[]
   >([])
+
+  console.log(response_history)
   const [workspace_folder_count, set_workspace_folder_count] =
     useState<number>()
   const [is_connected, set_is_connected] = useState<boolean>()
@@ -154,6 +157,51 @@ export const use_panel = (vscode: any) => {
             return [...files, { ...message.file, is_checked: true }]
           }
         })
+        set_response_history((current_history) => {
+          const history_item_index = current_history.findIndex(
+            (item) => item.created_at === selected_history_item_created_at
+          )
+
+          if (history_item_index === -1) {
+            return current_history
+          }
+
+          const new_history = [...current_history]
+          const history_item_to_update = { ...new_history[history_item_index] }
+
+          const files_in_history = history_item_to_update.files
+            ? [...history_item_to_update.files]
+            : []
+
+          const file_in_history_index = files_in_history.findIndex(
+            (f) =>
+              f.file_path === message.file.file_path &&
+              f.workspace_name === message.file.workspace_name
+          )
+
+          if (file_in_history_index !== -1) {
+            files_in_history[file_in_history_index] = message.file
+          } else {
+            files_in_history.push(message.file)
+          }
+
+          history_item_to_update.files = files_in_history
+
+          // Recalculate total lines added/removed
+          let total_lines_added = 0
+          let total_lines_removed = 0
+          for (const file of files_in_history) {
+            total_lines_added += file.lines_added
+            total_lines_removed += file.lines_removed
+          }
+
+          history_item_to_update.lines_added = total_lines_added
+          history_item_to_update.lines_removed = total_lines_removed
+
+          new_history[history_item_index] = history_item_to_update
+
+          return new_history
+        })
       } else if (message.command == 'CODE_REVIEW_FINISHED') {
         set_files_to_review(undefined)
         set_raw_instructions(undefined)
@@ -188,7 +236,8 @@ export const use_panel = (vscode: any) => {
               raw_instructions: message.raw_instructions,
               created_at: now,
               lines_added: message.lines_added,
-              lines_removed: message.lines_removed
+              lines_removed: message.lines_removed,
+              files: message.files
             }
           ])
         } else {
@@ -203,7 +252,8 @@ export const use_panel = (vscode: any) => {
               raw_instructions: message.raw_instructions,
               created_at: now,
               lines_added: message.lines_added,
-              lines_removed: message.lines_removed
+              lines_removed: message.lines_removed,
+              files: message.files
             }
             set_response_history([...response_history, new_item])
             if (!files_to_review) {

packages/vscode/src/views/panel/types/messages.ts

@@ -317,6 +317,7 @@ export interface ApplyResponseFromHistoryMessage extends BaseMessage {
   command: 'APPLY_RESPONSE_FROM_HISTORY'
   response: string
   raw_instructions?: string
+  files?: FileInReview[]
 }
 
 export type FrontendMessage =
@@ -572,6 +573,7 @@ export interface NewResponseReceivedMessage extends BaseMessage {
   raw_instructions?: string
   lines_added: number
   lines_removed: number
+  files?: FileInReview[]
 }
 
 export type BackendMessage =