Adjust timing issue of prompt to code

Author: intitni

Core/Sources/SuggestionWidget/FeatureReducers/PanelFeature.swift

@@ -111,7 +111,7 @@ public struct PanelFeature: ReducerProtocol {
 
             case .removeDisplayedContent:
                 state.content.error = nil
-                state.content.promptToCodeGroup.activePromptToCode = nil
+                state.content.promptToCodeGroup.activeDocumentURL = nil
                 state.content.suggestion = nil
                 return .none
 

Core/Sources/SuggestionWidget/FeatureReducers/PromptToCodeGroup.swift

@@ -18,7 +18,12 @@ public struct PromptToCodeGroup: ReducerProtocol {
                 guard let id = activeDocumentURL else { return nil }
                 return promptToCodes[id: id]
             }
-            set { activeDocumentURL = newValue?.id }
+            set {
+                activeDocumentURL = newValue?.id
+                if let id = newValue?.id {
+                    promptToCodes[id: id] = newValue
+                }
+            }
         }
     }
 
@@ -77,6 +82,7 @@ public struct PromptToCodeGroup: ReducerProtocol {
         case updateActivePromptToCode(documentURL: URL)
         case discardExpiredPromptToCode(documentURLs: [URL])
         case promptToCode(PromptToCode.State.ID, PromptToCode.Action)
+        case activePromptToCode(PromptToCode.Action)
     }
 
     @Dependency(\.promptToCodeServiceFactory) var promptToCodeServiceFactory
@@ -141,22 +147,38 @@ public struct PromptToCodeGroup: ReducerProtocol {
                 }
                 return .none
 
-            case let .promptToCode(id, action):
-                switch action {
-                case .cancelButtonTapped:
-                    state.promptToCodes.remove(id: id)
-                    return .run { _ in
-                        activatePreviousActiveXcode()
-                    }
-                default:
-                    return .none
-                }
+            case .promptToCode:
+                return .none
+                
+            case .activePromptToCode:
+                return .none
             }
         }
+        .ifLet(\.activePromptToCode, action: /Action.activePromptToCode) {
+            PromptToCode()
+                .dependency(\.promptToCodeService, promptToCodeServiceFactory())
+        }
         .forEach(\.promptToCodes, action: /Action.promptToCode, element: {
             PromptToCode()
                 .dependency(\.promptToCodeService, promptToCodeServiceFactory())
         })
+        
+        Reduce { state, action in
+            switch action {
+            case let .promptToCode(id, .cancelButtonTapped):
+                state.promptToCodes.remove(id: id)
+                return .run { _ in
+                    activatePreviousActiveXcode()
+                }
+            case .activePromptToCode(.cancelButtonTapped):
+                guard let id = state.activePromptToCode?.id else { return .none }
+                state.promptToCodes.remove(id: id)
+                return .run { _ in
+                    activatePreviousActiveXcode()
+                }
+            default: return .none
+            }
+        }
     }
 }
 

Core/Sources/SuggestionWidget/FeatureReducers/WidgetFeature.swift

@@ -196,8 +196,8 @@ public struct WidgetFeature: ReducerProtocol {
         Scope(state: \.panelState, action: /Action.panel) {
             PanelFeature()
         }
-        
-        Reduce { state, action in
+
+        Reduce { _, action in
             switch action {
             case .panel(.sharedPanel(.promptToCodeGroup(.activateOrCreatePromptToCode))):
                 return .run { send in
@@ -619,7 +619,7 @@ public struct WidgetFeature: ReducerProtocol {
                 return .none
 
             case let .updateKeyWindow(window):
-                return .run { send in
+                return .run { _ in
                     switch window {
                     case .chatPanel:
                         await windows.chatPanelWindow.makeKeyAndOrderFront(nil)

Core/Sources/SuggestionWidget/SharedPanelView.swift

@@ -57,13 +57,16 @@ struct SharedPanelView: View {
                                 )
                             }
                         } else if let promptToCode = viewStore.state.promptToCode {
-                            PromptToCodePanel(store: store.scope(
-                                state: { _ in promptToCode },
+                            IfLetStore(store.scope(
+                                state: { $0.content.promptToCodeGroup.activePromptToCode },
                                 action: {
                                     SharedPanelFeature.Action
-                                        .promptToCodeGroup(.promptToCode(promptToCode.id, $0))
+                                        .promptToCodeGroup(.activePromptToCode($0))
                                 }
-                            ))
+                            )) {
+                                PromptToCodePanel(store: $0)
+                            }
+                            
                         } else if let suggestion = viewStore.state.suggestion {
                             switch suggestionPresentationMode {
                             case .nearbyTextCursor: