@arach/lattices 0.1.0 → 0.2.0

package/app/Sources/DiagnosticLog.swift

@@ -67,18 +67,27 @@ final class DiagnosticWindow {
     static let shared = DiagnosticWindow()
 
     private var window: NSWindow?
+    private var keyMonitor: Any?
     private let log = DiagnosticLog.shared
 
     var isVisible: Bool { window?.isVisible ?? false }
 
     func toggle() {
         if let w = window, w.isVisible {
-            w.orderOut(nil)
+            dismiss()
         } else {
             show()
         }
     }
 
+    func dismiss() {
+        window?.orderOut(nil)
+        if let monitor = keyMonitor {
+            NSEvent.removeMonitor(monitor)
+            keyMonitor = nil
+        }
+    }
+
     func show() {
         if let w = window {
             w.orderFrontRegardless()
@@ -119,6 +128,15 @@ final class DiagnosticWindow {
         w.orderFrontRegardless()
         window = w
 
+        // Escape key → dismiss
+        keyMonitor = NSEvent.addLocalMonitorForEvents(matching: .keyDown) { [weak self] event in
+            guard event.keyCode == 53,
+                  let win = self?.window,
+                  event.window === win || win.isKeyWindow else { return event }
+            self?.dismiss()
+            return nil
+        }
+
         // Startup log
         let diag = DiagnosticLog.shared
         diag.info("Diagnostics opened")

package/app/Sources/EventBus.swift

@@ -5,6 +5,7 @@ enum ModelEvent {
     case tmuxChanged(sessions: [TmuxSession])
     case layerSwitched(index: Int)
     case processesChanged(interesting: [Int])
+    case ocrScanComplete(windowCount: Int, totalBlocks: Int)
 }
 
 final class EventBus {

package/app/Sources/HotkeyManager.swift

@@ -1,5 +1,6 @@
 import Carbon
 import AppKit
+import Foundation
 
 /// Global callback registry keyed by hotkey ID
 private var hotkeyCallbacks: [UInt32: () -> Void] = [:]

package/app/Sources/HotkeyStore.swift

@@ -18,6 +18,8 @@ enum HotkeyAction: String, CaseIterable, Codable {
     case screenMap
     case bezel
     case cheatSheet
+    case desktopInventory
+    case omniSearch
     // Layers
     case layer1, layer2, layer3, layer4, layer5, layer6, layer7, layer8, layer9
     // Tiling
@@ -32,6 +34,8 @@ enum HotkeyAction: String, CaseIterable, Codable {
         case .screenMap:       return "Screen Map"
         case .bezel:           return "Window Bezel"
         case .cheatSheet:      return "Cheat Sheet"
+        case .desktopInventory: return "Desktop Inventory"
+        case .omniSearch:      return "Omni Search"
         case .layer1:          return "Layer 1"
         case .layer2:          return "Layer 2"
         case .layer3:          return "Layer 3"
@@ -60,7 +64,7 @@ enum HotkeyAction: String, CaseIterable, Codable {
 
     var group: HotkeyGroup {
         switch self {
-        case .palette, .screenMap, .bezel, .cheatSheet: return .app
+        case .palette, .screenMap, .bezel, .cheatSheet, .desktopInventory, .omniSearch: return .app
         case .layer1, .layer2, .layer3, .layer4, .layer5,
              .layer6, .layer7, .layer8, .layer9: return .layers
         default: return .tiling
@@ -73,6 +77,8 @@ enum HotkeyAction: String, CaseIterable, Codable {
         case .screenMap:       return 200
         case .bezel:           return 201
         case .cheatSheet:      return 202
+        case .desktopInventory: return 203
+        case .omniSearch:      return 204
         case .layer1:          return 101
         case .layer2:          return 102
         case .layer3:          return 103
@@ -192,6 +198,8 @@ class HotkeyStore: ObservableObject {
         bind(.screenMap, 18, hyper)      // Hyper+1
         bind(.bezel,     19, hyper)      // Hyper+2
         bind(.cheatSheet, 20, hyper)     // Hyper+3
+        bind(.desktopInventory, 21, hyper) // Hyper+4
+        bind(.omniSearch, 23, hyper)       // Hyper+5
 
         // Layers: Cmd+Option+1-9
         let layerKeyCodes: [UInt32] = [18, 19, 20, 21, 23, 22, 26, 28, 25]

package/app/Sources/LatticesApi.swift

@@ -244,6 +244,36 @@ final class LatticesApi {
             Field(name: "displayName", type: "string", required: true, description: "Best display name (session > tab title > tty)"),
         ]))
 
+        api.model(ApiModel(name: "OcrResult", fields: [
+            Field(name: "wid", type: "int", required: true, description: "Window ID"),
+            Field(name: "app", type: "string", required: true, description: "Application name"),
+            Field(name: "title", type: "string", required: true, description: "Window title"),
+            Field(name: "frame", type: "Frame", required: true, description: "Window frame"),
+            Field(name: "fullText", type: "string", required: true, description: "All recognized text"),
+            Field(name: "blocks", type: "[OcrBlock]", required: true, description: "Individual text blocks with position/confidence"),
+            Field(name: "timestamp", type: "double", required: true, description: "Scan timestamp (Unix)"),
+        ]))
+
+        api.model(ApiModel(name: "OcrBlock", fields: [
+            Field(name: "text", type: "string", required: true, description: "Recognized text"),
+            Field(name: "confidence", type: "double", required: true, description: "Recognition confidence 0-1"),
+            Field(name: "x", type: "double", required: true, description: "Normalized bounding box x"),
+            Field(name: "y", type: "double", required: true, description: "Normalized bounding box y"),
+            Field(name: "w", type: "double", required: true, description: "Normalized bounding box width"),
+            Field(name: "h", type: "double", required: true, description: "Normalized bounding box height"),
+        ]))
+
+        api.model(ApiModel(name: "OcrSearchResult", fields: [
+            Field(name: "id", type: "int", required: true, description: "Database row ID"),
+            Field(name: "wid", type: "int", required: true, description: "Window ID"),
+            Field(name: "app", type: "string", required: true, description: "Application name"),
+            Field(name: "title", type: "string", required: true, description: "Window title"),
+            Field(name: "frame", type: "Frame", required: true, description: "Window frame at scan time"),
+            Field(name: "fullText", type: "string", required: true, description: "Full recognized text"),
+            Field(name: "snippet", type: "string", required: true, description: "Highlighted snippet (FTS5)"),
+            Field(name: "timestamp", type: "double", required: true, description: "Scan timestamp (Unix)"),
+        ]))
+
         api.model(ApiModel(name: "DaemonStatus", fields: [
             Field(name: "uptime", type: "double", required: true, description: "Seconds since daemon started"),
             Field(name: "clientCount", type: "int", required: true, description: "Connected WebSocket clients"),
@@ -283,6 +313,63 @@ final class LatticesApi {
             }
         ))
 
+        api.register(Endpoint(
+            method: "windows.search",
+            description: "Search windows by title, app, and OCR content",
+            access: .read,
+            params: [
+                Param(name: "query", type: "string", required: true, description: "Search text"),
+                Param(name: "ocr", type: "bool", required: false, description: "Include OCR content (default true)"),
+                Param(name: "limit", type: "int", required: false, description: "Max results (default 50)"),
+            ],
+            returns: .array(model: "Window"),
+            handler: { params in
+                guard let query = params?["query"]?.stringValue?.lowercased(), !query.isEmpty else {
+                    throw RouterError.missingParam("query")
+                }
+                let includeOcr = params?["ocr"]?.boolValue ?? true
+                let limit = params?["limit"]?.intValue ?? 50
+                let ocrResults = OcrModel.shared.results
+
+                var matches: [JSON] = []
+                for entry in DesktopModel.shared.allWindows() {
+                    let matchesApp = entry.app.lowercased().contains(query)
+                    let matchesTitle = entry.title.lowercased().contains(query)
+                    let matchesSession = entry.latticesSession?.lowercased().contains(query) ?? false
+                    let ocrText = includeOcr ? ocrResults[entry.wid]?.fullText : nil
+                    let matchesOcrContent = ocrText?.lowercased().contains(query) ?? false
+
+                    if matchesApp || matchesTitle || matchesSession || matchesOcrContent {
+                        var obj = Encoders.window(entry)
+                        if matchesOcrContent, let text = ocrText,
+                           let range = text.lowercased().range(of: query) {
+                            // Extract snippet around match
+                            let half = max(0, (80 - text.distance(from: range.lowerBound, to: range.upperBound)) / 2)
+                            let start = text.index(range.lowerBound, offsetBy: -half, limitedBy: text.startIndex) ?? text.startIndex
+                            let end = text.index(range.upperBound, offsetBy: half, limitedBy: text.endIndex) ?? text.endIndex
+                            var snippet = String(text[start..<end])
+                                .replacingOccurrences(of: "\n", with: " ")
+                                .trimmingCharacters(in: .whitespaces)
+                            if start > text.startIndex { snippet = "…" + snippet }
+                            if end < text.endIndex { snippet += "…" }
+                            if case .object(var dict) = obj {
+                                dict["ocrSnippet"] = .string(snippet)
+                                dict["matchSource"] = .string("ocr")
+                                obj = .object(dict)
+                            }
+                        } else if case .object(var dict) = obj {
+                            let source = matchesTitle ? "title" : matchesApp ? "app" : "session"
+                            dict["matchSource"] = .string(source)
+                            obj = .object(dict)
+                        }
+                        matches.append(obj)
+                        if matches.count >= limit { break }
+                    }
+                }
+                return .array(matches)
+            }
+        ))
+
         api.register(Endpoint(
             method: "tmux.sessions",
             description: "List all tmux sessions with child process enrichment",
@@ -486,6 +573,85 @@ final class LatticesApi {
             }
         ))
 
+        // ── Endpoints: OCR ─────────────────────────────────────
+
+        api.register(Endpoint(
+            method: "ocr.snapshot",
+            description: "Get the latest OCR scan results for all on-screen windows",
+            access: .read,
+            params: [],
+            returns: .array(model: "OcrResult"),
+            handler: { _ in
+                let results = OcrModel.shared.results
+                return .array(results.values.map { Encoders.ocrResult($0) })
+            }
+        ))
+
+        api.register(Endpoint(
+            method: "ocr.search",
+            description: "Search OCR text across all windows (queries persistent SQLite FTS5 index by default)",
+            access: .read,
+            params: [
+                Param(name: "query", type: "string", required: true, description: "Search text (FTS5 query syntax)"),
+                Param(name: "app", type: "string", required: false, description: "Filter by app name"),
+                Param(name: "limit", type: "int", required: false, description: "Max results (default 50)"),
+                Param(name: "live", type: "bool", required: false, description: "Search in-memory snapshot instead of history (default false)"),
+            ],
+            returns: .array(model: "OcrSearchResult"),
+            handler: { params in
+                guard let query = params?["query"]?.stringValue else {
+                    throw RouterError.missingParam("query")
+                }
+                let app = params?["app"]?.stringValue
+                let limit = params?["limit"]?.intValue ?? 50
+                let live = params?["live"]?.boolValue ?? false
+
+                if live {
+                    // In-memory snapshot search (original behavior)
+                    var results = Array(OcrModel.shared.results.values)
+                    let q = query.lowercased()
+                    results = results.filter { $0.fullText.lowercased().contains(q) }
+                    if let app { results = results.filter { $0.app == app } }
+                    return .array(results.prefix(limit).map { Encoders.ocrResult($0) })
+                }
+
+                // Persistent FTS5 search
+                let results = OcrStore.shared.search(query: query, app: app, limit: limit)
+                return .array(results.map { Encoders.ocrSearchResult($0) })
+            }
+        ))
+
+        api.register(Endpoint(
+            method: "ocr.history",
+            description: "Get OCR content timeline for a specific window",
+            access: .read,
+            params: [
+                Param(name: "wid", type: "uint32", required: true, description: "Window ID"),
+                Param(name: "limit", type: "int", required: false, description: "Max results (default 50)"),
+            ],
+            returns: .array(model: "OcrSearchResult"),
+            handler: { params in
+                guard let wid = params?["wid"]?.uint32Value else {
+                    throw RouterError.missingParam("wid")
+                }
+                let limit = params?["limit"]?.intValue ?? 50
+                let results = OcrStore.shared.history(wid: wid, limit: limit)
+                return .array(results.map { Encoders.ocrSearchResult($0) })
+            }
+        ))
+
+        api.register(Endpoint(
+            method: "ocr.scan",
+            description: "Trigger an immediate OCR scan",
+            access: .mutate,
+            params: [],
+            returns: .ok,
+            handler: { _ in
+                OcrModel.shared.scan()
+                return .object(["ok": .bool(true)])
+            }
+        ))
+
         // ── Endpoints: Mutations ────────────────────────────────
 
         api.register(Endpoint(
@@ -857,6 +1023,50 @@ enum Encoders {
         return .object(obj)
     }
 
+    static func ocrResult(_ r: OcrWindowResult) -> JSON {
+        .object([
+            "wid": .int(Int(r.wid)),
+            "app": .string(r.app),
+            "title": .string(r.title),
+            "frame": .object([
+                "x": .double(r.frame.x),
+                "y": .double(r.frame.y),
+                "w": .double(r.frame.w),
+                "h": .double(r.frame.h)
+            ]),
+            "fullText": .string(r.fullText),
+            "blocks": .array(r.texts.map { block in
+                .object([
+                    "text": .string(block.text),
+                    "confidence": .double(Double(block.confidence)),
+                    "x": .double(block.boundingBox.origin.x),
+                    "y": .double(block.boundingBox.origin.y),
+                    "w": .double(block.boundingBox.size.width),
+                    "h": .double(block.boundingBox.size.height)
+                ])
+            }),
+            "timestamp": .double(r.timestamp.timeIntervalSince1970)
+        ])
+    }
+
+    static func ocrSearchResult(_ r: OcrSearchResult) -> JSON {
+        .object([
+            "id": .int(Int(r.id)),
+            "wid": .int(Int(r.wid)),
+            "app": .string(r.app),
+            "title": .string(r.title),
+            "frame": .object([
+                "x": .double(r.frame.x),
+                "y": .double(r.frame.y),
+                "w": .double(r.frame.w),
+                "h": .double(r.frame.h)
+            ]),
+            "fullText": .string(r.fullText),
+            "snippet": .string(r.snippet),
+            "timestamp": .double(r.timestamp.timeIntervalSince1970)
+        ])
+    }
+
     static func enrichedSession(_ s: TmuxSession) -> JSON {
         let pm = ProcessModel.shared
         return .object([

package/app/Sources/MainView.swift

@@ -71,16 +71,7 @@ struct MainView: View {
                 Spacer()
 
                 headerButton(icon: "arrow.up.left.and.arrow.down.right") {
-                    // Dismiss the MenuBarExtra panel immediately
-                    for window in NSApp.windows {
-                        if window is NSPanel, window.isVisible,
-                           !CommandPaletteWindow.shared.isVisible || window.frame.width < 500 {
-                            // MenuBarExtra panels are small (~380px); command palette is 540px
-                            if window.frame.width <= 400 {
-                                window.orderOut(nil)
-                            }
-                        }
-                    }
+                    (NSApp.delegate as? AppDelegate)?.dismissPopover()
                     MainWindow.shared.show()
                 }
                 headerButton(icon: "arrow.clockwise") { scanner.scan(); inventory.refresh() }
@@ -190,8 +181,8 @@ struct MainView: View {
                 .fill(Palette.border)
                 .frame(height: 0.5)
 
-            // Status bar
-            statusBar
+            // Actions footer
+            actionsSection
         }
     }
 
@@ -253,96 +244,65 @@ struct MainView: View {
         }
     }
 
-    // MARK: - Status bar
+    // MARK: - Actions footer
 
-    private var statusBar: some View {
-        HStack(spacing: 0) {
-            // Settings button
-            Button { SettingsWindowController.shared.show() } label: {
-                Image(systemName: "gearshape")
-                    .font(.system(size: 10, weight: .medium))
-                    .foregroundColor(Palette.textMuted)
+    private var actionsSection: some View {
+        VStack(spacing: 0) {
+            ActionRow(shortcut: "1", label: "Command Palette", hotkey: hotkeyLabel(.palette), icon: "command", accentColor: Palette.running) {
+                CommandPaletteWindow.shared.toggle()
             }
-            .buttonStyle(.plain)
-            .help("Settings")
-
-            // Diagnostics toggle
-            Button { DiagnosticWindow.shared.toggle() } label: {
-                HStack(spacing: 3) {
-                    Image(systemName: "stethoscope")
-                        .font(.system(size: 10, weight: .medium))
-                        .foregroundColor(DiagnosticWindow.shared.isVisible ? Palette.running : Palette.textMuted)
-                    if !permChecker.allGranted {
-                        Circle()
-                            .fill(Palette.detach)
-                            .frame(width: 5, height: 5)
-                    }
-                }
+            ActionRow(shortcut: "2", label: "Screen Map", hotkey: hotkeyLabel(.screenMap), icon: "rectangle.3.group") {
+                ScreenMapWindowController.shared.toggle()
+            }
+            ActionRow(shortcut: "3", label: "Desktop Inventory", hotkey: hotkeyLabel(.desktopInventory), icon: "rectangle.split.2x1") {
+                CommandModeWindow.shared.toggle()
+            }
+            ActionRow(shortcut: "4", label: "Window Bezel", hotkey: hotkeyLabel(.bezel), icon: "macwindow") {
+                WindowBezel.showBezelForFrontmostWindow()
+            }
+            ActionRow(shortcut: "5", label: "Cheat Sheet", hotkey: hotkeyLabel(.cheatSheet), icon: "keyboard") {
+                CheatSheetHUD.shared.toggle()
+            }
+            ActionRow(shortcut: "6", label: "Omni Search", hotkey: hotkeyLabel(.omniSearch), icon: "magnifyingglass", accentColor: Palette.running) {
+                OmniSearchWindow.shared.toggle()
             }
-            .buttonStyle(.plain)
-            .help(!permChecker.allGranted ? "Permissions missing — open diagnostics" : "Toggle diagnostics")
 
             Rectangle()
                 .fill(Palette.border)
-                .frame(width: 0.5, height: 12)
-                .padding(.horizontal, 8)
-
-            // Config summary — keys dim, values white
-            statusLine
-
-            Spacer()
+                .frame(height: 0.5)
+                .padding(.horizontal, 10)
 
-            // Palette hint
-            Text("\u{2318}\u{21E7}M")
-                .font(Typo.mono(9))
-                .foregroundColor(Palette.textMuted)
-                .help("Command palette (Cmd+Shift+M)")
+            ActionRow(shortcut: "S", label: "Settings", icon: "gearshape") {
+                SettingsWindowController.shared.show()
+            }
+            HStack(spacing: 0) {
+                ActionRow(shortcut: "D", label: "Diagnostics", icon: "stethoscope") {
+                    DiagnosticWindow.shared.toggle()
+                }
+                if !permChecker.allGranted {
+                    Circle()
+                        .fill(Palette.detach)
+                        .frame(width: 6, height: 6)
+                        .padding(.trailing, 14)
+                }
+            }
 
             Rectangle()
                 .fill(Palette.border)
-                .frame(width: 0.5, height: 12)
-                .padding(.horizontal, 6)
+                .frame(height: 0.5)
+                .padding(.horizontal, 10)
 
-            // Quit
-            Button { NSApp.terminate(nil) } label: {
-                Image(systemName: "power")
-                    .font(.system(size: 9, weight: .medium))
-                    .foregroundColor(Palette.textMuted)
+            ActionRow(shortcut: "Q", label: "Quit", icon: "power", accentColor: Palette.kill) {
+                NSApp.terminate(nil)
             }
-            .buttonStyle(.plain)
-            .help("Quit lattices")
         }
-        .padding(.horizontal, 14)
-        .padding(.vertical, 7)
+        .padding(.vertical, 4)
         .background(Palette.surface.opacity(0.4))
     }
 
-    private var statusLine: some View {
-        HStack(spacing: 3) {
-            statusPair("terminal", prefs.terminal.rawValue.lowercased())
-            statusDot
-            statusPair("mode", prefs.mode.rawValue)
-            statusDot
-            statusPair("home", "~/\((prefs.scanRoot as NSString).lastPathComponent)")
-        }
-    }
-
-    private func statusPair(_ key: String, _ value: String) -> some View {
-        HStack(spacing: 3) {
-            Text(key + ":")
-                .font(Typo.mono(9))
-                .foregroundColor(Palette.textMuted)
-            Text(value)
-                .font(Typo.mono(9))
-                .foregroundColor(Palette.text)
-        }
-    }
-
-    private var statusDot: some View {
-        Circle()
-            .fill(Palette.textMuted)
-            .frame(width: 2, height: 2)
-            .padding(.horizontal, 4)
+    private func hotkeyLabel(_ action: HotkeyAction) -> String? {
+        guard let binding = HotkeyStore.shared.bindings[action] else { return nil }
+        return binding.displayParts.joined(separator: "")
     }
 
     // MARK: - Empty state

package/app/Sources/MainWindow.swift

@@ -7,6 +7,7 @@ final class MainWindow {
     static let shared = MainWindow()
 
     private var window: NSWindow?
+    private var keyMonitor: Any?
 
     var isVisible: Bool { window?.isVisible ?? false }
 
@@ -61,10 +62,22 @@ final class MainWindow {
 
         window = w
         AppDelegate.updateActivationPolicy()
+
+        // Escape key → close
+        keyMonitor = NSEvent.addLocalMonitorForEvents(matching: .keyDown) { [weak self] event in
+            guard event.keyCode == 53,
+                  self?.window?.isKeyWindow == true else { return event }
+            self?.close()
+            return nil
+        }
     }
 
     func close() {
         window?.orderOut(nil)
+        if let monitor = keyMonitor {
+            NSEvent.removeMonitor(monitor)
+            keyMonitor = nil
+        }
         AppDelegate.updateActivationPolicy()
     }
 }