Move ActiveDocumentChatContextCollector to Tool

Author: intitni

Core/Package.swift

@@ -210,7 +210,6 @@ let package = Package(
 
                 // context collectors
                 "WebChatContextCollector",
-                "ActiveDocumentChatContextCollector",
                 "SystemInfoChatContextCollector",
 
                 .product(name: "ChatContextCollector", package: "Tool"),
@@ -354,23 +353,6 @@ let package = Package(
             ],
             path: "Sources/ChatContextCollectors/SystemInfoChatContextCollector"
         ),
-
-        .target(
-            name: "ActiveDocumentChatContextCollector",
-            dependencies: [
-                .product(name: "ChatContextCollector", package: "Tool"),
-                .product(name: "OpenAIService", package: "Tool"),
-                .product(name: "Preferences", package: "Tool"),
-                .product(name: "FocusedCodeFinder", package: "Tool"),
-                .product(name: "AppMonitoring", package: "Tool"),
-            ],
-            path: "Sources/ChatContextCollectors/ActiveDocumentChatContextCollector"
-        ),
-
-        .testTarget(
-            name: "ActiveDocumentChatContextCollectorTests",
-            dependencies: ["ActiveDocumentChatContextCollector"]
-        ),
     ]
 )
 

Core/Sources/ChatService/AllContextCollector.swift

@@ -6,7 +6,6 @@ import WebChatContextCollector
 import ProChatContextCollectors
 let allContextCollectors: [any ChatContextCollector] = [
     SystemInfoChatContextCollector(),
-    ActiveDocumentChatContextCollector(),
     WebChatContextCollector(),
     ProChatContextCollectors(),
 ]

Pro

@@ -15,7 +15,10 @@ let package = Package(
         .library(name: "Logger", targets: ["Logger"]),
         .library(name: "OpenAIService", targets: ["OpenAIService"]),
         .library(name: "ChatTab", targets: ["ChatTab"]),
-        .library(name: "ChatContextCollector", targets: ["ChatContextCollector"]),
+        .library(
+            name: "ChatContextCollector",
+            targets: ["ChatContextCollector", "ActiveDocumentChatContextCollector"]
+        ),
         .library(name: "Environment", targets: ["Environment"]),
         .library(name: "SuggestionModel", targets: ["SuggestionModel"]),
         .library(name: "ASTParser", targets: ["ASTParser"]),
@@ -70,7 +73,7 @@ let package = Package(
         // MARK: - Helpers
 
         .target(name: "XPCShared", dependencies: ["SuggestionModel"]),
-        
+
         .target(name: "Configs"),
 
         .target(name: "Preferences", dependencies: ["Configs", "AIModel"]),
@@ -234,14 +237,6 @@ let package = Package(
             ]
         ),
 
-        .target(
-            name: "ChatContextCollector",
-            dependencies: [
-                "SuggestionModel",
-                "OpenAIService",
-            ]
-        ),
-
         .target(name: "BingSearchService"),
 
         .target(name: "SuggestionService", dependencies: [
@@ -310,6 +305,33 @@ let package = Package(
             )]
         ),
 
+        // MARK: - Chat Context Collector
+
+        .target(
+            name: "ChatContextCollector",
+            dependencies: [
+                "SuggestionModel",
+                "OpenAIService",
+            ]
+        ),
+
+        .target(
+            name: "ActiveDocumentChatContextCollector",
+            dependencies: [
+                "ChatContextCollector",
+                "OpenAIService",
+                "Preferences",
+                "FocusedCodeFinder",
+                "XcodeInspector",
+            ],
+            path: "Sources/ChatContextCollectors/ActiveDocumentChatContextCollector"
+        ),
+
+        .testTarget(
+            name: "ActiveDocumentChatContextCollectorTests",
+            dependencies: ["ActiveDocumentChatContextCollector"]
+        ),
+
         // MARK: - Tests
 
         .testTarget(

Tool/Package.swift

@@ -4,19 +4,25 @@ import OpenAIService
 public struct ChatContext {
     public struct RetrievedContent {
         public enum Priority: Equatable, Comparable {
+            case bottom
             case low
             case medium
             case high
+            case top
             case custom(Int)
 
             public var rawValue: Int {
                 switch self {
+                case .bottom:
+                    return 0
                 case .low:
-                    return 20
+                    return 400
                 case .medium:
-                    return 60
+                    return 600
                 case .high:
-                    return 80
+                    return 800
+                case .top:
+                    return 1_000_000_000
                 case let .custom(value):
                     return value
                 }

Tool/Sources/ChatContextCollector/ChatContextCollector.swift

@@ -10,7 +10,7 @@ import XcodeInspector
 public final class ActiveDocumentChatContextCollector: ChatContextCollector {
     public init() {}
 
-    var activeDocumentContext: ActiveDocumentContext?
+    public var activeDocumentContext: ActiveDocumentContext?
 
     public func generateContext(
         history: [ChatMessage],