@lattices/cli 0.4.1 → 0.4.5

package/app/Sources/CompanionActivityLog.swift

@@ -0,0 +1,70 @@
+import DeckKit
+import Foundation
+
+final class CompanionActivityLog {
+    static let shared = CompanionActivityLog()
+
+    private let lock = NSLock()
+    private var entries: [DeckActivityLogEntry] = []
+    private let maxEntries = 120
+
+    private init() {
+        EventBus.shared.subscribe { [weak self] event in
+            self?.record(event)
+        }
+    }
+
+    func record(tag: String, tint: String?, text: String) {
+        let entry = DeckActivityLogEntry(
+            id: UUID().uuidString,
+            createdAt: Date(),
+            tag: tag,
+            tint: tint,
+            text: text
+        )
+
+        lock.lock()
+        entries.append(entry)
+        if entries.count > maxEntries {
+            entries.removeFirst(entries.count - maxEntries)
+        }
+        lock.unlock()
+    }
+
+    func snapshot(limit: Int = 80) -> [DeckActivityLogEntry] {
+        lock.lock()
+        let copy = entries
+        lock.unlock()
+
+        return Array(copy.suffix(limit).reversed())
+    }
+}
+
+private extension CompanionActivityLog {
+    func record(_ event: ModelEvent) {
+        switch event {
+        case .windowsChanged(let windows, let added, let removed):
+            let delta = [added.isEmpty ? nil : "+\(added.count)", removed.isEmpty ? nil : "-\(removed.count)"]
+                .compactMap { $0 }
+                .joined(separator: " ")
+            let suffix = delta.isEmpty ? "" : " (\(delta))"
+            record(tag: "WIN", tint: "blue", text: "\(windows.count) desktop windows\(suffix)")
+
+        case .tmuxChanged(let sessions):
+            record(tag: "TMUX", tint: "green", text: "\(sessions.count) tmux sessions indexed")
+
+        case .layerSwitched(let index):
+            record(tag: "LAYER", tint: "violet", text: "Switched workspace layer \(index + 1)")
+
+        case .processesChanged(let interesting):
+            record(tag: "PROC", tint: "amber", text: "\(interesting.count) terminal processes changed")
+
+        case .ocrScanComplete(let windowCount, let totalBlocks):
+            record(tag: "OCR", tint: "teal", text: "Scanned \(totalBlocks) text blocks across \(windowCount) windows")
+
+        case .voiceCommand(let text, let confidence):
+            let pct = Int((confidence * 100).rounded())
+            record(tag: "VOICE", tint: "red", text: "\"\(text)\" · \(pct)%")
+        }
+    }
+}

package/app/Sources/CompanionKeyboardController.swift

@@ -0,0 +1,141 @@
+import AppKit
+import Foundation
+
+enum CompanionKeyboardError: LocalizedError {
+    case unknownKey(String)
+    case eventSourceUnavailable
+
+    var errorDescription: String? {
+        switch self {
+        case .unknownKey(let key):
+            return "Unsupported key for forwarding: \(key)"
+        case .eventSourceUnavailable:
+            return "Unable to create a keyboard event source."
+        }
+    }
+}
+
+final class CompanionKeyboardController {
+    static let shared = CompanionKeyboardController()
+
+    private init() {}
+
+    func send(key rawKey: String, modifiers rawModifiers: [String]) throws -> String {
+        let parsed = parse(key: rawKey, modifiers: rawModifiers)
+        guard let keyCode = keyCode(for: parsed.key) else {
+            throw CompanionKeyboardError.unknownKey(rawKey)
+        }
+        guard let source = CGEventSource(stateID: .combinedSessionState) else {
+            throw CompanionKeyboardError.eventSourceUnavailable
+        }
+
+        let flags = eventFlags(for: parsed.modifiers)
+        guard
+            let down = CGEvent(keyboardEventSource: source, virtualKey: keyCode, keyDown: true),
+            let up = CGEvent(keyboardEventSource: source, virtualKey: keyCode, keyDown: false)
+        else {
+            throw CompanionKeyboardError.eventSourceUnavailable
+        }
+
+        down.flags = flags
+        up.flags = flags
+        down.post(tap: .cghidEventTap)
+        usleep(12_000)
+        up.post(tap: .cghidEventTap)
+
+        return displayName(key: parsed.key, modifiers: parsed.modifiers)
+    }
+}
+
+private extension CompanionKeyboardController {
+    func parse(key rawKey: String, modifiers rawModifiers: [String]) -> (key: String, modifiers: Set<String>) {
+        var modifiers = Set(rawModifiers.map(normalizeModifier).filter { !$0.isEmpty })
+        var key = rawKey
+            .trimmingCharacters(in: .whitespacesAndNewlines)
+            .lowercased()
+
+        let symbolModifiers: [(String, String)] = [
+            ("⌘", "command"),
+            ("cmd", "command"),
+            ("command", "command"),
+            ("⌥", "option"),
+            ("option", "option"),
+            ("alt", "option"),
+            ("⌃", "control"),
+            ("ctrl", "control"),
+            ("control", "control"),
+            ("⇧", "shift"),
+            ("shift", "shift"),
+        ]
+
+        for (symbol, modifier) in symbolModifiers where key.contains(symbol) {
+            modifiers.insert(modifier)
+            key = key.replacingOccurrences(of: symbol, with: "")
+        }
+
+        key = key
+            .replacingOccurrences(of: "+", with: "")
+            .replacingOccurrences(of: " ", with: "")
+            .replacingOccurrences(of: "⎋", with: "escape")
+            .replacingOccurrences(of: "⇥", with: "tab")
+            .replacingOccurrences(of: "↩", with: "enter")
+            .replacingOccurrences(of: "⏎", with: "enter")
+            .replacingOccurrences(of: "return", with: "enter")
+            .replacingOccurrences(of: "←", with: "left")
+            .replacingOccurrences(of: "→", with: "right")
+            .replacingOccurrences(of: "↑", with: "up")
+            .replacingOccurrences(of: "↓", with: "down")
+
+        if key == "esc" {
+            key = "escape"
+        }
+
+        return (key.isEmpty ? rawKey.lowercased() : key, modifiers)
+    }
+
+    func normalizeModifier(_ modifier: String) -> String {
+        switch modifier.trimmingCharacters(in: .whitespacesAndNewlines).lowercased() {
+        case "cmd", "command", "meta", "⌘":
+            return "command"
+        case "opt", "option", "alt", "⌥":
+            return "option"
+        case "ctrl", "control", "⌃":
+            return "control"
+        case "shift", "⇧":
+            return "shift"
+        default:
+            return ""
+        }
+    }
+
+    func eventFlags(for modifiers: Set<String>) -> CGEventFlags {
+        var flags: CGEventFlags = []
+        if modifiers.contains("command") { flags.insert(.maskCommand) }
+        if modifiers.contains("option") { flags.insert(.maskAlternate) }
+        if modifiers.contains("control") { flags.insert(.maskControl) }
+        if modifiers.contains("shift") { flags.insert(.maskShift) }
+        return flags
+    }
+
+    func keyCode(for key: String) -> CGKeyCode? {
+        let codes: [String: CGKeyCode] = [
+            "a": 0, "s": 1, "d": 2, "f": 3, "h": 4, "g": 5, "z": 6, "x": 7,
+            "c": 8, "v": 9, "b": 11, "q": 12, "w": 13, "e": 14, "r": 15,
+            "y": 16, "t": 17, "1": 18, "2": 19, "3": 20, "4": 21, "6": 22,
+            "5": 23, "=": 24, "9": 25, "7": 26, "-": 27, "8": 28, "0": 29,
+            "]": 30, "o": 31, "u": 32, "[": 33, "i": 34, "p": 35, "enter": 36,
+            "l": 37, "j": 38, "'": 39, "k": 40, ";": 41, "\\": 42, ",": 43,
+            "/": 44, "n": 45, "m": 46, ".": 47, "tab": 48, "space": 49,
+            "`": 50, "delete": 51, "backspace": 51, "escape": 53,
+            "command": 55, "cmd": 55, "shift": 56, "capslock": 57, "option": 58,
+            "alt": 58, "control": 59, "left": 123, "right": 124, "down": 125,
+            "up": 126,
+        ]
+        return codes[key]
+    }
+
+    func displayName(key: String, modifiers: Set<String>) -> String {
+        let ordered = ["control", "option", "shift", "command"].filter { modifiers.contains($0) }
+        return (ordered + [key]).joined(separator: "+")
+    }
+}

package/app/Sources/DesktopModel.swift

@@ -81,6 +81,10 @@ final class DesktopModel: ObservableObject {
         Array(windows.values).sorted { $0.zIndex < $1.zIndex }
     }
 
+    func frontmostWindow() -> WindowEntry? {
+        windows.values.min { $0.zIndex < $1.zIndex }
+    }
+
     func lastInteractionDate(for wid: UInt32) -> Date? {
         interactionDates[wid]
     }

package/app/Sources/HandsOffSession.swift

@@ -43,7 +43,14 @@ final class HandsOffSession: ObservableObject {
         case thinking
     }
 
-    @Published var state: State = .idle
+    @Published var state: State = .idle {
+        didSet {
+            if state != oldValue {
+                stateChangedAt = Date()
+            }
+        }
+    }
+    @Published private(set) var stateChangedAt: Date = Date()
     @Published var lastTranscript: String?
     @Published var lastResponse: String?
     @Published var audibleFeedbackEnabled: Bool = false
@@ -58,6 +65,7 @@ final class HandsOffSession: ObservableObject {
         let frame: WindowFrame
     }
     private(set) var frameHistory: [FrameSnapshot] = []
+    private(set) var frameHistoryUpdatedAt: Date?
 
     /// Snapshot current frames for all windows that are about to be moved.
     /// Stores frames in CG/AX coordinates (top-left origin) for direct use with batchRestoreWindows.
@@ -77,10 +85,12 @@ final class HandsOffSession: ObservableObject {
                 break
             }
         }
+        frameHistoryUpdatedAt = frameHistory.isEmpty ? nil : Date()
     }
 
     func clearFrameHistory() {
         frameHistory.removeAll()
+        frameHistoryUpdatedAt = nil
     }
 
     /// Running chat log — visible in the voice chat panel. Persists across turns.
@@ -97,6 +107,15 @@ final class HandsOffSession: ObservableObject {
     private var workerBuffer = ""
     private let workerQueue = DispatchQueue(label: "com.lattices.handsoff-worker", qos: .userInitiated)
     private var lastCueAt: Date = .distantPast
+    private var workerRoot: String? {
+        if let idx = CommandLine.arguments.firstIndex(of: "--lattices-cli-root"),
+           CommandLine.arguments.indices.contains(idx + 1) {
+            return CommandLine.arguments[idx + 1]
+        }
+
+        let devRoot = NSHomeDirectory() + "/dev/lattices"
+        return FileManager.default.fileExists(atPath: devRoot) ? devRoot : nil
+    }
 
     /// JSONL log for full turn data — ~/.lattices/handsoff.jsonl
     private let turnLogPath = NSHomeDirectory() + "/.lattices/handsoff.jsonl"
@@ -122,7 +141,7 @@ final class HandsOffSession: ObservableObject {
     // MARK: - Lifecycle
 
     func start() {
-        startWorker()
+        // Worker startup is lazy — only start it when a voice turn or cached cue needs it.
     }
 
     func setAudibleFeedbackEnabled(_ enabled: Bool) {
@@ -170,9 +189,10 @@ final class HandsOffSession: ObservableObject {
         }
     }
 
-    private func startWorker() {
+    @discardableResult
+    private func startWorker() -> Bool {
         if workerProcess?.isRunning == true, workerStdin != nil {
-            return
+            return true
         }
 
         let bunPaths = [
@@ -182,19 +202,24 @@ final class HandsOffSession: ObservableObject {
         ]
         guard let bunPath = bunPaths.first(where: { FileManager.default.isExecutableFile(atPath: $0) }) else {
             DiagnosticLog.shared.warn("HandsOff: bun not found, worker disabled")
-            return
+            return false
         }
 
-        let scriptPath = NSHomeDirectory() + "/dev/lattices/bin/handsoff-worker.ts"
+        guard let workerRoot else {
+            DiagnosticLog.shared.warn("HandsOff: worker root not found, worker disabled")
+            return false
+        }
+
+        let scriptPath = workerRoot + "/bin/handsoff-worker.ts"
         guard FileManager.default.fileExists(atPath: scriptPath) else {
             DiagnosticLog.shared.warn("HandsOff: worker script not found at \(scriptPath)")
-            return
+            return false
         }
 
         let proc = Process()
         proc.executableURL = URL(fileURLWithPath: bunPath)
         proc.arguments = ["run", scriptPath]
-        proc.currentDirectoryURL = URL(fileURLWithPath: NSHomeDirectory() + "/dev/lattices")
+        proc.currentDirectoryURL = URL(fileURLWithPath: workerRoot)
 
         var env = ProcessInfo.processInfo.environment
         env.removeValue(forKey: "CLAUDECODE")
@@ -211,7 +236,7 @@ final class HandsOffSession: ObservableObject {
             try proc.run()
         } catch {
             DiagnosticLog.shared.warn("HandsOff: failed to start worker — \(error)")
-            return
+            return false
         }
 
         workerProcess = proc
@@ -235,17 +260,22 @@ final class HandsOffSession: ObservableObject {
 
         // Handle worker crash → restart
         proc.terminationHandler = { [weak self] proc in
-            DiagnosticLog.shared.warn("HandsOff: worker exited (code \(proc.terminationStatus)), restarting in 2s")
-            self?.workerProcess = nil
-            self?.workerStdin = nil
+            guard let self else { return }
+            let keepWarm = self.audibleFeedbackEnabled || self.state != .idle
+            let suffix = keepWarm ? ", restarting in 2s" : ", staying idle"
+            DiagnosticLog.shared.warn("HandsOff: worker exited (code \(proc.terminationStatus))\(suffix)")
+            self.workerProcess = nil
+            self.workerStdin = nil
+            guard keepWarm else { return }
             DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
-                self?.startWorker()
+                self.startWorker()
             }
         }
 
         // Ping to verify
         sendToWorker(["cmd": "ping"])
         DiagnosticLog.shared.info("HandsOff: worker started (pid \(proc.processIdentifier))")
+        return true
     }
 
     // MARK: - Worker communication
@@ -307,7 +337,9 @@ final class HandsOffSession: ObservableObject {
                 }
             }
 
-            // Single dispatch — all @Published mutations in one block
+            // Single dispatch — all @Published mutations in one block.
+            // The pending callback also mutates @Published state, so it must
+            // run on main with the rest of the turn completion.
             DispatchQueue.main.async { [weak self] in
                 guard let self else { return }
                 if let spoken { self.lastResponse = spoken }
@@ -322,9 +354,8 @@ final class HandsOffSession: ObservableObject {
                     self.executeActions(actions)
                 }
                 self.state = .idle
+                cb?(json)
             }
-
-            cb?(json)
         }
     }
 
@@ -486,6 +517,12 @@ final class HandsOffSession: ObservableObject {
 
     private func processTurn(_ transcript: String) {
         state = .thinking
+        guard startWorker() else {
+            state = .idle
+            DiagnosticLog.shared.warn("HandsOff: worker unavailable")
+            playSound("Basso")
+            return
+        }
         turnCount += 1
 
         let turnStart = Date()

package/app/Sources/HomeDashboardView.swift

@@ -4,6 +4,7 @@ struct HomeDashboardView: View {
     var onNavigate: ((AppPage) -> Void)? = nil
 
     @ObservedObject private var scanner = ProjectScanner.shared
+    @ObservedObject private var piSession = PiChatSession.shared
 
     var body: some View {
         VStack(spacing: 0) {
@@ -16,6 +17,9 @@ struct HomeDashboardView: View {
             MainView(scanner: scanner, layout: .embedded)
         }
         .background(Palette.bg)
+        .onAppear {
+            piSession.refreshBinaryAvailability()
+        }
     }
 
     private var hero: some View {
@@ -26,7 +30,7 @@ struct HomeDashboardView: View {
                         .font(Typo.heading(18))
                         .foregroundColor(Palette.text)
 
-                    Text("Launch workspaces, jump into the screen map, or open a full Pi session from one place.")
+                    Text("Workspace status, project launch, layout, search, and chat in one place.")
                         .font(Typo.mono(11))
                         .foregroundColor(Palette.textDim)
                         .fixedSize(horizontal: false, vertical: true)
@@ -37,8 +41,8 @@ struct HomeDashboardView: View {
 
             HStack(spacing: 10) {
                 homeActionCard(
-                    title: "Screen Map",
-                    subtitle: "Spatial window layout",
+                    title: "Layout",
+                    subtitle: "Arrange windows",
                     icon: "rectangle.3.group",
                     tint: Palette.running
                 ) {
@@ -46,19 +50,23 @@ struct HomeDashboardView: View {
                 }
 
                 homeActionCard(
-                    title: "Desktop Inventory",
-                    subtitle: "Enumerate displays and spaces",
-                    icon: "macwindow.on.rectangle",
+                    title: "Search",
+                    subtitle: "Find workspace context",
+                    icon: "magnifyingglass",
                     tint: Palette.detach
                 ) {
                     onNavigate?(.desktopInventory)
                 }
 
                 homeActionCard(
-                    title: "Pi Workspace",
-                    subtitle: "Standalone conversation surface",
-                    icon: "terminal",
-                    tint: Palette.text
+                    title: "Chat",
+                    subtitle: piSession.hasPiBinary
+                        ? (piSession.needsProviderSetup || piSession.isAuthenticating
+                            ? piSession.setupStatusSummary
+                            : "Standalone conversation surface")
+                        : "Install Pi to enable the assistant",
+                    icon: "bubble.left.and.bubble.right",
+                    tint: piSession.hasPiBinary ? Palette.text : Palette.kill
                 ) {
                     onNavigate?(.pi)
                 }

package/app/Sources/HotkeyStore.swift

@@ -31,7 +31,7 @@ enum HotkeyAction: String, CaseIterable, Codable {
     // Tiling
     case tileLeft, tileRight, tileMaximize, tileCenter
     case tileTopLeft, tileTopRight, tileBottomLeft, tileBottomRight
-    case tileTop, tileBottom, tileDistribute
+    case tileTop, tileBottom, tileDistribute, tileTypeGrid
     case tileLeftThird, tileCenterThird, tileRightThird
 
     var label: String {
@@ -40,11 +40,11 @@ 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 .desktopInventory: return "Search"
+        case .omniSearch:      return "Search"
         case .voiceCommand:    return "Voice Command"
         case .handsOff:        return "Hands-Off Mode"
-        case .unifiedWindow:   return "Unified Window"
+        case .unifiedWindow:   return "Workspace Home"
         case .hud:             return "HUD"
         case .mouseFinder:     return "Find Mouse"
         case .layer1:          return "Layer 1"
@@ -70,6 +70,7 @@ enum HotkeyAction: String, CaseIterable, Codable {
         case .tileTop:         return "Top Half"
         case .tileBottom:      return "Bottom Half"
         case .tileDistribute:  return "Distribute"
+        case .tileTypeGrid:    return "Grid Type"
         case .tileLeftThird:   return "Left Third"
         case .tileCenterThird: return "Center Third"
         case .tileRightThird:  return "Right Third"
@@ -122,6 +123,7 @@ enum HotkeyAction: String, CaseIterable, Codable {
         case .tileTop:         return 308
         case .tileBottom:      return 309
         case .tileDistribute:  return 310
+        case .tileTypeGrid:    return 314
         case .tileLeftThird:   return 311
         case .tileCenterThird: return 312
         case .tileRightThird:  return 313
@@ -226,7 +228,7 @@ class HotkeyStore: ObservableObject {
 
         // App
         bind(.palette,   46, cmdShift)   // Cmd+Shift+M
-        bind(.unifiedWindow, 18, hyper)  // Hyper+1 (Screen Map + Desktop Inventory)
+        bind(.unifiedWindow, 18, hyper)  // Hyper+1 (Workspace Home)
         bind(.bezel,     19, hyper)      // Hyper+2
         bind(.hud,       20, hyper)      // Hyper+3 (HUD overlay)
         bind(.voiceCommand, 21, hyper)   // Hyper+4 (moved from Hyper+3)
@@ -259,6 +261,7 @@ class HotkeyStore: ObservableObject {
         bind(.tileBottomLeft,   38, ctrlOpt)  // Ctrl+Opt+J
         bind(.tileBottomRight,  40, ctrlOpt)  // Ctrl+Opt+K
         bind(.tileDistribute,    2, ctrlOpt)  // Ctrl+Opt+D
+        bind(.tileTypeGrid,      5, hyper)    // Hyper+G
         bind(.tileLeftThird,    18, ctrlOpt)  // Ctrl+Opt+1
         bind(.tileCenterThird,  19, ctrlOpt)  // Ctrl+Opt+2
         bind(.tileRightThird,   20, ctrlOpt)  // Ctrl+Opt+3

package/app/Sources/IntentEngine.swift

@@ -381,7 +381,7 @@ final class IntentEngine {
 
         register(IntentDef(
             name: "distribute",
-            description: "Distribute windows evenly in a grid, optionally filtered by app and constrained to a screen region",
+            description: "Distribute windows evenly in a grid, optionally filtered by app or window type and constrained to a screen region",
             examples: [
                 "spread out the windows",
                 "distribute everything",
@@ -394,6 +394,9 @@ final class IntentEngine {
             slots: [
                 IntentSlot(name: "app", type: "string", required: false,
                            description: "Filter to windows of this app (e.g. 'iTerm2', 'Google Chrome')", enumValues: nil),
+                IntentSlot(name: "type", type: "string", required: false,
+                           description: "Filter to a window type (e.g. 'terminal', 'browser', 'editor')",
+                           enumValues: AppType.allCases.map(\.rawValue)),
                 IntentSlot(name: "region", type: "position", required: false,
                            description: "Constrain the grid to a screen region. Uses tile position names.",
                            enumValues: ["left", "right", "top", "bottom", "top-left", "top-right", "bottom-left", "bottom-right",
@@ -404,6 +407,9 @@ final class IntentEngine {
                 if let app = req.slots["app"]?.stringValue {
                     params["app"] = .string(app)
                 }
+                if let type = req.slots["type"]?.stringValue {
+                    params["type"] = .string(type)
+                }
                 if let region = req.slots["region"]?.stringValue {
                     params["region"] = .string(region)
                 }