Remove the redundant codeWebChat.undo command and integrate its functionality directly into the ViewProvider to centralize undo logic within the webview panel

Author: robertpiosik

packages/vscode/package.json

@@ -251,11 +251,6 @@
         "command": "codeWebChat.delete",
         "title": "Delete"
       },
-      {
-        "command": "codeWebChat.undo",
-        "title": "Undo Last Changes",
-        "category": "Code Web Chat"
-      },
       {
         "command": "codeWebChat.referenceInChat",
         "title": "Reference in Chat",
@@ -281,14 +276,6 @@
     ],
     "menus": {
       "commandPalette": [
-        {
-          "command": "codeWebChat.applyChatResponse",
-          "when": "false"
-        },
-        {
-          "command": "codeWebChat.undo",
-          "when": "false"
-        },
         {
           "command": "codeWebChat.clearChecks",
           "when": "false"

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

@@ -732,7 +732,7 @@ export const apply_chat_response_command = (
             const editor = vscode.window.activeTextEditor
             if (editor) {
               const choice = await vscode.window.showWarningMessage(
-                'No valid code blocks found in the clipboard text. Apply it to the active editor with the Intelligent Update API tool?',
+                'No valid code blocks found in the clipboard text. Apply found text to the active editor with the Intelligent Update API tool?',
                 { modal: true },
                 'Apply'
               )

packages/vscode/src/commands/index.ts

@@ -11,7 +11,6 @@ export * from './open-url-command'
 export * from './reference-in-chat-command'
 export * from './feedback-command'
 export * from './rename-command'
-export * from './undo-command'
 export * from './save-all-command'
 export * from './save-context-command'
 export * from './apply-context-command'

packages/vscode/src/commands/undo-command.ts

@@ -20,7 +20,6 @@ import {
   rename_command,
   delete_command,
   save_context_command,
-  undo_command,
   reference_in_chat_command,
   open_url_command,
   feedback_command,
@@ -69,7 +68,6 @@ export async function activate(context: vscode.ExtensionContext) {
       ),
       reference_in_chat_command(view_provider, workspace_provider),
       apply_chat_response_command(context, view_provider, workspace_provider),
-      undo_command(context, view_provider.set_undo_button_state),
       ...code_completion_commands(
         workspace_provider,
         open_editors_provider,

packages/vscode/src/extension.ts

@@ -55,6 +55,7 @@ import {
 } from './message-handlers'
 import {
   API_EDIT_FORMAT_STATE_KEY,
+  LAST_APPLIED_CHANGES_EDITOR_STATE_STATE_KEY,
   API_MODE_STATE_KEY,
   CHAT_EDIT_FORMAT_STATE_KEY,
   INSTRUCTIONS_ASK_STATE_KEY,
@@ -64,23 +65,26 @@ import {
   get_last_group_or_preset_choice_state_key,
   get_last_selected_group_state_key,
   get_last_selected_preset_key,
+  LAST_APPLIED_CHANGES_STATE_KEY,
+  LAST_APPLIED_CLIPBOARD_CONTENT_STATE_KEY,
   LAST_SELECTED_CODE_COMPLETION_CONFIG_ID_STATE_KEY,
   LAST_SELECTED_EDIT_CONTEXT_CONFIG_ID_STATE_KEY,
   RECENT_DONATIONS_VISIBLE_STATE_KEY,
   WEB_MODE_STATE_KEY
 } from '@/constants/state-keys'
-import { can_undo } from '@/commands/undo-command'
 import {
   config_preset_to_ui_format,
   ConfigPresetFormat
 } from '@/views/panel/backend/utils/preset-format-converters'
+import { OriginalFileState } from '@/commands/apply-chat-response-command/types/original-file-state'
 import { CHATBOTS } from '@shared/constants/chatbots'
 import { HOME_VIEW_TYPES, HomeViewType } from '../types/home-view-type'
 import { ApiMode, WebMode } from '@shared/types/modes'
 import { code_review_promise_resolve } from '@/commands/apply-chat-response-command/utils/review'
 import { Logger } from '@shared/utils/logger'
 import { CancelTokenSource } from 'axios'
 import { update_last_used_preset_or_group } from './message-handlers/update-last-used-preset-or-group'
+import { undo_files } from '@/commands/apply-chat-response-command/utils/file-operations'
 import { dictionary } from '@shared/constants/dictionary'
 
 export class ViewProvider implements vscode.WebviewViewProvider {
@@ -363,6 +367,8 @@ export class ViewProvider implements vscode.WebviewViewProvider {
             await handle_duplicate_preset(this, message, webview_view)
           } else if (message.command == 'CREATE_PRESET') {
             await handle_create_preset(this)
+          } else if (message.command == 'UNDO') {
+            await this._handle_undo()
           } else if (message.command == 'EXECUTE_COMMAND') {
             await vscode.commands.executeCommand(message.command_id)
           } else if (message.command == 'EDIT_CONTEXT') {
@@ -479,7 +485,7 @@ export class ViewProvider implements vscode.WebviewViewProvider {
     setTimeout(() => {
       this.send_message({
         command: 'CAN_UNDO_CHANGED',
-        can_undo: can_undo(this.context)
+        can_undo: this._can_undo()
       })
     }, 1000)
   }
@@ -736,6 +742,81 @@ export class ViewProvider implements vscode.WebviewViewProvider {
     })
   }
 
+  private _can_undo(): boolean {
+    const original_states = this.context.workspaceState.get<
+      OriginalFileState[]
+    >(LAST_APPLIED_CHANGES_STATE_KEY)
+    return !!original_states && original_states.length > 0
+  }
+
+  private async _handle_undo(): Promise<void> {
+    const context = this.context
+    const original_states = context.workspaceState.get<OriginalFileState[]>(
+      LAST_APPLIED_CHANGES_STATE_KEY
+    )
+    const editor_state = context.workspaceState.get<
+      | {
+          file_path: string
+          position: { line: number; character: number }
+        }
+      | undefined
+    >(LAST_APPLIED_CHANGES_EDITOR_STATE_STATE_KEY)
+
+    if (!original_states || original_states.length == 0) {
+      vscode.window.showInformationMessage(
+        dictionary.information_message.NO_RECENT_CHANGES_TO_UNDO
+      )
+      return
+    }
+
+    try {
+      const success = await undo_files({ original_states })
+
+      if (!success) {
+        return
+      }
+
+      if (editor_state) {
+        try {
+          const uri = vscode.Uri.file(editor_state.file_path)
+          const document = await vscode.workspace.openTextDocument(uri)
+          const editor = await vscode.window.showTextDocument(document, {
+            preview: false
+          })
+          const position = new vscode.Position(
+            editor_state.position.line,
+            editor_state.position.character
+          )
+          editor.selection = new vscode.Selection(position, position)
+          editor.revealRange(
+            new vscode.Range(position, position),
+            vscode.TextEditorRevealType.InCenter
+          )
+        } catch (error) {
+          console.error('Error restoring editor state:', error)
+        }
+      }
+
+      context.workspaceState.update(LAST_APPLIED_CHANGES_STATE_KEY, null)
+      context.workspaceState.update(
+        LAST_APPLIED_CHANGES_EDITOR_STATE_STATE_KEY,
+        null
+      )
+      context.workspaceState.update(
+        LAST_APPLIED_CLIPBOARD_CONTENT_STATE_KEY,
+        null
+      )
+      this.set_undo_button_state(false)
+    } catch (error: any) {
+      console.error('Error during undo:', error)
+      vscode.window.showErrorMessage(
+        dictionary.error_message.FAILED_TO_UNDO_CHANGES(
+          error.message || 'Unknown error'
+        )
+      )
+    }
+  }
+
   private _get_html_for_webview(webview: vscode.Webview) {
     const resources_uri = webview.asWebviewUri(
       vscode.Uri.joinPath(this.extension_uri, 'resources')

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

@@ -548,6 +548,12 @@ export const Main: React.FC<Props> = (props) => {
     })
   }
 
+  const handle_undo_click = () => {
+    post_message(props.vscode, {
+      command: 'UNDO'
+    })
+  }
+
   const instructions =
     current_mode == 'ask'
       ? props.ask_instructions
@@ -618,6 +624,7 @@ export const Main: React.FC<Props> = (props) => {
       on_create_preset={handle_create_preset}
       on_quick_action_click={handle_quick_action_click}
       on_commit_click={handle_commit_click}
+      on_undo_click={handle_undo_click}
       has_active_editor={props.has_active_editor}
       has_active_selection={props.has_active_selection}
       has_changes_to_commit={has_changes_to_commit}

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

@@ -44,9 +44,7 @@
     height: 24px;
     padding: 0 var(--padding-5px);
     border-radius: var(--border-radius-4px);
-    text-decoration: none;
     color: var(--vscode-foreground);
-    letter-spacing: -0.5px;
 
     &:disabled {
       opacity: var(--disabled-opacity);

packages/vscode/src/views/panel/frontend/Main/MainView/MainView.module.scss

@@ -37,6 +37,7 @@ type Props = {
   on_curly_braces_click: () => void
   on_quick_action_click: (command: string) => void
   on_commit_click: () => void
+  on_undo_click: () => void
   is_connected: boolean
   presets: Preset[]
   configurations: ApiToolConfiguration[]
@@ -193,10 +194,6 @@ export const MainView: React.FC<Props> = (props) => {
     }, 500)
   }, [props.can_undo])
 
-  const handle_undo_click = () => {
-    props.on_quick_action_click('codeWebChat.undo')
-  }
-
   const handle_commit_click = () => {
     if (!props.has_changes_to_commit) return
 
@@ -425,32 +422,32 @@ export const MainView: React.FC<Props> = (props) => {
           </a>
         </div>
         <div className={styles.footer__right}>
+          {props.home_view_type == HOME_VIEW_TYPES.WEB && (
+            <button
+              className={cn(
+                styles.footer__button,
+                styles['footer__button--outlined']
+              )}
+              onClick={handle_apply_click}
+              title={'Integrate copied chat response or a single code block'}
+              disabled={is_apply_disabled_temporarily}
+            >
+              Apply
+            </button>
+          )}
           <button
             className={cn(
               styles.footer__button,
               styles['footer__button--outlined']
             )}
-            onClick={handle_undo_click}
+            onClick={props.on_undo_click}
             title={
               'Restore saved state of the codebase after chat/API response integration'
             }
             disabled={!props.can_undo}
           >
             Undo
           </button>
-          {props.home_view_type == HOME_VIEW_TYPES.WEB && (
-            <button
-              className={cn(
-                styles.footer__button,
-                styles['footer__button--outlined']
-              )}
-              onClick={handle_apply_click}
-              title={'Integrate copied message or a code block'}
-              disabled={is_apply_disabled_temporarily}
-            >
-              Apply clipboard
-            </button>
-          )}
           <button
             className={cn(
               styles.footer__button,