@lattices/cli 0.4.6 → 0.4.7

package/app/Info.plist

@@ -15,9 +15,9 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleVersion</key>
-    <string>0.4.6</string>
+    <string>0.4.7</string>
     <key>CFBundleShortVersionString</key>
-    <string>0.4.6</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.6</string>
+    <string>0.4.7</string>
     <key>CFBundleShortVersionString</key>
-    <string>0.4.6</string>
+    <string>0.4.7</string>
     <key>LSMinimumSystemVersion</key>
     <string>13.0</string>
     <key>LSUIElement</key>

package/app/Sources/AppShell/AppDelegate.swift

@@ -162,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/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/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/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/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 {
@@ -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) }
@@ -266,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/Core/Desktop/WindowTiler.swift

@@ -2118,7 +2118,6 @@ enum WindowTiler {
         }
         return nil
     }
-
     private static func displaySpaces(containing cgPoint: CGPoint) -> DisplaySpaces? {
         guard let screenIndex = screenIndex(for: cgPoint) else { return nil }
         return getDisplaySpaces().first(where: { $0.displayIndex == screenIndex })
@@ -2134,7 +2133,6 @@ enum WindowTiler {
     private static func formatCGPoint(_ point: CGPoint) -> String {
         "\(Int(point.x)),\(Int(point.y))"
     }
-
     private static func screenIndex(for cgPoint: CGPoint) -> Int? {
         let primaryHeight = NSScreen.screens.first?.frame.height ?? 0
         let nsPoint = NSPoint(x: cgPoint.x, y: primaryHeight - cgPoint.y)

package/app/Sources/Core/Overlays/CommandMode/CommandModeState.swift

@@ -45,6 +45,11 @@ enum DesktopInventoryMode: Equatable {
     case screenMap    // m → interactive screen map editor
 }
 
+enum CommandModeLaunchMode: Equatable {
+    case normal
+    case organize(appName: String?)
+}
+
 // DisplayGeometry, ScreenMapWindowEntry, ScreenMapEditorState, ScreenMapActionLog
 // are defined in ScreenMapState.swift
 // MARK: - Filter Presets
@@ -132,10 +137,43 @@ final class CommandModeState: ObservableObject {
 
     var onDismiss: (() -> Void)?
     var onPanelResize: ((_ width: CGFloat, _ height: CGFloat) -> Void)?
+    private let launchMode: CommandModeLaunchMode
 
     /// Tracks the last item navigated to, for consistent Shift+arrow multi-select
     private var cursorWindowId: UInt32?
 
+    init(launchMode: CommandModeLaunchMode = .normal) {
+        self.launchMode = launchMode
+    }
+
+    var isOrganizeFlow: Bool {
+        if case .organize = launchMode { return true }
+        return false
+    }
+
+    var organizeSeedAppName: String? {
+        if case .organize(let appName) = launchMode { return appName }
+        return nil
+    }
+
+    var organizeSelectionSummary: String {
+        let count = selectedWindowIds.count
+        if let appName = organizeSeedAppName, !appName.isEmpty {
+            return "\(count) \(appName) window\(count == 1 ? "" : "s") selected"
+        }
+        return "\(count) window\(count == 1 ? "" : "s") selected"
+    }
+
+    var organizeGuidance: String {
+        if selectedWindowIds.count > 1 {
+            return "Press D to organize. Cmd-click adds or removes windows. Shift-click extends the selection."
+        }
+        if selectedWindowIds.count == 1 {
+            return "Cmd-click another window to add it, then press D to organize the set."
+        }
+        return "Click windows to select them. Cmd-click adds or removes windows, and D organizes the selection."
+    }
+
     // MARK: - Selection Helpers
 
     /// Backwards-compat: returns single selected ID (first element)
@@ -369,6 +407,7 @@ final class CommandModeState: ObservableObject {
         desktopMode = .browsing
         gridPreviewPlacement = nil
         phase = .desktopInventory
+        configureLaunchMode()
         // Don't call onPanelResize here — caller handles initial sizing
     }
 
@@ -576,6 +615,20 @@ final class CommandModeState: ObservableObject {
             }
             return true
 
+        case 2: // d → distribute selected
+            if isSearching && selectedWindowIds.isEmpty { return false }
+            if isSearching { deactivateSearch() }
+            guard !selectedWindowIds.isEmpty else {
+                flash("Select 2+ windows to organize")
+                return true
+            }
+            guard selectedWindowIds.count > 1 else {
+                flash("Add another window, then press D to organize")
+                return true
+            }
+            distributeSelected()
+            return true
+
         case 46: // m → screen map editor (standalone window)
             if isSearching { deactivateSearch() }
             ScreenMapWindowController.shared.show()
@@ -1050,6 +1103,54 @@ final class CommandModeState: ObservableObject {
         }
     }
 
+    private func configureLaunchMode() {
+        switch launchMode {
+        case .normal:
+            return
+        case .organize(let appName):
+            activePreset = .currentSpace
+            seedSelectionForOrganization(appName: appName)
+        }
+    }
+
+    private func seedSelectionForOrganization(appName: String?) {
+        let visibleWindows = flatWindowList.filter(\.isOnScreen)
+        let targetApp = appName ?? visibleWindows.first?.appName
+        let initialSelection = visibleWindows.filter { window in
+            guard let name = window.appName, let targetApp else { return false }
+            return name.localizedCaseInsensitiveCompare(targetApp) == .orderedSame
+        }
+
+        if initialSelection.isEmpty {
+            flash("Select windows to organize. Cmd-click adds or removes windows; D distributes.")
+            return
+        }
+
+        selectedWindowIds = Set(initialSelection.map(\.id))
+        cursorWindowId = initialSelection.first?.id
+
+        if let targetApp {
+            if initialSelection.count > 1 {
+                flash("Selected \(initialSelection.count) \(targetApp) windows. Press D to organize.")
+            } else {
+                flash("Selected the \(targetApp) window. Cmd-click more windows, then press D.")
+            }
+        } else if initialSelection.count > 1 {
+            flash("Selected \(initialSelection.count) windows. Press D to organize.")
+        } else {
+            flash("Selected 1 window. Cmd-click more windows, then press D.")
+        }
+
+        DispatchQueue.main.async { [weak self] in
+            guard let self = self else { return }
+            if self.selectedWindowIds.count > 1 {
+                self.highlightAllSelected()
+            } else {
+                self.highlightSelectedWindow()
+            }
+        }
+    }
+
     // MARK: - Inventory Builder
 
     private func buildInventory() -> CommandModeInventory {

package/app/Sources/Core/Overlays/CommandMode/CommandModeView.swift

@@ -200,10 +200,17 @@ struct CommandModeView: View {
 
     private var header: some View {
         HStack {
-            Text(isDesktopInventory ? "DESKTOP INVENTORY" : "COMMAND MODE")
+            Text(isDesktopInventory ? (state.isOrganizeFlow ? "ORGANIZE WINDOWS" : "DESKTOP INVENTORY") : "COMMAND MODE")
                 .font(Typo.monoBold(11))
                 .foregroundColor(Palette.text)
 
+            if isDesktopInventory && state.isOrganizeFlow {
+                bannerBadge("Current Space", tone: .neutral)
+                if let appName = state.organizeSeedAppName, !appName.isEmpty {
+                    bannerBadge(appName, tone: .accent)
+                }
+            }
+
             if isDesktopInventory {
                 Button(action: { state.copyInventoryToClipboard() }) {
                     HStack(spacing: 3) {
@@ -275,6 +282,11 @@ struct CommandModeView: View {
 
     private func desktopInventoryContent(contentWidth: CGFloat) -> some View {
         VStack(spacing: 0) {
+            if state.isOrganizeFlow {
+                organizeBanner
+                divider
+            }
+
             if state.isSearching {
                 searchBar
             } else {
@@ -358,6 +370,33 @@ struct CommandModeView: View {
         }
     }
 
+    private var organizeBanner: some View {
+        VStack(alignment: .leading, spacing: 6) {
+            HStack(alignment: .center, spacing: 8) {
+                Image(systemName: "rectangle.3.group")
+                    .font(.system(size: 11, weight: .medium))
+                    .foregroundColor(Palette.running)
+                Text(state.organizeSelectionSummary)
+                    .font(Typo.monoBold(10))
+                    .foregroundColor(Palette.text)
+                Spacer()
+                if state.selectedWindowIds.count > 1 {
+                    bannerBadge("Ready", tone: .accent)
+                } else {
+                    bannerBadge("Add More", tone: .neutral)
+                }
+            }
+
+            Text(state.organizeGuidance)
+                .font(Typo.mono(10))
+                .foregroundColor(Palette.textDim)
+                .lineLimit(2)
+        }
+        .padding(.horizontal, 14)
+        .padding(.vertical, 8)
+        .background(Palette.running.opacity(0.06))
+    }
+
     private var filterPillBar: some View {
         HStack(spacing: 6) {
             ForEach(FilterPreset.allCases, id: \.rawValue) { preset in
@@ -835,9 +874,17 @@ struct CommandModeView: View {
                 if indented {
                     Spacer().frame(width: 8)
                 }
-                Text(isLattices ? "●" : "•")
-                    .font(.system(size: 7))
-                    .foregroundColor(isLattices ? Palette.running : (isSelected ? Palette.text : Palette.textDim))
+                Group {
+                    if isSelected {
+                        Image(systemName: "checkmark.circle.fill")
+                            .font(.system(size: 10, weight: .semibold))
+                            .foregroundColor(Palette.running)
+                    } else {
+                        Text(isLattices ? "●" : "•")
+                            .font(.system(size: 7))
+                            .foregroundColor(isLattices ? Palette.running : Palette.textDim)
+                    }
+                }
                 if let app = appLabel {
                     Text(app)
                         .font(Typo.monoBold(10))
@@ -1242,6 +1289,9 @@ struct CommandModeView: View {
                     chordHint(key: "↩", label: "select & front")
                     chordHint(key: "⌘A", label: "select all")
                     chordHint(key: "⇧↑↓", label: "multi-select")
+                    if state.isOrganizeFlow && state.selectedWindowIds.count > 1 {
+                        chordHint(key: "d", label: "organize")
+                    }
                     if !state.selectedWindowIds.isEmpty {
                         chordHint(key: "t", label: "tile")
                     }
@@ -1279,9 +1329,42 @@ struct CommandModeView: View {
                             .foregroundColor(Palette.running)
                     }
                 }
+            } else if isDesktopInventory && state.isOrganizeFlow && state.selectedWindowIds.count > 1 {
+                HStack(spacing: 12) {
+                    chordHint(key: "d", label: "organize")
+                    chordHint(key: "⌘-click", label: "add/remove")
+                    chordHint(key: "⇧-click", label: "range")
+                    chordHint(key: "↩", label: "front")
+                    chordHint(key: "esc", label: "cancel")
+                    Spacer()
+                    Text("\(state.selectedWindowIds.count) selected")
+                        .font(Typo.mono(9))
+                        .foregroundColor(Palette.running)
+                }
+            } else if isDesktopInventory && state.isOrganizeFlow && !state.selectedWindowIds.isEmpty {
+                HStack(spacing: 12) {
+                    chordHint(key: "⌘-click", label: "add more")
+                    chordHint(key: "d", label: "need 2+")
+                    chordHint(key: "↩", label: "front")
+                    chordHint(key: "esc", label: "cancel")
+                    Spacer()
+                    Text(state.organizeSelectionSummary)
+                        .font(Typo.mono(9))
+                        .foregroundColor(Palette.textDim)
+                }
+            } else if isDesktopInventory && state.isOrganizeFlow {
+                HStack(spacing: 12) {
+                    chordHint(key: "click", label: "select")
+                    chordHint(key: "⌘-click", label: "add/remove")
+                    chordHint(key: "/", label: "search")
+                    chordHint(key: "esc", label: "cancel")
+                    Spacer()
+                }
             } else if isDesktopInventory && state.selectedWindowIds.count > 1 {
                 // Multi-selection active
                 HStack(spacing: 12) {
+                    chordHint(key: "s", label: "grid preview")
+                    chordHint(key: "d", label: "distribute")
                     chordHint(key: "s", label: "grid preview")
                     chordHint(key: "↩", label: "front")
                     chordHint(key: "t", label: "grid region")
@@ -1302,6 +1385,7 @@ struct CommandModeView: View {
             } else if isDesktopInventory && !state.selectedWindowIds.isEmpty {
                 // Single selection active — browsing hints with direct shortcuts
                 HStack(spacing: 12) {
+                    chordHint(key: "d", label: "organize")
                     chordHint(key: "s", label: "show")
                     chordHint(key: "↩", label: "front")
                     chordHint(key: "f", label: "focus+close")
@@ -1367,6 +1451,31 @@ struct CommandModeView: View {
         }
     }
 
+    private enum BannerTone {
+        case neutral
+        case accent
+    }
+
+    private func bannerBadge(_ text: String, tone: BannerTone) -> some View {
+        let foreground = tone == .accent ? Palette.running : Palette.textDim
+        let fill = tone == .accent ? Palette.running.opacity(0.10) : Palette.surface
+        let stroke = tone == .accent ? Palette.running.opacity(0.30) : Palette.border
+
+        return Text(text)
+            .font(Typo.mono(8))
+            .foregroundColor(foreground)
+            .padding(.horizontal, 6)
+            .padding(.vertical, 3)
+            .background(
+                RoundedRectangle(cornerRadius: 8)
+                    .fill(fill)
+                    .overlay(
+                        RoundedRectangle(cornerRadius: 8)
+                            .strokeBorder(stroke, lineWidth: 0.5)
+                    )
+            )
+    }
+
     private func actionButton(key: String, label: String, action: @escaping () -> Void) -> some View {
         Button(action: action) {
             HStack(spacing: 4) {

package/app/Sources/Core/Overlays/CommandMode/CommandModeWindow.swift

@@ -43,15 +43,19 @@ final class CommandModeWindow {
 
     var isVisible: Bool { isOpen }
 
-    func toggle() {
+    func toggle(launchMode: CommandModeLaunchMode = .normal) {
         if isOpen {
-            dismiss()
+            if launchMode == .normal {
+                dismiss()
+            } else {
+                show(launchMode: launchMode)
+            }
         } else {
-            show()
+            show(launchMode: launchMode)
         }
     }
 
-    func show() {
+    func show(launchMode: CommandModeLaunchMode = .normal) {
         // Always rebuild for fresh state
         dismiss()
         isOpen = true
@@ -61,7 +65,7 @@ final class CommandModeWindow {
             CommandPaletteWindow.shared.dismiss()
         }
 
-        let state = CommandModeState()
+        let state = CommandModeState(launchMode: launchMode)
         state.onDismiss = { [weak self] in
             self?.dismiss()
         }

package/app/Sources/Core/Overlays/HUD/CheatSheetHUD.swift

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

package/app/Sources/Core/Overlays/ScreenMap/ScreenMapState.swift

@@ -2035,7 +2035,6 @@ final class ScreenMapController: ObservableObject {
 
     func handleKey(_ keyCode: UInt16, modifiers: NSEvent.ModifierFlags = []) -> Bool {
         let diag = DiagnosticLog.shared
-        diag.info("[ScreenMap] key: \(keyCode)")
 
         // Tiling mode intercepts keys before anything else
         if editor?.isTilingMode == true {

package/app/Sources/Core/Overlays/ScreenMap/ScreenMapView.swift

@@ -1805,6 +1805,7 @@ struct ScreenMapView: View {
         let displays = editor?.displays ?? []
         let zoomLevel = editor?.zoomLevel ?? 1.0
         let panOffset = editor?.panOffset ?? .zero
+        let canvasShape = RoundedRectangle(cornerRadius: 6, style: .continuous)
 
         return GeometryReader { geo in
             let metrics = CanvasMetrics(editor: editor, displays: displays, viewportSize: geo.size)
@@ -1852,12 +1853,14 @@ struct ScreenMapView: View {
         }
         .padding(8)
         .frame(maxWidth: .infinity, maxHeight: .infinity)
+        .contentShape(canvasShape)
+        .clipShape(canvasShape)
         .clipped()
         .background(
             ZStack {
-                RoundedRectangle(cornerRadius: 6)
+                canvasShape
                     .fill(Color.black.opacity(0.25))
-                RoundedRectangle(cornerRadius: 6)
+                canvasShape
                     .strokeBorder(Color.white.opacity(0.06), lineWidth: 0.5)
                 Canvas { context, size in
                     let spacing: CGFloat = 20
@@ -2742,11 +2745,14 @@ struct ScreenMapView: View {
             }
             // Track space key for canvas drag-to-pan
             if event.keyCode == 49 && !controller.isSearchActive {
-                if event.type == .keyDown && !event.isARepeat {
-                    isSpaceHeld = true
-                    NSCursor.openHand.push()
+                if event.type == .keyDown {
+                    if !isSpaceHeld {
+                        isSpaceHeld = true
+                        NSCursor.openHand.push()
+                    }
                     return nil
                 } else if event.type == .keyUp {
+                    guard isSpaceHeld else { return nil }
                     isSpaceHeld = false
                     spaceDragStart = nil
                     NSCursor.pop()
@@ -2788,16 +2794,18 @@ struct ScreenMapView: View {
         mouseDownMonitor = NSEvent.addLocalMonitorForEvents(matching: .leftMouseDown) { event in
             guard let eventWindow = event.window,
                   eventWindow === ScreenMapWindowController.shared.nsWindow else { return event }
+            let flippedPt = flippedScreenPoint(event)
 
             // Space+click → begin canvas pan
-            if isSpaceHeld, let editor = controller.editor {
+            if isSpaceHeld,
+               isCanvasPoint(flippedPt),
+               let editor = controller.editor {
                 spaceDragStart = event.locationInWindow
                 spaceDragPanStart = editor.panOffset
                 NSCursor.closedHand.push()
                 return nil
             }
 
-            let flippedPt = flippedScreenPoint(event)
             if let editor = controller.editor,
                let hit = canvasHit(flippedScreenPt: flippedPt, editor: editor),
                hoveredWindowId == hit.id {
@@ -3042,6 +3050,7 @@ struct ScreenMapView: View {
     // MARK: - Hit Test / Coordinate Conversion
 
     private func canvasHit(flippedScreenPt: CGPoint, editor: ScreenMapEditorState) -> CanvasHit? {
+        guard isCanvasPoint(flippedScreenPt) else { return nil }
         let projection = CanvasProjection(editor: editor)
         guard projection.scale > 0 else { return nil }
         let canvasLocal = CGPoint(
@@ -3059,6 +3068,10 @@ struct ScreenMapView: View {
         return nil
     }
 
+    private func isCanvasPoint(_ point: CGPoint) -> Bool {
+        CGRect(origin: screenMapCanvasOrigin, size: screenMapCanvasSize).contains(point)
+    }
+
     private func detectDragMode(mapPoint: CGPoint, windowMapRect: CGRect) -> CanvasDragMode {
         let w = windowMapRect.width
         let h = windowMapRect.height

package/app/Sources/Core/Workspace/WorkspaceManager.swift

@@ -66,12 +66,40 @@ struct GridFile: Codable {
     let snapZones: SnapZonesConfig?
 }
 
-enum SnapModifierKey: String, Codable, Equatable {
+enum SnapModifierKey: String, Codable, Equatable, CaseIterable, Identifiable {
     case command
     case option
     case control
     case shift
 
+    var id: String { rawValue }
+
+    var label: String {
+        switch self {
+        case .command:
+            return "Command"
+        case .option:
+            return "Option"
+        case .control:
+            return "Control"
+        case .shift:
+            return "Shift"
+        }
+    }
+
+    var shortLabel: String {
+        switch self {
+        case .command:
+            return "Cmd"
+        case .option:
+            return "Opt"
+        case .control:
+            return "Ctrl"
+        case .shift:
+            return "Shift"
+        }
+    }
+
     var eventFlags: NSEvent.ModifierFlags {
         switch self {
         case .command:
@@ -98,9 +126,6 @@ enum SnapModifierKey: String, Codable, Equatable {
         }
     }
 
-    var label: String {
-        rawValue.capitalized
-    }
 }
 
 enum SnapZoneTriggerSpec: Codable, Equatable {
@@ -459,6 +484,36 @@ class WorkspaceManager: ObservableObject {
         self.snapZonesConfig = snapZones
     }
 
+    func updateSnapModifier(_ modifier: SnapModifierKey) {
+        let updated = SnapZonesConfig(
+            enabled: snapZonesConfig.enabled,
+            modifier: modifier,
+            zoneOpacity: snapZonesConfig.zoneOpacity,
+            highlightOpacity: snapZonesConfig.highlightOpacity,
+            previewOpacity: snapZonesConfig.previewOpacity,
+            cornerRadius: snapZonesConfig.cornerRadius,
+            rules: snapZonesConfig.rules
+        )
+
+        do {
+            let url = URL(fileURLWithPath: snapZonesConfigPath)
+            try FileManager.default.createDirectory(
+                at: url.deletingLastPathComponent(),
+                withIntermediateDirectories: true
+            )
+
+            let encoder = JSONEncoder()
+            encoder.outputFormatting = [.prettyPrinted, .sortedKeys]
+            let data = try encoder.encode(updated)
+            try data.write(to: url, options: .atomic)
+
+            loadGridConfig()
+            DiagnosticLog.shared.info("WorkspaceManager: updated snap modifier to \(modifier.rawValue)")
+        } catch {
+            DiagnosticLog.shared.error("WorkspaceManager: failed to write snap-zones.json — \(error.localizedDescription)")
+        }
+    }
+
     /// Resolve a tile string to fractions: check user presets first, then built-in TilePosition
     func resolveTileFractions(_ tile: String) -> (CGFloat, CGFloat, CGFloat, CGFloat)? {
         resolvePlacement(tile)?.fractions

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lattices/cli",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "description": "Agentic window manager for macOS — programmable workspace, smart layouts, managed tmux sessions, and a 35+-method agent API",
   "bin": {
     "lattices": "./bin/lattices.ts",