Move ChatContextCollector to Tool

Author: intitni

Core/Package.swift

@@ -171,7 +171,6 @@ let package = Package(
             name: "ChatService",
             dependencies: [
                 "ChatPlugin",
-                "ChatContextCollector",
 
                 // plugins
                 "MathChatPlugin",
@@ -183,6 +182,7 @@ let package = Package(
                 "ActiveDocumentChatContextCollector",
                 "SystemInfoChatContextCollector",
 
+                .product(name: "ChatContextCollector", package: "Tool"),
                 .product(name: "AppMonitoring", package: "Tool"),
                 .product(name: "Environment", package: "Tool"),
                 .product(name: "Parsing", package: "swift-parsing"),
@@ -199,16 +199,6 @@ let package = Package(
                 .product(name: "Terminal", package: "Tool"),
             ]
         ),
-        .target(
-            name: "ChatContextCollector",
-            dependencies: [
-                .product(name: "SuggestionModel", package: "Tool"),
-                .product(name: "AppMonitoring", package: "Tool"),
-                .product(name: "Environment", package: "Tool"),
-                .product(name: "OpenAIService", package: "Tool"),
-                .product(name: "Preferences", package: "Tool"),
-            ]
-        ),
 
         .target(
             name: "ChatGPTChatTab",
@@ -346,7 +336,7 @@ let package = Package(
         .target(
             name: "WebChatContextCollector",
             dependencies: [
-                "ChatContextCollector",
+                .product(name: "ChatContextCollector", package: "Tool"),
                 .product(name: "LangChain", package: "Tool"),
                 .product(name: "OpenAIService", package: "Tool"),
                 .product(name: "ExternalServices", package: "Tool"),
@@ -358,7 +348,7 @@ let package = Package(
         .target(
             name: "SystemInfoChatContextCollector",
             dependencies: [
-                "ChatContextCollector",
+                .product(name: "ChatContextCollector", package: "Tool"),
                 .product(name: "OpenAIService", package: "Tool"),
             ],
             path: "Sources/ChatContextCollectors/SystemInfoChatContextCollector"
@@ -367,7 +357,7 @@ let package = Package(
         .target(
             name: "ActiveDocumentChatContextCollector",
             dependencies: [
-                "ChatContextCollector",
+                .product(name: "ChatContextCollector", package: "Tool"),
                 .product(name: "OpenAIService", package: "Tool"),
                 .product(name: "Preferences", package: "Tool"),
                 .product(name: "FocusedCodeFinder", package: "Tool"),

Pro

@@ -14,6 +14,7 @@ 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: "Environment", targets: ["Environment"]),
         .library(name: "SuggestionModel", targets: ["SuggestionModel"]),
         .library(name: "ASTParser", targets: ["ASTParser"]),
@@ -214,6 +215,14 @@ let package = Package(
             ]
         ),
 
+        .target(
+            name: "ChatContextCollector",
+            dependencies: [
+                "SuggestionModel",
+                "OpenAIService",
+            ]
+        ),
+
         .target(name: "BingSearchService"),
 
         // MARK: - OpenAI