@lattices/cli 0.3.0 → 0.4.0

package/app/Sources/HomeDashboardView.swift

@@ -0,0 +1,125 @@
+import SwiftUI
+
+struct HomeDashboardView: View {
+    var onNavigate: ((AppPage) -> Void)? = nil
+
+    @ObservedObject private var scanner = ProjectScanner.shared
+
+    var body: some View {
+        VStack(spacing: 0) {
+            hero
+
+            Rectangle()
+                .fill(Palette.border)
+                .frame(height: 0.5)
+
+            MainView(scanner: scanner, layout: .embedded)
+        }
+        .background(Palette.bg)
+    }
+
+    private var hero: some View {
+        VStack(alignment: .leading, spacing: 18) {
+            HStack(alignment: .top) {
+                VStack(alignment: .leading, spacing: 8) {
+                    Text("Lattices Home")
+                        .font(Typo.heading(18))
+                        .foregroundColor(Palette.text)
+
+                    Text("Launch workspaces, jump into the screen map, or open a full Pi session from one place.")
+                        .font(Typo.mono(11))
+                        .foregroundColor(Palette.textDim)
+                        .fixedSize(horizontal: false, vertical: true)
+                }
+
+                Spacer()
+            }
+
+            HStack(spacing: 10) {
+                homeActionCard(
+                    title: "Screen Map",
+                    subtitle: "Spatial window layout",
+                    icon: "rectangle.3.group",
+                    tint: Palette.running
+                ) {
+                    onNavigate?(.screenMap)
+                }
+
+                homeActionCard(
+                    title: "Desktop Inventory",
+                    subtitle: "Enumerate displays and spaces",
+                    icon: "macwindow.on.rectangle",
+                    tint: Palette.detach
+                ) {
+                    onNavigate?(.desktopInventory)
+                }
+
+                homeActionCard(
+                    title: "Pi Workspace",
+                    subtitle: "Standalone conversation surface",
+                    icon: "terminal",
+                    tint: Palette.text
+                ) {
+                    onNavigate?(.pi)
+                }
+            }
+        }
+        .padding(.horizontal, 16)
+        .padding(.vertical, 16)
+        .background(
+            LinearGradient(
+                colors: [
+                    Palette.running.opacity(0.08),
+                    Color.black.opacity(0.18),
+                ],
+                startPoint: .topLeading,
+                endPoint: .bottomTrailing
+            )
+        )
+    }
+
+    private func homeActionCard(
+        title: String,
+        subtitle: String,
+        icon: String,
+        tint: Color,
+        action: @escaping () -> Void
+    ) -> some View {
+        Button(action: action) {
+            VStack(alignment: .leading, spacing: 10) {
+                HStack {
+                    Image(systemName: icon)
+                        .font(.system(size: 12, weight: .semibold))
+                        .foregroundColor(tint)
+
+                    Spacer()
+
+                    Circle()
+                        .fill(tint.opacity(0.85))
+                        .frame(width: 6, height: 6)
+                }
+
+                Text(title)
+                    .font(Typo.monoBold(12))
+                    .foregroundColor(Palette.text)
+
+                Text(subtitle)
+                    .font(Typo.mono(10))
+                    .foregroundColor(Palette.textMuted)
+                    .multilineTextAlignment(.leading)
+                    .fixedSize(horizontal: false, vertical: true)
+            }
+            .frame(maxWidth: .infinity, alignment: .leading)
+            .padding(12)
+            .background(
+                RoundedRectangle(cornerRadius: 8)
+                    .fill(Palette.surface.opacity(0.7))
+                    .overlay(
+                        RoundedRectangle(cornerRadius: 8)
+                            .strokeBorder(tint.opacity(0.18), lineWidth: 0.5)
+                    )
+            )
+        }
+        .buttonStyle(.plain)
+    }
+}

package/app/Sources/HotkeyManager.swift

@@ -35,6 +35,7 @@ class HotkeyManager {
                     nil,
                     &hotkeyID
                 )
+                DiagnosticLog.shared.info("HotkeyManager: fired id=\(hotkeyID.id)")
                 hotkeyCallbacks[hotkeyID.id]?()
                 return noErr
             },
@@ -176,6 +177,7 @@ class HotkeyManager {
         )
         if let ref {
             hotKeyRefs[id] = ref
+            DiagnosticLog.shared.info("HotkeyManager: registered id=\(id) keyCode=\(keyCode) mods=\(modifiers)")
         } else {
             DiagnosticLog.shared.warn("HotkeyManager: failed to register id=\(id) keyCode=\(keyCode) mods=\(modifiers) status=\(status)")
         }

package/app/Sources/HotkeyStore.swift

@@ -20,8 +20,13 @@ enum HotkeyAction: String, CaseIterable, Codable {
     case cheatSheet
     case desktopInventory
     case omniSearch
+    case voiceCommand
+    case handsOff
+    case unifiedWindow
+    case hud
     // Layers
     case layer1, layer2, layer3, layer4, layer5, layer6, layer7, layer8, layer9
+    case layerNext, layerPrev, layerTag
     // Tiling
     case tileLeft, tileRight, tileMaximize, tileCenter
     case tileTopLeft, tileTopRight, tileBottomLeft, tileBottomRight
@@ -36,6 +41,10 @@ enum HotkeyAction: String, CaseIterable, Codable {
         case .cheatSheet:      return "Cheat Sheet"
         case .desktopInventory: return "Desktop Inventory"
         case .omniSearch:      return "Omni Search"
+        case .voiceCommand:    return "Voice Command"
+        case .handsOff:        return "Hands-Off Mode"
+        case .unifiedWindow:   return "Unified Window"
+        case .hud:             return "HUD"
         case .layer1:          return "Layer 1"
         case .layer2:          return "Layer 2"
         case .layer3:          return "Layer 3"
@@ -45,6 +54,9 @@ enum HotkeyAction: String, CaseIterable, Codable {
         case .layer7:          return "Layer 7"
         case .layer8:          return "Layer 8"
         case .layer9:          return "Layer 9"
+        case .layerNext:       return "Next Layer"
+        case .layerPrev:       return "Previous Layer"
+        case .layerTag:        return "Tag Window"
         case .tileLeft:        return "Tile Left"
         case .tileRight:       return "Tile Right"
         case .tileMaximize:    return "Maximize"
@@ -64,9 +76,10 @@ enum HotkeyAction: String, CaseIterable, Codable {
 
     var group: HotkeyGroup {
         switch self {
-        case .palette, .screenMap, .bezel, .cheatSheet, .desktopInventory, .omniSearch: return .app
+        case .palette, .screenMap, .bezel, .cheatSheet, .desktopInventory, .omniSearch, .voiceCommand, .handsOff, .unifiedWindow, .hud: return .app
         case .layer1, .layer2, .layer3, .layer4, .layer5,
-             .layer6, .layer7, .layer8, .layer9: return .layers
+             .layer6, .layer7, .layer8, .layer9,
+             .layerNext, .layerPrev, .layerTag: return .layers
         default: return .tiling
         }
     }
@@ -79,6 +92,10 @@ enum HotkeyAction: String, CaseIterable, Codable {
         case .cheatSheet:      return 202
         case .desktopInventory: return 203
         case .omniSearch:      return 204
+        case .voiceCommand:    return 205
+        case .handsOff:        return 206
+        case .unifiedWindow:   return 207
+        case .hud:             return 208
         case .layer1:          return 101
         case .layer2:          return 102
         case .layer3:          return 103
@@ -88,6 +105,9 @@ enum HotkeyAction: String, CaseIterable, Codable {
         case .layer7:          return 107
         case .layer8:          return 108
         case .layer9:          return 109
+        case .layerNext:       return 110
+        case .layerPrev:       return 111
+        case .layerTag:        return 112
         case .tileLeft:        return 300
         case .tileRight:       return 301
         case .tileMaximize:    return 302
@@ -178,6 +198,14 @@ class HotkeyStore: ObservableObject {
     @Published var bindings: [HotkeyAction: KeyBinding]
     private var callbacks: [HotkeyAction: () -> Void] = [:]
 
+    private func instrumentedCallback(for action: HotkeyAction, callback: @escaping () -> Void) -> () -> Void {
+        {
+            let timed = DiagnosticLog.shared.startTimed("Hotkey \(action.label)")
+            callback()
+            DiagnosticLog.shared.finish(timed)
+        }
+    }
+
     static let defaultBindings: [HotkeyAction: KeyBinding] = {
         var d = [HotkeyAction: KeyBinding]()
         let hyper = UInt32(cmdKey | controlKey | optionKey | shiftKey)
@@ -195,11 +223,14 @@ class HotkeyStore: ObservableObject {
 
         // App
         bind(.palette,   46, cmdShift)   // Cmd+Shift+M
-        bind(.screenMap, 18, hyper)      // Hyper+1
+        bind(.unifiedWindow, 18, hyper)  // Hyper+1 (Screen Map + Desktop Inventory)
         bind(.bezel,     19, hyper)      // Hyper+2
-        bind(.cheatSheet, 20, hyper)     // Hyper+3
-        bind(.desktopInventory, 21, hyper) // Hyper+4
+        bind(.hud,       20, hyper)      // Hyper+3 (HUD overlay)
+        bind(.voiceCommand, 21, hyper)   // Hyper+4 (moved from Hyper+3)
+        let cmdCtrl = UInt32(cmdKey | controlKey)
+        bind(.handsOff, 46, cmdCtrl)          // Ctrl+Cmd+M
         bind(.omniSearch, 23, hyper)       // Hyper+5
+        bind(.cheatSheet, 22, hyper)       // Hyper+6
 
         // Layers: Cmd+Option+1-9
         let layerKeyCodes: [UInt32] = [18, 19, 20, 21, 23, 22, 26, 28, 25]
@@ -207,6 +238,11 @@ class HotkeyStore: ObservableObject {
             bind(action, layerKeyCodes[i], cmdOpt)
         }
 
+        // Layer cycling: Cmd+Option+Arrow / Cmd+Option+T
+        bind(.layerNext, 124, cmdOpt)  // Cmd+Opt+→
+        bind(.layerPrev, 123, cmdOpt)  // Cmd+Opt+←
+        bind(.layerTag,   17, cmdOpt)  // Cmd+Opt+T
+
         // Tiling: Ctrl+Option for all
         bind(.tileLeft,        123, ctrlOpt)  // Ctrl+Opt+←
         bind(.tileRight,       124, ctrlOpt)  // Ctrl+Opt+→
@@ -263,7 +299,7 @@ class HotkeyStore: ObservableObject {
             id: action.carbonID,
             keyCode: binding.keyCode,
             modifiers: binding.carbonModifiers,
-            callback: callback
+            callback: instrumentedCallback(for: action, callback: callback)
         )
     }
 
@@ -283,7 +319,7 @@ class HotkeyStore: ObservableObject {
                 id: action.carbonID,
                 keyCode: binding.keyCode,
                 modifiers: binding.carbonModifiers,
-                callback: callback
+                callback: instrumentedCallback(for: action, callback: callback)
             )
         }
     }
@@ -300,7 +336,7 @@ class HotkeyStore: ObservableObject {
                 id: action.carbonID,
                 keyCode: defaultBinding.keyCode,
                 modifiers: defaultBinding.carbonModifiers,
-                callback: callback
+                callback: instrumentedCallback(for: action, callback: callback)
             )
         }
     }
@@ -318,7 +354,7 @@ class HotkeyStore: ObservableObject {
                 id: action.carbonID,
                 keyCode: binding.keyCode,
                 modifiers: binding.carbonModifiers,
-                callback: callback
+                callback: instrumentedCallback(for: action, callback: callback)
             )
         }
     }