@lattices/cli 0.4.1 → 0.4.5

package/README.md

@@ -58,6 +58,9 @@ To build a signed, notarized DMG for distribution:
 ```sh
 # Requires a Developer ID certificate and notarytool keychain profile
 ./scripts/build-dmg.sh
+
+# Update v<package.json version> and upload the DMG to GitHub Releases
+./scripts/ship.sh
 ```
 
 ## Quick start

package/app/Info.plist

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

package/app/Package.swift

@@ -4,9 +4,15 @@ import PackageDescription
 let package = Package(
     name: "Lattices",
     platforms: [.macOS(.v13)],
+    dependencies: [
+        .package(path: "../swift")
+    ],
     targets: [
         .executableTarget(
             name: "Lattices",
+            dependencies: [
+                .product(name: "DeckKit", package: "swift")
+            ],
             path: "Sources",
             resources: [
                 .copy("../Resources/tap.wav"),

package/app/Sources/ActionRow.swift

@@ -2,9 +2,9 @@ import SwiftUI
 
 /// A single action row with shortcut badge, label, optional icon, and hotkey hint.
 struct ActionRow: View {
-    let shortcut: String
     let label: String
-    var hotkey: String? = nil
+    var detail: String? = nil
+    var hotkeyTokens: [String] = []
     var icon: String? = nil
     var accentColor: Color = Palette.textDim
     var action: () -> Void
@@ -14,41 +14,58 @@ struct ActionRow: View {
     var body: some View {
         Button(action: action) {
             HStack(spacing: 10) {
-                // Shortcut badge
-                Text(shortcut)
-                    .font(Typo.monoBold(10))
-                    .foregroundColor(accentColor)
-                    .frame(width: 18, height: 18)
-                    .background(
-                        RoundedRectangle(cornerRadius: 4)
-                            .fill(accentColor.opacity(0.12))
-                    )
-
                 // Icon
                 if let icon {
-                    Image(systemName: icon)
-                        .font(.system(size: 11, weight: .medium))
-                        .foregroundColor(isHovered ? Palette.text : Palette.textDim)
-                        .frame(width: 14)
+                    ZStack {
+                        RoundedRectangle(cornerRadius: 5)
+                            .fill(accentColor.opacity(isHovered ? 0.18 : 0.12))
+                        Image(systemName: icon)
+                            .font(.system(size: 11, weight: .medium))
+                            .foregroundColor(isHovered ? Palette.text : accentColor)
+                    }
+                    .frame(width: 22, height: 22)
                 }
 
                 // Label
-                Text(label)
-                    .font(Typo.mono(12))
-                    .foregroundColor(isHovered ? Palette.text : Palette.textDim)
-                    .lineLimit(1)
+                VStack(alignment: .leading, spacing: detail == nil ? 0 : 2) {
+                    Text(label)
+                        .font(Typo.body(12))
+                        .foregroundColor(isHovered ? Palette.text : Palette.textDim)
+                        .lineLimit(1)
+
+                    if let detail {
+                        Text(detail)
+                            .font(Typo.mono(9))
+                            .foregroundColor(Palette.textMuted)
+                            .lineLimit(1)
+                    }
+                }
 
                 Spacer()
 
                 // Hotkey
-                if let hotkey {
-                    Text(hotkey)
-                        .font(Typo.mono(10))
-                        .foregroundColor(Palette.textMuted)
+                if !hotkeyTokens.isEmpty {
+                    HStack(spacing: 4) {
+                        ForEach(hotkeyTokens, id: \.self) { token in
+                            Text(token)
+                                .font(Typo.monoBold(8))
+                                .foregroundColor(Palette.textMuted)
+                                .padding(.horizontal, token.count > 3 ? 6 : 5)
+                                .padding(.vertical, 3)
+                                .background(
+                                    RoundedRectangle(cornerRadius: 4)
+                                        .fill(Palette.surface)
+                                        .overlay(
+                                            RoundedRectangle(cornerRadius: 4)
+                                                .strokeBorder(Palette.border, lineWidth: 0.5)
+                                        )
+                                )
+                        }
+                    }
                 }
             }
-            .padding(.horizontal, 10)
-            .padding(.vertical, 6)
+            .padding(.horizontal, 12)
+            .padding(.vertical, 8)
             .background(
                 RoundedRectangle(cornerRadius: 5)
                     .fill(isHovered ? Palette.surfaceHov : Color.clear)

package/app/Sources/App.swift

@@ -6,5 +6,15 @@ struct LatticesApp: App {
 
     var body: some Scene {
         Settings { EmptyView() }
+            .commands {
+                CommandGroup(after: .appInfo) {
+                    Button("Update Lattices…") {
+                        AppUpdater.shared.promptForUpdate()
+                    }
+                    .disabled(!AppUpdater.shared.canUpdate)
+
+                    Divider()
+                }
+            }
     }
 }

package/app/Sources/AppDelegate.swift

@@ -1,9 +1,14 @@
 import AppKit
 import SwiftUI
 
+extension Notification.Name {
+    static let latticesPopoverWillShow = Notification.Name("latticesPopoverWillShow")
+}
+
 /// Manages the NSStatusItem (menu bar icon), left-click popover, and right-click context menu.
 /// Replaces the previous SwiftUI MenuBarExtra approach for full click-event control.
 class AppDelegate: NSObject, NSApplicationDelegate, NSPopoverDelegate {
+    private static weak var shared: AppDelegate?
 
     private var statusItem: NSStatusItem!
     private var popover: NSPopover?
@@ -45,6 +50,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSPopoverDelegate {
     /// based on whether any managed windows are open.
     static func updateActivationPolicy() {
         let hasVisibleWindow =
+            (Self.shared?.popover?.isShown == true) ||
             CommandModeWindow.shared.isVisible ||
             CommandPaletteWindow.shared.isVisible ||
             MainWindow.shared.isVisible ||
@@ -60,6 +66,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSPopoverDelegate {
     }
 
     func applicationDidFinishLaunching(_ notification: Notification) {
+        Self.shared = self
         NSApp.setActivationPolicy(.accessory)
         NSApp.appearance = NSAppearance(named: .darkAqua)
 
@@ -82,8 +89,8 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSPopoverDelegate {
         let store = HotkeyStore.shared
         store.register(action: .palette) { CommandPaletteWindow.shared.toggle() }
         store.register(action: .unifiedWindow) { ScreenMapWindowController.shared.toggle() }
-        store.register(action: .bezel) { WindowBezel.showBezelForFrontmostWindow() }
-        store.register(action: .cheatSheet) { CheatSheetHUD.shared.toggle() }
+        store.register(action: .bezel) { Self.showWorkspaceInspector() }
+        store.register(action: .cheatSheet) { SettingsWindowController.shared.show() }
         store.register(action: .voiceCommand) {
             DiagnosticLog.shared.info("Hotkey: voiceCommand triggered")
             VoiceCommandWindow.shared.toggle()
@@ -103,7 +110,16 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSPopoverDelegate {
 
         // Pre-render HUD panels off-screen for instant first open
         DispatchQueue.main.async { HUDController.shared.warmUp() }
+        // Pre-build the menu bar popover so the first click doesn't pay the SwiftUI mount cost.
+        // Touching `.view` forces NSHostingController to materialize the SwiftUI view tree.
+        DispatchQueue.main.async { [weak self] in
+            guard let self = self else { return }
+            let p = self.makePopover()
+            _ = p.contentViewController?.view
+        }
         store.register(action: .omniSearch) { OmniSearchWindow.shared.toggle() }
+        WindowDragSnapController.shared.start()
+        MouseGestureController.shared.start()
 
         // Session layer cycling
         store.register(action: .layerNext) { SessionLayerStore.shared.cycleNext() }
@@ -140,7 +156,8 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSPopoverDelegate {
         for (action, position) in tileMap {
             store.register(action: action) { WindowTiler.tileFrontmostViaAX(to: position) }
         }
-        store.register(action: .tileDistribute) { WindowTiler.distributeVisible() }
+        store.register(action: .tileDistribute) { WindowTiler.distributeVisible(reactivateLattices: false) }
+        store.register(action: .tileTypeGrid) { WindowTiler.distributeVisibleByFrontmostType(reactivateLattices: false) }
 
         // Onboarding on first launch; otherwise just check permissions
         if !OnboardingWindowController.shared.showIfNeeded() {
@@ -157,8 +174,8 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSPopoverDelegate {
         ProcessModel.shared.start()
         LatticesApi.setup()
         DaemonServer.shared.start()
+        LatticesCompanionBridgeServer.shared.start()
         AgentPool.shared.start()
-        HandsOffSession.shared.start()
         diag.finish(tBoot)
 
         // --diagnostics flag: auto-open diagnostics panel on launch
@@ -168,14 +185,19 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSPopoverDelegate {
             }
         }
 
-        // --screen-map flag: auto-open screen map on launch
+        // --screen-map flag: auto-open layout on launch
         if CommandLine.arguments.contains("--screen-map") {
             DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-                ScreenMapWindowController.shared.show()
+                ScreenMapWindowController.shared.showPage(.screenMap)
             }
         }
     }
 
+    func applicationWillTerminate(_ notification: Notification) {
+        LatticesCompanionBridgeServer.shared.stop()
+        DaemonServer.shared.stop()
+    }
+
     // MARK: - Status item click handler
 
     @objc private func statusItemClicked(_ sender: Any?) {
@@ -185,13 +207,11 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSPopoverDelegate {
             // Right-click → context menu
             contextMenu.popUp(positioning: nil, at: NSPoint(x: 0, y: button.bounds.height + 4), in: button)
         } else {
-            // Left-click → toggle popover
+            // Left-click → toggle the menu bar projects popover.
             if let shown = popover, shown.isShown {
                 shown.performClose(sender)
             } else {
-                let p = makePopover()
-                p.show(relativeTo: button.bounds, of: button, preferredEdge: .minY)
-                p.contentViewController?.view.window?.makeKey()
+                showProjectsPopover()
             }
         }
     }
@@ -201,14 +221,16 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSPopoverDelegate {
         popover?.performClose(nil)
     }
 
-    /// Create a fresh popover each time so the SwiftUI view tree isn't kept alive
-    /// when the popover is closed — prevents continuous CPU usage from @Published updates.
+    /// Cached popover — built lazily on first click, reused on every subsequent open.
+    /// Keeping the SwiftUI view tree alive avoids rebuilding on each click (slow first paint).
+    /// Data refresh is driven from `popoverWillShow` + a notification MainView listens to.
     private func makePopover() -> NSPopover {
+        if let p = popover { return p }
         let t = DiagnosticLog.shared.startTimed("makePopover")
         let p = NSPopover()
         p.contentViewController = NSHostingController(rootView: MainView(scanner: ProjectScanner.shared))
         p.behavior = .transient
-        p.contentSize = NSSize(width: 380, height: 560)
+        p.contentSize = NSSize(width: 380, height: 300)
         p.appearance = NSAppearance(named: .darkAqua)
         p.delegate = self
         popover = p
@@ -216,10 +238,20 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSPopoverDelegate {
         return p
     }
 
+    private func showProjectsPopover() {
+        guard let button = statusItem.button else { return }
+        let p = makePopover()
+        p.show(relativeTo: button.bounds, of: button, preferredEdge: .minY)
+        p.contentViewController?.view.window?.makeKey()
+    }
+
+    func popoverWillShow(_ notification: Notification) {
+        Self.updateActivationPolicy()
+        NotificationCenter.default.post(name: .latticesPopoverWillShow, object: nil)
+    }
+
     func popoverDidClose(_ notification: Notification) {
-        // Tear down the SwiftUI view tree so observed models stop driving re-renders
-        popover?.contentViewController = nil
-        popover = nil
+        Self.updateActivationPolicy()
     }
 
     // MARK: - Context menu
@@ -228,12 +260,10 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSPopoverDelegate {
         let menu = NSMenu()
 
         let actions: [(String, String, Selector)] = [
+            ("Home", "", #selector(menuWorkspace)),
+            ("Layout", "", #selector(menuLayout)),
+            ("Search", "", #selector(menuSearch)),
             ("Command Palette", "⌘⇧M", #selector(menuCommandPalette)),
-            ("Unified Window", "", #selector(menuScreenMap)),
-            ("HUD", "", #selector(menuHUD)),
-            ("Window Bezel", "", #selector(menuWindowBezel)),
-            ("Cheat Sheet", "", #selector(menuCheatSheet)),
-            ("Omni Search", "", #selector(menuOmniSearch)),
         ]
         for (title, shortcut, action) in actions {
             let item = NSMenuItem(title: title, action: action, keyEquivalent: "")
@@ -246,14 +276,29 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSPopoverDelegate {
 
         menu.addItem(.separator())
 
-        let settings = NSMenuItem(title: "Settings…", action: #selector(menuSettings), keyEquivalent: ",")
+        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)
 
-        let diag = NSMenuItem(title: "Diagnostics", action: #selector(menuDiagnostics), keyEquivalent: "")
-        diag.target = self
-        menu.addItem(diag)
-
         menu.addItem(.separator())
 
         let quit = NSMenuItem(title: "Quit Lattices", action: #selector(menuQuit), keyEquivalent: "q")
@@ -264,12 +309,28 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSPopoverDelegate {
     }
 
     @objc private func menuCommandPalette() { CommandPaletteWindow.shared.toggle() }
-    @objc private func menuScreenMap() { ScreenMapWindowController.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 menuDocs() { SettingsWindowController.shared.show() }
+    @objc private func menuProjects() { DispatchQueue.main.async { self.showProjectsPopover() } }
+    @objc private func menuInitializeProject() { CliActionLauncher.initializeProjectInTerminal() }
+    @objc private func menuLaunchProject() { CliActionLauncher.launchProjectInTerminal() }
     @objc private func menuHUD() { HUDController.shared.toggle() }
-    @objc private func menuWindowBezel() { WindowBezel.showBezelForFrontmostWindow() }
-    @objc private func menuCheatSheet() { CheatSheetHUD.shared.toggle() }
+    @objc private func menuWindowBezel() { Self.showWorkspaceInspector() }
+    @objc private func menuCheatSheet() { SettingsWindowController.shared.show() }
     @objc private func menuOmniSearch() { OmniSearchWindow.shared.toggle() }
+    @MainActor @objc private func menuUpdate() { AppUpdater.shared.promptForUpdate() }
     @objc private func menuSettings() { SettingsWindowController.shared.show() }
-    @objc private func menuDiagnostics() { DiagnosticWindow.shared.toggle() }
     @objc private func menuQuit() { NSApp.terminate(nil) }
+
+    private static func showWorkspaceInspector() {
+        guard let entry = DesktopModel.shared.frontmostWindow(),
+              entry.app != "Lattices" else {
+            ScreenMapWindowController.shared.showPage(.screenMap)
+            return
+        }
+
+        ScreenMapWindowController.shared.showWindow(wid: entry.wid)
+    }
 }

package/app/Sources/AppShellView.swift

@@ -66,6 +66,7 @@ struct AppShellView: View {
             ForEach(AppPage.primaryTabs, id: \.rawValue) { tab in
                 tabButton(tab)
             }
+
             Spacer()
         }
         .padding(.horizontal, 12)
@@ -90,6 +91,7 @@ struct AppShellView: View {
             .foregroundColor(isActive ? Palette.text : Palette.textMuted)
             .padding(.horizontal, 12)
             .padding(.vertical, 6)
+            .contentShape(Rectangle())
             .background(
                 RoundedRectangle(cornerRadius: 6)
                     .fill(isActive ? Palette.surfaceHov : Color.clear)

package/app/Sources/AppTypeClassifier.swift

@@ -13,6 +13,20 @@ enum AppType: String, CaseIterable {
     var label: String { rawValue }
 }
 
+enum AppGrouping {
+    case type(AppType)
+    case exactApp(String)
+
+    var label: String {
+        switch self {
+        case .type(let type):
+            return type.label
+        case .exactApp(let appName):
+            return appName
+        }
+    }
+}
+
 enum AppTypeClassifier {
     private static let nameMap: [String: AppType] = [
         // Terminals
@@ -67,4 +81,26 @@ enum AppTypeClassifier {
         if lower.contains("slack") || lower.contains("discord") || lower.contains("chat") || lower.contains("teams") { return .chat }
         return .other
     }
+
+    static func grouping(for appName: String) -> AppGrouping {
+        switch classify(appName) {
+        case .system, .other:
+            return .exactApp(appName)
+        case let type:
+            return .type(type)
+        }
+    }
+
+    static func matches(_ appName: String, grouping: AppGrouping) -> Bool {
+        switch grouping {
+        case .type(let type):
+            return classify(appName) == type
+        case .exactApp(let exactApp):
+            return appName.localizedCaseInsensitiveCompare(exactApp) == .orderedSame
+        }
+    }
+
+    static func matches(_ appName: String, type: AppType) -> Bool {
+        classify(appName) == type
+    }
 }

package/app/Sources/AppUpdater.swift

@@ -0,0 +1,92 @@
+import AppKit
+import Combine
+import Foundation
+
+@MainActor
+final class AppUpdater: ObservableObject {
+    static let shared = AppUpdater()
+
+    @Published private(set) var isUpdating = false
+    @Published private(set) var statusMessage: String?
+
+    private init() {}
+
+    var currentVersion: String { LatticesRuntime.appVersion }
+
+    var canUpdate: Bool {
+        LatticesRuntime.bunPath != nil && LatticesRuntime.appHelperScriptPath != nil
+    }
+
+    var unavailableReason: String? {
+        if LatticesRuntime.bunPath == nil {
+            return "Install Bun to enable in-app updates."
+        }
+        if LatticesRuntime.appHelperScriptPath == nil {
+            return "Launch Lattices via `lattices app` so the updater can find the CLI bundle."
+        }
+        return nil
+    }
+
+    func promptForUpdate() {
+        guard canUpdate else {
+            presentAlert(
+                title: "Update Unavailable",
+                message: unavailableReason ?? "Lattices could not locate its updater."
+            )
+            return
+        }
+
+        let alert = NSAlert()
+        alert.alertStyle = .informational
+        alert.messageText = "Install the latest Lattices app update?"
+        alert.informativeText = "Lattices will download the latest released app bundle, close, and relaunch when the update is ready."
+        alert.addButton(withTitle: "Update")
+        alert.addButton(withTitle: "Cancel")
+
+        guard alert.runModal() == .alertFirstButtonReturn else { return }
+        startDetachedUpdate()
+    }
+
+    private func startDetachedUpdate() {
+        guard !isUpdating else { return }
+        guard let bunPath = LatticesRuntime.bunPath,
+              let scriptPath = LatticesRuntime.appHelperScriptPath else {
+            presentAlert(
+                title: "Update Unavailable",
+                message: unavailableReason ?? "Lattices could not locate its updater."
+            )
+            return
+        }
+
+        let proc = Process()
+        proc.executableURL = URL(fileURLWithPath: bunPath)
+        proc.arguments = [scriptPath, "update", "--detach", "--launch"]
+        if let cliRoot = LatticesRuntime.cliRoot {
+            proc.currentDirectoryURL = URL(fileURLWithPath: cliRoot)
+        }
+
+        var env = ProcessInfo.processInfo.environment
+        env.removeValue(forKey: "CLAUDECODE")
+        proc.environment = env
+
+        do {
+            try proc.run()
+            isUpdating = true
+            statusMessage = "Updating to the latest release. Lattices will relaunch when it's ready."
+        } catch {
+            presentAlert(
+                title: "Update Failed",
+                message: "Lattices could not start the updater.\n\n\(error.localizedDescription)"
+            )
+        }
+    }
+
+    private func presentAlert(title: String, message: String) {
+        let alert = NSAlert()
+        alert.alertStyle = .warning
+        alert.messageText = title
+        alert.informativeText = message
+        alert.addButton(withTitle: "OK")
+        alert.runModal()
+    }
+}

package/app/Sources/CheatSheetHUD.swift

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

package/app/Sources/CliActionLauncher.swift

@@ -0,0 +1,50 @@
+import AppKit
+
+enum CliActionLauncher {
+    private static var defaultDirectory: String {
+        let root = Preferences.shared.scanRoot
+        return root.isEmpty ? NSHomeDirectory() : root
+    }
+
+    private static func chooseProjectDirectory(message: String, prompt: String) -> String? {
+        let panel = NSOpenPanel()
+        panel.message = message
+        panel.prompt = prompt
+        panel.canChooseFiles = false
+        panel.canChooseDirectories = true
+        panel.allowsMultipleSelection = false
+        panel.directoryURL = URL(fileURLWithPath: defaultDirectory)
+        return panel.runModal() == .OK ? panel.url?.path : nil
+    }
+
+    static func initializeProjectInTerminal() {
+        guard let directory = chooseProjectDirectory(
+            message: "Choose a project folder to initialize with Lattices.",
+            prompt: "Initialize"
+        ) else { return }
+
+        Preferences.shared.terminal.launch(
+            command: "lattices init && lattices",
+            in: directory
+        )
+    }
+
+    static func launchProjectInTerminal() {
+        guard let directory = chooseProjectDirectory(
+            message: "Choose a project folder to launch with Lattices.",
+            prompt: "Launch"
+        ) else { return }
+
+        Preferences.shared.terminal.launch(
+            command: "lattices",
+            in: directory
+        )
+    }
+
+    static func installTmuxInTerminal() {
+        Preferences.shared.terminal.launch(
+            command: "brew install tmux",
+            in: defaultDirectory
+        )
+    }
+}

package/app/Sources/CommandModeView.swift

@@ -121,23 +121,6 @@ struct CommandModeView: View {
 
             Spacer()
 
-            if let layer = state.inventory.activeLayer {
-                HStack(spacing: 4) {
-                    Text("Layer: \(layer)")
-                        .font(Typo.mono(10))
-                        .foregroundColor(Palette.running)
-
-                    Text("[\(state.inventory.layerCount > 0 ? "\(WorkspaceManager.shared.activeLayerIndex + 1)/\(state.inventory.layerCount)" : "—")]")
-                        .font(Typo.mono(10))
-                        .foregroundColor(Palette.textMuted)
-                }
-                .padding(.horizontal, 6)
-                .padding(.vertical, 2)
-                .background(
-                    RoundedRectangle(cornerRadius: 3)
-                        .fill(Palette.running.opacity(0.10))
-                )
-            }
         }
         .padding(.horizontal, 16)
         .padding(.vertical, 10)
@@ -155,15 +138,12 @@ struct CommandModeView: View {
     private var inventoryGrid: some View {
         ScrollView {
             LazyVStack(alignment: .leading, spacing: 0) {
-                let grouped = groupedItems
-                if grouped.isEmpty {
+                let items = state.inventory.items
+                if items.isEmpty {
                     emptyState
                 } else {
-                    ForEach(grouped, id: \.0) { section, items in
-                        sectionHeader(section)
-                        ForEach(Array(items.enumerated()), id: \.offset) { _, item in
-                            inventoryRow(item)
-                        }
+                    ForEach(Array(items.enumerated()), id: \.offset) { _, item in
+                        inventoryRow(item)
                     }
                 }
             }