@lattices/cli 0.4.1 → 0.4.2

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.2</string>
     <key>CFBundleShortVersionString</key>
-    <string>0.4.1</string>
+    <string>0.4.2</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.2</string>
     <key>CFBundleShortVersionString</key>
-    <string>0.4.1</string>
+    <string>0.4.2</string>
     <key>LSMinimumSystemVersion</key>
     <string>13.0</string>
     <key>LSUIElement</key>

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/AppDelegate.swift

@@ -158,7 +158,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSPopoverDelegate {
         LatticesApi.setup()
         DaemonServer.shared.start()
         AgentPool.shared.start()
-        HandsOffSession.shared.start()
         diag.finish(tBoot)
 
         // --diagnostics flag: auto-open diagnostics panel on launch
@@ -229,11 +228,9 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSPopoverDelegate {
 
         let actions: [(String, String, Selector)] = [
             ("Command Palette", "⌘⇧M", #selector(menuCommandPalette)),
-            ("Unified Window", "", #selector(menuScreenMap)),
-            ("HUD", "", #selector(menuHUD)),
-            ("Window Bezel", "", #selector(menuWindowBezel)),
-            ("Cheat Sheet", "", #selector(menuCheatSheet)),
-            ("Omni Search", "", #selector(menuOmniSearch)),
+            ("Workspace", "", #selector(menuWorkspace)),
+            ("Assistant", "", #selector(menuAssistant)),
+            ("Help & Shortcuts", "", #selector(menuDocs)),
         ]
         for (title, shortcut, action) in actions {
             let item = NSMenuItem(title: title, action: action, keyEquivalent: "")
@@ -264,7 +261,15 @@ 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 menuAssistant() {
+        if AudioLayer.shared.isListening || VoiceCommandWindow.shared.isVisible {
+            VoiceCommandWindow.shared.toggle()
+        } else {
+            OmniSearchWindow.shared.show()
+        }
+    }
+    @objc private func menuDocs() { ScreenMapWindowController.shared.showPage(.docs) }
     @objc private func menuHUD() { HUDController.shared.toggle() }
     @objc private func menuWindowBezel() { WindowBezel.showBezelForFrontmostWindow() }
     @objc private func menuCheatSheet() { CheatSheetHUD.shared.toggle() }

package/app/Sources/HandsOffSession.swift

@@ -97,6 +97,15 @@ final class HandsOffSession: ObservableObject {
     private var workerBuffer = ""
     private let workerQueue = DispatchQueue(label: "com.lattices.handsoff-worker", qos: .userInitiated)
     private var lastCueAt: Date = .distantPast
+    private var workerRoot: String? {
+        if let idx = CommandLine.arguments.firstIndex(of: "--lattices-cli-root"),
+           CommandLine.arguments.indices.contains(idx + 1) {
+            return CommandLine.arguments[idx + 1]
+        }
+
+        let devRoot = NSHomeDirectory() + "/dev/lattices"
+        return FileManager.default.fileExists(atPath: devRoot) ? devRoot : nil
+    }
 
     /// JSONL log for full turn data — ~/.lattices/handsoff.jsonl
     private let turnLogPath = NSHomeDirectory() + "/.lattices/handsoff.jsonl"
@@ -122,7 +131,7 @@ final class HandsOffSession: ObservableObject {
     // MARK: - Lifecycle
 
     func start() {
-        startWorker()
+        // Worker startup is lazy — only start it when a voice turn or cached cue needs it.
     }
 
     func setAudibleFeedbackEnabled(_ enabled: Bool) {
@@ -170,9 +179,10 @@ final class HandsOffSession: ObservableObject {
         }
     }
 
-    private func startWorker() {
+    @discardableResult
+    private func startWorker() -> Bool {
         if workerProcess?.isRunning == true, workerStdin != nil {
-            return
+            return true
         }
 
         let bunPaths = [
@@ -182,19 +192,24 @@ final class HandsOffSession: ObservableObject {
         ]
         guard let bunPath = bunPaths.first(where: { FileManager.default.isExecutableFile(atPath: $0) }) else {
             DiagnosticLog.shared.warn("HandsOff: bun not found, worker disabled")
-            return
+            return false
+        }
+
+        guard let workerRoot else {
+            DiagnosticLog.shared.warn("HandsOff: worker root not found, worker disabled")
+            return false
         }
 
-        let scriptPath = NSHomeDirectory() + "/dev/lattices/bin/handsoff-worker.ts"
+        let scriptPath = workerRoot + "/bin/handsoff-worker.ts"
         guard FileManager.default.fileExists(atPath: scriptPath) else {
             DiagnosticLog.shared.warn("HandsOff: worker script not found at \(scriptPath)")
-            return
+            return false
         }
 
         let proc = Process()
         proc.executableURL = URL(fileURLWithPath: bunPath)
         proc.arguments = ["run", scriptPath]
-        proc.currentDirectoryURL = URL(fileURLWithPath: NSHomeDirectory() + "/dev/lattices")
+        proc.currentDirectoryURL = URL(fileURLWithPath: workerRoot)
 
         var env = ProcessInfo.processInfo.environment
         env.removeValue(forKey: "CLAUDECODE")
@@ -211,7 +226,7 @@ final class HandsOffSession: ObservableObject {
             try proc.run()
         } catch {
             DiagnosticLog.shared.warn("HandsOff: failed to start worker — \(error)")
-            return
+            return false
         }
 
         workerProcess = proc
@@ -235,17 +250,22 @@ final class HandsOffSession: ObservableObject {
 
         // Handle worker crash → restart
         proc.terminationHandler = { [weak self] proc in
-            DiagnosticLog.shared.warn("HandsOff: worker exited (code \(proc.terminationStatus)), restarting in 2s")
-            self?.workerProcess = nil
-            self?.workerStdin = nil
+            guard let self else { return }
+            let keepWarm = self.audibleFeedbackEnabled || self.state != .idle
+            let suffix = keepWarm ? ", restarting in 2s" : ", staying idle"
+            DiagnosticLog.shared.warn("HandsOff: worker exited (code \(proc.terminationStatus))\(suffix)")
+            self.workerProcess = nil
+            self.workerStdin = nil
+            guard keepWarm else { return }
             DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
-                self?.startWorker()
+                self.startWorker()
             }
         }
 
         // Ping to verify
         sendToWorker(["cmd": "ping"])
         DiagnosticLog.shared.info("HandsOff: worker started (pid \(proc.processIdentifier))")
+        return true
     }
 
     // MARK: - Worker communication
@@ -486,6 +506,12 @@ final class HandsOffSession: ObservableObject {
 
     private func processTurn(_ transcript: String) {
         state = .thinking
+        guard startWorker() else {
+            state = .idle
+            DiagnosticLog.shared.warn("HandsOff: worker unavailable")
+            playSound("Basso")
+            return
+        }
         turnCount += 1
 
         let turnStart = Date()

package/app/Sources/MainView.swift

@@ -283,27 +283,50 @@ struct MainView: View {
 
     private var actionsSection: some View {
         VStack(spacing: 0) {
-            ActionRow(shortcut: "1", label: "Command Palette", hotkey: hotkeyLabel(.palette), icon: "command", accentColor: Palette.running) {
-                CommandPaletteWindow.shared.toggle()
-            }
-            ActionRow(shortcut: "2", label: "Screen Map", hotkey: hotkeyLabel(.screenMap), icon: "rectangle.3.group") {
-                ScreenMapWindowController.shared.toggle()
-            }
-            ActionRow(shortcut: "3", label: "Desktop Inventory", hotkey: hotkeyLabel(.desktopInventory), icon: "rectangle.split.2x1") {
-                CommandModeWindow.shared.toggle()
-            }
-            ActionRow(shortcut: "4", label: "Window Bezel", hotkey: hotkeyLabel(.bezel), icon: "macwindow") {
-                WindowBezel.showBezelForFrontmostWindow()
+            HStack {
+                Text("Quick Actions")
+                    .font(Typo.monoBold(10))
+                    .foregroundColor(Palette.textMuted)
+
+                Spacer()
+
+                Button("Help & shortcuts") {
+                    ScreenMapWindowController.shared.showPage(.docs)
+                }
+                .buttonStyle(.plain)
+                .font(Typo.mono(9))
+                .foregroundColor(Palette.textMuted)
             }
-            ActionRow(shortcut: "5", label: "Cheat Sheet", hotkey: hotkeyLabel(.cheatSheet), icon: "keyboard") {
-                CheatSheetHUD.shared.toggle()
+            .padding(.horizontal, 14)
+            .padding(.top, 10)
+            .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(shortcut: "6", label: "Omni Search", hotkey: hotkeyLabel(.omniSearch), icon: "magnifyingglass", accentColor: Palette.running) {
-                OmniSearchWindow.shared.toggle()
+            ActionRow(
+                label: "Workspace",
+                detail: "Screen map, inventory, and window context",
+                hotkeyTokens: hotkeyTokens(.unifiedWindow),
+                icon: "square.grid.2x2",
+                accentColor: Palette.text
+            ) {
+                ScreenMapWindowController.shared.showPage(.home)
             }
-            ActionRow(shortcut: "7", label: "Voice Command", hotkey: hotkeyLabel(.voiceCommand), icon: "mic", accentColor: AudioLayer.shared.isListening ? Palette.running : Palette.textDim) {
-                let audio = AudioLayer.shared
-                if audio.isListening { audio.stopVoiceCommand() } else { audio.startVoiceCommand() }
+            ActionRow(
+                label: "Assistant",
+                detail: "Search now, or use voice when you need it",
+                hotkeyTokens: hotkeyTokens(.omniSearch),
+                icon: "magnifyingglass",
+                accentColor: AudioLayer.shared.isListening ? Palette.running : Palette.textDim
+            ) {
+                showAssistant()
             }
         }
         .padding(.vertical, 4)
@@ -351,9 +374,38 @@ struct MainView: View {
         .buttonStyle(.plain)
     }
 
-    private func hotkeyLabel(_ action: HotkeyAction) -> String? {
-        guard let binding = HotkeyStore.shared.bindings[action] else { return nil }
-        return binding.displayParts.joined(separator: "")
+    private func hotkeyTokens(_ action: HotkeyAction) -> [String] {
+        guard let binding = HotkeyStore.shared.bindings[action],
+              let key = binding.displayParts.last else { return [] }
+
+        let modifiers = Set(binding.displayParts.dropLast())
+        if modifiers == Set(["Ctrl", "Option", "Shift", "Cmd"]) {
+            return ["Hyper", shortenHotkeyToken(key)]
+        }
+
+        return binding.displayParts.map(shortenHotkeyToken)
+    }
+
+    private func shortenHotkeyToken(_ token: String) -> String {
+        switch token {
+        case "Cmd": return "⌘"
+        case "Shift": return "⇧"
+        case "Option": return "⌥"
+        case "Ctrl": return "⌃"
+        case "Return": return "↩"
+        case "Escape": return "Esc"
+        case "Space": return "Space"
+        default: return token
+        }
+    }
+
+    private func showAssistant() {
+        if AudioLayer.shared.isListening || VoiceCommandWindow.shared.isVisible {
+            VoiceCommandWindow.shared.toggle()
+            return
+        }
+
+        OmniSearchWindow.shared.show()
     }
 
     // MARK: - Empty state

package/bin/lattices-app.ts

@@ -9,6 +9,7 @@ import type { IncomingMessage } from "node:http";
 
 const __dirname = import.meta.dir;
 const appDir = resolve(__dirname, "../app");
+const cliRoot = resolve(__dirname, "..");
 const bundlePath = resolve(appDir, "Lattices.app");
 const binaryDir = resolve(bundlePath, "Contents/MacOS");
 const binaryPath = resolve(binaryDir, "Lattices");
@@ -72,7 +73,8 @@ function launch(extraArgs: string[] = []): void {
     return;
   }
   const args = [bundlePath];
-  if (extraArgs.length) args.push("--args", ...extraArgs);
+  const appArgs = ["--lattices-cli-root", cliRoot, ...extraArgs];
+  if (appArgs.length) args.push("--args", ...appArgs);
   spawn("open", args, { detached: true, stdio: "ignore" }).unref();
   console.log("lattices app launched.");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lattices/cli",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "Agentic window manager for macOS — programmable workspace, smart layouts, managed tmux sessions, and a 35+-method agent API",
   "bin": {
     "lattices": "./bin/lattices.ts",
@@ -55,6 +55,7 @@
     "@ai-sdk/openai": "^3.0.41",
     "@ai-sdk/xai": "^3.0.67",
     "@arach/speakeasy": "^0.2.8",
-    "ai": "^6.0.116"
+    "ai": "^6.0.116",
+    "zod": "^3.25.76"
   }
 }