Tweak modification panel behavior

Core/Sources/SuggestionWidget/FeatureReducers/PromptToCodeGroup.swift

@@ -50,6 +50,7 @@ public struct PromptToCodeGroup {
             switch action {
             case let .activateOrCreatePromptToCode(s):
                 if let promptToCode = state.activePromptToCode, s.id == promptToCode.id {
+                    state.selectedTabId = promptToCode.id
                     return .run { send in
                         await send(.promptToCode(.element(
                             id: promptToCode.id,
@@ -61,10 +62,11 @@ public struct PromptToCodeGroup {
                     await send(.createPromptToCode(s, sendImmediately: false))
                 }
             case let .createPromptToCode(newPromptToCode, sendImmediately):
-                // insert at 0 so it has high priority then the other detached prompt to codes
+                var newPromptToCode = newPromptToCode
+                newPromptToCode.isActiveDocument = newPromptToCode.id == state.activeDocumentURL
                 state.promptToCodes.append(newPromptToCode)
                 state.selectedTabId = newPromptToCode.id
-                return .run { send in
+                return .run { [newPromptToCode] send in
                     if sendImmediately,
                        !newPromptToCode.contextInputController.instruction.string.isEmpty
                     {
@@ -91,6 +93,10 @@ public struct PromptToCodeGroup {
 
             case let .updateActivePromptToCode(documentURL):
                 state.activeDocumentURL = documentURL
+                for index in state.promptToCodes.indices {
+                    state.promptToCodes[index].isActiveDocument =
+                        state.promptToCodes[index].id == documentURL
+                }
                 return .none
 
             case let .discardExpiredPromptToCode(documentURLs):

Core/Sources/SuggestionWidget/FeatureReducers/PromptToCodePanel.swift

@@ -37,6 +37,8 @@ public struct PromptToCodePanel {
         public var generateDescriptionRequirement: Bool
 
         public var hasEnded = false
+
+        public var isActiveDocument: Bool = false
 
         public var snippetPanels: IdentifiedArrayOf<PromptToCodeSnippetPanel.State> {
             get {
@@ -85,6 +87,7 @@ public struct PromptToCodePanel {
         case cancelButtonTapped
         case acceptButtonTapped
         case acceptAndContinueButtonTapped
+        case revealFileButtonClicked
         case statusUpdated([String])
         case snippetPanel(IdentifiedActionOf<PromptToCodeSnippetPanel>)
     }
@@ -248,13 +251,7 @@ public struct PromptToCodePanel {
 
             case .acceptButtonTapped:
                 state.hasEnded = true
-                let url = state.promptToCodeState.source.documentURL
-                let startLine = state.snippetPanels.first?.snippet.attachedRange.start.line ?? 0
                 return .run { _ in
-                    let activeDocumentURL = await XcodeInspector.shared.safe.activeDocumentURL
-                    if activeDocumentURL != url {
-                        await commandHandler.presentFile(at: url, line: startLine)
-                    }
                     await commandHandler.acceptModification()
                     activatePreviousActiveXcode()
                 }
@@ -265,6 +262,13 @@ public struct PromptToCodePanel {
                     activateThisApp()
                 }
 
+            case .revealFileButtonClicked:
+                let url = state.promptToCodeState.source.documentURL
+                let startLine = state.snippetPanels.first?.snippet.attachedRange.start.line ?? 0
+                return .run { _ in
+                    await commandHandler.presentFile(at: url, line: startLine)
+                }
+
             case let .statusUpdated(status):
                 state.promptToCodeState.status = status
                 return .none

Core/Sources/SuggestionWidget/PromptToCodePanelGroupView.swift

@@ -106,6 +106,8 @@ struct PromptToCodeTabBarButton: View {
                         .controlSize(.small)
                 }
                 Text(info.tabTitle)
+                    .truncationMode(.middle)
+                    .allowsTightening(true)
             }
             .font(.callout)
             .lineLimit(1)

Core/Sources/SuggestionWidget/SuggestionPanelContent/PromptToCodePanelView.swift

@@ -288,8 +288,12 @@ extension PromptToCodePanelView {
                             .buttonStyle(CommandButtonStyle(color: .gray))
                             .keyboardShortcut("w", modifiers: [.command])
 
-                            if !isCodeEmpty {
-                                AcceptButton(store: store)
+                            if store.isActiveDocument {
+                                if !isCodeEmpty {
+                                    AcceptButton(store: store)
+                                }
+                            } else {
+                                RevealButton(store: store)
                             }
                         }
                         .fixedSize()
@@ -357,6 +361,22 @@ extension PromptToCodePanelView {
                 }
             }
         }
+
+        struct RevealButton: View {
+            let store: StoreOf<PromptToCodePanel>
+
+            var body: some View {
+                WithPerceptionTracking {
+                    Button(action: {
+                        store.send(.revealFileButtonClicked)
+                    }) {
+                        Text("Jump to File(⌘ + ⏎)")
+                    }
+                    .buttonStyle(CommandButtonStyle(color: .accentColor))
+                    .keyboardShortcut(KeyEquivalent.return, modifiers: [.command])
+                }
+            }
+        }
 
         struct AcceptButton: View {
             let store: StoreOf<PromptToCodePanel>

Core/Sources/SuggestionWidget/WidgetWindowsController.swift

@@ -97,7 +97,7 @@ actor WidgetWindowsController: NSObject {
                 }
             }
         }
-        
+
         Task { @MainActor in
             windows.chatPanelWindow.isPanelDisplayed = false
         }
@@ -132,36 +132,38 @@ private extension WidgetWindowsController {
         observeToAppTask = Task {
             await windows.orderFront()
 
-            for await notification in await notifications.notifications() {
-                try Task.checkCancellation()
-
-                /// Hide the widgets before switching to another window/editor
-                /// so the transition looks better.
-                func hideWidgetForTransitions() async {
-                    let newDocumentURL = await xcodeInspector.safe.realtimeActiveDocumentURL
-                    let documentURL = await MainActor
-                        .run { store.withState { $0.focusingDocumentURL } }
-                    if documentURL != newDocumentURL {
-                        await send(.panel(.removeDisplayedContent))
-                        await hidePanelWindows()
-                    }
-                    await send(.updateFocusingDocumentURL)
-                }
-
-                func removeContent() async {
+            /// Hide the widgets before switching to another window/editor
+            /// so the transition looks better.
+            func hideWidgetForTransitions() async {
+                let newDocumentURL = await xcodeInspector.safe.realtimeActiveDocumentURL
+                let documentURL = await MainActor
+                    .run { store.withState { $0.focusingDocumentURL } }
+                if documentURL != newDocumentURL {
                     await send(.panel(.removeDisplayedContent))
+                    await hidePanelWindows()
                 }
+                await send(.updateFocusingDocumentURL)
+            }
 
-                func updateWidgetsAndNotifyChangeOfEditor(immediately: Bool) async {
-                    await send(.panel(.switchToAnotherEditorAndUpdateContent))
-                    updateWindowLocation(animated: false, immediately: immediately)
-                    updateWindowOpacity(immediately: immediately)
-                }
+            func removeContent() async {
+                await send(.panel(.removeDisplayedContent))
+            }
 
-                func updateWidgets(immediately: Bool) async {
-                    updateWindowLocation(animated: false, immediately: immediately)
-                    updateWindowOpacity(immediately: immediately)
-                }
+            func updateWidgetsAndNotifyChangeOfEditor(immediately: Bool) async {
+                await send(.panel(.switchToAnotherEditorAndUpdateContent))
+                updateWindowLocation(animated: false, immediately: immediately)
+                updateWindowOpacity(immediately: immediately)
+            }
+
+            func updateWidgets(immediately: Bool) async {
+                updateWindowLocation(animated: false, immediately: immediately)
+                updateWindowOpacity(immediately: immediately)
+            }
+
+            await updateWidgetsAndNotifyChangeOfEditor(immediately: true)
+
+            for await notification in await notifications.notifications() {
+                try Task.checkCancellation()
 
                 switch notification.kind {
                 case .focusedWindowChanged:
@@ -257,7 +259,7 @@ private extension WidgetWindowsController {
 extension WidgetWindowsController {
     @MainActor
     func hidePanelWindows() {
-        windows.sharedPanelWindow.alphaValue = 0
+//        windows.sharedPanelWindow.alphaValue = 0
         windows.suggestionPanelWindow.alphaValue = 0
     }
 
@@ -903,7 +905,7 @@ class WidgetWindow: CanBecomeKeyWindow {
             : .normal
 
         if targetLevel != level {
-            self.orderFrontRegardless()
+            orderFrontRegardless()
             level = targetLevel
         }
     }