[pull] main from intitni:main

Core/Package.swift

@@ -200,7 +200,9 @@ let package = Package(
                 .product(name: "OpenAIService", package: "Tool"),
                 .product(name: "AppMonitoring", package: "Tool"),
                 .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
-            ]
+            ].pro([
+                "ProService",
+            ])
         ),
         .testTarget(name: "PromptToCodeServiceTests", dependencies: ["PromptToCodeService"]),
 

Core/Sources/ChatContextCollectors/SystemInfoChatContextCollector/SystemInfoChatContextCollector.swift

@@ -13,7 +13,7 @@ public final class SystemInfoChatContextCollector: ChatContextCollector {
 
     public func generateContext(
         history: [ChatMessage],
-        scopes: Set<String>,
+        scopes: Set<ChatContext.Scope>,
         content: String,
         configuration: ChatGPTConfiguration
     ) -> ChatContext {

Core/Sources/ChatContextCollectors/WebChatContextCollector/WebChatContextCollector.swift

@@ -9,11 +9,11 @@ public final class WebChatContextCollector: ChatContextCollector {
 
     public func generateContext(
         history: [ChatMessage],
-        scopes: Set<String>,
+        scopes: Set<ChatContext.Scope>,
         content: String,
         configuration: ChatGPTConfiguration
     ) -> ChatContext {
-        guard scopes.contains("web") || scopes.contains("w") else { return .empty }
+        guard scopes.contains(.web) else { return .empty }
         let links = Self.detectLinks(from: history) + Self.detectLinks(from: content)
         let functions: [(any ChatGPTFunction)?] = [
             SearchFunction(maxTokens: configuration.maxTokens),

Core/Sources/ChatGPTChatTab/Chat.swift

@@ -51,11 +51,13 @@ struct Chat: ReducerProtocol {
         case observeIsReceivingMessageChange
         case observeSystemPromptChange
         case observeExtraSystemPromptChange
+        case observeDefaultScopesChange
 
         case historyChanged
         case isReceivingMessageChanged
         case systemPromptChanged
         case extraSystemPromptChanged
+        case defaultScopesChanged
 
         case chatMenu(ChatMenu.Action)
     }
@@ -68,6 +70,7 @@ struct Chat: ReducerProtocol {
         case observeIsReceivingMessageChange(UUID)
         case observeSystemPromptChange(UUID)
         case observeExtraSystemPromptChange(UUID)
+        case observeDefaultScopesChange(UUID)
     }
 
     var body: some ReducerProtocol<State, Action> {
@@ -131,6 +134,7 @@ struct Chat: ReducerProtocol {
                     await send(.observeIsReceivingMessageChange)
                     await send(.observeSystemPromptChange)
                     await send(.observeExtraSystemPromptChange)
+                    await send(.observeDefaultScopesChange)
                 }
 
             case .observeHistoryChange:
@@ -198,6 +202,22 @@ struct Chat: ReducerProtocol {
                     }
                 }.cancellable(id: CancelID.observeExtraSystemPromptChange(id), cancelInFlight: true)
 
+            case .observeDefaultScopesChange:
+                return .run { send in
+                    let stream = AsyncStream<Void> { continuation in
+                        let cancellable = service.$defaultScopes
+                            .sink { _ in
+                                continuation.yield()
+                            }
+                        continuation.onTermination = { _ in
+                            cancellable.cancel()
+                        }
+                    }
+                    for await _ in stream {
+                        await send(.defaultScopesChanged)
+                    }
+                }.cancellable(id: CancelID.observeDefaultScopesChange(id), cancelInFlight: true)
+
             case .historyChanged:
                 state.history = service.chatHistory.map { message in
                     .init(
@@ -250,6 +270,10 @@ struct Chat: ReducerProtocol {
                 state.chatMenu.extraSystemPrompt = service.extraSystemPrompt
                 return .none
 
+            case .defaultScopesChanged:
+                state.chatMenu.defaultScopes = service.defaultScopes
+                return .none
+
             case .binding:
                 return .none
 
@@ -266,6 +290,7 @@ struct ChatMenu: ReducerProtocol {
         var extraSystemPrompt: String = ""
         var temperatureOverride: Double? = nil
         var chatModelIdOverride: String? = nil
+        var defaultScopes: Set<ChatService.Scope> = []
     }
 
     enum Action: Equatable {
@@ -274,6 +299,8 @@ struct ChatMenu: ReducerProtocol {
         case temperatureOverrideSelected(Double?)
         case chatModelIdOverrideSelected(String?)
         case customCommandButtonTapped(CustomCommand)
+        case resetDefaultScopesButtonTapped
+        case toggleScope(ChatService.Scope)
     }
 
     let service: ChatService
@@ -304,6 +331,15 @@ struct ChatMenu: ReducerProtocol {
                 return .run { _ in
                     try await service.handleCustomCommand(command)
                 }
+
+            case .resetDefaultScopesButtonTapped:
+                return .run { _ in
+                    service.resetDefaultScopes()
+                }
+            case let .toggleScope(scope):
+                return .run { _ in
+                    service.defaultScopes.formSymmetricDifference([scope])
+                }
             }
         }
     }

Core/Sources/ChatGPTChatTab/ChatContextMenu.swift

@@ -1,4 +1,5 @@
 import AppKit
+import ChatService
 import ComposableArchitecture
 import SharedUIComponents
 import SwiftUI
@@ -30,6 +31,7 @@ struct ChatContextMenu: View {
 
         chatModel
         temperature
+        defaultScopes
 
         Divider()
 
@@ -153,6 +155,34 @@ struct ChatContextMenu: View {
         }
     }
 
+    @ViewBuilder
+    var defaultScopes: some View {
+        Menu("Default Scopes") {
+            WithViewStore(store, observe: \.defaultScopes) { viewStore in
+                Button(action: {
+                    store.send(.resetDefaultScopesButtonTapped)
+                }) {
+                    Text("Reset Default Scopes")
+                }
+
+                Divider()
+
+                ForEach(ChatService.Scope.allCases, id: \.rawValue) { value in
+                    Button(action: {
+                        viewStore.send(.toggleScope(value))
+                    }) {
+                        HStack {
+                            Text("@" + value.rawValue)
+                            if viewStore.state.contains(value) {
+                                Image(systemName: "checkmark")
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     var customCommandMenu: some View {
         Menu("Custom Commands") {
             ForEach(

Core/Sources/ChatGPTChatTab/ChatGPTChatTab.swift

@@ -1,5 +1,7 @@
+import ChatContextCollector
 import ChatService
 import ChatTab
+import CodableWrappers
 import Combine
 import ComposableArchitecture
 import Foundation
@@ -21,6 +23,7 @@ public class ChatGPTChatTab: ChatTab {
         var configuration: OverridingChatGPTConfiguration.Overriding
         var systemPrompt: String
         var extraSystemPrompt: String
+        var defaultScopes: Set<ChatContext.Scope>?
     }
 
     struct Builder: ChatTabBuilder {
@@ -65,7 +68,8 @@ public class ChatGPTChatTab: ChatTab {
             history: await service.memory.history,
             configuration: service.configuration.overriding,
             systemPrompt: service.systemPrompt,
-            extraSystemPrompt: service.extraSystemPrompt
+            extraSystemPrompt: service.extraSystemPrompt,
+            defaultScopes: service.defaultScopes
         )
         return (try? JSONEncoder().encode(state)) ?? Data()
     }
@@ -79,6 +83,9 @@ public class ChatGPTChatTab: ChatTab {
             tab.service.configuration.overriding = state.configuration
             tab.service.mutateSystemPrompt(state.systemPrompt)
             tab.service.mutateExtraSystemPrompt(state.extraSystemPrompt)
+            if let scopes = state.defaultScopes {
+                tab.service.defaultScopes = scopes
+            }
             await tab.service.memory.mutateHistory { history in
                 history = state.history
             }