Migrate prompt to code to use TCA

Author: intitni

Core/Sources/Service/GUI/GraphicalUserInterfaceController.swift

@@ -24,6 +24,11 @@ struct GUI: ReducerProtocol {
             set { suggestionWidgetState.chatPanelState.chatTabGroup = newValue }
         }
 
+        var promptToCodeGroup: PromptToCodeGroup.State {
+            get { suggestionWidgetState.panelState.content.promptToCodeGroup }
+            set { suggestionWidgetState.panelState.content.promptToCodeGroup = newValue }
+        }
+
         #if canImport(ChatTabPersistent)
         var persistentState: ChatTabPersistent.State {
             get {
@@ -44,6 +49,10 @@ struct GUI: ReducerProtocol {
 
         case suggestionWidget(WidgetFeature.Action)
 
+        static func promptToCodeGroup(_ action: PromptToCodeGroup.Action) -> Self {
+            .suggestionWidget(.panel(.sharedPanel(.promptToCodeGroup(action))))
+        }
+
         #if canImport(ChatTabPersistent)
         case persistent(ChatTabPersistent.Action)
         #endif
@@ -267,7 +276,7 @@ public final class GraphicalUserInterfaceController {
             }
         }
     }
-    
+
     func start() {
         store.send(.start)
     }

Core/Sources/Service/GUI/WidgetDataSource.swift

@@ -9,81 +9,7 @@ import SuggestionModel
 import SuggestionWidget
 
 @MainActor
-final class WidgetDataSource {
-    final class PromptToCode {
-        let promptToCodeService: PromptToCodeService
-        let provider: PromptToCodeProvider
-        public init(
-            promptToCodeService: PromptToCodeService,
-            provider: PromptToCodeProvider
-        ) {
-            self.promptToCodeService = promptToCodeService
-            self.provider = provider
-        }
-    }
-
-    private(set) var promptToCode: PromptToCode?
-
-    init() {}
-
-    @discardableResult
-    func createPromptToCode(
-        for url: URL,
-        projectURL: URL,
-        selectedCode: String,
-        allCode: String,
-        selectionRange: CursorRange,
-        language: CodeLanguage,
-        identSize: Int = 4,
-        usesTabsForIndentation: Bool = false,
-        extraSystemPrompt: String?,
-        generateDescriptionRequirement: Bool?,
-        name: String?
-    ) async -> PromptToCodeService {
-        let build = {
-            let service = PromptToCodeService(
-                code: selectedCode,
-                selectionRange: selectionRange,
-                language: language,
-                identSize: identSize,
-                usesTabsForIndentation: usesTabsForIndentation,
-                projectRootURL: projectURL,
-                fileURL: url,
-                allCode: allCode,
-                extraSystemPrompt: extraSystemPrompt,
-                generateDescriptionRequirement: generateDescriptionRequirement
-            )
-            let provider = PromptToCodeProvider(
-                service: service,
-                name: name,
-                onClosePromptToCode: { [weak self] in
-                    self?.removePromptToCode()
-                    let presenter = PresentInWindowSuggestionPresenter()
-                    presenter.closePromptToCode(fileURL: url)
-                    if let app = ActiveApplicationMonitor.shared.previousApp, app.isXcode {
-                        Task { @MainActor in
-                            try await Task.sleep(nanoseconds: 200_000_000)
-                            app.activate()
-                        }
-                    }
-                }
-            )
-            return PromptToCode(promptToCodeService: service, provider: provider)
-        }
-
-        let newPromptToCode = build()
-        promptToCode = newPromptToCode
-        return newPromptToCode.promptToCodeService
-    }
-
-    func removePromptToCode() {
-        promptToCode = nil
-    }
-
-    func cleanup(for url: URL) {
-//        removePromptToCode(for: url)
-    }
-}
+final class WidgetDataSource {}
 
 extension WidgetDataSource: SuggestionWidgetDataSource {
     func suggestionForFile(at url: URL) async -> SuggestionProvider? {
@@ -138,9 +64,5 @@ extension WidgetDataSource: SuggestionWidgetDataSource {
         }
         return nil
     }
-
-    func promptToCodeForFile(at url: URL) async -> PromptToCodeProvider? {
-        return promptToCode?.provider
-    }
 }
 

Core/Sources/Service/ScheduledCleaner.swift

@@ -17,7 +17,7 @@ public final class ScheduledCleaner {
         self.workspacePool = workspacePool
         self.guiController = guiController
     }
-    
+
     func start() {
         // occasionally cleanup workspaces.
         Task { @ServiceActor in
@@ -58,9 +58,13 @@ public final class ScheduledCleaner {
         for (url, workspace) in workspacePool.workspaces {
             if workspace.isExpired, workspaceInfos[.url(url)] == nil {
                 Logger.service.info("Remove idle workspace")
-                for url in workspace.filespaces.keys {
-                    await guiController.widgetDataSource.cleanup(for: url)
-                }
+                _ = await Task { @MainActor in
+                    guiController.viewStore.send(
+                        .promptToCodeGroup(.discardExpiredPromptToCode(documentURLs: Array(
+                            workspace.filespaces.keys
+                        )))
+                    )
+                }.result
                 await workspace.cleanUp(availableTabs: [])
                 workspacePool.removeWorkspace(url: url)
             } else {
@@ -74,7 +78,11 @@ public final class ScheduledCleaner {
                         availableTabs: tabs
                     ) {
                         Logger.service.info("Remove idle filespace")
-                        await guiController.widgetDataSource.cleanup(for: url)
+                        _ = await Task { @MainActor in
+                            guiController.viewStore.send(
+                                .promptToCodeGroup(.discardExpiredPromptToCode(documentURLs: [url]))
+                            )
+                        }.result
                     }
                 }
                 // cleanup workspace

Core/Sources/Service/SuggestionCommandHandler/WindowBaseCommandHandler.swift

@@ -190,20 +190,24 @@ struct WindowBaseCommandHandler: SuggestionCommandHandler {
         var cursorPosition = editor.cursorPosition
         var extraInfo = SuggestionInjector.ExtraInfo()
 
-        let dataSource = Service.shared.guiController.widgetDataSource
+        let viewStore = Service.shared.guiController.viewStore
 
-        if let service = await dataSource.promptToCode?.promptToCodeService {
-            let rangeStart = service.selectionRange?.start ?? editor.cursorPosition
+        if let promptToCode = viewStore.state.promptToCodeGroup.activePromptToCode {
+            if promptToCode.isAttachedToSelectionRange, promptToCode.documentURL != fileURL {
+                return nil
+            }
+
+            let rangeStart = promptToCode.selectionRange?.start ?? editor.cursorPosition
 
             let suggestion = CodeSuggestion(
-                text: service.code,
+                text: promptToCode.code,
                 position: rangeStart,
                 uuid: UUID().uuidString,
-                range: service.selectionRange ?? .init(
+                range: promptToCode.selectionRange ?? .init(
                     start: editor.cursorPosition,
                     end: editor.cursorPosition
                 ),
-                displayText: service.code
+                displayText: promptToCode.code
             )
 
             injector.acceptSuggestion(
@@ -213,16 +217,19 @@ struct WindowBaseCommandHandler: SuggestionCommandHandler {
                 extraInfo: &extraInfo
             )
 
-            if service.isContinuous {
-                service.selectionRange = .init(
-                    start: rangeStart,
-                    end: cursorPosition
+            _ = await Task { @MainActor [cursorPosition]  in
+                viewStore.send(
+                    .promptToCodeGroup(.updatePromptToCodeRange(
+                        id: promptToCode.id,
+                        range: .init(start: rangeStart, end: cursorPosition)
+                    ))
                 )
-                presenter.presentPromptToCode(fileURL: fileURL)
-            } else {
-                await dataSource.removePromptToCode()
-                presenter.closePromptToCode(fileURL: fileURL)
-            }
+                viewStore.send(
+                    .promptToCodeGroup(.discardAcceptedPromptToCodeIfNotContinuous(
+                        id: promptToCode.id
+                    ))
+                )
+            }.result
 
             return .init(
                 content: String(lines.joined(separator: "")),
@@ -348,7 +355,7 @@ extension WindowBaseCommandHandler {
         presenter.markAsProcessing(true)
         defer { presenter.markAsProcessing(false) }
         let fileURL = try await Environment.fetchCurrentFileURL()
-        let (workspace, _) = try await Service.shared.workspacePool
+        let (workspace, filespace) = try await Service.shared.workspacePool
             .fetchOrCreateWorkspaceAndFilespace(fileURL: fileURL)
         guard workspace.suggestionPlugin?.isSuggestionFeatureEnabled ?? false else {
             presenter.presentErrorMessage("Prompt to code is disabled for this project")
@@ -391,26 +398,25 @@ extension WindowBaseCommandHandler {
             )
         }() as (String, CursorRange)
 
-        let dataSource = Service.shared.guiController.widgetDataSource
-
-        let promptToCode = await dataSource.createPromptToCode(
-            for: fileURL,
-            projectURL: workspace.projectRootURL,
-            selectedCode: code,
-            allCode: editor.content,
-            selectionRange: selection,
-            language: codeLanguage,
-            extraSystemPrompt: extraSystemPrompt,
-            generateDescriptionRequirement: generateDescription,
-            name: name
-        )
-
-        promptToCode.isContinuous = isContinuous
-        if let prompt, !prompt.isEmpty {
-            Task { try await promptToCode.modifyCode(prompt: prompt) }
-        }
-
-        presenter.presentPromptToCode(fileURL: fileURL)
+        let viewStore = Service.shared.guiController.viewStore
+
+        _ = await Task { @MainActor in
+            viewStore.send(.promptToCodeGroup(.createPromptToCode(.init(
+                code: code,
+                selectionRange: selection,
+                language: codeLanguage,
+                identSize: filespace.codeMetadata.indentSize ?? 4,
+                usesTabsForIndentation: filespace.codeMetadata.usesTabsForIndentation ?? false,
+                documentURL: fileURL,
+                projectRootURL: workspace.projectRootURL,
+                allCode: editor.content,
+                isContinuous: isContinuous,
+                commandName: name,
+                defaultPrompt: prompt ?? "",
+                extraSystemPrompt: extraSystemPrompt,
+                generateDescriptionRequirement: generateDescription
+            ))))
+        }.result
     }
 
     func executeSingleRoundDialog(

Core/Sources/Service/SuggestionPresenter/PresentInWindowSuggestionPresenter.swift

@@ -55,19 +55,5 @@ struct PresentInWindowSuggestionPresenter {
             controller.presentChatRoom()
         }
     }
-
-    func presentPromptToCode(fileURL: URL) {
-        Task { @MainActor in
-            let controller = Service.shared.guiController.widgetController
-            controller.presentPromptToCode()
-        }
-    }
-
-    func closePromptToCode(fileURL: URL) {
-        Task { @MainActor in
-            let controller = Service.shared.guiController.widgetController
-            controller.discardPromptToCode()
-        }
-    }
 }