[pull] main from intitni:main

Core/Sources/ChatGPTChatTab/Chat.swift

@@ -226,9 +226,13 @@ struct Chat: ReducerProtocol {
                             cancellable.cancel()
                         }
                     }
-                    for await _ in stream {
+                    let debouncedHistoryChange = TimedDebounceFunction(duration: 0.2) {
                         await send(.historyChanged)
                     }
+
+                    for await _ in stream {
+                        await debouncedHistoryChange()
+                    }
                 }.cancellable(id: CancelID.observeHistoryChange(id), cancelInFlight: true)
 
             case .observeIsReceivingMessageChange:
@@ -450,3 +454,33 @@ struct ChatMenu: ReducerProtocol {
     }
 }
 
+private actor TimedDebounceFunction {
+    let duration: TimeInterval
+    let block: () async -> Void
+
+    var task: Task<Void, Error>?
+    var lastFireTime: Date = .init(timeIntervalSince1970: 0)
+
+    init(duration: TimeInterval, block: @escaping () async -> Void) {
+        self.duration = duration
+        self.block = block
+    }
+
+    func callAsFunction() async {
+        task?.cancel()
+        if lastFireTime.timeIntervalSinceNow < -duration {
+            await fire()
+            task = nil
+        } else {
+            task = Task.detached { [weak self, duration] in
+                try await Task.sleep(nanoseconds: UInt64(duration * 1_000_000_000))
+                await self?.fire()
+            }
+        }
+    }
+
+    func fire() async {
+        lastFireTime = Date()
+        await block()
+    }
+}

Core/Sources/ChatGPTChatTab/ChatPanel.swift

@@ -18,7 +18,7 @@ public struct ChatPanel: View {
             Divider()
             ChatPanelInputArea(chat: chat)
         }
-        .background(.regularMaterial)
+        .background(.clear)
         .onAppear { chat.send(.appear) }
     }
 }
@@ -86,13 +86,23 @@ struct ChatPanelMessages: View {
                     }
                     .modify { view in
                         if #available(macOS 13.0, *) {
-                            view.listRowSeparator(.hidden).listSectionSeparator(.hidden)
+                            view
+                                .listRowSeparator(.hidden)
+                                .listSectionSeparator(.hidden)
                         } else {
                             view
                         }
                     }
                 }
                 .listStyle(.plain)
+                .listRowBackground(EmptyView())
+                .modify { view in
+                    if #available(macOS 13.0, *) {
+                        view.scrollContentBackground(.hidden)
+                    } else {
+                        view
+                    }
+                }
                 .coordinateSpace(name: scrollSpace)
                 .preference(
                     key: ListHeightPreferenceKey.self,
@@ -218,7 +228,10 @@ struct ChatPanelMessages: View {
                             if isInitialLoad {
                                 isInitialLoad = false
                             }
-                            scrollToBottom()
+                            Task {
+                                await Task.yield()
+                                scrollToBottom()
+                            }
                         }
                     }
             }

Core/Sources/ChatGPTChatTab/Styles.swift

@@ -9,7 +9,7 @@ extension Color {
             if appearance.isDarkMode {
                 return #colorLiteral(red: 0.1580096483, green: 0.1730263829, blue: 0.2026666105, alpha: 1)
             }
-            return .white
+            return #colorLiteral(red: 0.9896564803, green: 0.9896564803, blue: 0.9896564803, alpha: 1)
         }))
     }
 
@@ -18,7 +18,7 @@ extension Color {
             if appearance.isDarkMode {
                 return #colorLiteral(red: 0.2284317913, green: 0.2145925438, blue: 0.3214019983, alpha: 1)
             }
-            return #colorLiteral(red: 0.896820749, green: 0.8709097223, blue: 0.9766687925, alpha: 1)
+            return #colorLiteral(red: 0.9458052187, green: 0.9311983998, blue: 0.9906365955, alpha: 1)
         }))
     }
 }
@@ -92,6 +92,60 @@ extension MarkdownUI.Theme {
         }
     }
 
+    static func instruction(fontSize: Double) -> MarkdownUI.Theme {
+        .gitHub.text {
+            ForegroundColor(.primary)
+            BackgroundColor(Color.clear)
+            FontSize(fontSize)
+        }
+        .code {
+            FontFamilyVariant(.monospaced)
+            FontSize(.em(0.85))
+            BackgroundColor(Color.secondary.opacity(0.2))
+        }
+        .codeBlock { configuration in
+            let wrapCode = UserDefaults.shared.value(for: \.wrapCodeInChatCodeBlock)
+
+            if wrapCode {
+                configuration.label
+                    .codeBlockLabelStyle()
+                    .codeBlockStyle(configuration)
+            } else {
+                ScrollView(.horizontal) {
+                    configuration.label
+                        .codeBlockLabelStyle()
+                }
+                .workaroundForVerticalScrollingBugInMacOS()
+                .codeBlockStyle(configuration)
+            }
+        }
+        .table { configuration in
+            configuration.label
+                .fixedSize(horizontal: false, vertical: true)
+                .markdownTableBorderStyle(.init(
+                    color: .init(nsColor: .separatorColor),
+                    strokeStyle: .init(lineWidth: 1)
+                ))
+                .markdownTableBackgroundStyle(
+                    .alternatingRows(Color.secondary.opacity(0.1), Color.secondary.opacity(0.2))
+                )
+                .markdownMargin(top: 0, bottom: 16)
+        }
+        .tableCell { configuration in
+            configuration.label
+                .markdownTextStyle {
+                    if configuration.row == 0 {
+                        FontWeight(.semibold)
+                    }
+                    BackgroundColor(nil)
+                }
+                .fixedSize(horizontal: false, vertical: true)
+                .padding(.vertical, 6)
+                .padding(.horizontal, 13)
+                .relativeLineSpacing(.em(0.25))
+        }
+    }
+
     static func functionCall(fontSize: Double) -> MarkdownUI.Theme {
         .gitHub.text {
             ForegroundColor(.secondary)

Core/Sources/ChatGPTChatTab/Views/BotMessage.swift

@@ -66,7 +66,7 @@ struct BotMessage: View {
                     .stroke(Color(nsColor: .separatorColor), lineWidth: 1)
             }
             .padding(.leading, 8)
-            .shadow(color: .black.opacity(0.1), radius: 2)
+            .shadow(color: .black.opacity(0.05), radius: 6)
             .contextMenu {
                 Button("Copy") {
                     NSPasteboard.general.clearContents()

Core/Sources/ChatGPTChatTab/Views/Instructions.swift

@@ -71,7 +71,7 @@ struct Instruction: View {
         func body(content: Content) -> some View {
             content
                 .textSelection(.enabled)
-                .markdownTheme(.custom(fontSize: chatFontSize))
+                .markdownTheme(.instruction(fontSize: chatFontSize))
                 .opacity(0.8)
                 .frame(maxWidth: .infinity, alignment: .leading)
                 .padding()

Core/Sources/ChatGPTChatTab/Views/UserMessage.swift

@@ -34,7 +34,7 @@ struct UserMessage: View {
             }
             .padding(.leading)
             .padding(.trailing, 8)
-            .shadow(color: .black.opacity(0.1), radius: 2)
+            .shadow(color: .black.opacity(0.05), radius: 6)
             .frame(maxWidth: .infinity, alignment: .trailing)
             .contextMenu {
                 Button("Copy") {

Core/Sources/HostApp/DebugView.swift

@@ -25,6 +25,8 @@ final class DebugSettings: ObservableObject {
     var restartXcodeInspectorIfAccessibilityAPIIsMalfunctioningNoTimer
     @AppStorage(\.toastForTheReasonWhyXcodeInspectorNeedsToBeRestarted)
     var toastForTheReasonWhyXcodeInspectorNeedsToBeRestarted
+    @AppStorage(\.observeToAXNotificationWithDefaultMode)
+    var observeToAXNotificationWithDefaultMode
     init() {}
 }
 
@@ -116,8 +118,17 @@ struct DebugSettingsView: View {
                         UserDefaults.shared.set(nil, forKey: "ChatModels")
                         UserDefaults.shared.set(nil, forKey: "EmbeddingModels")
                     }
+
+                    Group {
+                        Toggle(
+                            isOn: $settings.observeToAXNotificationWithDefaultMode
+                        ) {
+                            Text("Observe to AXNotification with default mode")
+                        }
+                    }
                 }
             }
+            .frame(maxWidth: .infinity)
             .padding()
         }
     }

Core/Sources/HostApp/FeatureSettings/ChatSettingsView.swift

@@ -313,7 +313,7 @@ struct ChatSettingsView: View {
                             "Preferred Chat Model",
                             selection: $settings.preferredChatModelIdForSenseScope
                         ) {
-                            Text("None").tag("")
+                            Text("Use the default model").tag("")
 
                             if !settings.chatModels
                                 .contains(where: {
@@ -364,7 +364,7 @@ struct ChatSettingsView: View {
                             "Preferred Chat Model",
                             selection: $settings.preferredChatModelIdForProjectScope
                         ) {
-                            Text("None").tag("")
+                            Text("Use the default model").tag("")
 
                             if !settings.chatModels
                                 .contains(where: {
@@ -390,7 +390,7 @@ struct ChatSettingsView: View {
 
                 SubSection(
                     title: Text("Web Scope"),
-                    description: "Allow the bot to search on Bing or read a web page."
+                    description: "Allow the bot to search on Bing or read a web page. The current implementation requires function calling."
                 ) {
                     Form {
                         Toggle(isOn: $settings.enableWebScopeByDefaultInChatContext) {
@@ -401,7 +401,7 @@ struct ChatSettingsView: View {
                             "Preferred Chat Model",
                             selection: $settings.preferredChatModelIdForWebScope
                         ) {
-                            Text("None").tag("")
+                            Text("Use the default model").tag("")
 
                             if !settings.chatModels
                                 .contains(where: {

Core/Sources/Service/SuggestionCommandHandler/WindowBaseCommandHandler.swift

@@ -46,14 +46,6 @@ struct WindowBaseCommandHandler: SuggestionCommandHandler {
 
         try Task.checkCancellation()
 
-        let snapshot = FilespaceSuggestionSnapshot(
-            linesHash: editor.lines.hashValue,
-            cursorPosition: editor.cursorPosition
-        )
-
-        // There is no need to regenerate suggestions for the same editor content.
-        guard filespace.suggestionSourceSnapshot != snapshot else { return }
-
         try await workspace.generateSuggestions(
             forFileAt: fileURL,
             editor: editor

Core/Sources/SuggestionWidget/ChatWindowView.swift

@@ -43,7 +43,6 @@ struct ChatWindowView: View {
             }
             .xcodeStyleFrame(cornerRadius: 10)
             .ignoresSafeArea(edges: .top)
-            .background(.regularMaterial)
             .onChange(of: viewStore.state.isPanelDisplayed) { isDisplayed in
                 toggleVisibility(isDisplayed)
             }

Core/Sources/SuggestionWidget/FeatureReducers/PanelFeature.swift

@@ -95,8 +95,6 @@ public struct PanelFeature: ReducerProtocol {
                 return .none
 
             case .switchToAnotherEditorAndUpdateContent:
-                state.content.error = nil
-                state.content.suggestion = nil
                 return .run { send in
                     guard let fileURL = await xcodeInspector.safe.realtimeActiveDocumentURL
                     else { return }

Core/Sources/SuggestionWidget/FeatureReducers/PromptToCode.swift

@@ -187,6 +187,7 @@ public struct PromptToCode: ReducerProtocol {
                             generateDescriptionRequirement: copiedState
                                 .generateDescriptionRequirement
                         )
+                        #warning("TODO: make the action call debounced.")
                         for try await fragment in stream {
                             try Task.checkCancellation()
                             await send(.modifyCodeChunkReceived(

Core/Sources/SuggestionWidget/FeatureReducers/WidgetFeature.swift

@@ -295,11 +295,7 @@ public struct WidgetFeature: ReducerProtocol {
                 }.cancellable(id: CancelID.observeUserDefaults, cancelInFlight: true)
 
             case .updateActiveApplication:
-                return .run { send in
-                    if let app = await xcodeInspector.safe.activeApplication, app.isXcode {
-                        await send(.panel(.switchToAnotherEditorAndUpdateContent))
-                    }
-                }
+                return .none
 
             case .updateColorScheme:
                 let widgetColorScheme = UserDefaults.shared.value(for: \.widgetColorScheme)

Core/Sources/SuggestionWidget/Styles.swift

@@ -30,7 +30,7 @@ extension Color {
             if appearance.isDarkMode {
                 return #colorLiteral(red: 0.2284317913, green: 0.2145925438, blue: 0.3214019983, alpha: 1)
             }
-            return #colorLiteral(red: 0.896820749, green: 0.8709097223, blue: 0.9766687925, alpha: 1)
+            return #colorLiteral(red: 0.9458052187, green: 0.9311983998, blue: 0.9906365955, alpha: 1)
         }))
     }
 }
@@ -45,12 +45,16 @@ extension NSAppearance {
     }
 }
 
-extension View {
-    func xcodeStyleFrame(cornerRadius: Double = 8) -> some View {
-        clipShape(RoundedRectangle(cornerRadius: cornerRadius, style: .continuous))
-            .overlay(
+struct XcodeLikeFrame<Content: View>: View {
+    @Environment(\.colorScheme) var colorScheme
+    let content: Content
+    let cornerRadius: Double
+
+    var body: some View {
+        content.clipShape(RoundedRectangle(cornerRadius: cornerRadius, style: .continuous))
+            .background(
                 RoundedRectangle(cornerRadius: cornerRadius, style: .continuous)
-                    .stroke(Color.black.opacity(0.3), style: .init(lineWidth: 1))
+                    .fill(Material.bar)
             )
             .overlay(
                 RoundedRectangle(cornerRadius: max(0, cornerRadius - 1), style: .continuous)
@@ -60,6 +64,12 @@ extension View {
     }
 }
 
+extension View {
+    func xcodeStyleFrame(cornerRadius: Double? = nil) -> some View {
+        XcodeLikeFrame(content: self, cornerRadius: cornerRadius ?? 10)
+    }
+}
+
 extension MarkdownUI.Theme {
     static func custom(fontSize: Double) -> MarkdownUI.Theme {
         .gitHub.text {