@lattices/cli 0.4.5 → 0.4.7

package/app/Info.plist

@@ -15,9 +15,9 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleVersion</key>
-    <string>0.4.5</string>
+    <string>0.4.7</string>
     <key>CFBundleShortVersionString</key>
-    <string>0.4.5</string>
+    <string>0.4.7</string>
     <key>LSMinimumSystemVersion</key>
     <string>13.0</string>
     <key>LSUIElement</key>

package/app/Lattices.app/Contents/Info.plist

@@ -15,9 +15,9 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleVersion</key>
-    <string>0.4.5</string>
+    <string>0.4.7</string>
     <key>CFBundleShortVersionString</key>
-    <string>0.4.5</string>
+    <string>0.4.7</string>
     <key>LSMinimumSystemVersion</key>
     <string>13.0</string>
     <key>LSUIElement</key>

package/app/Sources/{AppDelegate.swift → AppShell/AppDelegate.swift}

@@ -91,6 +91,10 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSPopoverDelegate {
         store.register(action: .unifiedWindow) { ScreenMapWindowController.shared.toggle() }
         store.register(action: .bezel) { Self.showWorkspaceInspector() }
         store.register(action: .cheatSheet) { SettingsWindowController.shared.show() }
+        store.register(action: .desktopInventory) {
+            DiagnosticLog.shared.info("Hotkey: desktopInventory triggered")
+            ScreenMapWindowController.shared.showPage(.desktopInventory)
+        }
         store.register(action: .voiceCommand) {
             DiagnosticLog.shared.info("Hotkey: voiceCommand triggered")
             VoiceCommandWindow.shared.toggle()
@@ -158,6 +162,11 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSPopoverDelegate {
         }
         store.register(action: .tileDistribute) { WindowTiler.distributeVisible(reactivateLattices: false) }
         store.register(action: .tileTypeGrid) { WindowTiler.distributeVisibleByFrontmostType(reactivateLattices: false) }
+        store.register(action: .tileOrganize) {
+            let appName = DesktopModel.shared.frontmostWindow()?.app
+                ?? NSWorkspace.shared.frontmostApplication?.localizedName
+            CommandModeWindow.shared.show(launchMode: .organize(appName: appName))
+        }
 
         // Onboarding on first launch; otherwise just check permissions
         if !OnboardingWindowController.shared.showIfNeeded() {

package/app/Sources/{AppShellView.swift → AppShell/AppShellView.swift}

@@ -56,6 +56,10 @@ struct AppShellView: View {
         .background(Palette.bg)
         .onAppear {
             commandState.onDismiss = { windowController.activePage = .home }
+            syncPageState(windowController.activePage)
+        }
+        .onChange(of: windowController.activePage) { page in
+            syncPageState(page)
         }
     }
 
@@ -116,7 +120,7 @@ struct AppShellView: View {
                 windowController.activePage = page
             })
         case .desktopInventory:
-            CommandModeView(state: commandState)
+            CommandModeView(state: commandState, presentation: .embedded)
         case .pi:
             PiWorkspaceView()
         case .settings:
@@ -134,4 +138,9 @@ struct AppShellView: View {
             )
         }
     }
+
+    private func syncPageState(_ page: AppPage) {
+        if page == .screenMap { controller.enter() }
+        if page == .desktopInventory { commandState.enter() }
+    }
 }

package/app/Sources/{KeyRecorderView.swift → AppShell/KeyRecorderView.swift}

@@ -34,7 +34,7 @@ struct KeyRecorderView: View {
                     .frame(minWidth: 80, alignment: .leading)
             } else if let binding = binding {
                 HStack(spacing: 4) {
-                    ForEach(binding.displayParts, id: \.self) { part in
+                    ForEach(binding.compactDisplayParts, id: \.self) { part in
                         keyBadge(part)
                     }
                 }

package/app/Sources/{Preferences.swift → AppShell/Preferences.swift}

@@ -37,7 +37,6 @@ class Preferences: ObservableObject {
     @Published var companionCockpitLayout: LatticesCompanionCockpitLayout {
         didSet { persistCompanionCockpitLayout() }
     }
-
     @Published var mouseGesturesEnabled: Bool {
         didSet { UserDefaults.standard.set(mouseGesturesEnabled, forKey: "mouseGestures.enabled") }
     }
@@ -163,7 +162,6 @@ class Preferences: ObservableObject {
         }
 
         self.companionCockpitLayout = Self.loadCompanionCockpitLayout()
-
         if UserDefaults.standard.object(forKey: "mouseGestures.enabled") != nil {
             self.mouseGesturesEnabled = UserDefaults.standard.bool(forKey: "mouseGestures.enabled")
         } else {

package/app/Sources/{SettingsView.swift → AppShell/SettingsView.swift}

@@ -57,6 +57,7 @@ struct SettingsContentView: View {
     @ObservedObject var prefs: Preferences
     @ObservedObject var scanner: ProjectScanner
     @ObservedObject var hotkeyStore: HotkeyStore = .shared
+    @ObservedObject var workspaceManager: WorkspaceManager = .shared
     @ObservedObject var appUpdater: AppUpdater = .shared
     @ObservedObject var mouseShortcutStore: MouseShortcutStore = .shared
     var onBack: (() -> Void)? = nil
@@ -85,6 +86,13 @@ struct SettingsContentView: View {
         page == .docs ? "Docs" : selectedTab.title
     }
 
+    private var snapModifierBinding: Binding<SnapModifierKey> {
+        Binding(
+            get: { workspaceManager.snapZonesConfig.modifier ?? .command },
+            set: { workspaceManager.updateSnapModifier($0) }
+        )
+    }
+
     private var backBar: some View {
         VStack(spacing: 0) {
             HStack(spacing: 8) {
@@ -459,13 +467,28 @@ struct SettingsContentView: View {
                                 .labelsHidden()
                         }
 
-                        Text("Hold the configured snap modifier while dragging to reveal landing targets and a live preview, then release it to go back to a free drag. Default: Command.")
+                        HStack {
+                            Text("Snap modifier")
+                                .font(Typo.mono(10))
+                                .foregroundColor(Palette.textDim)
+                            Spacer()
+                            Picker("", selection: snapModifierBinding) {
+                                ForEach(SnapModifierKey.allCases) { modifier in
+                                    Text(modifier.shortLabel).tag(modifier)
+                                }
+                            }
+                            .pickerStyle(.segmented)
+                            .labelsHidden()
+                            .frame(width: 220)
+                        }
+
+                        Text("Dragging stays normal until you hold \(snapModifierBinding.wrappedValue.label). While that key is down, Lattices reveals snap targets and a live preview for the window you’re moving.")
                             .font(Typo.caption(9))
                             .foregroundColor(Palette.textMuted.opacity(0.7))
 
                         cardDivider
 
-                        Text("Agent-editable rules live in ~/.lattices/snap-zones.json. Changes are picked up on the next drag.")
+                        Text("Advanced landing-zone rules still live in ~/.lattices/snap-zones.json. Modifier changes here take effect on the next drag.")
                             .font(Typo.caption(9))
                             .foregroundColor(Palette.textMuted.opacity(0.7))
                     }
@@ -1541,6 +1564,8 @@ struct SettingsContentView: View {
                     .foregroundColor(Palette.textMuted)
                     .fixedSize(horizontal: false, vertical: true)
             }
+
+            compactKeyRecorder(action: .tileOrganize)
         }
     }
 

package/app/Sources/{HotkeyStore.swift → Core/Actions/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, tileTypeGrid
+    case tileTop, tileBottom, tileDistribute, tileTypeGrid, tileOrganize
     case tileLeftThird, tileCenterThird, tileRightThird
 
     var label: String {
@@ -40,7 +40,7 @@ enum HotkeyAction: String, CaseIterable, Codable {
         case .screenMap:       return "Screen Map"
         case .bezel:           return "Window Bezel"
         case .cheatSheet:      return "Cheat Sheet"
-        case .desktopInventory: return "Search"
+        case .desktopInventory: return "Window Selector"
         case .omniSearch:      return "Search"
         case .voiceCommand:    return "Voice Command"
         case .handsOff:        return "Hands-Off Mode"
@@ -71,6 +71,7 @@ enum HotkeyAction: String, CaseIterable, Codable {
         case .tileBottom:      return "Bottom Half"
         case .tileDistribute:  return "Distribute"
         case .tileTypeGrid:    return "Grid Type"
+        case .tileOrganize:    return "Organize Windows"
         case .tileLeftThird:   return "Left Third"
         case .tileCenterThird: return "Center Third"
         case .tileRightThird:  return "Right Third"
@@ -127,6 +128,7 @@ enum HotkeyAction: String, CaseIterable, Codable {
         case .tileLeftThird:   return 311
         case .tileCenterThird: return 312
         case .tileRightThird:  return 313
+        case .tileOrganize:    return 315
         }
     }
 
@@ -142,6 +144,15 @@ struct KeyBinding: Codable, Equatable {
     let carbonModifiers: UInt32
     var displayParts: [String]
 
+    var compactDisplayParts: [String] {
+        guard let key = displayParts.last else { return [] }
+        let modifiers = Set(displayParts.dropLast())
+        if modifiers == Set(["Ctrl", "Option", "Shift", "Cmd"]) {
+            return ["Hyper", key]
+        }
+        return displayParts
+    }
+
     static func carbonModifiers(from flags: NSEvent.ModifierFlags) -> UInt32 {
         var mods: UInt32 = 0
         if flags.contains(.command) { mods |= UInt32(cmdKey) }
@@ -231,6 +242,7 @@ class HotkeyStore: ObservableObject {
         bind(.unifiedWindow, 18, hyper)  // Hyper+1 (Workspace Home)
         bind(.bezel,     19, hyper)      // Hyper+2
         bind(.hud,       20, hyper)      // Hyper+3 (HUD overlay)
+        bind(.desktopInventory, 5, hyper) // Hyper+G
         bind(.voiceCommand, 21, hyper)   // Hyper+4 (moved from Hyper+3)
         let cmdCtrl = UInt32(cmdKey | controlKey)
         bind(.handsOff, 46, cmdCtrl)          // Ctrl+Cmd+M
@@ -265,6 +277,7 @@ class HotkeyStore: ObservableObject {
         bind(.tileLeftThird,    18, ctrlOpt)  // Ctrl+Opt+1
         bind(.tileCenterThird,  19, ctrlOpt)  // Ctrl+Opt+2
         bind(.tileRightThird,   20, ctrlOpt)  // Ctrl+Opt+3
+        bind(.tileOrganize,     31, ctrlOpt)  // Ctrl+Opt+O
 
         return d
     }()

package/app/Sources/{IntentEngine.swift → Core/Actions/IntentEngine.swift}

@@ -1,31 +1,5 @@
 import AppKit
 
-// MARK: - Intent Definition
-
-struct IntentDef {
-    let name: String
-    let description: String
-    let examples: [String]           // Example phrases that map to this intent
-    let slots: [IntentSlot]          // Named parameters extracted from the utterance
-    let handler: (IntentRequest) throws -> JSON
-}
-
-struct IntentSlot {
-    let name: String
-    let type: String                 // "string", "int", "position", "query"
-    let required: Bool
-    let description: String
-    let enumValues: [String]?        // For constrained slots like tile positions
-}
-
-struct IntentRequest {
-    let intent: String
-    let slots: [String: JSON]
-    let rawText: String?             // Original transcription, for fallback matching
-    let confidence: Double?          // Transcription confidence from voice service
-    let source: String?              // "vox", "siri", "cli", etc.
-}
-
 // MARK: - Intent Engine
 
 final class IntentEngine {
@@ -133,6 +107,8 @@ final class IntentEngine {
                            description: "Target window ID", enumValues: nil),
                 IntentSlot(name: "session", type: "string", required: false,
                            description: "Target session name", enumValues: nil),
+                IntentSlot(name: "selection", type: "bool", required: false,
+                           description: "Apply to the active multi-window selection instead of a single window", enumValues: nil),
             ],
             handler: { req in
                 guard let posStr = req.slots["position"]?.stringValue else {
@@ -176,6 +152,34 @@ final class IntentEngine {
                     throw IntentError.targetNotFound("No window found for app '\(app)'")
                 }
 
+                if req.slots["selection"]?.boolValue == true {
+                    let selectionIds = WindowSelectionStore.shared.windowIds
+                    guard !selectionIds.isEmpty else {
+                        throw IntentError.targetNotFound("No active window selection")
+                    }
+
+                    if selectionIds.count == 1,
+                       let wid = selectionIds.first,
+                       let entry = DesktopModel.shared.windows[wid] {
+                        tileEntry(entry)
+                        return .object([
+                            "ok": .bool(true),
+                            "target": .string("selection"),
+                            "wid": .int(Int(wid)),
+                            "position": .string(posStr)
+                        ])
+                    }
+
+                    return try LatticesApi.shared.dispatch(
+                        method: "space.optimize",
+                        params: .object([
+                            "scope": .string("selection"),
+                            "windowIds": .array(selectionIds.map { .int(Int($0)) }),
+                            "region": .string(posStr)
+                        ])
+                    )
+                }
+
                 // Default: tile frontmost window
                 DispatchQueue.main.async {
                     WindowTiler.tileFrontmostViaAX(to: placement)
@@ -401,6 +405,8 @@ final class IntentEngine {
                            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",
                                         "left-third", "center-third", "right-third"]),
+                IntentSlot(name: "selection", type: "bool", required: false,
+                           description: "Use the active selected windows instead of all visible windows", enumValues: nil),
             ],
             handler: { req in
                 var params: [String: JSON] = [:]
@@ -413,6 +419,18 @@ final class IntentEngine {
                 if let region = req.slots["region"]?.stringValue {
                     params["region"] = .string(region)
                 }
+                if req.slots["selection"]?.boolValue == true {
+                    let selectionIds = WindowSelectionStore.shared.windowIds
+                    guard !selectionIds.isEmpty else {
+                        throw IntentError.targetNotFound("No active window selection")
+                    }
+                    params["scope"] = .string("selection")
+                    params["windowIds"] = .array(selectionIds.map { .int(Int($0)) })
+                    return try LatticesApi.shared.dispatch(
+                        method: "space.optimize",
+                        params: .object(params)
+                    )
+                }
                 return try LatticesApi.shared.dispatch(
                     method: "layout.distribute",
                     params: params.isEmpty ? nil : .object(params)

package/app/Sources/Core/Actions/IntentSchema.swift

@@ -0,0 +1,94 @@
+import Foundation
+
+struct IntentDef {
+    let name: String
+    let description: String
+    let examples: [String]
+    let slots: [IntentSlot]
+    let handler: (IntentRequest) throws -> JSON
+}
+
+struct IntentSlot {
+    let name: String
+    let type: String
+    let required: Bool
+    let description: String
+    let enumValues: [String]?
+    let defaultValue: JSON?
+
+    init(
+        name: String,
+        type: String,
+        required: Bool,
+        description: String,
+        enumValues: [String]? = nil,
+        defaultValue: JSON? = nil
+    ) {
+        self.name = name
+        self.type = type
+        self.required = required
+        self.description = description
+        self.enumValues = enumValues
+        self.defaultValue = defaultValue
+    }
+}
+
+struct IntentRequest {
+    let intent: String
+    let slots: [String: JSON]
+    let rawText: String?
+    let confidence: Double?
+    let source: String?
+}
+
+enum SlotType {
+    case string
+    case int
+    case bool
+    case position
+    case query
+    case app
+    case session
+    case layer
+    case enumerated([String])
+
+    var typeLabel: String {
+        switch self {
+        case .string: return "string"
+        case .int: return "int"
+        case .bool: return "bool"
+        case .position: return "position"
+        case .query: return "query"
+        case .app: return "app"
+        case .session: return "session"
+        case .layer: return "layer"
+        case .enumerated: return "string"
+        }
+    }
+
+    var enumValues: [String]? {
+        guard case .enumerated(let values) = self else { return nil }
+        return values
+    }
+}
+
+typealias SlotDef = IntentSlot
+
+extension IntentSlot {
+    init(
+        name: String,
+        type: SlotType,
+        required: Bool = true,
+        description: String = "",
+        defaultValue: JSON? = nil
+    ) {
+        self.init(
+            name: name,
+            type: type.typeLabel,
+            required: required,
+            description: description,
+            enumValues: type.enumValues,
+            defaultValue: defaultValue
+        )
+    }
+}

package/app/Sources/{Intents → Core/Actions/Intents}/LatticeIntent.swift

@@ -12,31 +12,6 @@ protocol LatticeIntent {
     func perform(slots: [String: JSON]) throws -> JSON
 }
 
-// MARK: - Slot Definition
-
-enum SlotType {
-    case string                           // Free-form text
-    case position                         // Tile position (left, right, maximize, etc.)
-    case app                              // Running app name
-    case session                          // Active tmux session
-    case layer                            // Layer name
-    case enumerated([String])             // Fixed set of values
-}
-
-struct SlotDef {
-    let name: String
-    let type: SlotType
-    let required: Bool
-    let defaultValue: JSON?
-
-    init(name: String, type: SlotType, required: Bool = true, defaultValue: JSON? = nil) {
-        self.name = name
-        self.type = type
-        self.required = required
-        self.defaultValue = defaultValue
-    }
-}
-
 // MARK: - Compiled Phrase Template
 
 struct CompiledPhrase {

package/app/Sources/{VoiceIntentResolver.swift → Core/Actions/VoiceIntentResolver.swift}

@@ -141,10 +141,43 @@ final class VoiceIntentResolver {
     private func extractSlots(for intentName: String, input: String) -> ExtractedSlots {
         switch intentName {
         case "tile_window":
-            guard let position = resolvePosition(in: input) else {
+            var slots: [String: JSON] = [:]
+            var boost = 0.0
+
+            if let position = resolvePosition(in: input) {
+                slots["position"] = .string(position)
+                boost += 0.28
+            } else {
                 return ExtractedSlots(slots: [:], boost: 0)
             }
-            return ExtractedSlots(slots: ["position": .string(position)], boost: 0.28)
+
+            if refersToSelection(in: input) {
+                slots["selection"] = .bool(true)
+                boost += 0.08
+            }
+
+            return ExtractedSlots(slots: slots, boost: boost)
+
+        case "distribute":
+            var slots: [String: JSON] = [:]
+            var boost = 0.0
+
+            if let region = resolvePosition(in: input) {
+                slots["region"] = .string(region)
+                boost += 0.18
+            }
+
+            if let app = detectKnownApp(in: input) {
+                slots["app"] = .string(app)
+                boost += 0.14
+            }
+
+            if refersToSelection(in: input) {
+                slots["selection"] = .bool(true)
+                boost += 0.12
+            }
+
+            return ExtractedSlots(slots: slots, boost: boost)
 
         case "focus":
             if let app = detectKnownApp(in: input) ?? extractEntity(in: input, prefixes: focusPrefixes) {
@@ -426,6 +459,15 @@ final class VoiceIntentResolver {
         return nil
     }
 
+    private func refersToSelection(in input: String) -> Bool {
+        let markers = [
+            "grid that", "grid these", "grid those",
+            "tile that", "tile these", "tile those",
+            "selected windows", "selection", "selected", "these windows", "those windows", "them"
+        ]
+        return markers.contains(where: input.contains)
+    }
+
     private func detectKnownApp(in input: String) -> String? {
         for app in knownApps() {
             let lower = app.lowercased()
@@ -601,7 +643,7 @@ final class VoiceIntentResolver {
         "search": ["find", "search", "look for", "where is", "where d", "locate", "lost", "show me all", "windows"],
         "list_windows": ["what s open", "list windows", "which windows", "what do i have open"],
         "list_sessions": ["list sessions", "what s running", "which projects", "show my sessions"],
-        "distribute": ["distribute", "spread", "organize", "arrange", "tidy", "clean up", "grid"],
+        "distribute": ["distribute", "spread", "organize", "arrange", "tidy", "clean up", "grid", "selected", "selection"],
         "create_layer": ["create layer", "save layout", "snapshot", "remember this layout"],
         "kill": ["kill", "stop", "shut down", "close", "terminate", "end"],
         "scan": ["scan", "rescan", "ocr", "read the screen", "what s on my screen", "screen text"],
@@ -662,7 +704,7 @@ final class VoiceIntentResolver {
         "search": ["where d my slack go", "pull up everything with dewey in it", "show me all the chrome windows", "dewey"],
         "list_windows": ["what do i have open", "what windows do i have"],
         "list_sessions": ["show me my sessions", "which projects are active"],
-        "distribute": ["tidy up", "line everything up", "clean up the windows"],
+        "distribute": ["tidy up", "line everything up", "clean up the windows", "grid that in the bottom half", "arrange the selected windows"],
         "create_layer": ["snapshot this", "remember this layout"],
         "kill": ["close the dewey session", "stop my session"],
         "scan": ["what s on my screen", "read the screen", "give me a fresh scan"],

package/app/Sources/{DesktopModel.swift → Core/Desktop/DesktopModel.swift}

@@ -106,8 +106,7 @@ final class DesktopModel: ObservableObject {
     }
 
     func windowForSession(_ session: String) -> WindowEntry? {
-        let tag = Terminal.windowTag(for: session)
-        return windows.values.first { $0.title.contains(tag) }
+        SessionWindowLocator.cachedWindow(forSession: session, in: windows)
     }
 
     /// Assign a layer tag to a window (in-memory only)
@@ -205,12 +204,7 @@ final class DesktopModel: ObservableObject {
 
             let spaceIds = WindowTiler.getSpacesForWindow(wid)
 
-            // Extract lattices session tag from title: [lattices:session-name]
-            var latticesSession: String?
-            if let range = title.range(of: #"\[lattices:([^\]]+)\]"#, options: .regularExpression) {
-                let match = String(title[range])
-                latticesSession = String(match.dropFirst(9).dropLast(1)) // drop "[lattices:" and "]"
-            }
+            let latticesSession = SessionWindowLocator.extractSessionName(from: title)
 
             var entry = WindowEntry(
                 wid: wid,