@arach/lattices 0.1.0 → 0.2.0

package/app/Sources/PermissionChecker.swift

@@ -13,14 +13,14 @@ final class PermissionChecker: ObservableObject {
 
     var allGranted: Bool { accessibility && screenRecording }
 
-    /// Check current permission state without prompting.
+    /// Check current permission state, prompting on first launch if not granted.
     func check() {
         let diag = DiagnosticLog.shared
 
         let ax = AXIsProcessTrusted()
         let sr = CGPreflightScreenCaptureAccess()
 
-        // First check: log detailed identity info to help debug TCC issues
+        // First check: log identity info and prompt if needed
         if !hasLoggedInitial {
             hasLoggedInitial = true
             let bundleId = Bundle.main.bundleIdentifier ?? "<no bundle id>"
@@ -30,6 +30,16 @@ final class PermissionChecker: ObservableObject {
             diag.info("PermissionChecker: exec=\(execPath)")
             diag.info("AXIsProcessTrusted() → \(ax)")
             diag.info("CGPreflightScreenCaptureAccess() → \(sr)")
+
+            // Prompt for missing permissions on first check
+            if !ax {
+                requestAccessibility()
+                return
+            }
+            if !sr {
+                requestScreenRecording()
+                return
+            }
         }
 
         // Log on state changes

package/app/Sources/Preferences.swift

@@ -20,6 +20,32 @@ class Preferences: ObservableObject {
         didSet { UserDefaults.standard.set(mode.rawValue, forKey: "mode") }
     }
 
+    // MARK: - Search & OCR
+
+    @Published var ocrEnabled: Bool {
+        didSet { UserDefaults.standard.set(!ocrEnabled, forKey: "ocr.disabled") }
+    }
+
+    @Published var ocrQuickInterval: Double {
+        didSet { UserDefaults.standard.set(ocrQuickInterval, forKey: "ocr.interval") }
+    }
+
+    @Published var ocrDeepInterval: Double {
+        didSet { UserDefaults.standard.set(ocrDeepInterval, forKey: "ocr.deepInterval") }
+    }
+
+    @Published var ocrQuickLimit: Int {
+        didSet { UserDefaults.standard.set(ocrQuickLimit, forKey: "ocr.quickLimit") }
+    }
+
+    @Published var ocrDeepLimit: Int {
+        didSet { UserDefaults.standard.set(ocrDeepLimit, forKey: "ocr.deepLimit") }
+    }
+
+    @Published var ocrAccuracy: String {
+        didSet { UserDefaults.standard.set(ocrAccuracy, forKey: "ocr.accuracy") }
+    }
+
     init() {
         if let saved = UserDefaults.standard.string(forKey: "terminal"),
            let t = Terminal(rawValue: saved), t.isInstalled {
@@ -44,5 +70,23 @@ class Preferences: ObservableObject {
         } else {
             self.mode = .learning
         }
+
+        // Search & OCR
+        self.ocrEnabled = !UserDefaults.standard.bool(forKey: "ocr.disabled")
+
+        let savedInterval = UserDefaults.standard.double(forKey: "ocr.interval")
+        self.ocrQuickInterval = savedInterval > 0 ? savedInterval : 60
+
+        let savedDeep = UserDefaults.standard.double(forKey: "ocr.deepInterval")
+        self.ocrDeepInterval = savedDeep > 0 ? savedDeep : 7200
+
+        let savedQL = UserDefaults.standard.integer(forKey: "ocr.quickLimit")
+        self.ocrQuickLimit = savedQL > 0 ? savedQL : 5
+
+        let savedDL = UserDefaults.standard.integer(forKey: "ocr.deepLimit")
+        self.ocrDeepLimit = savedDL > 0 ? savedDL : 15
+
+        let savedAcc = UserDefaults.standard.string(forKey: "ocr.accuracy") ?? "accurate"
+        self.ocrAccuracy = savedAcc
     }
 }

package/app/Sources/ScreenMapState.swift

@@ -1438,9 +1438,8 @@ final class ScreenMapController: ObservableObject {
         // Tiling mode intercepts keys before anything else
         if editor?.isTilingMode == true {
             switch keyCode {
-            case 53: // Escape → cancel tiling mode
-                exitTilingMode()
-                flash("Tiling cancelled")
+            case 53: // Escape — always dismiss
+                onDismiss?()
                 return true
             case 123: // ← → left
                 tileSelectedWindowInEditor(to: .left)
@@ -1516,8 +1515,8 @@ final class ScreenMapController: ObservableObject {
         // Search mode intercepts keys before normal handling
         if isSearchActive {
             switch keyCode {
-            case 53: // Escape → close search
-                closeSearch()
+            case 53: // Escape — always dismiss
+                onDismiss?()
                 return true
             case 36: // Enter → select or focus
                 if modifiers.contains(.command) {
@@ -1539,18 +1538,9 @@ final class ScreenMapController: ObservableObject {
         }
 
         switch keyCode {
-        case 53: // Escape
-            if editor?.isPreviewing == true {
-                endPreview()
-            }
-            if let ed = editor, ed.pendingEditCount > 0 {
-                ed.discardEdits()
-                diag.info("[ScreenMap] discarded edits")
-                flash("Edits discarded")
-            } else {
-                diag.info("[ScreenMap] exit")
-                onDismiss?()
-            }
+        case 53: // Escape — always dismiss
+            diag.info("[ScreenMap] exit")
+            onDismiss?()
             return true
 
         case 36: // Enter

package/app/Sources/ScreenMapView.swift

@@ -1972,6 +1972,9 @@ struct ScreenMapView: View {
 
     private func installKeyHandler() {
         eventMonitor = NSEvent.addLocalMonitorForEvents(matching: [.keyDown, .keyUp]) { event in
+            // Only handle keys when our window is the key window
+            guard let win = ScreenMapWindowController.shared.nsWindow,
+                  win.isKeyWindow else { return event }
             // Track space key for canvas drag-to-pan
             if event.keyCode == 49 && !controller.isSearchActive {
                 if event.type == .keyDown && !event.isARepeat {