@lattices/cli 0.4.9 → 0.4.11

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

@@ -6,55 +6,55 @@ import SwiftUI
 struct SettingsContentView: View {
     private enum SettingsSection: String, CaseIterable, Identifiable {
         case general
-        case companion
+        case shortcuts
         case ai
         case search
-        case shortcuts
+        case companion
 
         var id: String { rawValue }
 
         var title: String {
             switch self {
             case .general: return "General"
-            case .companion: return "Companion"
+            case .shortcuts: return "Shortcuts"
             case .ai: return "AI"
             case .search: return "Search & OCR"
-            case .shortcuts: return "Shortcuts"
+            case .companion: return "LATS iOS Companion"
             }
         }
 
         var icon: String {
             switch self {
             case .general: return "slider.horizontal.3"
-            case .companion: return "ipad.and.iphone"
+            case .shortcuts: return "command"
             case .ai: return "sparkles"
             case .search: return "text.viewfinder"
-            case .shortcuts: return "command"
+            case .companion: return "ipad.and.iphone"
             }
         }
 
         var eyebrow: String {
             switch self {
             case .general: return "Workspace"
-            case .companion: return "Local Bridge"
+            case .shortcuts: return "Controls"
             case .ai: return "Agents"
             case .search: return "Indexing"
-            case .shortcuts: return "Controls"
+            case .companion: return "Local Bridge"
             }
         }
 
         var summary: String {
             switch self {
             case .general:
-                return "Terminal defaults, scan roots, window snapping, and app updates."
-            case .companion:
-                return "Local-network pairing, trusted iPad devices, and bridge security."
+                return "App updates, permissions, terminal defaults, project discovery, and interaction behavior."
+            case .shortcuts:
+                return "A full map of global hotkeys for workspace movement and tmux flow."
             case .ai:
                 return "Claude CLI detection plus advisor model and spending controls."
             case .search:
                 return "OCR cadence, quality, and recent capture visibility."
-            case .shortcuts:
-                return "A full map of global hotkeys for workspace movement and tmux flow."
+            case .companion:
+                return "Local-network pairing, trusted iPad devices, and bridge security."
             }
         }
     }
@@ -67,6 +67,9 @@ struct SettingsContentView: View {
     @ObservedObject var appUpdater: AppUpdater = .shared
     @ObservedObject var mouseShortcutStore: MouseShortcutStore = .shared
     @ObservedObject var keyboardRemapStore: KeyboardRemapStore = .shared
+    @ObservedObject var permChecker: PermissionChecker = .shared
+    @ObservedObject var mouseGestureController: MouseGestureController = .shared
+    @ObservedObject var keyboardRemapController: KeyboardRemapController = .shared
     var onBack: (() -> Void)? = nil
 
     @State private var selectedTab: SettingsSection = .general
@@ -86,10 +89,17 @@ struct SettingsContentView: View {
         .clipped()
         .background(PanelBackground())
         .onAppear {
+            permChecker.check()
             if page == .companionSettings {
                 selectedTab = .companion
             }
         }
+        .onReceive(NotificationCenter.default.publisher(for: .latticesShowGeneralSettings)) { _ in
+            selectedTab = .general
+        }
+        .onReceive(NotificationCenter.default.publisher(for: .latticesShowAssistantSettings)) { _ in
+            selectedTab = .ai
+        }
     }
 
     // MARK: - Back Bar
@@ -138,7 +148,7 @@ struct SettingsContentView: View {
     private var settingsBody: some View {
         HStack(spacing: 0) {
             settingsSidebar
-                .frame(width: 220, alignment: .top)
+                .frame(width: 190, alignment: .top)
 
             Rectangle()
                 .fill(Palette.border)
@@ -188,23 +198,22 @@ struct SettingsContentView: View {
                 Image(systemName: section.icon)
                     .font(.system(size: 11, weight: .semibold))
                     .foregroundColor(active ? Palette.text : Palette.textMuted)
-                    .frame(width: 16, alignment: .center)
+                    .frame(width: 16, height: 18, alignment: .center)
 
                 VStack(alignment: .leading, spacing: 3) {
                     Text(section.title)
                         .font(Typo.mono(11))
                         .foregroundColor(active ? Palette.text : Palette.textMuted)
 
-                    Text(section.summary)
-                        .font(Typo.caption(9.5))
-                        .foregroundColor(Palette.textMuted.opacity(active ? 0.9 : 0.7))
-                        .fixedSize(horizontal: false, vertical: true)
+                    Text(section.eyebrow)
+                        .font(Typo.caption(9))
+                        .foregroundColor(Palette.textMuted.opacity(active ? 0.85 : 0.62))
                 }
 
                 Spacer(minLength: 0)
             }
             .padding(.horizontal, 10)
-            .padding(.vertical, 9)
+            .padding(.vertical, 8)
             .contentShape(RoundedRectangle(cornerRadius: 8))
             .background(
                 ZStack {
@@ -254,14 +263,14 @@ struct SettingsContentView: View {
         switch selectedTab {
         case .general:
             generalContent
-        case .companion:
-            companionContent
+        case .shortcuts:
+            shortcutsContent
         case .ai:
             aiContent
         case .search:
             searchOcrContent
-        case .shortcuts:
-            shortcutsContent
+        case .companion:
+            companionContent
         }
     }
 
@@ -286,24 +295,614 @@ struct SettingsContentView: View {
         }
     }
 
-    // MARK: - General
-
-    private var generalContent: some View {
+    // MARK: - General
+
+    private var permissionsAssistantCard: some View {
+        let missing = Capability.allCases.filter { !$0.isGranted }
+        return settingsCard {
+            VStack(alignment: .leading, spacing: 12) {
+                HStack(alignment: .center, spacing: 8) {
+                    RoundedRectangle(cornerRadius: 5)
+                        .fill((missing.isEmpty ? Palette.running : Palette.detach).opacity(0.13))
+                        .overlay(
+                            Image(systemName: missing.isEmpty ? "checkmark.shield.fill" : "exclamationmark.shield.fill")
+                                .font(.system(size: 12, weight: .semibold))
+                                .foregroundColor(missing.isEmpty ? Palette.running : Palette.detach)
+                        )
+                        .frame(width: 26, height: 26)
+
+                    VStack(alignment: .leading, spacing: 2) {
+                        Text("Permissions")
+                            .font(Typo.mono(12))
+                            .foregroundColor(Palette.text)
+                        Text(missing.isEmpty ? "Ready for window control, gestures, and OCR" : "\(missing.count) permission \(missing.count == 1 ? "needs" : "need") attention")
+                            .font(Typo.caption(9.5))
+                            .foregroundColor(Palette.textMuted)
+                    }
+
+                    Spacer()
+
+                    Text(missing.isEmpty ? "All on" : "\(missing.count) off")
+                        .font(Typo.monoBold(9.5))
+                        .foregroundColor(missing.isEmpty ? Palette.running : Palette.detach)
+                        .padding(.horizontal, 7)
+                        .padding(.vertical, 3)
+                        .background(
+                            Capsule()
+                                .fill((missing.isEmpty ? Palette.running : Palette.detach).opacity(0.10))
+                                .overlay(Capsule().strokeBorder((missing.isEmpty ? Palette.running : Palette.detach).opacity(0.18), lineWidth: 0.5))
+                        )
+                }
+
+                Text("The assistant explains each macOS prompt before you grant it. Advanced privacy panes stay available for review when a synthetic shortcut or input capture needs macOS-level repair.")
+                    .font(Typo.caption(10))
+                    .foregroundColor(Palette.textMuted)
+
+                HStack(spacing: 8) {
+                    ForEach(Capability.allCases) { cap in
+                        HStack(spacing: 4) {
+                            Circle()
+                                .fill(cap.isGranted ? Palette.running : Palette.detach)
+                                .frame(width: 5, height: 5)
+                            Text(cap.title)
+                                .font(Typo.mono(9))
+                                .foregroundColor(Palette.textMuted)
+                        }
+                        .padding(.horizontal, 6)
+                        .padding(.vertical, 2)
+                        .background(
+                            Capsule().fill(Palette.surface)
+                        )
+                    }
+                    Spacer(minLength: 0)
+                }
+
+                HStack(spacing: 8) {
+                    Button {
+                        PermissionsAssistantWindowController.shared.show(focus: missing.first)
+                    } label: {
+                        Text(missing.isEmpty ? "Open Assistant" : "Set Up")
+                            .font(Typo.monoBold(10))
+                            .foregroundColor(Palette.text)
+                            .padding(.horizontal, 12)
+                            .padding(.vertical, 5)
+                            .background(
+                                RoundedRectangle(cornerRadius: 4)
+                                    .fill(Palette.surfaceHov)
+                                    .overlay(RoundedRectangle(cornerRadius: 4).strokeBorder(Palette.borderLit, lineWidth: 0.5))
+                            )
+                    }
+                    .buttonStyle(.plain)
+
+                    Button {
+                        permChecker.check()
+                    } label: {
+                        Image(systemName: "arrow.clockwise")
+                            .font(.system(size: 10, weight: .semibold))
+                            .foregroundColor(Palette.textDim)
+                            .frame(width: 24, height: 22)
+                    }
+                    .buttonStyle(.plain)
+                    .help("Refresh permission status")
+
+                    Spacer()
+
+                    Button {
+                        permChecker.openAutomationSettings()
+                    } label: {
+                        Text("Automation")
+                            .font(Typo.caption(9))
+                            .foregroundColor(Palette.textMuted.opacity(0.9))
+                    }
+                    .buttonStyle(.plain)
+
+                    Button {
+                        permChecker.openInputMonitoringSettings()
+                    } label: {
+                        Text("Input Monitoring")
+                            .font(Typo.caption(9))
+                            .foregroundColor(Palette.textMuted.opacity(0.9))
+                    }
+                    .buttonStyle(.plain)
+                }
+            }
+        }
+    }
+
+    private var permissionsDetailCard: some View {
+        settingsCard {
+            VStack(alignment: .leading, spacing: 10) {
+                HStack(alignment: .center, spacing: 8) {
+                    Image(systemName: permChecker.allGranted ? "checkmark.shield.fill" : "exclamationmark.shield.fill")
+                        .font(.system(size: 11, weight: .medium))
+                        .foregroundColor(permChecker.allGranted ? Palette.running : Palette.detach)
+                    Text("macOS permissions")
+                        .font(Typo.mono(12))
+                        .foregroundColor(Palette.text)
+                    Spacer()
+                    Button {
+                        permChecker.check()
+                    } label: {
+                        Image(systemName: "arrow.clockwise")
+                            .font(.system(size: 10, weight: .semibold))
+                            .foregroundColor(Palette.textDim)
+                            .frame(width: 24, height: 22)
+                    }
+                    .buttonStyle(.plain)
+                    .help("Refresh permission status")
+                }
+
+                Text("Window discovery, gestures, remaps, OCR, and synthetic shortcuts all depend on these macOS grants.")
+                    .font(Typo.caption(10))
+                    .foregroundColor(Palette.textMuted)
+
+                VStack(alignment: .leading, spacing: 6) {
+                    permissionSettingsRow(
+                        "Accessibility",
+                        granted: permChecker.accessibility,
+                        detail: "Required for mouse gestures, keyboard remaps, window movement, and focusing windows."
+                    ) {
+                        permChecker.requestAccessibility()
+                    }
+
+                    permissionSettingsRow(
+                        "Screen Recording",
+                        granted: permChecker.screenRecording,
+                        detail: "Required for reliable window titles, OCR, and Space-aware window discovery."
+                    ) {
+                        permChecker.requestScreenRecording()
+                    }
+
+                    permissionReviewRow(
+                        "Automation",
+                        detail: "Needed when Lattices sends shortcuts through System Events, including gesture-triggered dictation."
+                    ) {
+                        permChecker.openAutomationSettings()
+                    }
+
+                    permissionReviewRow(
+                        "Input Monitoring",
+                        detail: "Useful to review if global input capture or synthetic shortcut behavior starts failing."
+                    ) {
+                        permChecker.openInputMonitoringSettings()
+                    }
+                }
+            }
+        }
+    }
+
+    private var appUpdateCard: some View {
+        settingsCard {
+            VStack(alignment: .leading, spacing: 10) {
+                HStack(alignment: .center, spacing: 10) {
+                    RoundedRectangle(cornerRadius: 6)
+                        .fill((LatticesRuntime.isDevBuild ? Palette.detach : Palette.running).opacity(0.13))
+                        .overlay(
+                            Image(systemName: LatticesRuntime.isDevBuild ? "hammer.fill" : "checkmark.seal.fill")
+                                .font(.system(size: 13, weight: .semibold))
+                                .foregroundColor(LatticesRuntime.isDevBuild ? Palette.detach : Palette.running)
+                        )
+                        .frame(width: 30, height: 30)
+
+                    VStack(alignment: .leading, spacing: 4) {
+                        HStack(spacing: 8) {
+                            Text("Lattices app")
+                                .font(Typo.mono(12))
+                                .foregroundColor(Palette.text)
+                            buildChannelBadge
+                        }
+
+                        HStack(alignment: .firstTextBaseline, spacing: 8) {
+                            Text(appUpdater.currentDisplayVersion)
+                                .font(Typo.monoBold(13))
+                                .foregroundColor(Palette.text)
+                            Text(LatticesRuntime.buildStatusLabel)
+                                .font(Typo.monoBold(9.5))
+                                .foregroundColor(LatticesRuntime.isDevBuild ? Palette.detach : Palette.running)
+                        }
+                    }
+
+                    Spacer()
+
+                    Toggle("Auto", isOn: $appUpdater.autoCheckEnabled)
+                        .font(Typo.caption(9))
+                        .toggleStyle(.checkbox)
+                        .foregroundColor(Palette.textMuted.opacity(0.9))
+                }
+
+                if let update = appUpdater.availableUpdate {
+                    Text("New version v\(update.version) is ready")
+                        .font(Typo.monoBold(10))
+                        .foregroundColor(Palette.detach)
+                } else if appUpdater.isChecking {
+                    Text("Checking for updates...")
+                        .font(Typo.caption(9))
+                        .foregroundColor(Palette.textMuted)
+                } else if let error = appUpdater.lastError {
+                    Text(error)
+                        .font(Typo.caption(9))
+                        .foregroundColor(Palette.detach.opacity(0.9))
+                } else if let checked = appUpdater.lastChecked {
+                    Text("Last checked \(checked, style: .relative)")
+                        .font(Typo.caption(9))
+                        .foregroundColor(Palette.textMuted.opacity(0.8))
+                }
+
+                HStack(spacing: 10) {
+                    Button {
+                        appUpdater.promptForUpdate()
+                    } label: {
+                        Text(appUpdater.isUpdating ? "Preparing..." : (appUpdater.availableUpdate == nil ? "Check for Updates" : "Update to v\(appUpdater.availableUpdate?.version ?? "")"))
+                            .font(Typo.monoBold(10))
+                            .foregroundColor(Palette.text)
+                            .padding(.horizontal, 12)
+                            .padding(.vertical, 5)
+                            .background(
+                                RoundedRectangle(cornerRadius: 4)
+                                    .fill(Palette.surfaceHov)
+                                    .overlay(RoundedRectangle(cornerRadius: 4).strokeBorder(Palette.borderLit, lineWidth: 0.5))
+                            )
+                    }
+                    .buttonStyle(.plain)
+                    .disabled(appUpdater.isUpdating)
+
+                    Button {
+                        Task { await appUpdater.check() }
+                    } label: {
+                        Text(appUpdater.isChecking ? "Checking..." : "Check Now")
+                            .font(Typo.caption(9))
+                            .foregroundColor(Palette.textMuted.opacity(0.9))
+                    }
+                    .buttonStyle(.plain)
+                    .disabled(appUpdater.isChecking)
+
+                    Spacer()
+                }
+            }
+        }
+    }
+
+    private var interactionBehaviorCard: some View {
+        settingsCard {
+            VStack(alignment: .leading, spacing: 12) {
+                Text("Session behavior")
+                    .font(Typo.mono(12))
+                    .foregroundColor(Palette.text)
+
+                HStack {
+                    Text("Detach mode")
+                        .font(Typo.mono(10))
+                        .foregroundColor(Palette.textDim)
+                    Spacer()
+                    Picker("", selection: $prefs.mode) {
+                        Text("Learning").tag(InteractionMode.learning)
+                        Text("Auto").tag(InteractionMode.auto)
+                    }
+                    .pickerStyle(.segmented)
+                    .labelsHidden()
+                    .frame(width: 160)
+                }
+
+                Text(prefs.mode == .learning
+                    ? "Shows keybinding hints when you detach from a tmux session."
+                    : "Detaches sessions quietly once Lattices has done the workspace handoff.")
+                    .font(Typo.caption(9.5))
+                    .foregroundColor(Palette.textMuted.opacity(0.75))
+            }
+        }
+    }
+
+    private var inputControlsCard: some View {
+        shortcutSectionCard(
+            title: "Input Controls",
+            eyebrow: "Gestures & Remaps",
+            summary: "Mouse gestures, drag snapping, and Hyper key remaps live alongside the shortcuts they trigger."
+        ) {
+            VStack(alignment: .leading, spacing: 12) {
+                HStack(alignment: .top, spacing: 12) {
+                    VStack(alignment: .leading, spacing: 5) {
+                        Text("Drag-to-snap")
+                            .font(Typo.monoBold(11))
+                            .foregroundColor(Palette.text)
+                        Text("Hold a modifier while dragging a window to reveal snap targets.")
+                            .font(Typo.caption(10))
+                            .foregroundColor(Palette.textMuted)
+                    }
+
+                    Spacer()
+
+                    Toggle("", isOn: $prefs.dragSnapEnabled)
+                        .toggleStyle(.switch)
+                        .controlSize(.small)
+                        .labelsHidden()
+                }
+
+                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)
+                }
+
+                cardDivider
+
+                HStack(alignment: .top, spacing: 12) {
+                    VStack(alignment: .leading, spacing: 5) {
+                        Text("Middle-click gestures")
+                            .font(Typo.monoBold(11))
+                            .foregroundColor(Palette.text)
+                        Text("Directional mouse gestures can switch Spaces, open the Screen Map, or trigger dictation.")
+                            .font(Typo.caption(10))
+                            .foregroundColor(Palette.textMuted)
+                    }
+
+                    Spacer()
+
+                    Toggle("", isOn: $prefs.mouseGesturesEnabled)
+                        .toggleStyle(.switch)
+                        .controlSize(.small)
+                        .labelsHidden()
+                }
+
+                breakerStatusRow(
+                    state: mouseGestureController.breakerState,
+                    label: "Mouse gestures"
+                ) {
+                    mouseGestureController.reArmAfterBreakerTrip()
+                }
+
+                cardDivider
+
+                HStack(alignment: .top, spacing: 12) {
+                    VStack(alignment: .leading, spacing: 5) {
+                        Text("Caps Lock as Hyper")
+                            .font(Typo.monoBold(11))
+                            .foregroundColor(Palette.text)
+                        Text("Hold Caps Lock for Hyper shortcuts, tap it for Escape.")
+                            .font(Typo.caption(10))
+                            .foregroundColor(Palette.textMuted)
+                    }
+
+                    Spacer()
+
+                    Toggle("", isOn: $prefs.keyboardRemapsEnabled)
+                        .toggleStyle(.switch)
+                        .controlSize(.small)
+                        .labelsHidden()
+                }
+
+                breakerStatusRow(
+                    state: keyboardRemapController.breakerState,
+                    label: "Keyboard remaps"
+                ) {
+                    keyboardRemapController.reArmAfterBreakerTrip()
+                }
+            }
+        }
+    }
+
+    private var generalContent: some View {
+        ScrollView {
+            VStack(alignment: .leading, spacing: 12) {
+                appUpdateCard
+
+                permissionsAssistantCard
+
+                settingsCard {
+                    VStack(alignment: .leading, spacing: 8) {
+                        Text("Terminal")
+                            .font(Typo.mono(11))
+                            .foregroundColor(Palette.text)
+
+                        Picker("", selection: $prefs.terminal) {
+                            ForEach(Terminal.installed) { t in
+                                Text(t.rawValue).tag(t)
+                            }
+                        }
+                        .pickerStyle(.segmented)
+                        .labelsHidden()
+
+                        Text("Used for attaching to tmux sessions")
+                            .font(Typo.caption(10))
+                            .foregroundColor(Palette.textMuted)
+                    }
+                }
+
+                settingsCard {
+                    VStack(alignment: .leading, spacing: 10) {
+                        Text("Project discovery")
+                            .font(Typo.mono(11))
+                            .foregroundColor(Palette.text)
+
+                        Text("Project scan root")
+                            .font(Typo.mono(10))
+                            .foregroundColor(Palette.textDim)
+
+                        HStack(spacing: 6) {
+                            TextField("~/dev", text: $prefs.scanRoot)
+                                .textFieldStyle(.plain)
+                                .font(Typo.mono(11))
+                                .foregroundColor(Palette.text)
+                                .padding(.horizontal, 8)
+                                .padding(.vertical, 5)
+                                .background(
+                                    RoundedRectangle(cornerRadius: 5)
+                                        .fill(Color.white.opacity(0.06))
+                                        .overlay(RoundedRectangle(cornerRadius: 5).strokeBorder(Color.white.opacity(0.08), lineWidth: 0.5))
+                                )
+
+                            Button {
+                                let panel = NSOpenPanel()
+                                panel.canChooseDirectories = true
+                                panel.canChooseFiles = false
+                                panel.allowsMultipleSelection = false
+                                if !prefs.scanRoot.isEmpty {
+                                    panel.directoryURL = URL(fileURLWithPath: prefs.scanRoot)
+                                }
+                                if panel.runModal() == .OK, let url = panel.url {
+                                    prefs.scanRoot = url.path
+                                }
+                            } label: {
+                                Image(systemName: "folder")
+                                    .font(.system(size: 11))
+                                    .foregroundColor(Palette.textDim)
+                                    .padding(6)
+                                    .background(
+                                        RoundedRectangle(cornerRadius: 5)
+                                            .fill(Color.white.opacity(0.06))
+                                            .overlay(RoundedRectangle(cornerRadius: 5).strokeBorder(Color.white.opacity(0.08), lineWidth: 0.5))
+                                    )
+                            }
+                            .buttonStyle(.plain)
+                        }
+
+                        HStack {
+                            Text("Scans for .lattices.json project configs")
+                                .font(Typo.caption(9))
+                                .foregroundColor(Palette.textMuted.opacity(0.7))
+                            Spacer()
+                            Button {
+                                scanner.updateRoot(prefs.scanRoot)
+                                scanner.scan()
+                            } label: {
+                                Text("Rescan")
+                                    .font(Typo.monoBold(10))
+                                    .foregroundColor(Palette.text)
+                                    .padding(.horizontal, 12)
+                                    .padding(.vertical, 4)
+                                    .background(
+                                        RoundedRectangle(cornerRadius: 4)
+                                            .fill(Palette.surfaceHov)
+                                            .overlay(RoundedRectangle(cornerRadius: 4).strokeBorder(Palette.borderLit, lineWidth: 0.5))
+                                    )
+                            }
+                            .buttonStyle(.plain)
+                        }
+                    }
+                }
+
+                interactionBehaviorCard
+            }
+            .padding(16)
+            .frame(maxWidth: 760, alignment: .leading)
+            .frame(maxWidth: .infinity, alignment: .leading)
+        }
+    }
+
+    private var permissionsContent: some View {
         ScrollView {
             VStack(alignment: .leading, spacing: 12) {
+                permissionsAssistantCard
+
                 settingsCard {
                     VStack(alignment: .leading, spacing: 10) {
                         HStack(alignment: .center, spacing: 8) {
-                            Image(systemName: "arrow.down.circle")
+                            Image(systemName: permChecker.allGranted ? "checkmark.shield.fill" : "exclamationmark.shield.fill")
                                 .font(.system(size: 11, weight: .medium))
-                                .foregroundColor(Palette.running)
-                            Text("Lattices app")
+                                .foregroundColor(permChecker.allGranted ? Palette.running : Palette.detach)
+                            Text("Permissions")
                                 .font(Typo.mono(12))
                                 .foregroundColor(Palette.text)
                             Spacer()
-                            Text("Current v\(appUpdater.currentVersion)")
-                                .font(Typo.caption(10))
-                                .foregroundColor(Palette.textMuted)
+                            Button {
+                                permChecker.check()
+                            } label: {
+                                Image(systemName: "arrow.clockwise")
+                                    .font(.system(size: 10, weight: .semibold))
+                                    .foregroundColor(Palette.textDim)
+                                    .frame(width: 24, height: 22)
+                            }
+                            .buttonStyle(.plain)
+                            .help("Refresh permission status")
+                        }
+
+                        Text("Lattices uses macOS privacy permissions for window discovery, tiling, gestures, remaps, and synthetic shortcuts.")
+                            .font(Typo.caption(10))
+                            .foregroundColor(Palette.textMuted)
+
+                        VStack(alignment: .leading, spacing: 6) {
+                            permissionSettingsRow(
+                                "Accessibility",
+                                granted: permChecker.accessibility,
+                                detail: "Required for mouse gestures, keyboard remaps, window movement, and focusing windows."
+                            ) {
+                                permChecker.requestAccessibility()
+                            }
+
+                            permissionSettingsRow(
+                                "Screen Recording",
+                                granted: permChecker.screenRecording,
+                                detail: "Required for reliable window titles, OCR, and Space-aware window discovery."
+                            ) {
+                                permChecker.requestScreenRecording()
+                            }
+
+                            permissionReviewRow(
+                                "Automation",
+                                detail: "Needed when Lattices sends shortcuts through System Events, including gesture-triggered dictation."
+                            ) {
+                                permChecker.openAutomationSettings()
+                            }
+
+                            permissionReviewRow(
+                                "Input Monitoring",
+                                detail: "Useful to review if global input capture or synthetic shortcut behavior starts failing."
+                            ) {
+                                permChecker.openInputMonitoringSettings()
+                            }
+                        }
+                    }
+                }
+            }
+            .padding(16)
+            .frame(maxWidth: 760, alignment: .leading)
+            .frame(maxWidth: .infinity, alignment: .leading)
+        }
+    }
+
+    private var appContent: some View {
+        ScrollView {
+            VStack(alignment: .leading, spacing: 12) {
+                settingsCard {
+                    VStack(alignment: .leading, spacing: 12) {
+                        HStack(alignment: .top, spacing: 10) {
+                            Image(systemName: LatticesRuntime.isDevBuild ? "hammer.fill" : "checkmark.seal.fill")
+                                .font(.system(size: 13, weight: .semibold))
+                                .foregroundColor(LatticesRuntime.isDevBuild ? Palette.detach : Palette.running)
+                                .frame(width: 24, height: 24)
+
+                            VStack(alignment: .leading, spacing: 6) {
+                                HStack(spacing: 8) {
+                                    Text("Lattices app")
+                                        .font(Typo.mono(12))
+                                        .foregroundColor(Palette.text)
+                                    buildChannelBadge
+                                    Spacer()
+                                }
+
+                                HStack(alignment: .firstTextBaseline, spacing: 8) {
+                                    Text(appUpdater.currentDisplayVersion)
+                                        .font(Typo.heading(20))
+                                        .foregroundColor(Palette.text)
+                                    Text(LatticesRuntime.buildStatusLabel)
+                                        .font(Typo.monoBold(10))
+                                        .foregroundColor(LatticesRuntime.isDevBuild ? Palette.detach : Palette.running)
+                                }
+
+                                if let revision = LatticesRuntime.buildRevision {
+                                    Text("Build \(revision)")
+                                        .font(Typo.caption(9))
+                                        .foregroundColor(Palette.textMuted.opacity(0.8))
+                                }
+                            }
                         }
 
                         Text("Lattices can check for new signed releases and prepare the update here. You’ll confirm before the app quits and relaunches.")
@@ -364,7 +963,7 @@ struct SettingsContentView: View {
                             Button {
                                 appUpdater.promptForUpdate()
                             } label: {
-                                Text(appUpdater.isUpdating ? "Preparing…" : (appUpdater.availableUpdate == nil ? "Check for Updates" : "Update to v\(appUpdater.availableUpdate?.version ?? "")"))
+                                Text(appUpdater.isUpdating ? "Preparing..." : (appUpdater.availableUpdate == nil ? "Check for Updates" : "Update to v\(appUpdater.availableUpdate?.version ?? "")"))
                                     .font(Typo.monoBold(10))
                                     .foregroundColor(Palette.text)
                                     .padding(.horizontal, 12)
@@ -421,36 +1020,22 @@ struct SettingsContentView: View {
                         }
                     }
                 }
+            }
+            .padding(16)
+            .frame(maxWidth: 760, alignment: .leading)
+            .frame(maxWidth: .infinity, alignment: .leading)
+        }
+    }
 
-                // ── Terminal ──
-                settingsCard {
-                    VStack(alignment: .leading, spacing: 8) {
-                        Text("Terminal")
-                            .font(Typo.mono(11))
-                            .foregroundColor(Palette.text)
-
-                        Picker("", selection: $prefs.terminal) {
-                            ForEach(Terminal.installed) { t in
-                                Text(t.rawValue).tag(t)
-                            }
-                        }
-                        .pickerStyle(.segmented)
-                        .labelsHidden()
-
-                        Text("Used for attaching to tmux sessions")
-                            .font(Typo.caption(10))
-                            .foregroundColor(Palette.textMuted)
-                    }
-                }
-
-                // ── tmux ──
+    private var behaviorContent: some View {
+        ScrollView {
+            VStack(alignment: .leading, spacing: 12) {
                 settingsCard {
                     VStack(alignment: .leading, spacing: 10) {
                         Text("tmux")
                             .font(Typo.mono(11))
                             .foregroundColor(Palette.text)
 
-                        // Mode
                         HStack {
                             Text("Detach mode")
                                 .font(Typo.mono(10))
@@ -470,74 +1055,6 @@ struct SettingsContentView: View {
                             : "Detaches sessions silently")
                             .font(Typo.caption(9))
                             .foregroundColor(Palette.textMuted.opacity(0.7))
-
-                        cardDivider
-
-                        // Project scan root
-                        Text("Project scan root")
-                            .font(Typo.mono(10))
-                            .foregroundColor(Palette.textDim)
-
-                        HStack(spacing: 6) {
-                            TextField("~/dev", text: $prefs.scanRoot)
-                                .textFieldStyle(.plain)
-                                .font(Typo.mono(11))
-                                .foregroundColor(Palette.text)
-                                .padding(.horizontal, 8)
-                                .padding(.vertical, 5)
-                                .background(
-                                    RoundedRectangle(cornerRadius: 5)
-                                        .fill(Color.white.opacity(0.06))
-                                        .overlay(RoundedRectangle(cornerRadius: 5).strokeBorder(Color.white.opacity(0.08), lineWidth: 0.5))
-                                )
-
-                            Button {
-                                let panel = NSOpenPanel()
-                                panel.canChooseDirectories = true
-                                panel.canChooseFiles = false
-                                panel.allowsMultipleSelection = false
-                                if !prefs.scanRoot.isEmpty {
-                                    panel.directoryURL = URL(fileURLWithPath: prefs.scanRoot)
-                                }
-                                if panel.runModal() == .OK, let url = panel.url {
-                                    prefs.scanRoot = url.path
-                                }
-                            } label: {
-                                Image(systemName: "folder")
-                                    .font(.system(size: 11))
-                                    .foregroundColor(Palette.textDim)
-                                    .padding(6)
-                                    .background(
-                                        RoundedRectangle(cornerRadius: 5)
-                                            .fill(Color.white.opacity(0.06))
-                                            .overlay(RoundedRectangle(cornerRadius: 5).strokeBorder(Color.white.opacity(0.08), lineWidth: 0.5))
-                                    )
-                            }
-                            .buttonStyle(.plain)
-                        }
-
-                        HStack {
-                            Text("Scans for .lattices.json project configs")
-                                .font(Typo.caption(9))
-                                .foregroundColor(Palette.textMuted.opacity(0.7))
-                            Spacer()
-                            Button {
-                                scanner.updateRoot(prefs.scanRoot)
-                                scanner.scan()
-                            } label: {
-                                Text("Rescan")
-                                    .font(Typo.monoBold(10))
-                                    .foregroundColor(Palette.text)
-                                    .padding(.horizontal, 12)
-                                    .padding(.vertical, 4)
-                                    .background(
-                                        RoundedRectangle(cornerRadius: 4)
-                                            .fill(Palette.surfaceHov)
-                                            .overlay(RoundedRectangle(cornerRadius: 4).strokeBorder(Palette.borderLit, lineWidth: 0.5))
-                                    )
-                            }
-                            .buttonStyle(.plain)
-                        }
                     }
                 }
 
@@ -626,6 +1143,13 @@ struct SettingsContentView: View {
                             }
                         }
 
+                        breakerStatusRow(
+                            state: mouseGestureController.breakerState,
+                            label: "Mouse gestures"
+                        ) {
+                            mouseGestureController.reArmAfterBreakerTrip()
+                        }
+
                         HStack(spacing: 8) {
                             Button {
                                 mouseShortcutStore.openConfiguration()
@@ -723,6 +1247,13 @@ struct SettingsContentView: View {
                             }
                         }
 
+                        breakerStatusRow(
+                            state: keyboardRemapController.breakerState,
+                            label: "Keyboard remaps"
+                        ) {
+                            keyboardRemapController.reArmAfterBreakerTrip()
+                        }
+
                         HStack(spacing: 8) {
                             Button {
                                 keyboardRemapStore.openConfiguration()
@@ -772,35 +1303,7 @@ struct SettingsContentView: View {
             VStack(alignment: .leading, spacing: 12) {
                 companionBridgeOverviewCard
                 companionTrustedDevicesCard
-
-                settingsCard {
-                    VStack(alignment: .leading, spacing: 10) {
-                        Text("Input")
-                            .font(Typo.mono(11))
-                            .foregroundColor(Palette.text)
-
-                        HStack(alignment: .top, spacing: 12) {
-                            VStack(alignment: .leading, spacing: 4) {
-                                Text("Trackpad proxy")
-                                    .font(Typo.mono(10))
-                                    .foregroundColor(Palette.textDim)
-                                Text("Allow paired companions with the input.trackpad grant to move the Mac pointer through the encrypted bridge.")
-                                    .font(Typo.caption(9.5))
-                                    .foregroundColor(Palette.textMuted.opacity(0.75))
-                                    .fixedSize(horizontal: false, vertical: true)
-                            }
-
-                            Spacer()
-
-                            Toggle("", isOn: $prefs.companionTrackpadEnabled)
-                                .toggleStyle(.switch)
-                                .controlSize(.small)
-                                .labelsHidden()
-                                .disabled(!prefs.companionBridgeEnabled)
-                                .opacity(prefs.companionBridgeEnabled ? 1 : 0.45)
-                        }
-                    }
-                }
+                companionCockpitCard
             }
             .padding(16)
             .frame(maxWidth: 760, alignment: .leading)
@@ -1291,6 +1794,20 @@ struct SettingsContentView: View {
         }
     }
 
+    private var buildChannelBadge: some View {
+        let tint = LatticesRuntime.isDevBuild ? Palette.detach : Palette.running
+
+        return Text(LatticesRuntime.buildChannelLabel)
+            .font(Typo.monoBold(9))
+            .foregroundColor(tint)
+            .padding(.horizontal, 6)
+            .padding(.vertical, 3)
+            .background(
+                Capsule()
+                    .fill(tint.opacity(0.12))
+            )
+    }
+
     // MARK: - Search & OCR
 
     private func ocrNumField(_ value: Binding<Double>, width: CGFloat = 50) -> some View {
@@ -1688,6 +2205,149 @@ struct SettingsContentView: View {
             .padding(.vertical, 3)
     }
 
+    private func permissionSettingsRow(
+        _ title: String,
+        granted: Bool,
+        detail: String,
+        action: @escaping () -> Void
+    ) -> some View {
+        Button {
+            if granted {
+                permChecker.check()
+            } else {
+                action()
+            }
+        } label: {
+            permissionRowContent(
+                title,
+                status: granted ? "granted" : "not set",
+                statusColor: granted ? Palette.running : Palette.detach,
+                icon: granted ? "checkmark.circle.fill" : "exclamationmark.circle.fill",
+                iconColor: granted ? Palette.running : Palette.detach,
+                detail: detail,
+                showsExternalLink: !granted
+            )
+        }
+        .buttonStyle(.plain)
+        .help(granted ? "Refresh permission status" : "Open macOS permission flow")
+    }
+
+    private func permissionReviewRow(
+        _ title: String,
+        detail: String,
+        action: @escaping () -> Void
+    ) -> some View {
+        Button(action: action) {
+            permissionRowContent(
+                title,
+                status: "review",
+                statusColor: Palette.textDim,
+                icon: "gearshape.2.fill",
+                iconColor: Palette.textDim,
+                detail: detail,
+                showsExternalLink: true
+            )
+        }
+        .buttonStyle(.plain)
+        .help("Open macOS Privacy & Security settings")
+    }
+
+    private func permissionRowContent(
+        _ title: String,
+        status: String,
+        statusColor: Color,
+        icon: String,
+        iconColor: Color,
+        detail: String,
+        showsExternalLink: Bool
+    ) -> some View {
+        HStack(alignment: .top, spacing: 8) {
+            Image(systemName: icon)
+                .font(.system(size: 10, weight: .semibold))
+                .foregroundColor(iconColor)
+                .frame(width: 12, height: 16)
+
+            VStack(alignment: .leading, spacing: 2) {
+                HStack(spacing: 6) {
+                    Text(title)
+                        .font(Typo.mono(10))
+                        .foregroundColor(Palette.text)
+                    Text(status)
+                        .font(Typo.mono(9))
+                        .foregroundColor(statusColor)
+                    Spacer()
+                    if showsExternalLink {
+                        Image(systemName: "arrow.up.forward.square")
+                            .font(.system(size: 9))
+                            .foregroundColor(Palette.textMuted)
+                    }
+                }
+
+                Text(detail)
+                    .font(Typo.caption(9))
+                    .foregroundColor(Palette.textMuted.opacity(0.75))
+                    .fixedSize(horizontal: false, vertical: true)
+            }
+        }
+        .padding(.horizontal, 8)
+        .padding(.vertical, 7)
+        .background(
+            RoundedRectangle(cornerRadius: 5)
+                .fill(Palette.surfaceHov.opacity(status == "not set" ? 0.75 : 0.35))
+                .overlay(
+                    RoundedRectangle(cornerRadius: 5)
+                        .strokeBorder(status == "not set" ? Palette.detach.opacity(0.22) : Palette.borderLit.opacity(0.6), lineWidth: 0.5)
+                )
+        )
+    }
+
+    @ViewBuilder
+    private func breakerStatusRow(
+        state: EventTapBreaker.State,
+        label: String,
+        onReArm: @escaping () -> Void
+    ) -> some View {
+        switch state {
+        case .armed:
+            EmptyView()
+        case .paused(let cooldownSec):
+            HStack(spacing: 8) {
+                Circle()
+                    .fill(Color.orange)
+                    .frame(width: 6, height: 6)
+                Text("\(label) paused — \(cooldownSec)s cooldown")
+                    .font(Typo.caption(9))
+                    .foregroundColor(Palette.textMuted)
+                Spacer()
+            }
+        case .disabled:
+            HStack(spacing: 8) {
+                Circle()
+                    .fill(Color.red)
+                    .frame(width: 6, height: 6)
+                Text("\(label) disabled — tap callback exceeded OS budget repeatedly")
+                    .font(Typo.caption(9))
+                    .foregroundColor(Palette.textMuted)
+                Spacer()
+                Button {
+                    onReArm()
+                } label: {
+                    Text("Re-enable")
+                        .font(Typo.monoBold(10))
+                        .foregroundColor(Palette.text)
+                        .padding(.horizontal, 10)
+                        .padding(.vertical, 3)
+                        .background(
+                            RoundedRectangle(cornerRadius: 4)
+                                .fill(Palette.surfaceHov)
+                                .overlay(RoundedRectangle(cornerRadius: 4).strokeBorder(Palette.borderLit, lineWidth: 0.5))
+                        )
+                }
+                .buttonStyle(.plain)
+            }
+        }
+    }
+
     // MARK: - Shortcuts
 
     private var shortcutsContent: some View {
@@ -1707,9 +2367,8 @@ struct SettingsContentView: View {
                 ScrollView {
                     VStack(alignment: .leading, spacing: 0) {
                         VStack(alignment: .leading, spacing: 16) {
-                            companionCockpitCard
-
                             shortcutsOverviewCard
+                            inputControlsCard
 
                             LazyVGrid(columns: sectionColumns, alignment: .leading, spacing: 16) {
                                 shortcutsAppCard