Support multi-workspace file operations by correctly tracking and applying workspace roots during renames, restorations, and deletions

Author: robertpiosik

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

@@ -327,7 +327,8 @@ export const apply_chat_response_command = (params: {
                 files_for_history.push({
                   type: 'file',
                   file_path: state.file_path_to_restore,
-                  workspace_name: state.workspace_name,
+                  workspace_name:
+                    state.restore_workspace_name ?? state.workspace_name,
                   file_state: 'deleted',
                   lines_added: 0,
                   lines_removed: deleted_diff_stats.lines_removed,

apps/editor/src/commands/apply-chat-response-command/handlers/conflict-markers-handler.ts

@@ -75,19 +75,33 @@ export const handle_conflict_markers = async (params: {
 
       let rename_source_path: string | undefined
       let rename_source_content: string | undefined
+      let rename_source_workspace_root: string | undefined
 
       if (file.renamed_from) {
+        let old_workspace_root = default_workspace
+        if (
+          file.renamed_from_workspace &&
+          workspace_map.has(file.renamed_from_workspace)
+        ) {
+          old_workspace_root = workspace_map.get(file.renamed_from_workspace)!
+        }
+
         const source_info = await read_rename_source_file({
           renamed_from: file.renamed_from,
-          workspace_root
+          workspace_root: old_workspace_root
         })
         if (source_info) {
           rename_source_path = source_info.path
           rename_source_content = source_info.content
+          rename_source_workspace_root = old_workspace_root
         }
       }
 
-      if (rename_source_path && rename_source_content !== undefined) {
+      if (
+        rename_source_path &&
+        rename_source_content !== undefined &&
+        rename_source_workspace_root
+      ) {
         try {
           let new_content = rename_source_content
           if (has_markers) {
@@ -101,7 +115,7 @@ export const handle_conflict_markers = async (params: {
 
           await cleanup_rename_source({
             source_path: rename_source_path,
-            workspace_root
+            workspace_root: rename_source_workspace_root
           })
 
           const directory = path.dirname(safe_path)
@@ -118,6 +132,7 @@ export const handle_conflict_markers = async (params: {
             content: rename_source_content,
             workspace_name: file.workspace_name,
             file_path_to_restore: file.renamed_from,
+            restore_workspace_name: file.renamed_from_workspace,
             ai_content: file.content,
             proposed_content: new_content
           })

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

@@ -111,14 +111,22 @@ export const handle_fast_replace = async (params: {
       if (file.is_deleted) {
         // If the file was also renamed (moved then deleted), we need to ensure the source is deleted too.
         if (file.renamed_from) {
+          let old_workspace_root = default_workspace
+          if (
+            file.renamed_from_workspace &&
+            workspace_map.has(file.renamed_from_workspace)
+          ) {
+            old_workspace_root = workspace_map.get(file.renamed_from_workspace)!
+          }
+
           const source_info = await read_rename_source_file({
             renamed_from: file.renamed_from,
-            workspace_root
+            workspace_root: old_workspace_root
           })
           if (source_info) {
             await cleanup_rename_source({
               source_path: source_info.path,
-              workspace_root
+              workspace_root: old_workspace_root
             })
           }
         }
@@ -161,19 +169,33 @@ export const handle_fast_replace = async (params: {
 
       let rename_source_path: string | undefined
       let rename_source_content: string | undefined
+      let rename_source_workspace_root: string | undefined
 
       if (file.renamed_from) {
+        let old_workspace_root = default_workspace
+        if (
+          file.renamed_from_workspace &&
+          workspace_map.has(file.renamed_from_workspace)
+        ) {
+          old_workspace_root = workspace_map.get(file.renamed_from_workspace)!
+        }
+
         const source_info = await read_rename_source_file({
           renamed_from: file.renamed_from,
-          workspace_root
+          workspace_root: old_workspace_root
         })
         if (source_info) {
           rename_source_path = source_info.path
           rename_source_content = source_info.content
+          rename_source_workspace_root = old_workspace_root
         }
       }
 
-      if (rename_source_path && rename_source_content !== undefined) {
+      if (
+        rename_source_path &&
+        rename_source_content !== undefined &&
+        rename_source_workspace_root
+      ) {
         try {
           let new_content = file.content
           if (new_content == '') {
@@ -182,7 +204,7 @@ export const handle_fast_replace = async (params: {
 
           await cleanup_rename_source({
             source_path: rename_source_path,
-            workspace_root
+            workspace_root: rename_source_workspace_root
           })
 
           const directory = path.dirname(safe_path)
@@ -199,6 +221,7 @@ export const handle_fast_replace = async (params: {
             content: rename_source_content,
             workspace_name: file.workspace_name,
             file_path_to_restore: file.renamed_from,
+            restore_workspace_name: file.renamed_from_workspace,
             ai_content: file.content,
             proposed_content: new_content
           })

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

@@ -68,19 +68,33 @@ export const handle_truncated_edit = async (params: {
 
     let rename_source_path: string | undefined
     let rename_source_content: string | undefined
+    let rename_source_workspace_root: string | undefined
 
     if (file.renamed_from) {
+      let old_workspace_root = default_workspace
+      if (
+        file.renamed_from_workspace &&
+        workspace_map.has(file.renamed_from_workspace)
+      ) {
+        old_workspace_root = workspace_map.get(file.renamed_from_workspace)!
+      }
+
       const source_info = await read_rename_source_file({
         renamed_from: file.renamed_from,
-        workspace_root
+        workspace_root: old_workspace_root
       })
       if (source_info) {
         rename_source_path = source_info.path
         rename_source_content = source_info.content
+        rename_source_workspace_root = old_workspace_root
       }
     }
 
-    if (rename_source_path && rename_source_content !== undefined) {
+    if (
+      rename_source_path &&
+      rename_source_content !== undefined &&
+      rename_source_workspace_root
+    ) {
       try {
         const new_content = process_truncated_content(
           file.content,
@@ -89,7 +103,7 @@ export const handle_truncated_edit = async (params: {
 
         await cleanup_rename_source({
           source_path: rename_source_path,
-          workspace_root
+          workspace_root: rename_source_workspace_root
         })
 
         const directory = path.dirname(safe_path)
@@ -106,6 +120,7 @@ export const handle_truncated_edit = async (params: {
           content: rename_source_content,
           workspace_name: file.workspace_name,
           file_path_to_restore: file.renamed_from,
+          restore_workspace_name: file.renamed_from_workspace,
           ai_content: file.content,
           proposed_content: new_content
         })

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

@@ -268,18 +268,28 @@ export const process_chat_response = async (params: {
     const patches = params.clipboard_items.filter(
       (item): item is DiffItem => item.type == 'diff'
     )
-    const rename_map = new Map<string, string>()
+    const rename_map = new Map<
+      string,
+      { new_path: string; new_workspace?: string }
+    >()
     patches.forEach((patch) => {
       if (patch.new_file_path && patch.file_path) {
-        rename_map.set(patch.file_path, patch.new_file_path)
+        const key = `${patch.workspace_name || ''}:${patch.file_path}`
+        rename_map.set(key, {
+          new_path: patch.new_file_path,
+          new_workspace: patch.new_workspace_name
+        })
       }
     })
 
     const set_new_paths_in_original_states = (states: OriginalFileState[]) => {
       if (!rename_map.size) return
       states.forEach((state) => {
-        if (rename_map.has(state.file_path)) {
-          state.new_file_path = rename_map.get(state.file_path)!
+        const key = `${state.workspace_name || ''}:${state.file_path}`
+        if (rename_map.has(key)) {
+          const rename_info = rename_map.get(key)!
+          state.new_file_path = rename_info.new_path
+          state.new_workspace_name = rename_info.new_workspace
         }
       })
     }

apps/editor/src/commands/apply-chat-response-command/types/original-file-state.ts

@@ -4,7 +4,9 @@ export type OriginalFileState = {
   workspace_name?: string
   cursor_offset?: number
   new_file_path?: string
+  new_workspace_name?: string
   file_path_to_restore?: string
+  restore_workspace_name?: string
   diff_application_method?: 'recount' | 'search_and_replace'
   file_state?: 'new' | 'deleted'
   is_checked?: boolean

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

@@ -11,6 +11,7 @@ export type FileItem = {
   content: string
   workspace_name?: string
   renamed_from?: string
+  renamed_from_workspace?: string
   is_deleted?: boolean
 }
 
@@ -20,6 +21,7 @@ export type DiffItem = {
   content: string
   workspace_name?: string
   new_file_path?: string
+  new_workspace_name?: string
 }
 
 export type CodeAtCursorItem = {

apps/editor/src/commands/apply-chat-response-command/utils/clipboard-parser/parsers/diff-parser/diff-parser.ts

@@ -97,7 +97,7 @@ const process_collected_patch_lines = (params: {
       })
     patch.new_file_path = new_relative
     if (new_workspace && new_workspace !== workspace_name) {
-      patch.workspace_name = new_workspace
+      patch.new_workspace_name = new_workspace
     }
   }
 
@@ -353,7 +353,7 @@ const process_text_for_file_operations = (params: {
         new_info.workspace_name &&
         new_info.workspace_name !== old_info.workspace_name
       ) {
-        patch.workspace_name = new_info.workspace_name
+        patch.new_workspace_name = new_info.workspace_name
       }
       items.push(patch)
     } else {

apps/editor/src/commands/apply-chat-response-command/utils/clipboard-parser/parsers/multiple-files-parser/helpers/item-management.ts

@@ -9,6 +9,7 @@ export const create_or_update_file_item = (params: {
   results: (FileItem | TextItem | InlineFileItem)[]
   mode?: 'overwrite' | 'append'
   renamed_from?: string
+  renamed_from_workspace?: string
   is_deleted?: boolean
 }) => {
   if (!params.file_name) {
@@ -71,6 +72,10 @@ export const create_or_update_file_item = (params: {
       existing_file.renamed_from = params.renamed_from
     }
 
+    if (params.renamed_from_workspace !== undefined) {
+      existing_file.renamed_from_workspace = params.renamed_from_workspace
+    }
+
     if (params.is_deleted !== undefined) {
       existing_file.is_deleted = params.is_deleted
     }
@@ -81,6 +86,7 @@ export const create_or_update_file_item = (params: {
       content: processed_content,
       workspace_name: params.workspace_name,
       renamed_from: params.renamed_from,
+      renamed_from_workspace: params.renamed_from_workspace,
       is_deleted: params.is_deleted
     }
     params.file_ref_map.set(file_key, new_file)