feat: Update emergency stop functionality and adjust visual feedback settings

Author: jsonify

Sources/ClickIt/Core/Click/ClickCoordinator.swift

@@ -60,20 +60,7 @@ class ClickCoordinator: ObservableObject {
         // Start real-time elapsed time tracking
         timeManager.startTracking()
 
-        // Show visual feedback overlay if enabled
-        if configuration.showVisualFeedback {
-            if configuration.useDynamicMouseTracking {
-                print("ClickCoordinator: Starting dynamic automation with visual feedback")
-                // For dynamic mode, show overlay at current mouse position (in AppKit coordinates)
-                let currentAppKitPosition = NSEvent.mouseLocation
-                VisualFeedbackOverlay.shared.showOverlay(at: currentAppKitPosition, isActive: true)
-            } else {
-                print("ClickCoordinator: Starting fixed automation with visual feedback at \(configuration.location)")
-                VisualFeedbackOverlay.shared.showOverlay(at: configuration.location, isActive: true)
-            }
-        } else {
-            print("ClickCoordinator: Starting automation without visual feedback")
-        }
+        print("ClickCoordinator: Starting automation at \(configuration.location)")
 
         automationTask = Task {
             await runAutomationLoop(configuration: configuration)
@@ -98,11 +85,6 @@ class ClickCoordinator: ObservableObject {
         // Stop real-time elapsed time tracking
         timeManager.stopTracking()
 
-        // Hide visual feedback overlay immediately
-        print("ClickCoordinator: About to hide visual feedback overlay")
-        VisualFeedbackOverlay.shared.hideOverlay()
-        print("ClickCoordinator: Visual feedback overlay hidden")
-        
         automationConfig = nil
         print("ClickCoordinator: stopAutomation() completed")
     }
@@ -121,7 +103,6 @@ class ClickCoordinator: ObservableObject {
 
         // Priority cleanup - all operations must be synchronous for speed
         timeManager.stopTracking()
-        VisualFeedbackOverlay.shared.hideOverlay()
         automationConfig = nil
 
         print("ClickCoordinator: EMERGENCY STOP completed")
@@ -334,20 +315,6 @@ class ClickCoordinator: ObservableObject {
 
         print("ClickCoordinator: Executing automation step at \(location) (dynamic: \(configuration.useDynamicMouseTracking))")
 
-        // Update visual feedback overlay if enabled
-        if configuration.showVisualFeedback {
-            await MainActor.run {
-                if configuration.useDynamicMouseTracking {
-                    // Convert back to AppKit coordinates for overlay positioning
-                    let appKitLocation = convertCoreGraphicsToAppKitMultiMonitor(location)
-                    print("[Dynamic Debug] Overlay position (AppKit): \(appKitLocation)")
-                    VisualFeedbackOverlay.shared.updateOverlay(at: appKitLocation, isActive: true)
-                } else {
-                    VisualFeedbackOverlay.shared.updateOverlay(at: location, isActive: true)
-                }
-            }
-        }
-        
         // Perform the actual click
         print("ClickCoordinator: Performing actual click at \(location)")
         let result: ClickResult
@@ -369,19 +336,6 @@ class ClickCoordinator: ObservableObject {
 
         print("ClickCoordinator: Click result: success=\(result.success)")
 
-        // Show click pulse for successful clicks
-        if configuration.showVisualFeedback && result.success {
-            await MainActor.run {
-                if configuration.useDynamicMouseTracking {
-                    // Convert back to AppKit coordinates for pulse positioning
-                    let appKitLocation = convertCoreGraphicsToAppKitMultiMonitor(location)
-                    VisualFeedbackOverlay.shared.showClickPulse(at: appKitLocation)
-                } else {
-                    VisualFeedbackOverlay.shared.showClickPulse(at: location)
-                }
-            }
-        }
-        
         return result
     }
 
@@ -486,7 +440,6 @@ struct AutomationConfiguration {
     let stopOnError: Bool
     let randomizeLocation: Bool
     let locationVariance: CGFloat
-    let showVisualFeedback: Bool
     let useDynamicMouseTracking: Bool
 
     init(
@@ -499,7 +452,6 @@ struct AutomationConfiguration {
         stopOnError: Bool = false,
         randomizeLocation: Bool = false,
         locationVariance: CGFloat = 0,
-        showVisualFeedback: Bool = true,
         useDynamicMouseTracking: Bool = false
     ) {
         self.location = location
@@ -511,7 +463,6 @@ struct AutomationConfiguration {
         self.stopOnError = stopOnError
         self.randomizeLocation = randomizeLocation
         self.locationVariance = locationVariance
-        self.showVisualFeedback = showVisualFeedback
         self.useDynamicMouseTracking = useDynamicMouseTracking
     }
 }
@@ -536,13 +487,11 @@ extension ClickCoordinator {
     ///   - location: Location to click
     ///   - interval: Interval between clicks
     ///   - maxClicks: Maximum number of clicks (optional)
-    ///   - showVisualFeedback: Whether to show visual feedback overlay
-    func startSimpleAutomation(at location: CGPoint, interval: TimeInterval, maxClicks: Int? = nil, showVisualFeedback: Bool = true) {
+    func startSimpleAutomation(at location: CGPoint, interval: TimeInterval, maxClicks: Int? = nil) {
         let config = AutomationConfiguration(
             location: location,
             clickInterval: interval,
             maxClicks: maxClicks,
-            showVisualFeedback: showVisualFeedback,
             useDynamicMouseTracking: false
         )
         startAutomation(with: config)
@@ -554,21 +503,18 @@ extension ClickCoordinator {
     ///   - interval: Interval between clicks
     ///   - variance: Location randomization variance
     ///   - maxClicks: Maximum number of clicks (optional)
-    ///   - showVisualFeedback: Whether to show visual feedback overlay
     func startRandomizedAutomation(
         at location: CGPoint,
         interval: TimeInterval,
         variance: CGFloat,
-        maxClicks: Int? = nil,
-        showVisualFeedback: Bool = true
+        maxClicks: Int? = nil
     ) {
         let config = AutomationConfiguration(
             location: location,
             clickInterval: interval,
             maxClicks: maxClicks,
             randomizeLocation: true,
             locationVariance: variance,
-            showVisualFeedback: showVisualFeedback,
             useDynamicMouseTracking: false
         )
         startAutomation(with: config)

Sources/ClickIt/Core/Hotkeys/HotkeyManager.swift

@@ -130,39 +130,36 @@ class HotkeyManager: ObservableObject {
         // PRIORITY PATH: Direct synchronous emergency stop for <50ms guarantee
         print("HotkeyManager: EMERGENCY STOP activated (\(config.description))")
 
-        // Immediate synchronous stop - no async overhead
-        DispatchQueue.main.sync {
-            let coordinator = ClickCoordinator.shared
+        // CRITICAL FIX: We're already on @MainActor, so call coordinator methods directly
+        // without additional dispatch to avoid deadlock
+        let coordinator = ClickCoordinator.shared
+        
+        if coordinator.isActive {
+            // Call emergency stop method directly - no dispatch needed since we're on MainActor
+            coordinator.emergencyStopAutomation()
 
-            if coordinator.isActive {
-                // Call priority emergency stop method for immediate termination
-                coordinator.emergencyStopAutomation()
+            // Track response time
+            if let tracker = self.responseTimeTracker {
+                let responseTime = tracker.stopTracking()
+                print("HotkeyManager: Emergency stop response time: \(responseTime)ms")
 
-                // Show visual confirmation immediately after stopping
-                VisualFeedbackOverlay.shared.showEmergencyStopConfirmation()
-                
-                // Track response time
-                if let tracker = self.responseTimeTracker {
-                    let responseTime = tracker.stopTracking()
-                    print("HotkeyManager: Emergency stop response time: \(responseTime)ms")
-                    
-                    // Log warning if response time exceeds target
-                    if responseTime > 50.0 {
-                        print("⚠️ HotkeyManager: Emergency stop response time exceeded 50ms target: \(responseTime)ms")
-                    }
-                }
-            } else {
-                print("HotkeyManager: Emergency stop triggered but no automation running")
-                
-                // Still track response time for diagnostic purposes
-                if let tracker = self.responseTimeTracker {
-                    let responseTime = tracker.stopTracking()
-                    print("HotkeyManager: Emergency stop response time (no automation): \(responseTime)ms")
+                // Log warning if response time exceeds target
+                if responseTime > 50.0 {
+                    print("⚠️ HotkeyManager: Emergency stop response time exceeded 50ms target: \(responseTime)ms")
                 }
             }
+        } else {
+            print("HotkeyManager: Emergency stop triggered but no automation running")
+            
+            // Still track response time for diagnostic purposes
+            if let tracker = self.responseTimeTracker {
+                let responseTime = tracker.stopTracking()
+                print("HotkeyManager: Emergency stop response time (no automation): \(responseTime)ms")
+            }
         }
 
-        // Reset emergency stop state after brief visual feedback period (async is fine here)
+        // Reset emergency stop state after brief visual feedback period
+        // Use async dispatch since this is not time-critical
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
             self.emergencyStopActivated = false
             self.responseTimeTracker = nil
@@ -229,8 +226,7 @@ class HotkeyManager: ObservableObject {
             let testConfig = AutomationConfiguration(
                 location: CGPoint(x: 100, y: 100),
                 clickInterval: 5.0, // Long interval for testing
-                maxClicks: 1000,
-                showVisualFeedback: false
+                maxClicks: 1000
             )
 
             ClickCoordinator.shared.startAutomation(with: testConfig)
@@ -399,9 +395,9 @@ struct HotkeyConfiguration {
     let description: String
 
     static let `default` = HotkeyConfiguration(
-        keyCode: FrameworkConstants.CarbonConfig.deleteKeyCode,
-        modifiers: 0, // No modifiers for DELETE key
-        description: "DELETE Key"
+        keyCode: 122, // F1 key
+        modifiers: UInt32(NSEvent.ModifierFlags.shift.rawValue), // Shift modifier
+        description: "Shift + F1"
     )
 }
 
@@ -428,6 +424,12 @@ extension HotkeyConfiguration {
         description: "F1 Key"
     )
 
+    static let shiftF1Key = HotkeyConfiguration(
+        keyCode: 122, // F1 key
+        modifiers: UInt32(NSEvent.ModifierFlags.shift.rawValue),
+        description: "Shift + F1"
+    )
+    
     static let spaceKey = HotkeyConfiguration(
         keyCode: 49, // Space key
         modifiers: 0,
@@ -457,13 +459,7 @@ extension HotkeyConfiguration {
     // MARK: - All Available Emergency Stop Keys
 
     static let allEmergencyStopKeys: [HotkeyConfiguration] = [
-        .escapeKey,      // ESC - Universal emergency stop
-        .deleteKey,      // DELETE - Current default
-        .f1Key,          // F1 - Easy to reach function key
-        .spaceKey,       // Space - Large, easy target
-        .cmdPeriod,      // Cmd+Period - macOS standard cancel
-        .cmdDelete,      // Cmd+DELETE - Modified delete
-        .optionDelete    // Option+DELETE - Alternative modifier
+        .shiftF1Key      // Shift + F1 - Single emergency stop key
     ]
 
     // MARK: - Key Code Constants

Sources/ClickIt/Core/Models/ClickSettings.swift

@@ -226,8 +226,7 @@ class ClickSettings: ObservableObject {
             maxDuration: maxDurationValue,
             stopOnError: stopOnError,
             randomizeLocation: randomizeLocation,
-            locationVariance: CGFloat(locationVariance),
-            showVisualFeedback: showVisualFeedback
+            locationVariance: CGFloat(locationVariance)
         )
     }
 }

Sources/ClickIt/UI/Components/FooterInfoCard.swift

@@ -11,7 +11,7 @@ struct FooterInfoCard: View {
                     .font(.system(size: 12))
                     .foregroundColor(.secondary)
 
-                Text("DELETE to stop")
+                Text("Shift+F1 to stop")
                     .font(.caption)
                     .foregroundColor(.secondary)