Move ModificationState to ModificationBasic

Author: intitni

Core/Sources/Service/SuggestionCommandHandler/PseudoCommandHandler.swift

@@ -10,6 +10,7 @@ import Logger
 import ModificationBasic
 import PlusFeatureFlag
 import Preferences
+import PromptToCodeCustomization
 import SuggestionBasic
 import SuggestionInjector
 import Terminal
@@ -271,23 +272,14 @@ struct PseudoCommandHandler: CommandHandler {
         }
     }
 
-    func presentModification(
-        source: ModificationAgentRequest.ModificationSource,
-        snippets: [ModificationSnippet]
-    ) async {
+    func presentModification(state: Shared<ModificationState>) async {
         do {
             @Dependency(\.workspacePool) var workspacePool
             let (_, filespace) = try await workspacePool
-                .fetchOrCreateWorkspaceAndFilespace(fileURL: source.documentURL)
+                .fetchOrCreateWorkspaceAndFilespace(fileURL: state.wrappedValue.source.documentURL)
             let store = await Service.shared.guiController.store
             await store.send(.promptToCodeGroup(.createPromptToCode(.init(
-                promptToCodeState: Shared(.init(
-                    source: source,
-                    snippets: IdentifiedArray(uniqueElements: snippets),
-                    instruction: "",
-                    extraSystemPrompt: "",
-                    isAttachedToTarget: true
-                )),
+                promptToCodeState: state,
                 indentSize: filespace.codeMetadata.indentSize ?? 4,
                 usesTabsForIndentation: filespace.codeMetadata.usesTabsForIndentation ?? false,
                 commandName: nil,

Tool/Sources/CommandHandler/CommandHandler.swift

@@ -1,7 +1,9 @@
+import ComposableArchitecture
 import Dependencies
 import Foundation
 import ModificationBasic
 import Preferences
+import PromptToCodeCustomization
 import SuggestionBasic
 import Toast
 import XcodeInspector
@@ -26,10 +28,7 @@ public protocol CommandHandler {
     // MARK: Modification
 
     func acceptModification() async
-    func presentModification(
-        source: ModificationAgentRequest.ModificationSource,
-        snippets: [ModificationSnippet]
-    ) async
+    func presentModification(state: Shared<ModificationState>) async
 
     // MARK: Custom Command
 
@@ -107,11 +106,8 @@ public final class UniversalCommandHandler: CommandHandler {
         await commandHandler.acceptModification()
     }
 
-    public func presentModification(
-        source: ModificationAgentRequest.ModificationSource,
-        snippets: [ModificationSnippet]
-    ) async {
-        await commandHandler.presentModification(source: source, snippets: snippets)
+    public func presentModification(state: Shared<ModificationState>) async {
+        await commandHandler.presentModification(state: state)
     }
 
     public func handleCustomCommand(_ command: CustomCommand) async {
@@ -168,10 +164,7 @@ struct NOOPCommandHandler: CommandHandler {
         print("accept prompt to code")
     }
 
-    func presentModification(
-        source: ModificationAgentRequest.ModificationSource,
-        snippets: [ModificationSnippet]
-    ) {
+    func presentModification(state: Shared<ModificationState>) {
         print("present modification")
     }
 

Tool/Sources/ModificationBasic/ModificationState.swift

@@ -0,0 +1,79 @@
+import Foundation
+import IdentifiedCollections
+import SuggestionBasic
+
+public struct ModificationState: Equatable {
+    public typealias Source = ModificationAgentRequest.ModificationSource
+
+    public var source: Source
+    public var history: [ModificationHistoryNode] = []
+    public var snippets: IdentifiedArrayOf<ModificationSnippet> = []
+    public var isGenerating: Bool = false
+    public var instruction: String
+    public var extraSystemPrompt: String
+    public var isAttachedToTarget: Bool = true
+
+    public init(
+        source: Source,
+        history: [ModificationHistoryNode] = [],
+        snippets: IdentifiedArrayOf<ModificationSnippet>,
+        instruction: String,
+        extraSystemPrompt: String,
+        isAttachedToTarget: Bool
+    ) {
+        self.history = history
+        self.snippets = snippets
+        isGenerating = false
+        self.instruction = instruction
+        self.isAttachedToTarget = isAttachedToTarget
+        self.extraSystemPrompt = extraSystemPrompt
+        self.source = source
+    }
+
+    public init(
+        source: Source,
+        originalCode: String,
+        attachedRange: CursorRange,
+        instruction: String,
+        extraSystemPrompt: String
+    ) {
+        self.init(
+            source: source,
+            snippets: [
+                .init(
+                    startLineIndex: 0,
+                    originalCode: originalCode,
+                    modifiedCode: originalCode,
+                    description: "",
+                    error: nil,
+                    attachedRange: attachedRange
+                ),
+            ],
+            instruction: instruction,
+            extraSystemPrompt: extraSystemPrompt,
+            isAttachedToTarget: !attachedRange.isEmpty
+        )
+    }
+
+    public mutating func popHistory() {
+        if !history.isEmpty {
+            let last = history.removeLast()
+            snippets = last.snippets
+            instruction = last.instruction
+        }
+    }
+
+    public mutating func pushHistory() {
+        history.append(.init(snippets: snippets, instruction: instruction))
+        let oldSnippets = snippets
+        snippets = IdentifiedArrayOf()
+        for var snippet in oldSnippets {
+            snippet.originalCode = snippet.modifiedCode
+            snippet.modifiedCode = ""
+            snippet.description = ""
+            snippet.error = nil
+            snippets.append(snippet)
+        }
+    }
+}
+

Tool/Sources/PromptToCodeCustomization/PromptToCodeCustomization.swift

@@ -59,78 +59,3 @@ struct NoPromptToCodeCustomizedUI: PromptToCodeCustomizedUI {
     }
 }
 
-public struct ModificationState: Equatable {
-    public typealias Source = ModificationAgentRequest.ModificationSource
-
-    public var source: Source
-    public var history: [ModificationHistoryNode] = []
-    public var snippets: IdentifiedArrayOf<ModificationSnippet> = []
-    public var isGenerating: Bool = false
-    public var instruction: String
-    public var extraSystemPrompt: String
-    public var isAttachedToTarget: Bool = true
-
-    public init(
-        source: Source,
-        history: [ModificationHistoryNode] = [],
-        snippets: IdentifiedArrayOf<ModificationSnippet>,
-        instruction: String,
-        extraSystemPrompt: String,
-        isAttachedToTarget: Bool
-    ) {
-        self.history = history
-        self.snippets = snippets
-        isGenerating = false
-        self.instruction = instruction
-        self.isAttachedToTarget = isAttachedToTarget
-        self.extraSystemPrompt = extraSystemPrompt
-        self.source = source
-    }
-
-    public init(
-        source: Source,
-        originalCode: String,
-        attachedRange: CursorRange,
-        instruction: String,
-        extraSystemPrompt: String
-    ) {
-        self.init(
-            source: source,
-            snippets: [
-                .init(
-                    startLineIndex: 0,
-                    originalCode: originalCode,
-                    modifiedCode: originalCode,
-                    description: "",
-                    error: nil,
-                    attachedRange: attachedRange
-                ),
-            ],
-            instruction: instruction,
-            extraSystemPrompt: extraSystemPrompt,
-            isAttachedToTarget: !attachedRange.isEmpty
-        )
-    }
-
-    public mutating func popHistory() {
-        if !history.isEmpty {
-            let last = history.removeLast()
-            snippets = last.snippets
-            instruction = last.instruction
-        }
-    }
-
-    public mutating func pushHistory() {
-        history.append(.init(snippets: snippets, instruction: instruction))
-        let oldSnippets = snippets
-        snippets = IdentifiedArrayOf()
-        for var snippet in oldSnippets {
-            snippet.originalCode = snippet.modifiedCode
-            snippet.modifiedCode = ""
-            snippet.description = ""
-            snippet.error = nil
-            snippets.append(snippet)
-        }
-    }
-}
-