bukovinafilip/Atoll
1
0
Fork 0
mirror of https://github.com/FBukovina/Atoll.git synced 2026-10-27 15:14:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' of https://github.com/Ebullioscopic/Atoll into feature/lunar-support

Browse source 
conflict resolution needed
This commit is contained in:
Hariharan Mudaliar 2026-03-19 22:26:07 +05:30
commit 9396a5a8ff
No known key found for this signature in database
GPG key ID: 025583EB0BE5640E
4 changed files with 78 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

41
DynamicIsland/managers/ScreenAssistantManager.swift
View file

@ -120,6 +120,7 @@ class ScreenAssistantManager: NSObject, ObservableObject {
private var audioRecorder: AVAudioRecorder?
private var recordingTimer: Timer?
private var activeRequest: URLSessionTask?
// Panel management
private var chatMessagesPanel: ChatMessagesPanel?
@ -664,10 +665,18 @@ class ScreenAssistantManager: NSObject, ObservableObject {
let task = URLSession.shared.dataTask(with: request) { [weak self] data, response, error in
DispatchQueue.main.async {
guard let self = self else { return }
// Ensure this callback belongs to the current in-flight request
guard self.activeRequest === task else { return }
self.isLoading = false
self.activeRequest = nil
self.handleResponse(data: data, response: response, error: error, provider: provider)
}
}
activeRequest = task
task.resume()
}
@ -690,10 +699,18 @@ class ScreenAssistantManager: NSObject, ObservableObject {
let task = URLSession.shared.dataTask(with: request) { [weak self] data, response, error in
DispatchQueue.main.async {
guard let self = self else { return }
// Ensure this callback belongs to the current in-flight request
guard self.activeRequest === task else { return }
self.isLoading = false
self.activeRequest = nil
self.handleResponse(data: data, response: response, error: error, provider: .openai)
}
}
activeRequest = task
task.resume()
}
@ -717,17 +734,29 @@ class ScreenAssistantManager: NSObject, ObservableObject {
let task = URLSession.shared.dataTask(with: request) { [weak self] data, response, error in
DispatchQueue.main.async {
guard let self = self else { return }
// Ensure this callback belongs to the current in-flight request
guard self.activeRequest === task else { return }
self.isLoading = false
self.activeRequest = nil
self.handleResponse(data: data, response: response, error: error, provider: .claude)
}
}
activeRequest = task
task.resume()
}
// MARK: - Response Handlers
private func handleResponse(data: Data?, response: URLResponse?, error: Error?, provider: AIModelProvider) {
isLoading = false
// Check if the request was cancelled (e.g., by resetConversationContext)
if let error = error as? NSError, error.code == NSURLErrorCancelled {
print("ℹ️ ScreenAssistant: Request was cancelled")
return
}
if let error = error {
print("❌ ScreenAssistant: Network error - \(error)")
@ -1103,7 +1132,17 @@ class ScreenAssistantManager: NSObject, ObservableObject {
}
func clearChat() {
resetConversationContext()
}
func resetConversationContext() {
// Cancel any in-flight request
activeRequest?.cancel()
activeRequest = nil
isLoading = false
chatMessages.removeAll()
clearAllFiles()
}
private func addAssistantMessage(_ content: String) {