Update presentModification to also take a source

Author: intitni

Core/Sources/Service/SuggestionCommandHandler/PseudoCommandHandler.swift

@@ -271,23 +271,18 @@ struct PseudoCommandHandler: CommandHandler {
         }
     }
 
-    func presentModification(fileURL: URL, snippets: [ModificationSnippet]) async {
+    func presentModification(
+        source: ModificationAgentRequest.ModificationSource,
+        snippets: [ModificationSnippet]
+    ) async {
         do {
             @Dependency(\.workspacePool) var workspacePool
             let (workspace, filespace) = try await workspacePool
-                .fetchOrCreateWorkspaceAndFilespace(fileURL: fileURL)
+                .fetchOrCreateWorkspaceAndFilespace(fileURL: source.documentURL)
             let store = await Service.shared.guiController.store
-            let content = try String(contentsOf: fileURL)
-            let lines = content.breakLines(appendLineBreakToLastLine: false)
             await store.send(.promptToCodeGroup(.activateOrCreatePromptToCode(.init(
                 promptToCodeState: Shared(.init(
-                    source: .init(
-                        language: filespace.language,
-                        documentURL: filespace.fileURL,
-                        projectRootURL: workspace.projectRootURL,
-                        content: content,
-                        lines: lines
-                    ),
+                    source: source,
                     snippets: IdentifiedArray(uniqueElements: snippets),
                     instruction: "",
                     extraSystemPrompt: "",

Tool/Sources/CommandHandler/CommandHandler.swift

@@ -26,7 +26,10 @@ public protocol CommandHandler {
     // MARK: Modification
 
     func acceptPromptToCode() async
-    func presentModification(fileURL: URL, snippets: [ModificationSnippet]) async
+    func presentModification(
+        source: ModificationAgentRequest.ModificationSource,
+        snippets: [ModificationSnippet]
+    ) async
 
     // MARK: Custom Command
 
@@ -104,8 +107,11 @@ public final class UniversalCommandHandler: CommandHandler {
         await commandHandler.acceptPromptToCode()
     }
 
-    public func presentModification(fileURL: URL, snippets: [ModificationSnippet]) async {
-        await commandHandler.presentModification(fileURL: fileURL, snippets: snippets)
+    public func presentModification(
+        source: ModificationAgentRequest.ModificationSource,
+        snippets: [ModificationSnippet]
+    ) async {
+        await commandHandler.presentModification(source: source, snippets: snippets)
     }
 
     public func handleCustomCommand(_ command: CustomCommand) async {
@@ -162,7 +168,10 @@ struct NOOPCommandHandler: CommandHandler {
         print("accept prompt to code")
     }
 
-    func presentModification(fileURL: URL, snippets: [ModificationSnippet]) {
+    func presentModification(
+        source: ModificationAgentRequest.ModificationSource,
+        snippets: [ModificationSnippet]
+    ) {
         print("present modification")
     }
 

Tool/Sources/ModificationBasic/ModificationAgent.swift

@@ -8,37 +8,53 @@ public enum ModificationAgentResponse {
 }
 
 public struct ModificationAgentRequest {
-    var code: String
-    var requirement: String
-    var source: ModificationSource
-    var isDetached: Bool
-    var extraSystemPrompt: String?
-    var generateDescriptionRequirement: Bool?
+    public var code: String
+    public var requirement: String
+    public var source: ModificationSource
+    public var isDetached: Bool
+    public var extraSystemPrompt: String?
+    public var generateDescriptionRequirement: Bool?
+    public var range: CursorRange
 
-    public struct ModificationSource {
+    public struct ModificationSource: Equatable {
         public var language: CodeLanguage
         public var documentURL: URL
         public var projectRootURL: URL
         public var content: String
         public var lines: [String]
-        public var range: CursorRange
 
         public init(
             language: CodeLanguage,
             documentURL: URL,
             projectRootURL: URL,
             content: String,
-            lines: [String],
-            range: CursorRange
+            lines: [String]
         ) {
             self.language = language
             self.documentURL = documentURL
             self.projectRootURL = projectRootURL
             self.content = content
             self.lines = lines
-            self.range = range
         }
     }
+
+    public init(
+        code: String,
+        requirement: String,
+        source: ModificationSource,
+        isDetached: Bool,
+        extraSystemPrompt: String? = nil,
+        generateDescriptionRequirement: Bool? = nil,
+        range: CursorRange
+    ) {
+        self.code = code
+        self.requirement = requirement
+        self.source = source
+        self.isDetached = isDetached
+        self.extraSystemPrompt = extraSystemPrompt
+        self.generateDescriptionRequirement = generateDescriptionRequirement
+        self.range = range
+    }
 }
 
 public protocol ModificationAgent {

Tool/Sources/PromptToCodeCustomization/PromptToCodeCustomization.swift

@@ -60,27 +60,7 @@ struct NoPromptToCodeCustomizedUI: PromptToCodeCustomizedUI {
 }
 
 public struct PromptToCodeState: Equatable {
-    public struct Source: Equatable {
-        public var language: CodeLanguage
-        public var documentURL: URL
-        public var projectRootURL: URL
-        public var content: String
-        public var lines: [String]
-
-        public init(
-            language: CodeLanguage,
-            documentURL: URL,
-            projectRootURL: URL,
-            content: String,
-            lines: [String]
-        ) {
-            self.language = language
-            self.documentURL = documentURL
-            self.projectRootURL = projectRootURL
-            self.content = content
-            self.lines = lines
-        }
-    }
+    public typealias Source = ModificationAgentRequest.ModificationSource
 
     public var source: Source
     public var history: [ModificationHistoryNode] = []