allow edit tool to be used in different modes, improve UI

Author: gsabran

app/modules/App/Sources/plugins/ToolsPlugin.swift

@@ -14,7 +14,8 @@ extension ToolsPlugin {
     plugIn(tool: LSTool())
     plugIn(tool: ReadFileTool())
     plugIn(tool: SearchFilesTool())
-    plugIn(tool: EditFilesTool())
+    plugIn(tool: EditFilesTool(shouldAutoApply: true))
+    // plugIn(tool: EditFilesTool(shouldAutoApply: false))
     plugIn(tool: ExecuteCommandTool())
     plugIn(tool: AskFollowUpTool())
   }

app/modules/Package.swift

@@ -240,9 +240,9 @@ targets.append(contentsOf: Target.module(
     "FoundationInterfaces",
     "JSONFoundation",
     "ServerServiceInterface",
+    "ThreadSafe",
     "ToolFoundation",
     "XcodeControllerServiceInterface",
-    "XcodeObserverServiceInterface",
   ],
   testDependencies: [],
   path: "./plugins/tools/EditFilesTool"))
@@ -788,6 +788,7 @@ targets.append(contentsOf: Target.module(
     .product(name: "JSONScanner", package: "JSONScanner"),
     .product(name: "SwiftOpenAI", package: "SwiftOpenAI"),
     "AppFoundation",
+    "ChatFoundation",
     "ConcurrencyFoundation",
     "DependencyFoundation",
     "JSONFoundation",

app/modules/coreui/CodePreview/Sources/FileDiffViewModel.swift

@@ -24,22 +24,23 @@ public final class FileDiffViewModel: Sendable {
     filePath: String,
     llmDiff: String)
   {
-    // Variables used to log debug info if something fails.
-    var _oldContent: String?
+    let fileContent: String
+    do {
+      fileContent = try Self.getCurrentContent(of: URL(fileURLWithPath: filePath))
+    } catch {
+      defaultLogger.error("Error reading file \(filePath)", error)
+      return nil
+    }
     do {
-      let path = URL(fileURLWithPath: filePath)
-      @Dependency(\.fileManager) var fileManager
-      let fileContent = try fileManager.read(contentsOf: path)
-      _oldContent = fileContent
       let changes = try FileDiff.parse(searchReplacePattern: llmDiff, for: fileContent)
-      self.init(filePath: filePath, changes: changes)
+      self.init(filePath: filePath, changes: changes, oldContent: fileContent)
     } catch {
       defaultLogger.error("""
         Could not format diff for \(filePath): \(error)
         -- Diff:
         \(llmDiff)
         -- Current content:
-        \(_oldContent ?? "?")
+        \(fileContent)
         --
         """)
       return nil
@@ -48,53 +49,53 @@ public final class FileDiffViewModel: Sendable {
 
   public convenience init?(
     filePath: String,
-    changes: [FileDiff.SearchReplace])
+    changes: [FileDiff.SearchReplace],
+    oldContent: String? = nil)
   {
-    // Variables used to log debug info if something fails.
-    var _oldContent: String?
-    var _newContent: String?
-    do {
-      let path = URL(fileURLWithPath: filePath)
-      @Dependency(\.fileManager) var fileManager
-      guard let oldContent = try? fileManager.read(contentsOf: path) else {
-        throw AppError(message: "File content not available for \(path)")
+    let path = URL(fileURLWithPath: filePath)
+    let fileContent: String
+    if let oldContent {
+      fileContent = oldContent
+    } else {
+      do {
+        fileContent = try Self.getCurrentContent(of: path)
+      } catch {
+        defaultLogger.error("Error reading file \(filePath)", error)
+        return nil
       }
-      _oldContent = oldContent
-
-      let newContent = try FileDiff.apply(changes: changes, to: oldContent)
-      _newContent = newContent
+    }
 
-      if newContent == oldContent {
+    do {
+      let newContent = try FileDiff.apply(changes: changes, to: fileContent)
+      if newContent == fileContent {
         return nil
       }
 
-      let gitDiff = try FileDiff.getGitDiff(oldContent: oldContent, newContent: newContent)
+      let gitDiff = try FileDiff.getGitDiff(oldContent: fileContent, newContent: newContent)
 
       self.init(
         filePath: path,
-        baseLineContent: oldContent,
+        baseLineContent: fileContent,
         targetContent: newContent,
         changes: changes,
         canBeApplied: true,
         formattedDiff: nil)
 
       diffingTasks.queue {
         let formattedDiff = try await FileDiff.getColoredDiff(
-          oldContent: oldContent,
+          oldContent: fileContent,
           newContent: newContent,
           gitDiff: gitDiff,
           highlightColors: .dark(.xcode))
-        return .init(canBeApplied: true, formattedDiff: formattedDiff, baseLineContent: oldContent)
+        return .init(canBeApplied: true, formattedDiff: formattedDiff, baseLineContent: fileContent)
       }
     } catch {
       defaultLogger.error("""
         Could not format diff for \(filePath): \(error)
         -- Changes:
         \(changes.map { "replace:\n\($0.replace)\nwith:\n\($0.replace)" }.joined(separator: "\n-------\n"))
         -- Previous Content:
-        \(_oldContent ?? "?")
-        -- New Content:
-        \(_newContent ?? "?")
+        \(fileContent)
         --
         """)
       return nil
@@ -251,4 +252,20 @@ public final class FileDiffViewModel: Sendable {
   private let xcodeController: XcodeController
 
   private let diffingTasks = ReplaceableTaskQueue<SuggestionUpdate?>()
+
+  /// Get the current content of the file. It is possible that the editor has content that is not yet saved to disk.
+  private static func getCurrentContent(of file: URL) throws -> String {
+    @Dependency(\.fileManager) var fileManager
+    @Dependency(\.xcodeObserver) var xcodeObserver
+    let editorContent = xcodeObserver.state.wrapped?.xcodesState.compactMap { xc in
+      xc.workspaces.compactMap { ws in
+        ws.tabs.compactMap { tab in
+          tab.knownPath == file ? tab.lastKnownContent : nil
+        }.first
+      }.first
+    }.first
+    // TODO: is it fine to run on the main thread?
+    return try editorContent ?? fileManager.read(contentsOf: file, encoding: .utf8)
+  }
+
 }

app/modules/features/Chat/Sources/ChatTabViewModel.swift

@@ -123,7 +123,8 @@ final class ChatTabViewModel: Identifiable, Equatable {
           model: selectedModel,
           context: DefaultChatContext(
             projectRoot: projectRoot,
-            prepareForWriteToolUse: { [weak self] in await self?.handlePrepareForWriteToolUse() }),
+            prepareForWriteToolUse: { [weak self] in await self?.handlePrepareForWriteToolUse() },
+            chatMode: input.mode),
           migrated: true,
           handleUpdateStream: { newMessages in
             Task { @MainActor [weak self] in
@@ -257,14 +258,17 @@ struct DefaultChatContext: ChatContext {
 
   init(
     projectRoot: URL,
-    prepareForWriteToolUse: @escaping @Sendable () async -> Void)
+    prepareForWriteToolUse: @escaping @Sendable () async -> Void,
+    chatMode: ChatMode)
   {
     self.projectRoot = projectRoot
     self.prepareForWriteToolUse = prepareForWriteToolUse
+    self.chatMode = chatMode
   }
 
   let projectRoot: URL
   let prepareForWriteToolUse: @Sendable () async -> Void
+  let chatMode: ChatMode
 }
 
 // MARK: - ChatEvent

app/modules/plugins/tools/EditFilesTool/Module.swift

@@ -10,8 +10,8 @@ Target.module(
     "FoundationInterfaces",
     "JSONFoundation",
     "ServerServiceInterface",
+    "ThreadSafe",
     "ToolFoundation",
     "XcodeControllerServiceInterface",
-    "XcodeObserverServiceInterface",
   ],
   testDependencies: [])