@arach/lattices 0.1.0 → 0.2.0

package/README.md

@@ -1,39 +1,39 @@
 <picture>
-  <img alt="lattice" src="www/public/og.png" />
+  <img alt="lattices" src="site/public/og.png" />
 </picture>
 
-# lattice
+# lattices
 
 Declarative tmux sessions for developers.
 
-One command to create a named tmux session with your tools running. Auto-detects your stack, fully configurable with `.lattice.json`, and a native macOS menu bar app.
+One command to create a named tmux session with your tools running. Auto-detects your stack, fully configurable with `.lattices.json`, and a native macOS menu bar app.
 
 ## Install
 
 ```sh
-npm install -g lattice
+npm install -g @arach/lattices
 ```
 
 ## Quick start
 
 ```sh
 cd my-project
-lattice
+lattices
 ```
 
-That's it. lattice creates a tmux session named after your project with Claude Code on the left and your dev server on the right. It detects your package manager and dev command automatically.
+That's it. lattices creates a tmux session named after your project with Claude Code on the left and your dev server on the right. It detects your package manager and dev command automatically.
 
 ## How it works
 
-1. **Run `lattice`** in any project directory
+1. **Run `lattices`** in any project directory
 2. A named tmux session is created with configured panes
 3. Commands start running in each pane immediately
-4. Detach with `Ctrl+b d`, reattach by running `lattice` again
+4. Detach with `Ctrl+b d`, reattach by running `lattices` again
 5. Sessions persist in the background until you kill them
 
 ## Configuration
 
-Drop a `.lattice.json` in your project root:
+Drop a `.lattices.json` in your project root:
 
 ```json
 {
@@ -75,7 +75,7 @@ Drop a `.lattice.json` in your project root:
 
 ## Auto-detection
 
-Without a config file, lattice reads your `package.json` and picks the right command:
+Without a config file, lattices reads your `package.json` and picks the right command:
 
 - Checks `scripts.dev`, `scripts.start`, `scripts.serve`, `scripts.watch`
 - Detects package manager from lock files (pnpm, bun, yarn, npm)
@@ -86,9 +86,9 @@ Without a config file, lattice reads your `package.json` and picks the right com
 A macOS companion app for managing sessions without touching the terminal.
 
 ```sh
-lattice app          # Launch (builds from source or downloads binary)
-lattice app build    # Force rebuild from source
-lattice app quit     # Stop the menu bar app
+lattices app          # Launch (builds from source or downloads binary)
+lattices app build    # Force rebuild from source
+lattices app quit     # Stop the menu bar app
 ```
 
 Features:
@@ -103,7 +103,7 @@ The app tries to compile from source first (requires Xcode CLI tools), falling b
 ## Tab groups
 
 Bundle related projects as tabs within a single terminal window.
-Configure in `~/.lattice/workspace.json`:
+Configure in `~/.lattices/workspace.json`:
 
 ```json
 {
@@ -122,28 +122,28 @@ Configure in `~/.lattice/workspace.json`:
 }
 ```
 
-Each tab gets its own tmux window with pane layout from its `.lattice.json`.
+Each tab gets its own tmux window with pane layout from its `.lattices.json`.
 
 ```sh
-lattice groups            # List groups with status
-lattice group talkie      # Launch or attach
-lattice tab talkie iOS    # Switch to a tab
+lattices groups            # List groups with status
+lattices group talkie      # Launch or attach
+lattices tab talkie iOS    # Switch to a tab
 ```
 
-Groups can also be referenced in [workspace layers](https://lattice.dev/docs/layers) to tile a whole group into a screen position.
+Groups can also be referenced in [workspace layers](https://lattices.dev/docs/layers) to tile a whole group into a screen position.
 
 ## CLI reference
 
 ```
-lattice                    Create or reattach to a session for the current project
-lattice init               Generate a .lattice.json config
-lattice ls                 List active tmux sessions
-lattice kill [name]        Kill a session (defaults to current project)
-lattice group [id]         List tab groups or launch/attach a group
-lattice groups             List all tab groups with status
-lattice tab <group> [tab]  Switch tab within a group (by label or index)
-lattice app                Launch the menu bar companion app
-lattice help               Show help
+lattices                    Create or reattach to a session for the current project
+lattices init               Generate a .lattices.json config
+lattices ls                 List active tmux sessions
+lattices kill [name]        Kill a session (defaults to current project)
+lattices group [id]         List tab groups or launch/attach a group
+lattices groups             List all tab groups with status
+lattices tab <group> [tab]  Switch tab within a group (by label or index)
+lattices app                Launch the menu bar companion app
+lattices help               Show help
 ```
 
 ## Requirements

package/app/Sources/ActionRow.swift

@@ -0,0 +1,61 @@
+import SwiftUI
+
+/// A single action row with shortcut badge, label, optional icon, and hotkey hint.
+struct ActionRow: View {
+    let shortcut: String
+    let label: String
+    var hotkey: String? = nil
+    var icon: String? = nil
+    var accentColor: Color = Palette.textDim
+    var action: () -> Void
+
+    @State private var isHovered = false
+
+    var body: some View {
+        Button(action: action) {
+            HStack(spacing: 10) {
+                // Shortcut badge
+                Text(shortcut)
+                    .font(Typo.monoBold(10))
+                    .foregroundColor(accentColor)
+                    .frame(width: 18, height: 18)
+                    .background(
+                        RoundedRectangle(cornerRadius: 4)
+                            .fill(accentColor.opacity(0.12))
+                    )
+
+                // Icon
+                if let icon {
+                    Image(systemName: icon)
+                        .font(.system(size: 11, weight: .medium))
+                        .foregroundColor(isHovered ? Palette.text : Palette.textDim)
+                        .frame(width: 14)
+                }
+
+                // Label
+                Text(label)
+                    .font(Typo.mono(12))
+                    .foregroundColor(isHovered ? Palette.text : Palette.textDim)
+                    .lineLimit(1)
+
+                Spacer()
+
+                // Hotkey
+                if let hotkey {
+                    Text(hotkey)
+                        .font(Typo.mono(10))
+                        .foregroundColor(Palette.textMuted)
+                }
+            }
+            .padding(.horizontal, 10)
+            .padding(.vertical, 6)
+            .background(
+                RoundedRectangle(cornerRadius: 5)
+                    .fill(isHovered ? Palette.surfaceHov : Color.clear)
+            )
+            .contentShape(Rectangle())
+        }
+        .buttonStyle(.plain)
+        .onHover { isHovered = $0 }
+    }
+}

package/app/Sources/App.swift

@@ -3,47 +3,8 @@ import SwiftUI
 @main
 struct LatticesApp: App {
     @NSApplicationDelegateAdaptor(AppDelegate.self) var delegate
-    @StateObject private var scanner = ProjectScanner.shared
-
-    /// 3×3 grid icon for the menu bar — L-shape bright, rest dim (template for auto light/dark)
-    private static let menuBarIcon: NSImage = {
-        let size: CGFloat = 18
-        let img = NSImage(size: NSSize(width: size, height: size), flipped: false) { _ in
-            let pad: CGFloat = 2
-            let gap: CGFloat = 1.5
-            let cellSize = (size - 2 * pad - 2 * gap) / 3
-
-            // L-shape: left column + bottom row are solid, rest are dim
-            let solidCells: Set<Int> = [0, 3, 6, 7, 8]  // (0,0),(1,0),(2,0),(2,1),(2,2)
-
-            for row in 0..<3 {
-                for col in 0..<3 {
-                    let idx = row * 3 + col
-                    let x = pad + CGFloat(col) * (cellSize + gap)
-                    let y = pad + CGFloat(row) * (cellSize + gap)
-                    let rect = NSRect(x: x, y: y, width: cellSize, height: cellSize)
-
-                    if solidCells.contains(idx) {
-                        NSColor.black.setFill()
-                    } else {
-                        NSColor.black.withAlphaComponent(0.25).setFill()
-                    }
-                    let path = NSBezierPath(roundedRect: rect, xRadius: 0.8, yRadius: 0.8)
-                    path.fill()
-                }
-            }
-            return true
-        }
-        img.isTemplate = true
-        return img
-    }()
 
     var body: some Scene {
-        MenuBarExtra {
-            MainView(scanner: scanner)
-        } label: {
-            Image(nsImage: Self.menuBarIcon)
-        }
-        .menuBarExtraStyle(.window)
+        Settings { EmptyView() }
     }
 }

package/app/Sources/AppDelegate.swift

@@ -1,18 +1,55 @@
 import AppKit
+import SwiftUI
 
-/// Registers the global hotkey (Cmd+Shift+D) on launch.
-/// The menu bar itself is handled by SwiftUI's MenuBarExtra.
-class AppDelegate: NSObject, NSApplicationDelegate {
+/// Manages the NSStatusItem (menu bar icon), left-click popover, and right-click context menu.
+/// Replaces the previous SwiftUI MenuBarExtra approach for full click-event control.
+class AppDelegate: NSObject, NSApplicationDelegate, NSPopoverDelegate {
+
+    private var statusItem: NSStatusItem!
+    private var popover: NSPopover?
+    private var contextMenu: NSMenu!
+
+    /// 3×3 grid icon for the menu bar — L-shape bright, rest dim (template for auto light/dark)
+    private static let menuBarIcon: NSImage = {
+        let size: CGFloat = 18
+        let img = NSImage(size: NSSize(width: size, height: size), flipped: true) { _ in
+            let pad: CGFloat = 2
+            let gap: CGFloat = 1.5
+            let cellSize = (size - 2 * pad - 2 * gap) / 3
+
+            let solidCells: Set<Int> = [0, 3, 6, 7, 8]
+
+            for row in 0..<3 {
+                for col in 0..<3 {
+                    let idx = row * 3 + col
+                    let x = pad + CGFloat(col) * (cellSize + gap)
+                    let y = pad + CGFloat(row) * (cellSize + gap)
+                    let rect = NSRect(x: x, y: y, width: cellSize, height: cellSize)
+
+                    if solidCells.contains(idx) {
+                        NSColor.black.setFill()
+                    } else {
+                        NSColor.black.withAlphaComponent(0.25).setFill()
+                    }
+                    let path = NSBezierPath(roundedRect: rect, xRadius: 0.8, yRadius: 0.8)
+                    path.fill()
+                }
+            }
+            return true
+        }
+        img.isTemplate = true
+        return img
+    }()
 
     /// Toggle between .accessory (hidden from Dock/Cmd+Tab) and .regular (visible)
     /// based on whether any managed windows are open.
-    /// Call this after showing or dismissing a window.
     static func updateActivationPolicy() {
         let hasVisibleWindow =
             CommandModeWindow.shared.isVisible ||
             CommandPaletteWindow.shared.isVisible ||
             MainWindow.shared.isVisible ||
-            ScreenMapWindowController.shared.isVisible
+            ScreenMapWindowController.shared.isVisible ||
+            OmniSearchWindow.shared.isVisible
         let desired: NSApplication.ActivationPolicy = hasVisibleWindow ? .regular : .accessory
         if NSApp.activationPolicy() != desired {
             NSApp.setActivationPolicy(desired)
@@ -26,14 +63,29 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         NSApp.setActivationPolicy(.accessory)
         NSApp.appearance = NSAppearance(named: .darkAqua)
 
-        CommandPaletteWindow.shared.configure(scanner: ProjectScanner.shared)
+        // --- Status item ---
+        statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.squareLength)
+        if let button = statusItem.button {
+            button.image = Self.menuBarIcon
+            button.action = #selector(statusItemClicked(_:))
+            button.sendAction(on: [.leftMouseUp, .rightMouseUp])
+            button.target = self
+        }
+
+        // --- Context menu (right-click) ---
+        contextMenu = buildContextMenu()
+
+        // --- Hotkey registration ---
+        let scanner = ProjectScanner.shared
+        CommandPaletteWindow.shared.configure(scanner: scanner)
 
-        // Register all hotkeys via HotkeyStore (user-configurable bindings)
         let store = HotkeyStore.shared
         store.register(action: .palette) { CommandPaletteWindow.shared.toggle() }
         store.register(action: .screenMap) { ScreenMapWindowController.shared.toggle() }
         store.register(action: .bezel) { WindowBezel.showBezelForFrontmostWindow() }
         store.register(action: .cheatSheet) { CheatSheetHUD.shared.toggle() }
+        store.register(action: .desktopInventory) { CommandModeWindow.shared.toggle() }
+        store.register(action: .omniSearch) { OmniSearchWindow.shared.toggle() }
 
         // Layer-switching hotkeys
         let workspace = WorkspaceManager.shared
@@ -58,21 +110,13 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         }
         store.register(action: .tileDistribute) { WindowTiler.distributeVisible() }
 
-        // Style the MenuBarExtra panel when it appears
-        NotificationCenter.default.addObserver(
-            forName: NSWindow.didBecomeKeyNotification,
-            object: nil,
-            queue: .main
-        ) { note in
-            guard let panel = note.object as? NSPanel else { return }
-            Self.stylePanel(panel)
-        }
-
         // Check macOS permissions (Accessibility, Screen Recording)
         PermissionChecker.shared.check()
 
         // Start daemon services
+        OcrStore.shared.open()
         DesktopModel.shared.start()
+        OcrModel.shared.start()
         TmuxModel.shared.start()
         ProcessModel.shared.start()
         LatticesApi.setup()
@@ -93,12 +137,98 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         }
     }
 
-    private static func stylePanel(_ panel: NSPanel) {
-        let bg = NSColor(red: 0.11, green: 0.11, blue: 0.12, alpha: 1.0)
-        panel.backgroundColor = bg
-        panel.isOpaque = false
-        panel.hasShadow = true
-        panel.becomesKeyOnlyIfNeeded = false
-        panel.invalidateShadow()
+    // MARK: - Status item click handler
+
+    @objc private func statusItemClicked(_ sender: Any?) {
+        guard let event = NSApp.currentEvent, let button = statusItem.button else { return }
+
+        if event.type == .rightMouseUp {
+            // Right-click → context menu
+            contextMenu.popUp(positioning: nil, at: NSPoint(x: 0, y: button.bounds.height + 4), in: button)
+        } else {
+            // Left-click → toggle popover
+            if let shown = popover, shown.isShown {
+                shown.performClose(sender)
+            } else {
+                let p = makePopover()
+                p.show(relativeTo: button.bounds, of: button, preferredEdge: .minY)
+                p.contentViewController?.view.window?.makeKey()
+            }
+        }
+    }
+
+    /// Dismiss the popover programmatically (e.g. from the pop-out button).
+    func dismissPopover() {
+        popover?.performClose(nil)
     }
+
+    /// Create a fresh popover each time so the SwiftUI view tree isn't kept alive
+    /// when the popover is closed — prevents continuous CPU usage from @Published updates.
+    private func makePopover() -> NSPopover {
+        let p = NSPopover()
+        p.contentViewController = NSHostingController(rootView: MainView(scanner: ProjectScanner.shared))
+        p.behavior = .transient
+        p.contentSize = NSSize(width: 380, height: 520)
+        p.appearance = NSAppearance(named: .darkAqua)
+        p.delegate = self
+        popover = p
+        return p
+    }
+
+    func popoverDidClose(_ notification: Notification) {
+        // Tear down the SwiftUI view tree so observed models stop driving re-renders
+        popover?.contentViewController = nil
+        popover = nil
+    }
+
+    // MARK: - Context menu
+
+    private func buildContextMenu() -> NSMenu {
+        let menu = NSMenu()
+
+        let actions: [(String, String, Selector)] = [
+            ("Command Palette", "⌘⇧M", #selector(menuCommandPalette)),
+            ("Screen Map", "", #selector(menuScreenMap)),
+            ("Desktop Inventory", "", #selector(menuDesktopInventory)),
+            ("Window Bezel", "", #selector(menuWindowBezel)),
+            ("Cheat Sheet", "", #selector(menuCheatSheet)),
+            ("Omni Search", "", #selector(menuOmniSearch)),
+        ]
+        for (title, shortcut, action) in actions {
+            let item = NSMenuItem(title: title, action: action, keyEquivalent: "")
+            item.target = self
+            if !shortcut.isEmpty {
+                // Display-only; the actual hotkey is global
+            }
+            menu.addItem(item)
+        }
+
+        menu.addItem(.separator())
+
+        let settings = NSMenuItem(title: "Settings…", action: #selector(menuSettings), keyEquivalent: ",")
+        settings.target = self
+        menu.addItem(settings)
+
+        let diag = NSMenuItem(title: "Diagnostics", action: #selector(menuDiagnostics), keyEquivalent: "")
+        diag.target = self
+        menu.addItem(diag)
+
+        menu.addItem(.separator())
+
+        let quit = NSMenuItem(title: "Quit Lattices", action: #selector(menuQuit), keyEquivalent: "q")
+        quit.target = self
+        menu.addItem(quit)
+
+        return menu
+    }
+
+    @objc private func menuCommandPalette() { CommandPaletteWindow.shared.toggle() }
+    @objc private func menuScreenMap() { ScreenMapWindowController.shared.toggle() }
+    @objc private func menuDesktopInventory() { CommandModeWindow.shared.toggle() }
+    @objc private func menuWindowBezel() { WindowBezel.showBezelForFrontmostWindow() }
+    @objc private func menuCheatSheet() { CheatSheetHUD.shared.toggle() }
+    @objc private func menuOmniSearch() { OmniSearchWindow.shared.toggle() }
+    @objc private func menuSettings() { SettingsWindowController.shared.show() }
+    @objc private func menuDiagnostics() { DiagnosticWindow.shared.toggle() }
+    @objc private func menuQuit() { NSApp.terminate(nil) }
 }

package/app/Sources/CheatSheetHUD.swift

@@ -231,6 +231,7 @@ struct CheatSheetView: View {
             shortcutRow(action: .screenMap)
             shortcutRow(action: .bezel)
             shortcutRow(action: .cheatSheet)
+            shortcutRow(action: .desktopInventory)
         }
     }
 

package/app/Sources/CommandModeState.swift

@@ -261,7 +261,9 @@ final class CommandModeState: ObservableObject {
                             let matchesApp = win.appName?.lowercased().contains(query) ?? false
                             let matchesTitle = win.title.lowercased().contains(query)
                             let matchesLattices = win.latticesSession?.lowercased().contains(query) ?? false
-                            if !matchesApp && !matchesTitle && !matchesLattices { return false }
+                            let matchesOcr = OcrModel.shared.results[win.id]?.fullText
+                                .lowercased().contains(query) ?? false
+                            if !matchesApp && !matchesTitle && !matchesLattices && !matchesOcr { return false }
                         }
 
                         return true
@@ -305,6 +307,37 @@ final class CommandModeState: ObservableObject {
         filteredSnapshot?.allWindows ?? []
     }
 
+    var ocrMatchSnippets: [UInt32: String] {
+        guard isSearching, !searchQuery.isEmpty else { return [:] }
+        let query = searchQuery.lowercased()
+        let ocrResults = OcrModel.shared.results
+        var snippets: [UInt32: String] = [:]
+        for win in flatWindowList {
+            // Only show snippet if match came from OCR, not title/app
+            let matchesApp = win.appName?.lowercased().contains(query) ?? false
+            let matchesTitle = win.title.lowercased().contains(query)
+            let matchesLattices = win.latticesSession?.lowercased().contains(query) ?? false
+            if matchesApp || matchesTitle || matchesLattices { continue }
+            if let ocr = ocrResults[win.id],
+               let range = ocr.fullText.lowercased().range(of: query) {
+                snippets[win.id] = Self.extractSnippet(from: ocr.fullText, around: range)
+            }
+        }
+        return snippets
+    }
+
+    private static func extractSnippet(from text: String, around range: Range<String.Index>, maxLen: Int = 80) -> String {
+        let half = max(0, (maxLen - 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 s = String(text[start..<end])
+            .replacingOccurrences(of: "\n", with: " ")
+            .trimmingCharacters(in: .whitespaces)
+        if start > text.startIndex { s = "…" + s }
+        if end < text.endIndex { s += "…" }
+        return s
+    }
+
     func enter() {
         inventory = buildInventory()
         chords = buildChords()
@@ -404,20 +437,8 @@ final class CommandModeState: ObservableObject {
         }
 
         switch keyCode {
-        case 53: // Escape
-            if isSearching {
-                deactivateSearch()
-                return true
-            }
-            if !selectedWindowIds.isEmpty {
-                clearSelection()
-                return true
-            }
-            // No selection — back to chord view
-            desktopMode = .browsing
-            activePreset = nil
-            phase = .inventory
-            onPanelResize?(chordPanelSize.0, chordPanelSize.1)
+        case 53: // Escape — always dismiss
+            onDismiss?()
             return true
 
         case 126: // ↑
@@ -560,8 +581,8 @@ final class CommandModeState: ObservableObject {
 
     private func handleTilingKey(_ keyCode: UInt16, modifiers: NSEvent.ModifierFlags = []) -> Bool {
         switch keyCode {
-        case 53: // Escape → back to browsing
-            desktopMode = .browsing
+        case 53: // Escape — always dismiss
+            onDismiss?()
             return true
 
         case 123: tileSelectedWindow(to: .left); return true       // ←
@@ -593,8 +614,8 @@ final class CommandModeState: ObservableObject {
 
     private func handleGridPreviewKey(_ keyCode: UInt16) -> Bool {
         switch keyCode {
-        case 53: // Escape → back to browsing
-            desktopMode = .browsing
+        case 53: // Escape — always dismiss
+            onDismiss?()
             return true
 
         case 36, 1: // Enter or s → apply the layout

package/app/Sources/CommandModeView.swift

@@ -282,13 +282,15 @@ struct CommandModeView: View {
             Image(systemName: "magnifyingglass")
                 .font(.system(size: 11))
                 .foregroundColor(Palette.textDim)
-            TextField("Search windows...", text: $state.searchQuery)
+            TextField("Search windows & content…", text: $state.searchQuery)
                 .textFieldStyle(.plain)
                 .font(Typo.mono(12))
                 .foregroundColor(Palette.text)
                 .focused($isSearchFieldFocused)
             if !state.searchQuery.isEmpty {
-                Text("\(state.flatWindowList.count) matches")
+                let total = state.flatWindowList.count
+                let ocrCount = state.ocrMatchSnippets.count
+                Text(ocrCount > 0 ? "\(total) matches (\(ocrCount) by content)" : "\(total) matches")
                     .font(Typo.mono(9))
                     .foregroundColor(Palette.textMuted)
             }
@@ -442,6 +444,7 @@ struct CommandModeView: View {
         VStack(alignment: .leading, spacing: 0) {
             if appGroup.windows.count == 1, let win = appGroup.windows.first {
                 inventoryRow(window: win, appLabel: appGroup.appName)
+                ocrSnippetRow(for: win.id)
                 if state.isSelected(win.id), let path = win.inventoryPath {
                     inventoryPathLabel(path)
                 }
@@ -454,6 +457,7 @@ struct CommandModeView: View {
                     .padding(.bottom, 1)
                 ForEach(appGroup.windows) { win in
                     inventoryRow(window: win, indented: true)
+                    ocrSnippetRow(for: win.id)
                     if state.isSelected(win.id), let path = win.inventoryPath {
                         inventoryPathLabel(path)
                     }
@@ -471,6 +475,24 @@ struct CommandModeView: View {
             .padding(.vertical, 2)
     }
 
+    @ViewBuilder
+    private func ocrSnippetRow(for windowId: UInt32) -> some View {
+        if let snippet = state.ocrMatchSnippets[windowId] {
+            HStack(spacing: 4) {
+                Image(systemName: "text.magnifyingglass")
+                    .font(.system(size: 7))
+                    .foregroundColor(Palette.textMuted)
+                Text(snippet)
+                    .font(Typo.mono(9).italic())
+                    .foregroundColor(Palette.textMuted)
+                    .lineLimit(1)
+                    .truncationMode(.tail)
+            }
+            .padding(.horizontal, 28)
+            .padding(.vertical, 1)
+        }
+    }
+
     /// Unified inventory row — handles both single-app rows (with appLabel) and
     /// sub-rows under a multi-window app header (with indented).
     private func inventoryRow(
@@ -1278,6 +1300,9 @@ struct CommandModeView: View {
     private func installKeyHandler() {
         eventMonitor = NSEvent.addLocalMonitorForEvents(matching: .keyDown) { event in
             guard state.phase == .inventory || state.phase == .desktopInventory else { return event }
+            // Only handle keys when our panel is the key window
+            guard let panel = CommandModeWindow.shared.panelWindow,
+                  panel.isKeyWindow else { return event }
             let consumed = state.handleKey(event.keyCode, modifiers: event.modifierFlags)
             return consumed ? nil : event
         }

package/app/Sources/DaemonServer.swift

@@ -386,6 +386,14 @@ final class DaemonServer: ObservableObject {
                     "pids": .array(interesting.map { .int($0) })
                 ])
             )
+        case .ocrScanComplete(let windowCount, let totalBlocks):
+            daemonEvent = DaemonEvent(
+                event: "ocr.scanComplete",
+                data: .object([
+                    "windowCount": .int(windowCount),
+                    "totalBlocks": .int(totalBlocks)
+                ])
+            )
         }
         broadcast(daemonEvent)
     }