@lattices/cli 0.4.2 → 0.4.5

package/app/Sources/MainView.swift

@@ -18,6 +18,12 @@ struct MainView: View {
     @State private var tmuxBannerDismissed = false
     @ObservedObject private var tmuxModel = TmuxModel.shared
     @State private var orphanSectionCollapsed = true
+    private let embeddedProjectColumns = Array(
+        repeating: GridItem(.flexible(minimum: 0, maximum: .infinity), spacing: 10, alignment: .top),
+        count: 3
+    )
+    private let embeddedProjectCardHeight: CGFloat = 94
+    private let embeddedProjectGridSpacing: CGFloat = 10
     private var filtered: [Project] {
         if searchText.isEmpty { return scanner.projects }
         return scanner.projects.filter {
@@ -34,6 +40,16 @@ struct MainView: View {
 
     private var needsSetup: Bool { prefs.scanRoot.isEmpty }
     private var runningCount: Int { scanner.projects.filter(\.isRunning).count }
+    private var hasVisibleGroups: Bool {
+        guard let groups = workspace.config?.groups else { return false }
+        return !groups.isEmpty && searchText.isEmpty
+    }
+    private var embeddedProjectGridHeight: CGFloat {
+        guard !filtered.isEmpty else { return 0 }
+        let rowCount = min(Int(ceil(Double(filtered.count) / 3.0)), 3)
+        return CGFloat(rowCount) * embeddedProjectCardHeight
+            + CGFloat(max(0, rowCount - 1)) * embeddedProjectGridSpacing
+    }
 
     var body: some View {
         VStack(spacing: 0) {
@@ -43,35 +59,42 @@ struct MainView: View {
             minWidth: layout == .popover ? 380 : 0,
             idealWidth: layout == .popover ? 380 : nil,
             maxWidth: .infinity,
-            minHeight: layout == .popover ? 520 : 0,
-            idealHeight: layout == .popover ? 560 : nil,
-            maxHeight: .infinity
+            maxHeight: .infinity,
+            alignment: .top
         )
         .background(PanelBackground())
         .preferredColorScheme(.dark)
         .onAppear {
-            let tTotal = DiagnosticLog.shared.startTimed("MainView.onAppear (total)")
             if needsSetup && !hasCheckedSetup {
                 hasCheckedSetup = true
                 SettingsWindowController.shared.show()
             }
-            scanner.updateRoot(prefs.scanRoot)
+            runRefresh()
+        }
+        .onReceive(NotificationCenter.default.publisher(for: .latticesPopoverWillShow)) { _ in
+            guard layout == .popover else { return }
+            runRefresh()
+        }
+    }
 
-            let tScan = DiagnosticLog.shared.startTimed("ProjectScanner.scan")
-            scanner.scan()
-            DiagnosticLog.shared.finish(tScan)
+    private func runRefresh() {
+        let tTotal = DiagnosticLog.shared.startTimed("MainView.refresh (total)")
+        scanner.updateRoot(prefs.scanRoot)
 
-            let tInv = DiagnosticLog.shared.startTimed("InventoryManager.refresh")
-            inventory.refresh()
-            DiagnosticLog.shared.finish(tInv)
+        let tScan = DiagnosticLog.shared.startTimed("ProjectScanner.scan")
+        scanner.scan()
+        DiagnosticLog.shared.finish(tScan)
 
-            let tPerm = DiagnosticLog.shared.startTimed("PermissionChecker.check")
-            permChecker.check()
-            DiagnosticLog.shared.finish(tPerm)
+        let tInv = DiagnosticLog.shared.startTimed("InventoryManager.refresh")
+        inventory.refresh()
+        DiagnosticLog.shared.finish(tInv)
 
-            bannerDismissed = false
-            DiagnosticLog.shared.finish(tTotal)
-        }
+        let tPerm = DiagnosticLog.shared.startTimed("PermissionChecker.check")
+        permChecker.check()
+        DiagnosticLog.shared.finish(tPerm)
+
+        bannerDismissed = false
+        DiagnosticLog.shared.finish(tTotal)
     }
 
     private var mainContent: some View {
@@ -88,52 +111,51 @@ struct MainView: View {
                         (NSApp.delegate as? AppDelegate)?.dismissPopover()
                         ScreenMapWindowController.shared.showPage(.home)
                     }
-                    headerButton(icon: "terminal") {
+                    headerButton(icon: "rectangle.3.group") {
+                        (NSApp.delegate as? AppDelegate)?.dismissPopover()
+                        ScreenMapWindowController.shared.showPage(.screenMap)
+                    }
+                    headerButton(icon: "magnifyingglass") {
                         (NSApp.delegate as? AppDelegate)?.dismissPopover()
-                        ScreenMapWindowController.shared.showPage(.pi)
+                        ScreenMapWindowController.shared.showPage(.desktopInventory)
                     }
-                    headerButton(icon: "arrow.up.left.and.arrow.down.right") {
+                    headerButton(icon: "command") {
                         (NSApp.delegate as? AppDelegate)?.dismissPopover()
-                        MainWindow.shared.show()
+                        CommandPaletteWindow.shared.toggle()
                     }
                     headerButton(icon: "arrow.clockwise") { scanner.scan(); inventory.refresh() }
                 }
                 .padding(.horizontal, 18)
                 .padding(.top, 18)
                 .padding(.bottom, 12)
-            }
-
-            // Layer switcher
-            if let config = workspace.config, let layers = config.layers, layers.count > 1 {
-                layerBar(config: config)
-            }
-
-            // Search
-            HStack(spacing: 8) {
-                Image(systemName: "magnifyingglass")
-                    .foregroundColor(Palette.textMuted)
-                    .font(.system(size: 11))
-                TextField("Search projects...", text: $searchText)
-                    .textFieldStyle(.plain)
-                    .font(Typo.body(13))
-                    .foregroundColor(Palette.text)
-                if !searchText.isEmpty {
-                    Button { searchText = "" } label: {
-                        Image(systemName: "xmark.circle.fill")
-                            .foregroundColor(Palette.textMuted)
-                            .font(.system(size: 11))
+            } else {
+                // Search
+                HStack(spacing: 8) {
+                    Image(systemName: "magnifyingglass")
+                        .foregroundColor(Palette.textMuted)
+                        .font(.system(size: 11))
+                    TextField("Search projects...", text: $searchText)
+                        .textFieldStyle(.plain)
+                        .font(Typo.body(13))
+                        .foregroundColor(Palette.text)
+                    if !searchText.isEmpty {
+                        Button { searchText = "" } label: {
+                            Image(systemName: "xmark.circle.fill")
+                                .foregroundColor(Palette.textMuted)
+                                .font(.system(size: 11))
+                        }
+                        .buttonStyle(.plain)
                     }
-                    .buttonStyle(.plain)
                 }
+                .padding(.horizontal, 12)
+                .padding(.vertical, 8)
+                .background(
+                    RoundedRectangle(cornerRadius: 4)
+                        .fill(Palette.surface)
+                )
+                .padding(.horizontal, 14)
+                .padding(.bottom, 10)
             }
-            .padding(.horizontal, 12)
-            .padding(.vertical, 8)
-            .background(
-                RoundedRectangle(cornerRadius: 4)
-                    .fill(Palette.surface)
-            )
-            .padding(.horizontal, 14)
-            .padding(.bottom, 10)
 
             // Permission banner
             if !permChecker.allGranted && !bannerDismissed {
@@ -145,79 +167,110 @@ struct MainView: View {
                 tmuxBanner
             }
 
-            Rectangle()
-                .fill(Palette.border)
-                .frame(height: 0.5)
+            if layout == .popover {
+                Rectangle()
+                    .fill(Palette.border)
+                    .frame(height: 0.5)
 
-            // List
-            if filtered.isEmpty && (workspace.config?.groups ?? []).isEmpty {
-                Spacer()
-                emptyState
-                Spacer()
+                actionsSection
+
+                Rectangle()
+                    .fill(Palette.border)
+                    .frame(height: 0.5)
+
+                bottomBar
             } else {
-                ScrollView {
-                    LazyVStack(spacing: 4) {
-                        // Tab groups section
-                        if let groups = workspace.config?.groups, !groups.isEmpty, searchText.isEmpty {
-                            ForEach(groups) { group in
-                                TabGroupRow(group: group, workspace: workspace)
-                            }
+                Rectangle()
+                    .fill(Palette.border)
+                    .frame(height: 0.5)
 
-                            if !filtered.isEmpty {
-                                Rectangle()
-                                    .fill(Palette.border)
-                                    .frame(height: 0.5)
-                                    .padding(.vertical, 4)
-                            }
-                        }
+                if filtered.isEmpty && !hasVisibleGroups {
+                    Spacer()
+                    emptyState
+                    Spacer()
+                } else {
+                    embeddedProjectsSection
+                }
 
-                        // Projects
-                        ForEach(filtered) { project in
-                            ProjectRow(project: project) {
-                                SessionManager.launch(project: project)
-                            } onDetach: {
-                                SessionManager.detach(project: project)
-                                DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-                                    scanner.refreshStatus()
-                                }
-                            } onKill: {
-                                SessionManager.kill(project: project)
-                                DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-                                    scanner.refreshStatus()
-                                }
-                            } onSync: {
-                                SessionManager.sync(project: project)
-                                DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
-                                    scanner.refreshStatus()
-                                }
-                            } onRestart: { paneName in
-                                SessionManager.restart(project: project, paneName: paneName)
-                            }
-                        }
+                Rectangle()
+                    .fill(Palette.border)
+                    .frame(height: 0.5)
 
-                        // Orphan sessions
-                        if !filteredOrphans.isEmpty {
-                            orphanSection
-                        }
+                // Actions footer
+                actionsSection
+
+                Rectangle()
+                    .fill(Palette.border)
+                    .frame(height: 0.5)
+
+                // Bottom bar
+                bottomBar
+            }
+        }
+    }
+
+    private var embeddedProjectsSection: some View {
+        VStack(spacing: 0) {
+            if hasVisibleGroups, let groups = workspace.config?.groups {
+                LazyVStack(spacing: 4) {
+                    ForEach(groups) { group in
+                        TabGroupRow(group: group, workspace: workspace)
                     }
-                    .padding(.horizontal, 10)
-                    .padding(.vertical, 8)
                 }
+                .padding(.horizontal, 10)
+                .padding(.top, 8)
+                .padding(.bottom, filtered.isEmpty ? 8 : 6)
             }
 
-            Rectangle()
-                .fill(Palette.border)
-                .frame(height: 0.5)
+            if !filtered.isEmpty {
+                VStack(spacing: 0) {
+                    HStack(spacing: 8) {
+                        Text(searchText.isEmpty ? "Projects" : "Matches")
+                            .font(Typo.monoBold(10))
+                            .foregroundColor(Palette.textMuted)
 
-            // Actions footer
-            actionsSection
+                        if searchText.isEmpty {
+                            Text("\(runningCount) live")
+                                .font(Typo.mono(9))
+                                .foregroundColor(Palette.running.opacity(0.8))
+                        }
 
-            Rectangle()
-                .fill(Palette.border)
-                .frame(height: 0.5)
+                        Spacer()
 
-            // Bottom bar
-            bottomBar
+                        Text("\(filtered.count)")
+                            .font(Typo.mono(9))
+                            .foregroundColor(Palette.textMuted)
+                    }
+                    .padding(.horizontal, 14)
+                    .padding(.top, 10)
+                    .padding(.bottom, 8)
+
+                    ScrollView(.vertical, showsIndicators: filtered.count > 9) {
+                        LazyVGrid(columns: embeddedProjectColumns, spacing: embeddedProjectGridSpacing) {
+                            ForEach(filtered) { project in
+                                HomeProjectCard(
+                                    project: project,
+                                    onLaunch: { launchProject(project) },
+                                    onDetach: { detachProject(project) },
+                                    onKill: { killProject(project) },
+                                    onSync: { syncProject(project) },
+                                    onRestart: { paneName in restartProject(project, paneName: paneName) }
+                                )
+                                .frame(height: embeddedProjectCardHeight)
+                            }
+                        }
+                        .padding(.horizontal, 14)
+                        .padding(.bottom, 10)
+                    }
+                    .frame(maxHeight: embeddedProjectGridHeight)
+                }
+            }
+
+            if !filteredOrphans.isEmpty {
+                orphanSection
+                    .padding(.horizontal, 10)
+                    .padding(.bottom, 8)
+            }
         }
     }
 
@@ -291,7 +344,7 @@ struct MainView: View {
                 Spacer()
 
                 Button("Help & shortcuts") {
-                    ScreenMapWindowController.shared.showPage(.docs)
+                    SettingsWindowController.shared.show()
                 }
                 .buttonStyle(.plain)
                 .font(Typo.mono(9))
@@ -302,31 +355,40 @@ struct MainView: View {
             .padding(.bottom, 6)
 
             ActionRow(
-                label: "Command Palette",
-                detail: "Launch, attach, and control projects",
-                hotkeyTokens: hotkeyTokens(.palette),
-                icon: "command",
-                accentColor: Palette.running
-            ) {
-                CommandPaletteWindow.shared.toggle()
-            }
-            ActionRow(
-                label: "Workspace",
-                detail: "Screen map, inventory, and window context",
+                label: "Home",
+                detail: "Workspace overview and project launcher",
                 hotkeyTokens: hotkeyTokens(.unifiedWindow),
-                icon: "square.grid.2x2",
+                icon: "house",
                 accentColor: Palette.text
             ) {
                 ScreenMapWindowController.shared.showPage(.home)
             }
             ActionRow(
-                label: "Assistant",
-                detail: "Search now, or use voice when you need it",
+                label: "Layout",
+                detail: "Arrange windows and layers",
+                hotkeyTokens: [],
+                icon: "rectangle.3.group",
+                accentColor: Palette.running
+            ) {
+                ScreenMapWindowController.shared.showPage(.screenMap)
+            }
+            ActionRow(
+                label: "Search",
+                detail: "Windows, projects, sessions, processes, and OCR",
                 hotkeyTokens: hotkeyTokens(.omniSearch),
                 icon: "magnifyingglass",
                 accentColor: AudioLayer.shared.isListening ? Palette.running : Palette.textDim
             ) {
-                showAssistant()
+                ScreenMapWindowController.shared.showPage(.desktopInventory)
+            }
+            ActionRow(
+                label: "Command Palette",
+                detail: "Launch, attach, and control projects",
+                hotkeyTokens: hotkeyTokens(.palette),
+                icon: "command",
+                accentColor: Palette.running
+            ) {
+                CommandPaletteWindow.shared.toggle()
             }
         }
         .padding(.vertical, 4)
@@ -340,9 +402,6 @@ struct MainView: View {
             }
 
             HStack(spacing: 4) {
-                bottomBarButton(icon: "stethoscope", label: "Diagnostics") {
-                    DiagnosticWindow.shared.toggle()
-                }
                 if !permChecker.allGranted {
                     Circle()
                         .fill(Palette.detach)
@@ -399,15 +458,6 @@ struct MainView: View {
         }
     }
 
-    private func showAssistant() {
-        if AudioLayer.shared.isListening || VoiceCommandWindow.shared.isVisible {
-            VoiceCommandWindow.shared.toggle()
-            return
-        }
-
-        OmniSearchWindow.shared.show()
-    }
-
     // MARK: - Empty state
 
     private var emptyState: some View {
@@ -420,12 +470,33 @@ struct MainView: View {
                 .font(Typo.heading(14))
                 .foregroundColor(Palette.textDim)
 
-            Text("Run  lattices init  in a project\nto add it here")
+            Text("Choose a repo and we’ll hand off to the CLI\nin your terminal.")
                 .font(Typo.mono(11))
                 .foregroundColor(Palette.textMuted)
                 .multilineTextAlignment(.center)
                 .lineSpacing(3)
+
+            HStack(spacing: 10) {
+                Button(action: CliActionLauncher.initializeProjectInTerminal) {
+                    Text("Initialize Project")
+                        .angularButton(Palette.running)
+                }
+                .buttonStyle(.plain)
+
+                Button(action: CliActionLauncher.launchProjectInTerminal) {
+                    Text("Launch Project")
+                        .angularButton(.white, filled: false)
+                }
+                .buttonStyle(.plain)
+            }
+
+            Text("Initialize runs  lattices init && lattices  in the folder you choose.")
+                .font(Typo.mono(9))
+                .foregroundColor(Palette.textMuted)
+                .multilineTextAlignment(.center)
+                .lineSpacing(2)
         }
+        .padding(.horizontal, 20)
     }
 
     // MARK: - Permission banner
@@ -451,11 +522,11 @@ struct MainView: View {
             permissionRow("Accessibility", granted: permChecker.accessibility) {
                 permChecker.requestAccessibility()
             }
-            permissionRow("Screen Recording", granted: permChecker.screenRecording) {
+            permissionRow("Screen Capture", granted: permChecker.screenRecording) {
                 permChecker.requestScreenRecording()
             }
 
-            Text("Click a row to request access.")
+            Text("Click a row to continue the permission flow in macOS.")
                 .font(Typo.mono(9))
                 .foregroundColor(Palette.textMuted)
         }
@@ -572,54 +643,6 @@ struct MainView: View {
         .disabled(granted)
     }
 
-    // MARK: - Layer Bar
-
-    private func layerBar(config: WorkspaceConfig) -> some View {
-        HStack(spacing: 6) {
-            ForEach(Array((config.layers ?? []).enumerated()), id: \.element.id) { i, layer in
-                let isActive = i == workspace.activeLayerIndex
-                let counts = workspace.layerRunningCount(index: i)
-                Button {
-                    workspace.tileLayer(index: i)
-                } label: {
-                    VStack(spacing: 2) {
-                        HStack(spacing: 5) {
-                            Circle()
-                                .fill(isActive ? Palette.running : Palette.textMuted.opacity(0.4))
-                                .frame(width: 6, height: 6)
-                            Text(layer.label)
-                                .font(Typo.mono(11))
-                                .foregroundColor(isActive ? Palette.text : Palette.textDim)
-                            if counts.total > 0 {
-                                Text("\(counts.running)/\(counts.total)")
-                                    .font(Typo.mono(8))
-                                    .foregroundColor(counts.running > 0 ? Palette.running : Palette.textMuted)
-                            }
-                        }
-                        Text("\u{2325}\(i + 1)")
-                            .font(Typo.mono(8))
-                            .foregroundColor(Palette.textMuted.opacity(0.6))
-                    }
-                    .padding(.horizontal, 10)
-                    .padding(.vertical, 5)
-                    .background(
-                        RoundedRectangle(cornerRadius: 5)
-                            .fill(isActive ? Palette.running.opacity(0.1) : Color.clear)
-                    )
-                    .overlay(
-                        RoundedRectangle(cornerRadius: 5)
-                            .strokeBorder(isActive ? Palette.running.opacity(0.3) : Palette.border, lineWidth: 0.5)
-                    )
-                }
-                .buttonStyle(.plain)
-                .disabled(workspace.isSwitching)
-            }
-            Spacer()
-        }
-        .padding(.horizontal, 14)
-        .padding(.bottom, 8)
-    }
-
     // MARK: - Helpers
 
     private func headerButton(icon: String, action: @escaping () -> Void) -> some View {
@@ -631,4 +654,141 @@ struct MainView: View {
         }
         .buttonStyle(.plain)
     }
+
+    private func launchProject(_ project: Project) {
+        SessionManager.launch(project: project)
+    }
+
+    private func detachProject(_ project: Project) {
+        SessionManager.detach(project: project)
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+            scanner.refreshStatus()
+        }
+    }
+
+    private func killProject(_ project: Project) {
+        SessionManager.kill(project: project)
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+            scanner.refreshStatus()
+        }
+    }
+
+    private func syncProject(_ project: Project) {
+        SessionManager.sync(project: project)
+        DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
+            scanner.refreshStatus()
+        }
+    }
+
+    private func restartProject(_ project: Project, paneName: String?) {
+        SessionManager.restart(project: project, paneName: paneName)
+    }
+}
+
+private struct HomeProjectCard: View {
+    let project: Project
+    let onLaunch: () -> Void
+    let onDetach: () -> Void
+    let onKill: () -> Void
+    let onSync: () -> Void
+    let onRestart: (String?) -> Void
+
+    @State private var isHovered = false
+
+    private var summaryText: String {
+        if !project.paneSummary.isEmpty { return project.paneSummary }
+        if let cmd = project.devCommand, !cmd.isEmpty { return cmd }
+        return project.hasConfig
+            ? "\(project.paneCount) pane\(project.paneCount == 1 ? "" : "s")"
+            : "No config"
+    }
+
+    var body: some View {
+        VStack(alignment: .leading, spacing: 10) {
+            HStack(alignment: .top, spacing: 8) {
+                Circle()
+                    .fill(project.isRunning ? Palette.running : Palette.borderLit)
+                    .frame(width: 7, height: 7)
+                    .padding(.top, 4)
+
+                VStack(alignment: .leading, spacing: 4) {
+                    Text(project.name)
+                        .font(Typo.heading(13))
+                        .foregroundColor(Palette.text)
+                        .lineLimit(1)
+
+                    Text(summaryText)
+                        .font(Typo.mono(10))
+                        .foregroundColor(Palette.textMuted)
+                        .lineLimit(2)
+                        .fixedSize(horizontal: false, vertical: true)
+                }
+
+                Spacer(minLength: 0)
+
+                if project.isRunning {
+                    Text("LIVE")
+                        .font(Typo.monoBold(8))
+                        .foregroundColor(Palette.running)
+                        .padding(.horizontal, 6)
+                        .padding(.vertical, 3)
+                        .background(
+                            Capsule()
+                                .fill(Palette.running.opacity(0.10))
+                        )
+                }
+            }
+
+            Spacer(minLength: 0)
+
+            HStack(spacing: 6) {
+                if project.isRunning {
+                    Button(action: onDetach) {
+                        Image(systemName: "rectangle.portrait.and.arrow.right")
+                            .font(.system(size: 10, weight: .medium))
+                            .angularButton(Palette.detach, filled: false)
+                    }
+                    .buttonStyle(.plain)
+                }
+
+                Spacer(minLength: 0)
+
+                Button(action: onLaunch) {
+                    Text(project.isRunning ? "Attach" : "Launch")
+                        .angularButton(project.isRunning ? Palette.running : Palette.launch)
+                }
+                .buttonStyle(.plain)
+            }
+        }
+        .padding(12)
+        .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
+        .glassCard(hovered: isHovered)
+        .contentShape(Rectangle())
+        .onHover { isHovered = $0 }
+        .contextMenu {
+            if project.isRunning {
+                Button("Attach") { onLaunch() }
+                Button("Detach") { onDetach() }
+                Button {
+                    WindowTiler.navigateToWindow(
+                        session: project.sessionName,
+                        terminal: Preferences.shared.terminal
+                    )
+                } label: {
+                    Label("Go to Window", systemImage: "macwindow")
+                }
+                Divider()
+                Button("Sync Session") { onSync() }
+                Menu("Restart Pane") {
+                    ForEach(project.paneNames, id: \.self) { name in
+                        Button(name) { onRestart(name) }
+                    }
+                }
+                Divider()
+                Button("Kill Session") { onKill() }
+            } else {
+                Button("Launch") { onLaunch() }
+            }
+        }
+    }
 }