Move workspace clean up to AutoTrigger

Author: intitni

Core/Sources/Service/AutoTrigger.swift

@@ -8,7 +8,20 @@ actor AutoTrigger {
     var eventObserver: CGEventObserverType = CGEventObserver()
     var task: Task<Void, Error>?
 
-    private init() {}
+    private init() {
+        Task { @ServiceActor in
+            while !Task.isCancelled {
+                try await Task.sleep(nanoseconds: 8 * 60 * 60 * 1_000_000_000)
+                for (url, workspace) in workspaces {
+                    if workspace.isExpired {
+                        workspaces[url] = nil
+                    } else {
+                        workspaces[url]?.cleanUp()
+                    }
+                }
+            }
+        }
+    }
 
     func start(by listener: ObjectIdentifier) {
         listeners.insert(listener)

Core/Sources/Service/XPCService.swift

@@ -22,18 +22,6 @@ public class XPCService: NSObject, XPCServiceProtocol {
         Task {
             await AutoTrigger.shared.start(by: identifier)
         }
-        Task { @ServiceActor in
-            while !Task.isCancelled {
-                try await Task.sleep(nanoseconds: 8 * 60 * 60 * 1_000_000_000)
-                for (url, workspace) in workspaces {
-                    if workspace.isExpired {
-                        workspaces[url] = nil
-                    } else {
-                        workspace.cleanUp()
-                    }
-                }
-            }
-        }
     }
 
     deinit {

Core/Tests/ServiceTests/AcceptSuggestionTests.swift

@@ -9,7 +9,7 @@ final class AcceptSuggestionTests: XCTestCase {
     let mock = MockSuggestionService(completions: [])
 
     override func setUp() async throws {
-        clearEnvironment()
+        await clearEnvironment()
         Environment.createSuggestionService = { [unowned self] _ in self.mock }
     }
 

Core/Tests/ServiceTests/Environment.swift

@@ -8,10 +8,12 @@ import XPCShared
 
 @testable import Service
 
-func clearEnvironment() {
+@ServiceActor func clearEnvironment() {
+    workspaces = [:]
+    
     Environment.now = { Date() }
 
-    Environment.fetchCurrentProjectRootURL = {
+    Environment.fetchCurrentProjectRootURL = { _ in
         URL(fileURLWithPath: "/path/to/project")
     }
 

Core/Tests/ServiceTests/GetNextSuggestionTests.swift

@@ -9,7 +9,7 @@ final class GetNextSuggestionTests: XCTestCase {
     let mock = MockSuggestionService(completions: [])
 
     override func setUp() async throws {
-        clearEnvironment()
+        await clearEnvironment()
         Environment.createSuggestionService = { [unowned self] _ in self.mock }
     }
 

Core/Tests/ServiceTests/GetPreviousSuggestionTests.swift

@@ -9,7 +9,7 @@ final class GetPreviousSuggestionTests: XCTestCase {
     let mock = MockSuggestionService(completions: [])
 
     override func setUp() async throws {
-        clearEnvironment()
+        await clearEnvironment()
         Environment.createSuggestionService = { [unowned self] _ in self.mock }
     }
 

Core/Tests/ServiceTests/GetSuggestionsTests.swift

@@ -9,7 +9,7 @@ final class GetSuggestionsTests: XCTestCase {
     let mock = MockSuggestionService(completions: [])
 
     override func setUp() async throws {
-        clearEnvironment()
+        await clearEnvironment()
         Environment.createSuggestionService = { [unowned self] _ in self.mock }
     }
 

Core/Tests/ServiceTests/RejectSuggestionTests.swift

@@ -9,7 +9,7 @@ final class RejectSuggestionTests: XCTestCase {
     let mock = MockSuggestionService(completions: [])
 
     override func setUp() async throws {
-        clearEnvironment()
+        await clearEnvironment()
         Environment.createSuggestionService = { [unowned self] _ in self.mock }
     }