@lattices/cli 0.4.2 → 0.4.6

package/app/Sources/Core/Overlays/CommandPalette/CommandPaletteWindow.swift

@@ -0,0 +1,67 @@
+import AppKit
+import SwiftUI
+
+final class CommandPaletteWindow {
+    static let shared = CommandPaletteWindow()
+
+    private var panel: NSPanel?
+    private var scanner: ProjectScanner?
+
+    func configure(scanner: ProjectScanner) {
+        self.scanner = scanner
+    }
+
+    var isVisible: Bool { panel?.isVisible ?? false }
+
+    func toggle() {
+        if let p = panel, p.isVisible {
+            dismiss()
+        } else {
+            show()
+        }
+    }
+
+    func show() {
+        // Always rebuild for fresh command state
+        dismiss()
+
+        guard let scanner = scanner else { return }
+
+        // Ensure projects are up to date (full scan if list is empty,
+        // e.g. palette opened via hotkey before main popover appeared)
+        if scanner.projects.isEmpty {
+            scanner.scan()
+        } else {
+            scanner.refreshStatus()
+        }
+
+        let commands = CommandBuilder.build(scanner: scanner)
+        let view = CommandPaletteView(commands: commands) { [weak self] in
+            self?.dismiss()
+        }
+        .preferredColorScheme(.dark)
+
+        let panel = OverlayPanelShell.makePanel(
+            config: .init(
+                size: NSSize(width: 540, height: 440),
+                styleMask: [.nonactivatingPanel],
+                background: .material(.popover),
+                cornerRadius: 14,
+                hidesOnDeactivate: true,
+                isMovableByWindowBackground: true
+            ),
+            rootView: view
+        )
+        OverlayPanelShell.position(panel, placement: .centered(yOffsetRatio: 0.1))
+        OverlayPanelShell.present(panel)
+
+        self.panel = panel
+        AppDelegate.updateActivationPolicy()
+    }
+
+    func dismiss() {
+        panel?.orderOut(nil)
+        panel = nil
+        AppDelegate.updateActivationPolicy()
+    }
+}

package/app/Sources/{CheatSheetHUD.swift → Core/Overlays/HUD/CheatSheetHUD.swift}

@@ -254,6 +254,7 @@ struct CheatSheetView: View {
             // Center + Distribute
             shortcutRow(action: .tileCenter)
             shortcutRow(action: .tileDistribute)
+            shortcutRow(action: .tileTypeGrid)
 
             // Hovered shortcut detail
             if let hovered = hoveredAction, let binding = hotkeyStore.bindings[hovered] {

package/app/Sources/{HUDRightBar.swift → Core/Overlays/HUD/HUDRightBar.swift}

@@ -168,34 +168,11 @@ struct HUDRightBar: View {
                     .foregroundColor(Palette.textDim)
             }
 
-            ZStack {
-                RoundedRectangle(cornerRadius: 10)
-                    .fill(Palette.surface.opacity(0.8))
-                    .overlay(
-                        RoundedRectangle(cornerRadius: 10)
-                            .strokeBorder(Palette.border, lineWidth: 0.5)
-                    )
-
-                if let image = previewModel.image(for: window.wid) {
-                    Image(nsImage: image)
-                        .resizable()
-                        .aspectRatio(contentMode: .fit)
-                        .clipShape(RoundedRectangle(cornerRadius: 8))
-                        .padding(8)
-                } else if previewModel.isLoading(window.wid) {
-                    previewPlaceholder(
-                        icon: "photo",
-                        title: "Capturing preview",
-                        subtitle: window.app
-                    )
-                } else {
-                    previewPlaceholder(
-                        icon: "eye.slash",
-                        title: "Preview unavailable",
-                        subtitle: window.app
-                    )
-                }
-            }
+            WindowPreviewCard(
+                image: previewModel.image(for: window.wid),
+                isLoading: previewModel.isLoading(window.wid),
+                appName: window.app
+            )
             .frame(maxWidth: .infinity)
             .frame(height: 190)
             .clipped()
@@ -207,22 +184,6 @@ struct HUDRightBar: View {
         }
     }
 
-    private func previewPlaceholder(icon: String, title: String, subtitle: String) -> some View {
-        VStack(spacing: 8) {
-            Image(systemName: icon)
-                .font(.system(size: 18, weight: .medium))
-                .foregroundColor(Palette.textMuted.opacity(0.7))
-            Text(title)
-                .font(Typo.monoBold(10))
-                .foregroundColor(Palette.textMuted)
-            Text(subtitle)
-                .font(Typo.mono(9))
-                .foregroundColor(Palette.textDim)
-                .lineLimit(1)
-        }
-        .padding(16)
-    }
-
     private func projectPreviewWindow(_ project: Project) -> WindowEntry? {
         guard project.isRunning else { return nil }
         return desktop.windowForSession(project.sessionName)
@@ -487,39 +448,25 @@ struct HUDHoverPreviewView: View {
                         }
 
                         ZStack {
-                            RoundedRectangle(cornerRadius: 12)
-                                .fill(Palette.bg.opacity(0.96))
-                                .overlay(
-                                    RoundedRectangle(cornerRadius: 12)
-                                        .strokeBorder(Palette.border, lineWidth: 0.5)
-                                )
-
-                            if let renderedImage {
-                                Image(nsImage: renderedImage)
-                                    .resizable()
-                                    .aspectRatio(contentMode: .fit)
-                                    .clipShape(RoundedRectangle(cornerRadius: 9))
-                                    .padding(10)
-                                    .id(renderedWindowID ?? window.wid)
-                                    .transition(.opacity)
-                                    .opacity(isHoldingPreviousPreview(for: window) ? 0.88 : 1)
-                            } else if previewModel.isLoading(window.wid) {
-                                previewPlaceholder(
-                                    icon: "photo",
-                                    title: "Capturing preview",
-                                    subtitle: window.app
-                                )
-                            } else {
-                                previewPlaceholder(
-                                    icon: "eye.slash",
-                                    title: "Preview unavailable",
-                                    subtitle: window.app
-                                )
-                            }
-
-                            if isHoldingPreviousPreview(for: window) {
-                                loadingOverlay(label: "Loading next preview")
+                            WindowPreviewCard(
+                                image: renderedImage,
+                                isLoading: previewModel.isLoading(window.wid),
+                                appName: window.app,
+                                style: WindowPreviewCardStyle(
+                                    containerCornerRadius: 12,
+                                    imageCornerRadius: 9,
+                                    imagePadding: 10,
+                                    background: Palette.bg.opacity(0.96),
+                                    border: Palette.border
+                                ),
+                                holdingPreviousPreview: isHoldingPreviousPreview(for: window)
+                            ) {
+                                if isHoldingPreviousPreview(for: window) {
+                                    loadingOverlay(label: "Loading next preview")
+                                }
                             }
+                            .id(renderedWindowID ?? window.wid)
+                            .transition(.opacity)
                         }
                         .frame(height: 190)
                     }
@@ -591,22 +538,6 @@ struct HUDHoverPreviewView: View {
         }
     }
 
-    private func previewPlaceholder(icon: String, title: String, subtitle: String) -> some View {
-        VStack(spacing: 8) {
-            Image(systemName: icon)
-                .font(.system(size: 18, weight: .medium))
-                .foregroundColor(Palette.textMuted.opacity(0.7))
-            Text(title)
-                .font(Typo.monoBold(10))
-                .foregroundColor(Palette.textMuted)
-            Text(subtitle)
-                .font(Typo.mono(9))
-                .foregroundColor(Palette.textDim)
-                .lineLimit(1)
-        }
-        .padding(16)
-    }
-
     private func loadingOverlay(label: String) -> some View {
         VStack {
             Spacer()
@@ -663,112 +594,3 @@ struct HUDHoverPreviewView: View {
         }
     }
 }
-
-final class WindowPreviewStore: ObservableObject {
-    static let shared = WindowPreviewStore()
-
-    @Published private var images: [UInt32: NSImage] = [:]
-    @Published private var loading: Set<UInt32> = []
-
-    private var lastAttemptAt: [UInt32: Date] = [:]
-    private var accessOrder: [UInt32] = []  // LRU: oldest first
-    private let maxCached = 15
-    private let queue = DispatchQueue(label: "com.arach.lattices.hud-preview", qos: .userInitiated)
-    private let previewMaxSize = NSSize(width: 360, height: 190)
-
-    func image(for wid: UInt32) -> NSImage? {
-        if images[wid] != nil { touchLRU(wid) }
-        return images[wid]
-    }
-
-    private func touchLRU(_ wid: UInt32) {
-        accessOrder.removeAll { $0 == wid }
-        accessOrder.append(wid)
-    }
-
-    private func evictIfNeeded() {
-        while images.count > maxCached, let oldest = accessOrder.first {
-            accessOrder.removeFirst()
-            images.removeValue(forKey: oldest)
-            lastAttemptAt.removeValue(forKey: oldest)
-        }
-    }
-
-    func hasSettled(_ wid: UInt32) -> Bool {
-        images[wid] != nil || (lastAttemptAt[wid] != nil && !loading.contains(wid))
-    }
-
-    func isLoading(_ wid: UInt32) -> Bool {
-        loading.contains(wid)
-    }
-
-    func prewarm(windows: [WindowEntry], limit: Int = 4) {
-        for window in windows.prefix(limit) {
-            load(window: window)
-        }
-    }
-
-    func load(window: WindowEntry) {
-        if images[window.wid] != nil || loading.contains(window.wid) {
-            return
-        }
-
-        let now = Date()
-        if let lastAttemptAt = lastAttemptAt[window.wid], now.timeIntervalSince(lastAttemptAt) < 1.0 {
-            return
-        }
-        lastAttemptAt[window.wid] = now
-
-        loading.insert(window.wid)
-        let wid = window.wid
-        let frame = window.frame
-        let startedAt = Date()
-
-        queue.async { [weak self] in
-            guard let self else { return }
-
-            let cgImage = CGWindowListCreateImage(
-                .null,
-                .optionIncludingWindow,
-                CGWindowID(wid),
-                [.boundsIgnoreFraming, .nominalResolution]
-            )
-
-            let image = cgImage.map {
-                NSImage(
-                    cgImage: $0,
-                    size: self.previewSize(for: frame)
-                )
-            }
-
-            DispatchQueue.main.async {
-                self.loading.remove(wid)
-                let elapsedMs = Int(Date().timeIntervalSince(startedAt) * 1000)
-                if let image {
-                    self.images[wid] = image
-                    self.touchLRU(wid)
-                    self.evictIfNeeded()
-                    if elapsedMs >= 80 {
-                        DiagnosticLog.shared.info("HUDPreview: captured wid=\(wid) in \(elapsedMs)ms")
-                    }
-                } else {
-                    DiagnosticLog.shared.info("HUDPreview: capture unavailable wid=\(wid) after \(elapsedMs)ms")
-                }
-            }
-        }
-    }
-
-    private func previewSize(for frame: WindowFrame) -> NSSize {
-        let width = max(CGFloat(frame.w), CGFloat(1))
-        let height = max(CGFloat(frame.h), CGFloat(1))
-        let scale = min(
-            previewMaxSize.width / width,
-            previewMaxSize.height / height,
-            CGFloat(1)
-        )
-        return NSSize(
-            width: max(CGFloat(1), width * scale),
-            height: max(CGFloat(1), height * scale)
-        )
-    }
-}

package/app/Sources/{LauncherHUD.swift → Core/Overlays/HUD/LauncherHUD.swift}

@@ -25,33 +25,20 @@ final class LauncherHUD {
         let view = LauncherView(dismiss: { [weak self] in self?.dismiss() })
             .preferredColorScheme(.dark)
 
-        let hosting = NSHostingView(rootView: view)
-
-        let p = NSPanel(
-            contentRect: NSRect(x: 0, y: 0, width: 420, height: 480),
-            styleMask: [.borderless, .nonactivatingPanel],
-            backing: .buffered,
-            defer: false
+        let p = OverlayPanelShell.makePanel(
+            config: .init(
+                size: NSSize(width: 420, height: 480),
+                styleMask: [.borderless, .nonactivatingPanel],
+                background: .clear,
+                hidesOnDeactivate: false,
+                isMovableByWindowBackground: false
+            ),
+            rootView: view
         )
-        p.isOpaque = false
-        p.backgroundColor = .clear
-        p.level = .floating
-        p.hasShadow = true
-        p.hidesOnDeactivate = false
-        p.isReleasedWhenClosed = false
-        p.isMovableByWindowBackground = false
-        p.contentView = hosting
-
-        // Center on mouse screen
-        let mouseLocation = NSEvent.mouseLocation
-        let screen = NSScreen.screens.first(where: { $0.frame.contains(mouseLocation) }) ?? NSScreen.main ?? NSScreen.screens.first!
-        let screenFrame = screen.visibleFrame
-        let x = screenFrame.midX - 210
-        let y = screenFrame.midY - 240 + (screenFrame.height * 0.08)
-        p.setFrameOrigin(NSPoint(x: x, y: y))
+        OverlayPanelShell.position(p, placement: .mouseScreenCentered(yOffsetRatio: 0.08))
 
         p.alphaValue = 0
-        p.orderFrontRegardless()
+        OverlayPanelShell.present(p, activate: false, makeKey: false, orderFrontRegardless: true)
 
         NSAnimationContext.runAnimationGroup { ctx in
             ctx.duration = 0.12
@@ -86,7 +73,6 @@ final class LauncherHUD {
         globalMonitor = NSEvent.addGlobalMonitorForEvents(matching: [.leftMouseDown, .rightMouseDown]) { [weak self] event in
             // Don't dismiss if clicking inside the panel
             guard let panel = self?.panel else { return }
-            let loc = event.locationInWindow
             if !panel.frame.contains(NSEvent.mouseLocation) {
                 self?.dismiss()
             }
@@ -115,7 +101,7 @@ struct LauncherView: View {
         let q = query.lowercased()
         return scanner.projects.filter {
             $0.name.lowercased().contains(q) ||
-            ($0.paneSummary ?? "").lowercased().contains(q)
+            $0.paneSummary.lowercased().contains(q)
         }
     }
 

package/app/Sources/{OmniSearchView.swift → Core/Overlays/OmniSearch/OmniSearchView.swift}

@@ -3,7 +3,10 @@ import SwiftUI
 struct OmniSearchView: View {
     @ObservedObject var state: OmniSearchState
     var onDismiss: () -> Void
+    var isEmbedded: Bool = false
 
+    @ObservedObject private var ocrModel = OcrModel.shared
+    @State private var expandedOcrWindow: UInt32?
     @FocusState private var searchFocused: Bool
 
     var body: some View {
@@ -46,8 +49,22 @@ struct OmniSearchView: View {
                 resultsView
             }
         }
-        .frame(minWidth: 520, idealWidth: 520, maxWidth: 700, minHeight: 360, idealHeight: 480, maxHeight: 600)
-        .background(PanelBackground())
+        .frame(
+            minWidth: isEmbedded ? 0 : 520,
+            idealWidth: isEmbedded ? nil : 520,
+            maxWidth: isEmbedded ? .infinity : 700,
+            minHeight: isEmbedded ? 0 : 360,
+            idealHeight: isEmbedded ? nil : 480,
+            maxHeight: isEmbedded ? .infinity : 600,
+            alignment: .top
+        )
+        .background {
+            if isEmbedded {
+                Palette.bg
+            } else {
+                PanelBackground()
+            }
+        }
         .preferredColorScheme(.dark)
         .onAppear {
             searchFocused = true
@@ -234,6 +251,10 @@ struct OmniSearchView: View {
                         }
                         .padding(.horizontal, 14)
                     }
+
+                    if !recentOcrResults.isEmpty {
+                        ocrResultsSection
+                    }
                 } else {
                     Text("Loading...")
                         .font(Typo.mono(11))
@@ -245,6 +266,105 @@ struct OmniSearchView: View {
         }
     }
 
+    private var recentOcrResults: [OcrWindowResult] {
+        Array(ocrModel.results.values.sorted { $0.timestamp > $1.timestamp }.prefix(10))
+    }
+
+    private var ocrResultsSection: some View {
+        summarySection("SCREEN TEXT", icon: "doc.text.magnifyingglass", count: ocrModel.results.count) {
+            ForEach(recentOcrResults, id: \.wid) { result in
+                ocrResultRow(result)
+            }
+        }
+    }
+
+    private func ocrResultRow(_ result: OcrWindowResult) -> some View {
+        let isExpanded = expandedOcrWindow == result.wid
+        let title = result.title.isEmpty ? "Untitled" : result.title
+        let preview = compactPreview(result.fullText)
+
+        return VStack(alignment: .leading, spacing: 5) {
+            Button {
+                withAnimation(.easeOut(duration: 0.12)) {
+                    expandedOcrWindow = isExpanded ? nil : result.wid
+                }
+            } label: {
+                VStack(alignment: .leading, spacing: 4) {
+                    HStack(spacing: 7) {
+                        Image(systemName: isExpanded ? "chevron.down" : "chevron.right")
+                            .font(.system(size: 8, weight: .semibold))
+                            .foregroundColor(Palette.textMuted)
+                            .frame(width: 9)
+
+                        Text(result.app)
+                            .font(Typo.monoBold(11))
+                            .foregroundColor(Palette.textDim)
+                            .lineLimit(1)
+
+                        Text(sourceLabel(result.source))
+                            .font(Typo.mono(8))
+                            .foregroundColor(Palette.textMuted)
+                            .padding(.horizontal, 4)
+                            .padding(.vertical, 1)
+                            .background(
+                                RoundedRectangle(cornerRadius: 3)
+                                    .fill(Palette.surface.opacity(0.8))
+                            )
+
+                        Spacer()
+
+                        Text(relativeTime(result.timestamp))
+                            .font(Typo.mono(9))
+                            .foregroundColor(Palette.textMuted)
+                    }
+
+                    Text(title)
+                        .font(Typo.mono(10))
+                        .foregroundColor(Palette.textMuted)
+                        .lineLimit(1)
+
+                    if !isExpanded && !preview.isEmpty {
+                        Text(preview)
+                            .font(Typo.mono(9))
+                            .foregroundColor(Palette.textMuted.opacity(0.75))
+                            .lineLimit(2)
+                    }
+                }
+                .padding(8)
+                .background(
+                    RoundedRectangle(cornerRadius: 5)
+                        .fill(Palette.surface.opacity(isExpanded ? 0.72 : 0.38))
+                        .overlay(
+                            RoundedRectangle(cornerRadius: 5)
+                                .strokeBorder(Color.white.opacity(isExpanded ? 0.10 : 0.05), lineWidth: 0.5)
+                        )
+                )
+                .contentShape(Rectangle())
+            }
+            .buttonStyle(.plain)
+
+            if isExpanded {
+                ScrollView {
+                    Text(result.fullText.isEmpty ? "No text captured." : result.fullText)
+                        .font(Typo.mono(10))
+                        .foregroundColor(Palette.textDim)
+                        .textSelection(.enabled)
+                        .frame(maxWidth: .infinity, alignment: .leading)
+                        .padding(8)
+                }
+                .frame(maxHeight: 140)
+                .background(
+                    RoundedRectangle(cornerRadius: 5)
+                        .fill(Color.black.opacity(0.22))
+                        .overlay(
+                            RoundedRectangle(cornerRadius: 5)
+                                .strokeBorder(Color.white.opacity(0.06), lineWidth: 0.5)
+                        )
+                )
+            }
+        }
+    }
+
     private func summarySection<Content: View>(
         _ title: String,
         icon: String,
@@ -285,4 +405,18 @@ struct OmniSearchView: View {
         if seconds < 3600 { return "\(seconds / 60)m ago" }
         return "\(seconds / 3600)h ago"
     }
+
+    private func sourceLabel(_ source: TextSource) -> String {
+        switch source {
+        case .accessibility: return "AX"
+        case .ocr: return "OCR"
+        }
+    }
+
+    private func compactPreview(_ text: String) -> String {
+        text
+            .components(separatedBy: .whitespacesAndNewlines)
+            .filter { !$0.isEmpty }
+            .joined(separator: " ")
+    }
 }

package/app/Sources/{OmniSearchWindow.swift → Core/Overlays/OmniSearch/OmniSearchWindow.swift}

@@ -34,39 +34,28 @@ final class OmniSearchWindow {
         }
         .preferredColorScheme(.dark)
 
-        let hosting = NSHostingController(rootView: view)
-        hosting.preferredContentSize = NSSize(width: 520, height: 480)
-
-        let p = NSPanel(
-            contentRect: NSRect(x: 0, y: 0, width: 520, height: 480),
-            styleMask: [.titled, .closable, .resizable, .utilityWindow, .nonactivatingPanel],
-            backing: .buffered,
-            defer: false
+        let p = OverlayPanelShell.makePanel(
+            config: .init(
+                size: NSSize(width: 520, height: 480),
+                styleMask: [.titled, .closable, .resizable, .utilityWindow, .nonactivatingPanel],
+                title: "Search",
+                titleVisible: .hidden,
+                titlebarAppearsTransparent: true,
+                background: .material(.popover),
+                cornerRadius: 14,
+                hidesOnDeactivate: false,
+                isMovableByWindowBackground: true,
+                minSize: NSSize(width: 400, height: 300),
+                maxSize: NSSize(width: 700, height: 700),
+                activatesOnMouseDown: true,
+                appearance: NSAppearance(named: .darkAqua)
+            ),
+            rootView: view
         )
-        p.contentViewController = hosting
-        p.title = "Omni Search"
-        p.titlebarAppearsTransparent = true
-        p.titleVisibility = .hidden
-        p.isMovableByWindowBackground = true
-        p.level = .floating
-        p.isOpaque = false
-        p.backgroundColor = NSColor(red: 0.11, green: 0.11, blue: 0.12, alpha: 1.0)
-        p.hasShadow = true
-        p.appearance = NSAppearance(named: .darkAqua)
-        p.collectionBehavior = [.canJoinAllSpaces, .fullScreenAuxiliary]
-        p.minSize = NSSize(width: 400, height: 300)
-        p.maxSize = NSSize(width: 700, height: 700)
-
-        // Center on screen
-        if let screen = NSScreen.main {
-            let visibleFrame = screen.visibleFrame
-            let x = visibleFrame.midX - 260
-            let y = visibleFrame.midY + 60  // slightly above center
-            p.setFrameOrigin(NSPoint(x: x, y: y))
-        }
-
-        p.makeKeyAndOrderFront(nil)
-        NSApp.activate(ignoringOtherApps: true)
+        p.hidesOnDeactivate = false
+        p.becomesKeyOnlyIfNeeded = false
+        OverlayPanelShell.position(p, placement: .centered(yOffsetRatio: 0.125))
+        OverlayPanelShell.present(p)
         panel = p
 
         // Key monitor: Escape → dismiss, arrow keys → navigate, Enter → activate