@lattices/cli 0.4.10 → 0.4.12

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

@@ -14,7 +14,6 @@ struct MainView: View {
     @StateObject private var inventory = InventoryManager.shared
     @State private var searchText = ""
     @State private var hasCheckedSetup = false
-    @State private var bannerDismissed = false
     @State private var tmuxBannerDismissed = false
     @ObservedObject private var tmuxModel = TmuxModel.shared
     @State private var orphanSectionCollapsed = true
@@ -93,10 +92,13 @@ struct MainView: View {
         permChecker.check()
         DiagnosticLog.shared.finish(tPerm)
 
-        bannerDismissed = false
         DiagnosticLog.shared.finish(tTotal)
     }
 
+    private var visiblyMissingCapabilities: [Capability] {
+        Capability.allCases.filter { !$0.isGranted && !prefs.isCapabilityDismissed($0.rawValue) }
+    }
+
     private var mainContent: some View {
         VStack(spacing: 0) {
             if layout == .popover {
@@ -104,23 +106,24 @@ struct MainView: View {
                     Text("Lattices")
                         .font(Typo.mono(14))
                         .foregroundColor(Palette.text)
+                    buildChannelBadge
 
                     Spacer()
 
                     headerButton(icon: "house") {
-                        (NSApp.delegate as? AppDelegate)?.dismissPopover()
+                        MenuBarController.shared.dismissPopover()
                         ScreenMapWindowController.shared.showPage(.home)
                     }
                     headerButton(icon: "rectangle.3.group") {
-                        (NSApp.delegate as? AppDelegate)?.dismissPopover()
+                        MenuBarController.shared.dismissPopover()
                         ScreenMapWindowController.shared.showPage(.screenMap)
                     }
                     headerButton(icon: "magnifyingglass") {
-                        (NSApp.delegate as? AppDelegate)?.dismissPopover()
+                        MenuBarController.shared.dismissPopover()
                         ScreenMapWindowController.shared.showPage(.desktopInventory)
                     }
                     headerButton(icon: "command") {
-                        (NSApp.delegate as? AppDelegate)?.dismissPopover()
+                        MenuBarController.shared.dismissPopover()
                         CommandPaletteWindow.shared.toggle()
                     }
                     headerButton(icon: "arrow.clockwise") { scanner.scan(); inventory.refresh() }
@@ -157,8 +160,8 @@ struct MainView: View {
                 .padding(.bottom, 10)
             }
 
-            // Permission banner
-            if !permChecker.allGranted && !bannerDismissed {
+            // Permission banner — only when something is missing AND not snoozed
+            if !visiblyMissingCapabilities.isEmpty {
                 permissionBanner
             }
 
@@ -401,12 +404,20 @@ struct MainView: View {
                 SettingsWindowController.shared.show()
             }
 
-            HStack(spacing: 4) {
-                if !permChecker.allGranted {
-                    Circle()
-                        .fill(Palette.detach)
-                        .frame(width: 5, height: 5)
+            if !permChecker.allGranted {
+                Button {
+                    PermissionsAssistantWindowController.shared.show()
+                } label: {
+                    HStack(spacing: 4) {
+                        Circle()
+                            .fill(Palette.detach)
+                            .frame(width: 5, height: 5)
+                        Text("Permissions")
+                            .font(Typo.mono(9))
+                            .foregroundColor(Palette.textMuted)
+                    }
                 }
+                .buttonStyle(.plain)
             }
 
             Spacer()
@@ -502,33 +513,61 @@ struct MainView: View {
     // MARK: - Permission banner
 
     private var permissionBanner: some View {
-        VStack(alignment: .leading, spacing: 6) {
+        let missing = visiblyMissingCapabilities
+
+        return VStack(alignment: .leading, spacing: 8) {
             HStack {
-                Image(systemName: "exclamationmark.triangle.fill")
+                Image(systemName: "sparkles")
                     .font(.system(size: 10))
                     .foregroundColor(Palette.detach)
-                Text("PERMISSIONS NEEDED")
+                Text("OPTIONAL CAPABILITIES")
                     .font(Typo.monoBold(10))
                     .foregroundColor(Palette.detach)
                 Spacer()
-                Button { bannerDismissed = true } label: {
-                    Image(systemName: "xmark")
-                        .font(.system(size: 8, weight: .bold))
+                Button {
+                    for cap in missing { prefs.dismissCapability(cap.rawValue) }
+                } label: {
+                    Text("Maybe later")
+                        .font(Typo.mono(9))
                         .foregroundColor(Palette.textMuted)
                 }
                 .buttonStyle(.plain)
             }
 
-            permissionRow("Accessibility", granted: permChecker.accessibility) {
-                permChecker.requestAccessibility()
-            }
-            permissionRow("Screen Capture", granted: permChecker.screenRecording) {
-                permChecker.requestScreenRecording()
+            Text(bannerSummary(missing))
+                .font(Typo.mono(10))
+                .foregroundColor(Palette.text)
+                .fixedSize(horizontal: false, vertical: true)
+
+            HStack(spacing: 8) {
+                ForEach(missing) { cap in
+                    capabilityChip(cap)
+                }
+                Spacer(minLength: 0)
             }
 
-            Text("Click a row to continue the permission flow in macOS.")
-                .font(Typo.mono(9))
-                .foregroundColor(Palette.textMuted)
+            Button {
+                PermissionsAssistantWindowController.shared.show(focus: missing.first)
+            } label: {
+                HStack(spacing: 6) {
+                    Image(systemName: "slider.horizontal.3")
+                        .font(.system(size: 10, weight: .semibold))
+                    Text("Open Permissions Assistant")
+                        .font(Typo.monoBold(10))
+                }
+                .foregroundColor(.white)
+                .padding(.horizontal, 10)
+                .padding(.vertical, 6)
+                .background(
+                    RoundedRectangle(cornerRadius: 4)
+                        .fill(Palette.detach.opacity(0.18))
+                        .overlay(
+                            RoundedRectangle(cornerRadius: 4)
+                                .strokeBorder(Palette.detach.opacity(0.45), lineWidth: 0.5)
+                        )
+                )
+            }
+            .buttonStyle(.plain)
         }
         .padding(12)
         .background(
@@ -543,6 +582,56 @@ struct MainView: View {
         .padding(.bottom, 10)
     }
 
+    private func bannerSummary(_ missing: [Capability]) -> String {
+        switch missing.count {
+        case 0: return ""
+        case 1: return "\(missing[0].title) is off. Lattices works without it."
+        default: return "\(missing.count) capabilities are off. Turn on whichever you want; the rest of the app works without them."
+        }
+    }
+
+    private func capabilityChip(_ cap: Capability) -> some View {
+        Button {
+            PermissionsAssistantWindowController.shared.show(focus: cap)
+        } label: {
+            HStack(spacing: 5) {
+                Image(systemName: cap.iconName)
+                    .font(.system(size: 9, weight: .semibold))
+                Text(cap.title)
+                    .font(Typo.mono(9))
+            }
+            .foregroundColor(Palette.textDim)
+            .padding(.horizontal, 7)
+            .padding(.vertical, 3)
+            .background(
+                Capsule()
+                    .fill(Palette.surface)
+                    .overlay(
+                        Capsule().strokeBorder(Palette.border, lineWidth: 0.5)
+                    )
+            )
+        }
+        .buttonStyle(.plain)
+    }
+
+    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))
+                    .overlay(
+                        Capsule()
+                            .strokeBorder(tint.opacity(0.28), lineWidth: 0.5)
+                    )
+            )
+    }
+
     // MARK: - tmux banner
 
     private var tmuxBanner: some View {
@@ -607,42 +696,6 @@ struct MainView: View {
         .padding(.bottom, 10)
     }
 
-    private func permissionRow(_ name: String, granted: Bool, open: @escaping () -> Void) -> some View {
-        Button(action: { if !granted { open() } }) {
-            HStack(spacing: 6) {
-                Image(systemName: granted ? "checkmark.circle.fill" : "circle")
-                    .font(.system(size: 10))
-                    .foregroundColor(granted ? Palette.running : Palette.detach)
-                Text(name)
-                    .font(Typo.mono(10))
-                    .foregroundColor(Palette.text)
-                Spacer()
-                if granted {
-                    Text("granted")
-                        .font(Typo.mono(9))
-                        .foregroundColor(Palette.running)
-                } else {
-                    HStack(spacing: 4) {
-                        Text("not set")
-                            .font(Typo.mono(9))
-                            .foregroundColor(Palette.detach)
-                        Image(systemName: "arrow.up.forward.square")
-                            .font(.system(size: 9))
-                            .foregroundColor(Palette.detach)
-                    }
-                }
-            }
-            .padding(.vertical, 4)
-            .padding(.horizontal, 8)
-            .background(
-                RoundedRectangle(cornerRadius: 4)
-                    .fill(granted ? Color.clear : Palette.detach.opacity(0.06))
-            )
-        }
-        .buttonStyle(.plain)
-        .disabled(granted)
-    }
-
     // MARK: - Helpers
 
     private func headerButton(icon: String, action: @escaping () -> Void) -> some View {

package/apps/mac/Sources/AppShell/MenuBarController.swift

@@ -0,0 +1,177 @@
+import AppKit
+import SwiftUI
+
+final class MenuBarController: NSObject, NSPopoverDelegate {
+    static let shared = MenuBarController()
+
+    private var statusItem: NSStatusItem?
+    private var popover: NSPopover?
+    private var contextMenu: NSMenu?
+
+    var isPopoverShown: Bool {
+        popover?.isShown == true
+    }
+
+    private override init() {
+        super.init()
+    }
+
+    func start() {
+        guard statusItem == nil else { return }
+
+        statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.squareLength)
+        if let button = statusItem?.button {
+            button.image = Self.menuBarIcon
+            button.action = #selector(statusItemClicked(_:))
+            button.sendAction(on: [.leftMouseUp, .rightMouseUp])
+            button.target = self
+        }
+
+        contextMenu = buildContextMenu()
+    }
+
+    func warmUpPopover() {
+        let popover = makePopover()
+        _ = popover.contentViewController?.view
+    }
+
+    func dismissPopover() {
+        popover?.performClose(nil)
+    }
+
+    private func showProjectsPopover() {
+        guard let button = statusItem?.button else { return }
+        let popover = makePopover()
+        popover.show(relativeTo: button.bounds, of: button, preferredEdge: .minY)
+        popover.contentViewController?.view.window?.makeKey()
+    }
+
+    @objc private func statusItemClicked(_ sender: Any?) {
+        guard let event = NSApp.currentEvent,
+              let button = statusItem?.button else { return }
+
+        if event.type == .rightMouseUp {
+            contextMenu?.popUp(positioning: nil, at: NSPoint(x: 0, y: button.bounds.height + 4), in: button)
+        } else if let shown = popover, shown.isShown {
+            shown.performClose(sender)
+        } else {
+            showProjectsPopover()
+        }
+    }
+
+    private func makePopover() -> NSPopover {
+        if let popover { return popover }
+        let timed = DiagnosticLog.shared.startTimed("makePopover")
+        let popover = NSPopover()
+        popover.contentViewController = NSHostingController(rootView: MainView(scanner: ProjectScanner.shared))
+        popover.behavior = .transient
+        popover.contentSize = NSSize(width: 380, height: 300)
+        popover.appearance = NSAppearance(named: .darkAqua)
+        popover.delegate = self
+        self.popover = popover
+        DiagnosticLog.shared.finish(timed)
+        return popover
+    }
+
+    func popoverWillShow(_ notification: Notification) {
+        AppActivationCoordinator.shared.refresh()
+        NotificationCenter.default.post(name: .latticesPopoverWillShow, object: nil)
+    }
+
+    func popoverDidClose(_ notification: Notification) {
+        AppActivationCoordinator.shared.refresh()
+    }
+
+    private func buildContextMenu() -> NSMenu {
+        let menu = NSMenu()
+
+        let actions: [(String, String, Selector)] = [
+            ("Home", "", #selector(menuWorkspace)),
+            ("Layout", "", #selector(menuLayout)),
+            ("Search", "", #selector(menuSearch)),
+            ("Command Palette", "⌘⇧M", #selector(menuCommandPalette)),
+        ]
+        for (title, shortcut, action) in actions {
+            let item = NSMenuItem(title: title, action: action, keyEquivalent: "")
+            item.target = self
+            if !shortcut.isEmpty {
+                // Display-only; the actual hotkey is global.
+            }
+            menu.addItem(item)
+        }
+
+        menu.addItem(.separator())
+
+        let cliActions: [(String, Selector)] = [
+            ("Projects…", #selector(menuProjects)),
+            ("Initialize Project in Terminal…", #selector(menuInitializeProject)),
+            ("Launch Project in Terminal…", #selector(menuLaunchProject)),
+        ]
+        for (title, action) in cliActions {
+            let item = NSMenuItem(title: title, action: action, keyEquivalent: "")
+            item.target = self
+            menu.addItem(item)
+        }
+
+        menu.addItem(.separator())
+
+        let update = NSMenuItem(title: "Update Lattices…", action: #selector(menuUpdate), keyEquivalent: "")
+        update.target = self
+        menu.addItem(update)
+
+        menu.addItem(.separator())
+
+        let settings = NSMenuItem(title: "Help & Settings…", action: #selector(menuSettings), keyEquivalent: ",")
+        settings.target = self
+        menu.addItem(settings)
+
+        menu.addItem(.separator())
+
+        let quit = NSMenuItem(title: "Quit Lattices", action: #selector(menuQuit), keyEquivalent: "q")
+        quit.target = self
+        menu.addItem(quit)
+
+        return menu
+    }
+
+    @objc private func menuCommandPalette() { CommandPaletteWindow.shared.toggle() }
+    @objc private func menuWorkspace() { ScreenMapWindowController.shared.showPage(.home) }
+    @objc private func menuLayout() { ScreenMapWindowController.shared.showPage(.screenMap) }
+    @objc private func menuSearch() { ScreenMapWindowController.shared.showPage(.desktopInventory) }
+    @objc private func menuProjects() { DispatchQueue.main.async { self.showProjectsPopover() } }
+    @objc private func menuInitializeProject() { CliActionLauncher.initializeProjectInTerminal() }
+    @objc private func menuLaunchProject() { CliActionLauncher.launchProjectInTerminal() }
+    @MainActor @objc private func menuUpdate() { AppUpdater.shared.promptForUpdate() }
+    @objc private func menuSettings() { SettingsWindowController.shared.show() }
+    @objc private func menuQuit() { NSApp.terminate(nil) }
+
+    private static let menuBarIcon: NSImage = {
+        let size: CGFloat = 18
+        let image = NSImage(size: NSSize(width: size, height: size), flipped: true) { _ in
+            let pad: CGFloat = 2
+            let gap: CGFloat = 1.5
+            let cellSize = (size - 2 * pad - 2 * gap) / 3
+            let solidCells: Set<Int> = [0, 3, 6, 7, 8]
+
+            for row in 0..<3 {
+                for column in 0..<3 {
+                    let index = row * 3 + column
+                    let x = pad + CGFloat(column) * (cellSize + gap)
+                    let y = pad + CGFloat(row) * (cellSize + gap)
+                    let rect = NSRect(x: x, y: y, width: cellSize, height: cellSize)
+
+                    if solidCells.contains(index) {
+                        NSColor.black.setFill()
+                    } else {
+                        NSColor.black.withAlphaComponent(0.25).setFill()
+                    }
+                    let path = NSBezierPath(roundedRect: rect, xRadius: 0.8, yRadius: 0.8)
+                    path.fill()
+                }
+            }
+            return true
+        }
+        image.isTemplate = true
+        return image
+    }()
+}

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

@@ -4,8 +4,8 @@ import AppKit
 // MARK: - Onboarding Flow
 
 /// A step-by-step welcome screen shown on first launch.
-/// Walks the user through granting Accessibility, Screen Recording,
-/// choosing a project root, and optionally installing tmux.
+/// Keeps setup quiet: permissions are introduced as optional capabilities
+/// and requested later from the feature that needs them.
 struct OnboardingView: View {
     @ObservedObject private var permChecker = PermissionChecker.shared
     @ObservedObject private var prefs = Preferences.shared
@@ -15,8 +15,7 @@ struct OnboardingView: View {
 
     enum Step: Int, CaseIterable {
         case welcome
-        case accessibility
-        case screenRecording
+        case capabilities
         case projectRoot
         case tmux
         case done
@@ -39,8 +38,7 @@ struct OnboardingView: View {
             Group {
                 switch step {
                 case .welcome:      welcomeStep
-                case .accessibility: accessibilityStep
-                case .screenRecording: screenRecordingStep
+                case .capabilities:  capabilitiesStep
                 case .projectRoot:  projectRootStep
                 case .tmux:         tmuxStep
                 case .done:         doneStep
@@ -98,24 +96,37 @@ struct OnboardingView: View {
         }
     }
 
-    private var accessibilityStep: some View {
-        permissionStep(
-            icon: "hand.raised.fill",
-            title: "Accessibility",
-            description: "Lattices needs Accessibility access to read window titles, move and resize windows, and tile your workspace.",
-            granted: permChecker.accessibility,
-            action: { permChecker.requestAccessibility() }
-        )
-    }
+    private var capabilitiesStep: some View {
+        VStack(spacing: 16) {
+            Image(systemName: "slider.horizontal.3")
+                .font(.system(size: 28))
+                .foregroundColor(.white.opacity(0.7))
 
-    private var screenRecordingStep: some View {
-        permissionStep(
-            icon: "rectangle.dashed.badge.record",
-            title: "Screen Capture",
-            description: "Allows Lattices to index on-screen text with OCR so you can search across all your windows. On newer macOS versions this finishes in System Settings under Screen & System Audio Recording.",
-            granted: permChecker.screenRecording,
-            action: { permChecker.requestScreenRecording() }
-        )
+            Text("Enable more when you need it")
+                .font(Typo.title(16))
+                .foregroundColor(Palette.text)
+
+            Text("Lattices launches projects without any extra permissions. Click a capability to set it up now in the Permissions Assistant — or skip and turn it on later.")
+                .font(Typo.body(12))
+                .foregroundColor(Palette.textDim)
+                .multilineTextAlignment(.center)
+                .lineSpacing(3)
+
+            VStack(alignment: .leading, spacing: 8) {
+                ForEach(Capability.allCases) { cap in
+                    capabilityRow(cap)
+                }
+            }
+            .padding(10)
+            .background(
+                RoundedRectangle(cornerRadius: 6)
+                    .fill(Palette.surface)
+                    .overlay(
+                        RoundedRectangle(cornerRadius: 6)
+                            .strokeBorder(Palette.border, lineWidth: 0.5)
+                    )
+            )
+        }
     }
 
     private var projectRootStep: some View {
@@ -251,8 +262,7 @@ struct OnboardingView: View {
                 .foregroundColor(Palette.text)
 
             VStack(alignment: .leading, spacing: 8) {
-                statusRow("Accessibility", granted: permChecker.accessibility)
-                statusRow("Screen Recording", granted: permChecker.screenRecording)
+                statusRow("Permission prompts", granted: true, detail: "shown when needed")
                 statusRow("Project root", granted: !prefs.scanRoot.isEmpty,
                           detail: prefs.scanRoot.isEmpty ? "not set" : abbreviatePath(prefs.scanRoot))
                 statusRow("tmux", granted: tmux.isAvailable,
@@ -293,43 +303,47 @@ struct OnboardingView: View {
 
     // MARK: - Shared helpers
 
-    private func permissionStep(icon: String, title: String, description: String, granted: Bool, action: @escaping () -> Void) -> some View {
-        VStack(spacing: 16) {
-            Image(systemName: icon)
-                .font(.system(size: 28))
-                .foregroundColor(.white.opacity(0.7))
-
-            Text(title)
-                .font(Typo.title(16))
-                .foregroundColor(Palette.text)
-
-            Text(description)
-                .font(Typo.body(12))
-                .foregroundColor(Palette.textDim)
-                .multilineTextAlignment(.center)
-                .lineSpacing(3)
-
-            if granted {
-                HStack(spacing: 6) {
-                    Image(systemName: "checkmark.circle.fill")
-                        .foregroundColor(Palette.running)
-                    Text("Granted")
+    private func capabilityRow(_ cap: Capability) -> some View {
+        let granted = cap.isGranted
+        return Button {
+            PermissionsAssistantWindowController.shared.show(focus: cap)
+        } label: {
+            HStack(alignment: .top, spacing: 10) {
+                Image(systemName: cap.iconName)
+                    .font(.system(size: 12, weight: .semibold))
+                    .foregroundColor(granted ? Palette.running : Palette.text.opacity(0.85))
+                    .frame(width: 18)
+                VStack(alignment: .leading, spacing: 3) {
+                    Text(cap.title)
                         .font(Typo.monoBold(11))
-                        .foregroundColor(Palette.running)
-                }
-            } else {
-                Button(action: action) {
-                    Text("Grant \(title)")
-                        .angularButton(.white, filled: false)
+                        .foregroundColor(Palette.text)
+                    Text(cap.requirementLabel)
+                        .font(Typo.mono(10))
+                        .foregroundColor(Palette.textMuted)
                 }
-                .buttonStyle(.plain)
-
-                Text("macOS may send you to System Settings to finish this step.")
-                    .font(Typo.mono(10))
-                    .foregroundColor(Palette.textMuted)
-                    .multilineTextAlignment(.center)
+                Spacer(minLength: 0)
+                Text(granted ? "ON" : "Set up")
+                    .font(Typo.monoBold(9))
+                    .foregroundColor(granted ? Palette.running : Palette.textDim)
+                    .padding(.horizontal, 6)
+                    .padding(.vertical, 3)
+                    .background(
+                        Capsule().fill((granted ? Palette.running : Palette.borderLit).opacity(0.12))
+                    )
             }
+            .padding(.horizontal, 8)
+            .padding(.vertical, 6)
+            .contentShape(Rectangle())
+            .background(
+                RoundedRectangle(cornerRadius: 5)
+                    .fill(Color.clear)
+                    .overlay(
+                        RoundedRectangle(cornerRadius: 5)
+                            .strokeBorder(Palette.border.opacity(0.6), lineWidth: 0.5)
+                    )
+            )
         }
+        .buttonStyle(.plain)
     }
 
     private func statusRow(_ label: String, granted: Bool, detail: String? = nil) -> some View {
@@ -382,8 +396,6 @@ struct OnboardingView: View {
 
     private var nextLabel: String {
         switch step {
-        case .accessibility where !permChecker.accessibility: return "Continue anyway"
-        case .screenRecording where !permChecker.screenRecording: return "Continue anyway"
         case .projectRoot where prefs.scanRoot.isEmpty: return "Skip for now"
         case .tmux where !tmux.isAvailable: return "Skip"
         default: return "Continue"