Dsiplay status in modification

Author: intitni

Core/Sources/SuggestionWidget/FeatureReducers/PromptToCodePanel.swift

@@ -84,6 +84,7 @@ public struct PromptToCodePanel {
         case cancelButtonTapped
         case acceptButtonTapped
         case acceptAndContinueButtonTapped
+        case statusUpdated([String])
         case snippetPanel(IdentifiedActionOf<PromptToCodeSnippetPanel>)
     }
 
@@ -128,7 +129,9 @@ public struct PromptToCodePanel {
 
                 return .run { send in
                     do {
-                        let context = await contextInputController.resolveContext()
+                        let context = await contextInputController.resolveContext(onStatusChange: {
+                            await send(.statusUpdated($0))
+                        })
                         let agentFactory = context.agent ?? { SimpleModificationAgent() }
                         _ = try await withThrowingTaskGroup(of: Void.self) { group in
                             for (index, snippet) in snippets.enumerated() {
@@ -216,11 +219,13 @@ public struct PromptToCodePanel {
 
             case .stopRespondingButtonTapped:
                 state.promptToCodeState.isGenerating = false
+                state.promptToCodeState.status = []
                 return .cancel(id: CancellationKey.modifyCode(state.id))
 
             case .modifyCodeFinished:
                 state.contextInputController.instruction = .init("")
                 state.promptToCodeState.isGenerating = false
+                state.promptToCodeState.status = []
 
                 if state.promptToCodeState.snippets.allSatisfy({ snippet in
                     snippet.modifiedCode.isEmpty && snippet.description.isEmpty && snippet
@@ -252,6 +257,10 @@ public struct PromptToCodePanel {
                     await commandHandler.acceptModification()
                     activateThisApp()
                 }
+            
+            case let .statusUpdated(status):
+                state.promptToCodeState.status = status
+                return .none
             }
         }
 

Core/Sources/SuggestionWidget/SuggestionPanelContent/PromptToCodePanelView.swift

@@ -23,14 +23,17 @@ struct PromptToCodePanelView: View {
                     TopBar(store: store)
 
                     Content(store: store)
-                        .overlay(alignment: .bottom) {
-                            ActionBar(store: store)
-                        }
                         .safeAreaInset(edge: .bottom) {
-                            if let inputField = customizedViews.contextInputField {
-                                inputField
-                            } else {
-                                Toolbar(store: store)
+                            VStack {
+                                StatusBar(store: store)
+
+                                ActionBar(store: store)
+
+                                if let inputField = customizedViews.contextInputField {
+                                    inputField
+                                } else {
+                                    Toolbar(store: store)
+                                }
                             }
                         }
                 }
@@ -143,6 +146,70 @@ extension PromptToCodePanelView {
         }
     }
 
+    struct StatusBar: View {
+        let store: StoreOf<PromptToCodePanel>
+        @State var isAllStatusesPresented = false
+        var body: some View {
+            WithPerceptionTracking {
+                if store.promptToCodeState.isGenerating, !store.promptToCodeState.status.isEmpty {
+                    if let firstStatus = store.promptToCodeState.status.first {
+                        let count = store.promptToCodeState.status.count
+                        Button(action: {
+                            isAllStatusesPresented = true
+                        }) {
+                            HStack {
+                                Text(firstStatus)
+                                    .lineLimit(1)
+                                    .font(.caption)
+
+                                Text("\(count)")
+                                    .lineLimit(1)
+                                    .font(.caption)
+                                    .background(
+                                        Circle()
+                                            .fill(Color.secondary.opacity(0.3))
+                                            .frame(width: 12, height: 12)
+                                    )
+                            }
+                            .padding(8)
+                            .background(
+                                .regularMaterial,
+                                in: RoundedRectangle(cornerRadius: 6, style: .continuous)
+                            )
+                            .overlay {
+                                RoundedRectangle(cornerRadius: 6, style: .continuous)
+                                    .stroke(Color(nsColor: .separatorColor), lineWidth: 1)
+                            }
+                            .contentShape(Rectangle())
+                        }
+                        .buttonStyle(.plain)
+                        .frame(maxWidth: 400)
+                        .popover(isPresented: $isAllStatusesPresented, arrowEdge: .top) {
+                            WithPerceptionTracking {
+                                VStack(alignment: .leading, spacing: 16) {
+                                    ForEach(store.promptToCodeState.status, id: \.self) { status in
+                                        HStack {
+                                            ProgressView()
+                                                .progressViewStyle(CircularProgressViewStyle())
+                                                .controlSize(.small)
+                                            Text(status)
+                                        }
+                                    }
+                                }
+                                .padding()
+                            }
+                        }
+                        .onChange(of: store.promptToCodeState.isGenerating) { isGenerating in
+                            if !isGenerating {
+                                isAllStatusesPresented = false
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     struct ActionBar: View {
         let store: StoreOf<PromptToCodePanel>
 
@@ -888,3 +955,59 @@ extension PromptToCodePanelView {
         .frame(width: 500, height: 500, alignment: .center)
 }
 
+#Preview("Geenrating") {
+    PromptToCodePanelView(store: .init(initialState: .init(
+        promptToCodeState: Shared(ModificationState(
+            source: .init(
+                language: CodeLanguage.builtIn(.swift),
+                documentURL: URL(
+                    fileURLWithPath: "path/to/file-name-is-super-long-what-should-we-do-with-it-hah.txt"
+                ),
+                projectRootURL: URL(fileURLWithPath: "path/to/file.txt"),
+                content: "",
+                lines: []
+            ),
+            snippets: [
+                .init(
+                    startLineIndex: 8,
+                    originalCode: "print(foo)",
+                    modifiedCode: "print(bar)",
+                    description: "",
+                    error: "Error",
+                    attachedRange: CursorRange(
+                        start: .init(line: 8, character: 0),
+                        end: .init(line: 12, character: 2)
+                    )
+                ),
+                .init(
+                    startLineIndex: 13,
+                    originalCode: """
+                      struct Bar {
+                        var foo: Int
+                      }
+                    """,
+                    modifiedCode: """
+                        struct Bar {
+                          var foo: String
+                        }
+                    """,
+                    description: "Cool",
+                    error: nil,
+                    attachedRange: CursorRange(
+                        start: .init(line: 13, character: 0),
+                        end: .init(line: 12, character: 2)
+                    )
+                ),
+            ],
+            extraSystemPrompt: "",
+            isAttachedToTarget: true,
+            isGenerating: true,
+            status: ["Status 1", "Status 2"]
+        )),
+        instruction: nil,
+        commandName: "Generate Code"
+    ), reducer: { PromptToCodePanel() }))
+        .frame(maxWidth: 450, maxHeight: Style.panelHeight)
+        .fixedSize(horizontal: false, vertical: true)
+        .frame(width: 500, height: 500, alignment: .center)
+}

Tool/Sources/ModificationBasic/ModificationState.swift

@@ -11,20 +11,24 @@ public struct ModificationState {
     public var isGenerating: Bool = false
     public var extraSystemPrompt: String
     public var isAttachedToTarget: Bool = true
+    public var status = [String]()
 
     public init(
         source: Source,
         history: [ModificationHistoryNode] = [],
         snippets: IdentifiedArrayOf<ModificationSnippet>,
         extraSystemPrompt: String,
-        isAttachedToTarget: Bool
+        isAttachedToTarget: Bool,
+        isGenerating: Bool = false,
+        status: [String] = []
     ) {
         self.history = history
         self.snippets = snippets
-        isGenerating = false
+        self.isGenerating = isGenerating
         self.isAttachedToTarget = isAttachedToTarget
         self.extraSystemPrompt = extraSystemPrompt
         self.source = source
+        self.status = status
     }
 
     public init(

Tool/Sources/PromptToCodeCustomization/PromptToCodeCustomization.swift

@@ -55,7 +55,7 @@ public protocol PromptToCodeContextInputControllerDelegate {
 public protocol PromptToCodeContextInputController: Perception.Perceptible {
     var instruction: NSAttributedString { get set }
 
-    func resolveContext() async -> (
+    func resolveContext(onStatusChange: @escaping ([String]) async -> Void) async -> (
         instruction: String,
         references: [ChatMessage.Reference],
         topics: [ChatMessage.Reference],
@@ -100,7 +100,7 @@ public final class DefaultPromptToCodeContextInputController: PromptToCodeContex
         instruction = mutable
     }
 
-    public func resolveContext() -> (
+    public func resolveContext(onStatusChange: @escaping ([String]) async -> Void) -> (
         instruction: String,
         references: [ChatMessage.Reference],
         topics: [ChatMessage.Reference],