Release v1.1.3: Fix entitlements, improve cancellation, update version

Author: CSL

SeaCrab.xcodeproj/project.pbxproj

@@ -262,7 +262,7 @@
 				CODE_SIGN_ENTITLEMENTS = SeaCrab/SeaCrab.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_ASSET_PATHS = "\"SeaCrab/Preview Content\"";
 				DEVELOPMENT_TEAM = 2795FFTPWT;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -273,7 +273,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.1.2;
+				MARKETING_VERSION = 1.1.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.csl.cool.SeaCrab;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -289,7 +289,7 @@
 				CODE_SIGN_ENTITLEMENTS = SeaCrab/SeaCrab.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_ASSET_PATHS = "\"SeaCrab/Preview Content\"";
 				DEVELOPMENT_TEAM = 2795FFTPWT;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -300,7 +300,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.1.2;
+				MARKETING_VERSION = 1.1.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.csl.cool.SeaCrab;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;

SeaCrab/SeaCrab.entitlements

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>com.apple.security.app-sandbox</key>
-	<true/>
+	<false/>
 	<key>com.apple.security.network.client</key>
 	<true/>
 	<key>com.apple.security.network.server</key>

SeaCrab/Services/LLMService.swift

@@ -55,22 +55,20 @@ actor LLMService {
         }
 
         // Extract host (domain) from the URL
-        // The MacPaw/OpenAI SDK expects just the hostname like "api.openai.com"
-        // not the full URL with scheme
         guard let host = baseURL.host else {
             throw LLMError.invalidURL(baseURLString)
         }
 
-        // Construct the host string with optional path
-        var hostString = host
-        if baseURL.path != "/" && !baseURL.path.isEmpty {
-            hostString += baseURL.path
-        }
+        let scheme = baseURL.scheme ?? "https"
+        let port = baseURL.port ?? (scheme == "https" ? 443 : 80)
 
-        // Construct the configuration with just the host
+        // Construct the configuration
         let configuration = OpenAI.Configuration(
             token: settings.apiKey,
-            host: hostString
+            host: host,
+            port: port,
+            scheme: scheme,
+            timeoutInterval: 60.0
         )
 
         return OpenAI(configuration: configuration)
@@ -100,6 +98,9 @@ actor LLMService {
     }
 
     func refineText(_ text: String, prompt: String) async throws -> String {
+        // Check for cancellation before starting
+        try Task.checkCancellation()
+        
         let client = try createClient()
 
         guard let systemMessage = ChatQuery.ChatCompletionMessageParam(role: .system, content: prompt),
@@ -115,15 +116,25 @@ actor LLMService {
         )
 
         do {
+            // The library uses URLSession which handles Task cancellation automatically
             let result = try await client.chats(query: query)
 
+            // Check again after response
+            try Task.checkCancellation()
+            
             guard let content = result.choices.first?.message.content else {
                 throw LLMError.invalidResponse
             }
 
             // Only trim spaces and tabs, but preserve line breaks to maintain text structure
             return content.trimmingCharacters(in: .whitespaces)
+        } catch is CancellationError {
+            throw CancellationError()
         } catch {
+            // Check if error is actually a cancellation
+            if (error as NSError).code == NSURLErrorCancelled {
+                throw CancellationError()
+            }
             throw LLMError.networkError(error)
         }
     }

SeaCrab/Services/TextRefinementService.swift

@@ -15,30 +15,52 @@ class TextRefinementService: ObservableObject {
     private let loadingIndicator = LoadingIndicatorWindow()
     @Published var isProcessing = false
     @Published var lastError: String?
+    private var currentTask: Task<Void, Never>?
 
     func refineSelectedText(using card: RefinementCard) {
-        guard !isProcessing else { return }
+        // If processing, cancel the current task and STOP
+        if isProcessing {
+            currentTask?.cancel()
+            currentTask = nil
+            isProcessing = false
+            loadingIndicator.hide()
+            print("Refinement task cancelled by user")
+            return // Do NOT start a new task
+        }
 
-        Task {
+        currentTask = Task {
             isProcessing = true
             lastError = nil
 
             // Show loading indicator near cursor
             loadingIndicator.show()
 
             do {
+                // Check for cancellation
+                try Task.checkCancellation()
+                
                 // Step 1: Get selected text (prefer Accessibility API, fallback to clipboard)
                 let textResult = await getSelectedText()
+                
+                try Task.checkCancellation()
+                
                 guard let (selectedText, element, hasSelection) = textResult else {
-                    lastError = "No text selected"
-                    loadingIndicator.hide()
-                    isProcessing = false
+                    if !Task.isCancelled {
+                        lastError = "No text selected"
+                    }
+                    // Only hide if we are still the current task (not cancelled by a new one)
+                    if !Task.isCancelled {
+                        loadingIndicator.hide()
+                        isProcessing = false
+                    }
                     return
                 }
 
                 // Step 2: Send to LLM for refinement using the card's prompt
                 let refinedText = try await llmService.refineText(selectedText, prompt: card.prompt)
 
+                try Task.checkCancellation()
+                
                 // Step 3: Check if text has actually changed
                 if refinedText == selectedText {
                     // Text unchanged - cancel any selection to avoid leaving highlight
@@ -62,13 +84,22 @@ class TextRefinementService: ObservableObject {
                     }
                 }
 
+            } catch is CancellationError {
+                // Task was cancelled - clean up silently
+                print("Refinement task cancelled")
             } catch {
-                lastError = error.localizedDescription
+                // Only show error if not cancelled
+                if !Task.isCancelled {
+                    lastError = error.localizedDescription
+                }
             }
 
-            // Hide loading indicator
-            loadingIndicator.hide()
-            isProcessing = false
+            // Hide loading indicator only if we are not cancelled (if cancelled, the new task handles UI)
+            if !Task.isCancelled {
+                loadingIndicator.hide()
+                isProcessing = false
+                currentTask = nil
+            }
         }
     }