@lattices/cli 0.4.14 → 0.6.0

package/apps/mac/Sources/Core/Input/MouseInputDeviceStore.swift

@@ -1,98 +0,0 @@
-import Foundation
-import IOKit.hid
-
-struct MouseInputDeviceInfo: Identifiable, Equatable {
-    var id: String
-    var vendorId: Int?
-    var productId: Int?
-    var locationId: Int?
-    var product: String?
-    var manufacturer: String?
-    var transport: String?
-
-    var summary: String {
-        var parts: [String] = []
-        if let product, !product.isEmpty {
-            parts.append(product)
-        }
-        if let manufacturer, !manufacturer.isEmpty, parts.isEmpty {
-            parts.append(manufacturer)
-        }
-        if let vendorId { parts.append("vid:\(vendorId)") }
-        if let productId { parts.append("pid:\(productId)") }
-        if let locationId { parts.append("loc:\(locationId)") }
-        if let transport, !transport.isEmpty { parts.append(transport) }
-        return parts.isEmpty ? "Unknown pointer device" : parts.joined(separator: " | ")
-    }
-}
-
-final class MouseInputDeviceStore: ObservableObject {
-    static let shared = MouseInputDeviceStore()
-
-    @Published private(set) var devices: [MouseInputDeviceInfo] = []
-
-    private init() {
-        refresh()
-    }
-
-    func refresh() {
-        let manager = IOHIDManagerCreate(kCFAllocatorDefault, IOOptionBits(kIOHIDOptionsTypeNone))
-        let matches: [[String: Any]] = [
-            [
-                kIOHIDDeviceUsagePageKey as String: kHIDPage_GenericDesktop,
-                kIOHIDDeviceUsageKey as String: kHIDUsage_GD_Mouse,
-            ],
-            [
-                kIOHIDDeviceUsagePageKey as String: kHIDPage_GenericDesktop,
-                kIOHIDDeviceUsageKey as String: kHIDUsage_GD_Pointer,
-            ],
-        ]
-        IOHIDManagerSetDeviceMatchingMultiple(manager, matches as CFArray)
-        IOHIDManagerOpen(manager, IOOptionBits(kIOHIDOptionsTypeNone))
-
-        let resolved: [MouseInputDeviceInfo]
-        if let rawDevices = IOHIDManagerCopyDevices(manager) as? Set<IOHIDDevice> {
-            resolved = rawDevices.compactMap(Self.deviceInfo(for:))
-                .sorted { $0.summary.localizedCaseInsensitiveCompare($1.summary) == .orderedAscending }
-        } else {
-            resolved = []
-        }
-
-        DispatchQueue.main.async {
-            self.devices = resolved
-        }
-    }
-
-    private static func deviceInfo(for device: IOHIDDevice) -> MouseInputDeviceInfo? {
-        let vendorId = integerProperty(kIOHIDVendorIDKey as CFString, from: device)
-        let productId = integerProperty(kIOHIDProductIDKey as CFString, from: device)
-        let locationId = integerProperty(kIOHIDLocationIDKey as CFString, from: device)
-        let product = stringProperty(kIOHIDProductKey as CFString, from: device)
-        let manufacturer = stringProperty(kIOHIDManufacturerKey as CFString, from: device)
-        let transport = stringProperty(kIOHIDTransportKey as CFString, from: device)
-
-        let vendorToken = vendorId.map(String.init) ?? "vid"
-        let productToken = productId.map(String.init) ?? "pid"
-        let locationToken = locationId.map(String.init) ?? "loc"
-        let id = [product ?? "mouse", vendorToken, productToken, locationToken].joined(separator: ":")
-
-        return MouseInputDeviceInfo(
-            id: id,
-            vendorId: vendorId,
-            productId: productId,
-            locationId: locationId,
-            product: product,
-            manufacturer: manufacturer,
-            transport: transport
-        )
-    }
-
-    private static func integerProperty(_ key: CFString, from device: IOHIDDevice) -> Int? {
-        guard let value = IOHIDDeviceGetProperty(device, key) else { return nil }
-        return (value as? NSNumber)?.intValue
-    }
-
-    private static func stringProperty(_ key: CFString, from device: IOHIDDevice) -> String? {
-        IOHIDDeviceGetProperty(device, key) as? String
-    }
-}

package/apps/mac/Sources/Core/Input/MouseInputEventViewer.swift

@@ -1,272 +0,0 @@
-import AppKit
-import SwiftUI
-
-final class MouseInputEventViewer: ObservableObject {
-    static let shared = MouseInputEventViewer()
-
-    struct Entry: Identifiable {
-        let id = UUID()
-        let timestamp: Date
-        let phase: String
-        let appName: String
-        let bundleId: String
-        let buttonNumber: Int
-        let triggerCandidate: String
-        let deltaText: String
-        let modifiersText: String
-        let deviceText: String
-        let matchText: String
-        let note: String
-    }
-
-    @Published private(set) var entries: [Entry] = []
-    @Published private(set) var isCaptureActive = false
-
-    private let maxEntries = 120
-    private var window: NSWindow?
-    private var closeObserver: Any?
-
-    private init() {}
-
-    func show() {
-        if let window {
-            isCaptureActive = true
-            window.makeKeyAndOrderFront(nil)
-            NSApp.activate(ignoringOtherApps: true)
-            return
-        }
-
-        let view = MouseInputEventViewerView()
-        let window = AppWindowShell.makeWindow(
-            config: .init(
-                title: "Mouse Shortcut Event Viewer",
-                initialSize: NSSize(width: 980, height: 620),
-                minSize: NSSize(width: 840, height: 460),
-                maxSize: NSSize(width: 1500, height: 1000)
-            ),
-            rootView: view
-        )
-        AppWindowShell.positionCentered(window)
-        AppWindowShell.present(window)
-
-        closeObserver = NotificationCenter.default.addObserver(
-            forName: NSWindow.willCloseNotification,
-            object: window,
-            queue: .main
-        ) { [weak self] _ in
-            self?.teardownWindow()
-        }
-
-        self.window = window
-        isCaptureActive = true
-        DiagnosticLog.shared.info("Mouse shortcuts event viewer opened")
-    }
-
-    func dismiss() {
-        window?.close()
-        teardownWindow()
-    }
-
-    func clear() {
-        entries.removeAll()
-    }
-
-    func record(_ observedEvent: MouseShortcutObservedEvent) {
-        let entry = Entry(
-            timestamp: observedEvent.timestamp,
-            phase: observedEvent.phase,
-            appName: observedEvent.frontmostAppName ?? "Unknown App",
-            bundleId: observedEvent.frontmostBundleId ?? "unknown.bundle",
-            buttonNumber: observedEvent.buttonNumber,
-            triggerCandidate: observedEvent.candidateTrigger ?? "--",
-            deltaText: "\(Int(observedEvent.delta.x)), \(Int(observedEvent.delta.y))",
-            modifiersText: Self.modifierLabels(for: observedEvent.modifiers).joined(separator: "+").ifEmpty("--"),
-            deviceText: observedEvent.device?.summary ?? "Unresolved device",
-            matchText: observedEvent.matchedRuleSummary ?? (observedEvent.willFire ? "Would fire" : "No match"),
-            note: observedEvent.note ?? ""
-        )
-
-        DispatchQueue.main.async {
-            self.entries.append(entry)
-            if self.entries.count > self.maxEntries {
-                self.entries.removeFirst(self.entries.count - self.maxEntries)
-            }
-        }
-    }
-
-    private func teardownWindow() {
-        if let closeObserver {
-            NotificationCenter.default.removeObserver(closeObserver)
-            self.closeObserver = nil
-        }
-        window = nil
-        isCaptureActive = false
-    }
-
-    private static func modifierLabels(for flags: NSEvent.ModifierFlags) -> [String] {
-        var labels: [String] = []
-        if flags.contains(.control) { labels.append("Ctrl") }
-        if flags.contains(.option) { labels.append("Option") }
-        if flags.contains(.shift) { labels.append("Shift") }
-        if flags.contains(.command) { labels.append("Cmd") }
-        return labels
-    }
-}
-
-private struct MouseInputEventViewerView: View {
-    @ObservedObject private var viewer = MouseInputEventViewer.shared
-    @ObservedObject private var devices = MouseInputDeviceStore.shared
-
-    private static let timestampFormatter: DateFormatter = {
-        let formatter = DateFormatter()
-        formatter.dateFormat = "HH:mm:ss.SSS"
-        return formatter
-    }()
-
-    var body: some View {
-        VStack(spacing: 0) {
-            header
-            Divider()
-                .overlay(Color.white.opacity(0.08))
-            ScrollView {
-                LazyVStack(alignment: .leading, spacing: 8) {
-                    if devices.devices.isEmpty {
-                        deviceStrip(text: "Devices: none detected")
-                    } else {
-                        deviceStrip(text: "Devices: " + devices.devices.map(\.summary).joined(separator: "  |  "))
-                    }
-
-                    ForEach(viewer.entries) { entry in
-                        entryRow(entry)
-                    }
-                }
-                .padding(14)
-            }
-            .background(Color.black.opacity(0.16))
-        }
-    }
-
-    private var header: some View {
-        HStack(spacing: 12) {
-            VStack(alignment: .leading, spacing: 4) {
-                Text("Mouse Shortcut Event Viewer")
-                    .font(.system(size: 14, weight: .semibold, design: .monospaced))
-                    .foregroundColor(.white.opacity(0.95))
-                Text("Watching extra mouse buttons and drag candidates for configurable shortcuts.")
-                    .font(.system(size: 11))
-                    .foregroundColor(.white.opacity(0.6))
-            }
-
-            Spacer()
-
-            Button("Copy") {
-                let text = viewer.entries.map { entry in
-                    [
-                        Self.timestampFormatter.string(from: entry.timestamp),
-                        entry.phase,
-                        entry.appName,
-                        entry.bundleId,
-                        "button=\(entry.buttonNumber)",
-                        "candidate=\(entry.triggerCandidate)",
-                        "delta=\(entry.deltaText)",
-                        "mods=\(entry.modifiersText)",
-                        "device=\(entry.deviceText)",
-                        "match=\(entry.matchText)",
-                        entry.note,
-                    ].filter { !$0.isEmpty }.joined(separator: " | ")
-                }.joined(separator: "\n")
-                NSPasteboard.general.clearContents()
-                NSPasteboard.general.setString(text, forType: .string)
-            }
-            .buttonStyle(.plain)
-            .foregroundColor(.white.opacity(0.72))
-
-            Button("Clear") {
-                viewer.clear()
-            }
-            .buttonStyle(.plain)
-            .foregroundColor(.white.opacity(0.72))
-        }
-        .padding(.horizontal, 16)
-        .padding(.vertical, 12)
-        .background(Color.white.opacity(0.04))
-    }
-
-    private func deviceStrip(text: String) -> some View {
-        Text(text)
-            .font(.system(size: 10, weight: .medium, design: .monospaced))
-            .foregroundColor(.white.opacity(0.6))
-            .padding(.horizontal, 10)
-            .padding(.vertical, 8)
-            .frame(maxWidth: .infinity, alignment: .leading)
-            .background(
-                RoundedRectangle(cornerRadius: 10)
-                    .fill(Color.white.opacity(0.04))
-            )
-    }
-
-    private func entryRow(_ entry: MouseInputEventViewer.Entry) -> some View {
-        VStack(alignment: .leading, spacing: 6) {
-            HStack(alignment: .firstTextBaseline, spacing: 10) {
-                Text(Self.timestampFormatter.string(from: entry.timestamp))
-                    .font(.system(size: 11, weight: .medium, design: .monospaced))
-                    .foregroundColor(.white.opacity(0.82))
-
-                Text(entry.phase.uppercased())
-                    .font(.system(size: 10, weight: .bold, design: .monospaced))
-                    .foregroundColor(Color(red: 0.62, green: 0.84, blue: 1.0))
-
-                Text(entry.triggerCandidate)
-                    .font(.system(size: 11, weight: .semibold, design: .monospaced))
-                    .foregroundColor(.white.opacity(0.94))
-
-                Spacer()
-
-                Text(entry.matchText)
-                    .font(.system(size: 10, weight: .medium, design: .monospaced))
-                    .foregroundColor(.white.opacity(0.68))
-            }
-
-            HStack(spacing: 14) {
-                metadataPill("App", "\(entry.appName) (\(entry.bundleId))")
-                metadataPill("Button", "\(entry.buttonNumber)")
-                metadataPill("Delta", entry.deltaText)
-                metadataPill("Mods", entry.modifiersText)
-            }
-
-            HStack(spacing: 14) {
-                metadataPill("Device", entry.deviceText)
-                if !entry.note.isEmpty {
-                    metadataPill("Note", entry.note)
-                }
-            }
-        }
-        .padding(12)
-        .frame(maxWidth: .infinity, alignment: .leading)
-        .background(
-            RoundedRectangle(cornerRadius: 12)
-                .fill(Color.white.opacity(0.04))
-                .overlay(
-                    RoundedRectangle(cornerRadius: 12)
-                        .stroke(Color.white.opacity(0.06), lineWidth: 0.5)
-                )
-        )
-    }
-
-    private func metadataPill(_ label: String, _ value: String) -> some View {
-        HStack(spacing: 6) {
-            Text(label.uppercased())
-                .font(.system(size: 9, weight: .bold, design: .monospaced))
-                .foregroundColor(.white.opacity(0.42))
-            Text(value)
-                .font(.system(size: 10, weight: .medium, design: .monospaced))
-                .foregroundColor(.white.opacity(0.82))
-        }
-    }
-}
-
-private extension String {
-    func ifEmpty(_ replacement: String) -> String {
-        isEmpty ? replacement : self
-    }
-}

package/apps/mac/Sources/Core/Input/MouseShortcutStore.swift

@@ -1,170 +0,0 @@
-import AppKit
-import Combine
-import Foundation
-
-final class MouseShortcutStore: ObservableObject {
-    static let shared = MouseShortcutStore()
-
-    /// Drives SwiftUI bindings; mutations always happen on main.
-    @Published private(set) var config: MouseShortcutConfig
-
-    let configURL: URL
-
-    /// Lock-protected mirror of `config` for tap-thread reads. The mouse event
-    /// tap fires on a non-main thread (EventTapThread) and reads
-    /// `watchedButtonNumbers` to compute the consume-vs-pass verdict; mutating
-    /// `config` (a struct) on main while reading from the tap thread is a
-    /// torn-read race. All tap-thread accessors read this snapshot under
-    /// `stateLock`.
-    private let stateLock = NSLock()
-    private var snapshot: MouseShortcutConfig
-    private var lastLoadedModifiedDate: Date?
-
-    private init() {
-        let dir = FileManager.default.homeDirectoryForCurrentUser
-            .appendingPathComponent(".lattices")
-        try? FileManager.default.createDirectory(at: dir, withIntermediateDirectories: true)
-        self.configURL = dir.appendingPathComponent("mouse-shortcuts.json")
-        self.config = .defaults
-        self.snapshot = .defaults
-        ensureConfigFile()
-        reload()
-    }
-
-    var tuning: MouseShortcutTuning {
-        stateLock.lock(); defer { stateLock.unlock() }
-        return snapshot.tuning
-    }
-
-    var enabledRules: [MouseShortcutRule] {
-        stateLock.lock(); defer { stateLock.unlock() }
-        return snapshot.rules.filter(\.enabled)
-    }
-
-    var watchedButtonNumbers: Set<Int64> {
-        stateLock.lock(); defer { stateLock.unlock() }
-        return Set(snapshot.rules.filter(\.enabled).map { Int64($0.trigger.button.rawButtonNumber) })
-    }
-
-    func hasEnabledRule(button: MouseShortcutButton, kind: MouseShortcutTriggerKind) -> Bool {
-        stateLock.lock(); defer { stateLock.unlock() }
-        return snapshot.rules.contains { rule in
-            rule.enabled
-                && rule.trigger.button == button
-                && rule.trigger.kind == kind
-        }
-    }
-
-    var summaryLines: [String] {
-        stateLock.lock(); defer { stateLock.unlock() }
-        return snapshot.rules.filter(\.enabled).map { "\($0.trigger.triggerName) -> \($0.action.type.rawValue)" }
-    }
-
-    func visualHint(for button: MouseShortcutButton) -> MouseShortcutVisualDefinition? {
-        stateLock.lock(); defer { stateLock.unlock() }
-        return snapshot.rules.filter(\.enabled).first { $0.trigger.button == button && $0.visual != nil }?.visual
-    }
-
-    func ensureConfigFile() {
-        guard !FileManager.default.fileExists(atPath: configURL.path) else { return }
-        write(config: .defaults)
-    }
-
-    func reload() {
-        let newDate = modifiedDate()
-        let newConfig: MouseShortcutConfig
-        if let data = FileManager.default.contents(atPath: configURL.path) {
-            do {
-                newConfig = try JSONDecoder().decode(MouseShortcutConfig.self, from: data)
-            } catch {
-                DiagnosticLog.shared.error("MouseShortcutStore: failed to decode mouse-shortcuts.json - \(error.localizedDescription)")
-                newConfig = .defaults
-            }
-        } else {
-            newConfig = .defaults
-        }
-        stateLock.lock()
-        snapshot = newConfig
-        lastLoadedModifiedDate = newDate
-        stateLock.unlock()
-        // @Published mutation must happen on main.
-        if Thread.isMainThread {
-            config = newConfig
-        } else {
-            DispatchQueue.main.async { [weak self] in
-                self?.config = newConfig
-            }
-        }
-    }
-
-    func reloadIfNeeded() {
-        // Called from the mouse event-tap thread (and from main paths). The
-        // stat is cheap and thread-safe; we claim the new mtime up-front so
-        // concurrent calls don't queue duplicate reloads while one is in
-        // flight (if reload fails to decode, we'll retry on the next mtime
-        // change).
-        let currentModifiedDate = modifiedDate()
-        stateLock.lock()
-        let needsReload = currentModifiedDate != lastLoadedModifiedDate
-        if needsReload {
-            lastLoadedModifiedDate = currentModifiedDate
-        }
-        stateLock.unlock()
-        guard needsReload else { return }
-        reload()
-    }
-
-    func restoreDefaults() {
-        write(config: .defaults)
-        reload()
-        DiagnosticLog.shared.info("Mouse shortcuts restored to defaults")
-    }
-
-    func openConfiguration() {
-        ensureConfigFile()
-        NSWorkspace.shared.open(configURL)
-    }
-
-    func match(for event: MouseShortcutTriggerEvent) -> MouseShortcutMatchResult? {
-        stateLock.lock()
-        let rules = snapshot.rules.filter(\.enabled)
-        stateLock.unlock()
-        for rule in rules {
-            guard rule.trigger.kind == event.kind,
-                  rule.trigger.button == event.button,
-                  rule.device.matches(event.device) else {
-                continue
-            }
-            switch event.kind {
-            case .drag:
-                guard rule.trigger.direction == event.direction else { continue }
-            case .shape:
-                guard rule.trigger.shape == event.shape else { continue }
-            case .click:
-                break
-            }
-
-            return MouseShortcutMatchResult(
-                rule: rule,
-                action: rule.action,
-                triggerName: rule.trigger.triggerName
-            )
-        }
-
-        return nil
-    }
-
-    private func write(config: MouseShortcutConfig) {
-        let encoder = JSONEncoder()
-        encoder.outputFormatting = [.prettyPrinted, .sortedKeys, .withoutEscapingSlashes]
-        guard let data = try? encoder.encode(config) else { return }
-        try? data.write(to: configURL, options: .atomic)
-        let newDate = modifiedDate()
-        stateLock.lock(); lastLoadedModifiedDate = newDate; stateLock.unlock()
-    }
-
-    private func modifiedDate() -> Date? {
-        let attrs = try? FileManager.default.attributesOfItem(atPath: configURL.path)
-        return attrs?[.modificationDate] as? Date
-    }
-}

package/apps/mac/Sources/Core/Input/SecureEventInputMonitor.swift

@@ -1,39 +0,0 @@
-import Carbon
-import Foundation
-
-final class SecureEventInputMonitor {
-    static let shared = SecureEventInputMonitor()
-
-    private var timer: Timer?
-    private var lastEnabled = IsSecureEventInputEnabled()
-
-    private init() {}
-
-    func start() {
-        dispatchPrecondition(condition: .onQueue(.main))
-        guard timer == nil else { return }
-
-        lastEnabled = IsSecureEventInputEnabled()
-        let timer = Timer(timeInterval: 0.25, repeats: true) { [weak self] _ in
-            self?.poll()
-        }
-        self.timer = timer
-        RunLoop.main.add(timer, forMode: .common)
-    }
-
-    func stop() {
-        dispatchPrecondition(condition: .onQueue(.main))
-        timer?.invalidate()
-        timer = nil
-    }
-
-    private func poll() {
-        let enabled = IsSecureEventInputEnabled()
-        guard enabled != lastEnabled else { return }
-
-        lastEnabled = enabled
-        let reason = enabled ? "Secure Event Input enabled" : "Secure Event Input disabled"
-        DiagnosticLog.shared.warn("InputCapture: \(reason)")
-        InputCaptureResetCenter.reset(reason: reason)
-    }
-}