Refactor response history management by introducing a dedicated ResponseHistoryItem type, centralizing history storage in PanelProvider, and integrating history tracking and preview switching directly into the chat response application flow

Author: robertpiosik

packages/shared/src/constants/dictionary.ts

@@ -268,8 +268,8 @@ export const dictionary = {
     API_KEY_MISSING: 'API key is missing. Please add it in the Settings tab.',
     CODE_COMPLETION_ERROR:
       'An error occurred during code completion. See console for details.',
-    REFACTOR_ERROR:
-      'An error occurred during refactor task. See console for details.',
+    EDIT_CONTEXT_ERROR:
+      'An error occurred during context editing. See console for details.',
     CONFIGURATION_ALREADY_EXISTS:
       'A configuration with these properties already exists',
     CONFIGURATION_NOT_FOUND: 'Configuration not found',

packages/shared/src/types/response-history-item.ts

@@ -0,0 +1,10 @@
+import { FileInPreview } from './file-in-preview'
+
+export type ResponseHistoryItem = {
+  response: string
+  raw_instructions?: string
+  created_at: number
+  lines_added?: number
+  lines_removed?: number
+  files?: FileInPreview[]
+}

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

@@ -2,27 +2,14 @@ import { useEffect, useState } from 'react'
 import cn from 'classnames'
 import dayjs from 'dayjs'
 import relativeTime from 'dayjs/plugin/relativeTime'
-import { FileInPreview } from '@shared/types/file-in-preview'
+import { ResponseHistoryItem } from '@shared/types/response-history-item'
 import styles from './Responses.module.scss'
 
 dayjs.extend(relativeTime)
 
-export type ResponseHistoryItem = {
-  response: string
-  raw_instructions?: string
-  created_at: number
-  lines_added?: number
-  lines_removed?: number
-  files?: FileInPreview[]
-}
-
 type Props = {
   response_history: ResponseHistoryItem[]
-  on_response_history_item_click: (item: {
-    response: string
-    raw_instructions?: string
-    files?: FileInPreview[]
-  }) => void
+  on_response_history_item_click: (item: ResponseHistoryItem) => void
   selected_history_item_created_at?: number
   on_selected_history_item_change: (created_at: number) => void
 }

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

@@ -18,8 +18,10 @@ import {
 import { process_chat_response, CommandArgs } from './response-processor'
 import { Checkpoint } from '../checkpoints-command/types'
 import { CHECKPOINTS_STATE_KEY } from '@/constants/state-keys'
+import { ResponseHistoryItem } from '@shared/types/response-history-item'
 
 let in_progress = false
+let placeholder_created_at_for_update: number | undefined
 
 export const apply_chat_response_command = (
   context: vscode.ExtensionContext,
@@ -52,28 +54,33 @@ export const apply_chat_response_command = (
         return
       }
 
-      if (in_progress) {
-        panel_provider.send_message({
-          command: 'NEW_RESPONSE_RECEIVED',
-          response: chat_response,
-          raw_instructions: args?.raw_instructions
-        })
-      }
-
       if (in_progress && !response_preview_promise_resolve) {
         // Running intelligent update before response preview...
         return
       }
-      in_progress = true
 
       if (response_preview_promise_resolve) {
         // Previewing response...
+        const history = panel_provider.response_history
+
+        const new_item: ResponseHistoryItem = {
+          response: chat_response,
+          raw_instructions: args?.raw_instructions,
+          created_at: Date.now()
+        }
+
+        history.push(new_item)
+        panel_provider.send_message({
+          command: 'RESPONSE_HISTORY',
+          history
+        })
         const choice = await vscode.window.showInformationMessage(
           dictionary.warning_message.PREVIEW_ONGOING,
           'Switch'
         )
 
         if (choice == 'Switch') {
+          placeholder_created_at_for_update = new_item.created_at
           response_preview_promise_resolve({ accepted_files: [] })
           if (ongoing_review_cleanup_promise) {
             await ongoing_review_cleanup_promise
@@ -84,6 +91,7 @@ export const apply_chat_response_command = (
         }
       }
 
+      in_progress = true
       let before_checkpoint: Checkpoint | undefined
       try {
         before_checkpoint = await create_checkpoint(
@@ -104,6 +112,7 @@ export const apply_chat_response_command = (
         )
 
         if (review_data) {
+          let created_at_for_preview = args?.created_at
           if (!args?.files_with_content) {
             let total_lines_added = 0
             let total_lines_removed = 0
@@ -168,24 +177,58 @@ export const apply_chat_response_command = (
                 is_checked: true
               })
             }
+            const history = panel_provider.response_history
+
+            if (placeholder_created_at_for_update) {
+              const item_to_update = history.find(
+                (i) => i.created_at === placeholder_created_at_for_update
+              )
+              if (item_to_update) {
+                item_to_update.files = files_for_history
+                item_to_update.lines_added = total_lines_added
+                item_to_update.lines_removed = total_lines_removed
+              }
+              created_at_for_preview = placeholder_created_at_for_update
+              placeholder_created_at_for_update = undefined
+            } else {
+              const item_to_update =
+                args?.created_at &&
+                history.find((i) => i.created_at === args.created_at)
+
+              if (item_to_update) {
+                item_to_update.files = files_for_history
+                item_to_update.lines_added = total_lines_added
+                item_to_update.lines_removed = total_lines_removed
+              } else {
+                created_at_for_preview = Date.now()
+                const new_item: ResponseHistoryItem = {
+                  response: review_data.chat_response,
+                  raw_instructions: args?.raw_instructions,
+                  created_at: created_at_for_preview,
+                  lines_added: total_lines_added,
+                  lines_removed: total_lines_removed,
+                  files: files_for_history
+                }
+
+                history.push(new_item)
+              }
+            }
 
             panel_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
+              command: 'RESPONSE_HISTORY',
+              history
             })
           }
 
+          const history_for_checkpoint = [...panel_provider.response_history]
           const changes_accepted = await preview_handler({
             original_states: review_data.original_states,
             chat_response: review_data.chat_response,
             panel_provider,
             context,
             original_editor_state: args?.original_editor_state,
-            raw_instructions: args?.raw_instructions
+            raw_instructions: args?.raw_instructions,
+            created_at: created_at_for_preview
           })
 
           if (changes_accepted) {
@@ -200,6 +243,9 @@ export const apply_chat_response_command = (
               )
               if (checkpoint_to_update) {
                 checkpoint_to_update.title = 'Before changes approved'
+                checkpoint_to_update.response_history = history_for_checkpoint
+                checkpoint_to_update.response_preview_item_created_at =
+                  created_at_for_preview
                 await context.workspaceState.update(
                   CHECKPOINTS_STATE_KEY,
                   checkpoints

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

@@ -35,6 +35,7 @@ export type CommandArgs = {
     position: { line: number; character: number }
   }
   files_with_content?: FileInPreview[]
+  created_at?: number
 }
 
 export const process_chat_response = async (
@@ -52,7 +53,11 @@ export const process_chat_response = async (
             f.file_path === state.file_path &&
             f.workspace_name === state.workspace_name
         )
-        return { ...state, ai_content: file_in_review?.content }
+        return {
+          ...state,
+          ai_content: file_in_review?.content,
+          is_checked: file_in_review?.is_checked
+        }
       })
       update_undo_button_state({
         context,

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

@@ -18,21 +18,36 @@ export const preview_handler = async (params: {
     position: { line: number; character: number }
   }
   raw_instructions?: string
+  created_at?: number
 }): Promise<boolean> => {
   let resolve_cleanup_promise: () => void
   ongoing_review_cleanup_promise = new Promise((resolve) => {
     resolve_cleanup_promise = resolve
   })
 
   try {
-    const review_result = await preview({
+    const preview_result = await preview({
       original_states: params.original_states,
       panel_provider: params.panel_provider,
       raw_instructions: params.raw_instructions,
-      chat_response: params.chat_response
+      chat_response: params.chat_response,
+      context: params.context,
+      created_at: params.created_at
     })
 
-    if (review_result === null || review_result.accepted_files.length == 0) {
+    if (preview_result === null || preview_result.accepted_files.length == 0) {
+      if (preview_result?.created_at) {
+        const history = params.panel_provider.response_history
+        const new_history = history.filter(
+          (item) => item.created_at !== preview_result.created_at
+        )
+
+        params.panel_provider.response_history = new_history
+        params.panel_provider.send_message({
+          command: 'RESPONSE_HISTORY',
+          history: new_history
+        })
+      }
       if (params.original_editor_state) {
         try {
           const uri = vscode.Uri.file(params.original_editor_state.file_path)
@@ -68,21 +83,28 @@ export const preview_handler = async (params: {
       return false
     }
 
-    if (review_result.rejected_states.length > 0) {
+    if (preview_result.rejected_states.length > 0) {
       await undo_files({
-        original_states: review_result.rejected_states
+        original_states: preview_result.rejected_states
       })
     }
 
     const accepted_states = params.original_states.filter((state) =>
-      review_result.accepted_files.some(
+      preview_result.accepted_files.some(
         (accepted) =>
           accepted.file_path == state.file_path &&
           accepted.workspace_name == state.workspace_name
       )
     )
 
     if (accepted_states.length > 0) {
+      if (preview_result.created_at) {
+        params.panel_provider.response_history = []
+        params.panel_provider.send_message({
+          command: 'RESPONSE_HISTORY',
+          history: []
+        })
+      }
       update_undo_button_state({
         context: params.context,
         panel_provider: params.panel_provider,

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

@@ -21,9 +21,12 @@ export const preview = async (params: {
   panel_provider: PanelProvider
   raw_instructions?: string
   chat_response: string
+  context: vscode.ExtensionContext
+  created_at?: number
 }): Promise<{
   accepted_files: ReviewableFile[]
   rejected_states: OriginalFileState[]
+  created_at?: number
 } | null> => {
   if (!vscode.workspace.workspaceFolders?.length) {
     vscode.window.showErrorMessage(
@@ -125,7 +128,9 @@ export const preview = async (params: {
       params.original_states,
       params.panel_provider,
       workspace_map,
-      default_workspace
+      default_workspace,
+      params.context,
+      params.created_at
     )
 
     create_temp_files_with_original_content(prepared_files)
@@ -160,7 +165,13 @@ export const preview = async (params: {
       const { decision } = result
 
       if ('accepted_files' in decision) {
-        await vscode.workspace.saveAll()
+        const has_unsaved_editors = vscode.workspace.textDocuments.some(
+          (doc) => doc.isDirty
+        )
+        if (has_unsaved_editors) {
+          await vscode.workspace.saveAll()
+          await new Promise((resolve) => setTimeout(resolve, 500))
+        }
 
         const accepted_files_info = decision.accepted_files
         const accepted_file_identifiers = new Set(
@@ -194,7 +205,11 @@ export const preview = async (params: {
           })
           .filter((state): state is OriginalFileState => state !== undefined)
 
-        return { accepted_files, rejected_states }
+        return {
+          accepted_files,
+          rejected_states,
+          created_at: decision.created_at
+        }
       }
 
       if ('jump_to' in decision) {

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

@@ -2,7 +2,7 @@ import { FileInPreview } from '@shared/types/file-in-preview'
 
 export type CodeReviewDecision =
   | { jump_to: { file_path: string; workspace_name?: string } }
-  | { accepted_files: FileInPreview[] }
+  | { accepted_files: FileInPreview[]; created_at?: number }
 
 export type CodeReviewResult = {
   decision: CodeReviewDecision