@lattices/cli 0.4.10 → 0.4.11

package/{app → apps/mac}/Sources/Core/Overlays/Voice/VoiceCommandWindow.swift

@@ -968,15 +968,14 @@ struct VoiceCommandView: View {
         let slots = state.intentSlots.map { "\($0.key)=\($0.value)" }.joined(separator: ", ")
         let matchStr = slots.isEmpty ? matched : "\(matched)(\(slots))"
 
-        let haiku = AgentPool.shared.haiku
-        guard haiku.isReady else {
-            state.appendLog("AI not ready")
+        let assistant = PiChatSession.shared
+        guard assistant.isProviderInferenceReady else {
+            state.appendLog("Assistant provider not ready")
             return
         }
 
-        state.appendLog("Asking AI...")
-        let message = "Transcript: \"\(transcript)\"\nMatched: \(matchStr)"
-        haiku.send(message: message) { [weak state] response in
+        state.appendLog("Asking Assistant...")
+        assistant.askVoiceAdvisor(transcript: transcript, matched: matchStr) { [weak state] response in
             guard let state = state, let response = response else { return }
             state.agentResponse = response
         }
@@ -985,7 +984,7 @@ struct VoiceCommandView: View {
     private func executeSuggestion(_ suggestion: AgentResponse.AgentSuggestion) {
         var slotsDict = suggestion.slots
 
-        // If the intent needs a query slot and Haiku didn't include one,
+        // If the intent needs a query slot and the assistant did not include one,
         // try to extract it from the label or fall back to the original query
         if suggestion.intent == "search" && slotsDict["query"] == nil {
             // Try extracting from label: "Deep search Vox" → "Vox"
@@ -1124,7 +1123,7 @@ struct VoiceCommandView: View {
 
     // MARK: - AI Corner (bottom-right)
 
-    @ObservedObject private var haikuSession = AgentPool.shared.haiku
+    @ObservedObject private var assistantSession = PiChatSession.shared
 
     private var aiCorner: some View {
         VStack(spacing: 0) {
@@ -1139,20 +1138,9 @@ struct VoiceCommandView: View {
                     .tracking(1)
                 Spacer()
 
-                // Context usage indicator
-                let stats = haikuSession.sessionStats
-                if stats.contextWindow > 0 {
-                    let pct = Int(stats.contextUsage * 100)
-                    Text("\(pct)%")
-                        .font(Typo.geistMono(8))
-                        .foregroundColor(pct > 60 ? Palette.detach : Palette.textMuted.opacity(0.6))
-                }
-
-                if stats.costUSD > 0 {
-                    Text("$\(String(format: "%.3f", stats.costUSD))")
-                        .font(Typo.geistMono(8))
-                        .foregroundColor(Palette.textMuted.opacity(0.6))
-                }
+                Text(assistantSession.currentProvider.name)
+                    .font(Typo.geistMono(8))
+                    .foregroundColor(Palette.textMuted.opacity(0.65))
 
                 if state.agentResponse != nil {
                     Button(action: { copyAIResponse() }) {
@@ -1163,7 +1151,7 @@ struct VoiceCommandView: View {
                     .buttonStyle(.plain)
                 }
 
-                if haikuSession.isReady {
+                if assistantSession.isProviderInferenceReady {
                     Circle()
                         .fill(Palette.running.opacity(0.6))
                         .frame(width: 4, height: 4)

package/{app → apps/mac}/Sources/Core/Pi/PiChatDock.swift

@@ -16,18 +16,6 @@ struct PiChatDock: View {
         VStack(spacing: 0) {
             topHandle
 
-            if session.hasPiBinary && session.isAuthPanelVisible {
-                Rectangle()
-                    .fill(Palette.border)
-                    .frame(height: 0.5)
-
-                authPanel
-
-                Rectangle()
-                    .fill(Palette.border)
-                    .frame(height: 0.5)
-            }
-
             transcript
 
             Rectangle()
@@ -37,14 +25,7 @@ struct PiChatDock: View {
             if session.hasPiBinary && !session.needsProviderSetup {
                 composer
             } else if session.needsProviderSetup {
-                if session.isAuthPanelVisible {
-                    setupLockedBar
-                } else {
-                    PiProviderSetupCallout(session: session, compact: true)
-                        .padding(.horizontal, 10)
-                        .padding(.vertical, 10)
-                        .background(Color.black.opacity(0.62))
-                }
+                providerSettingsBar
             } else {
                 PiInstallCallout(session: session, compact: true)
                     .padding(.horizontal, 10)
@@ -197,29 +178,54 @@ struct PiChatDock: View {
                     .fixedSize(horizontal: false, vertical: true)
 
                 if session.currentProvider.authMode == .apiKey {
-                    HStack(spacing: 8) {
-                        SecureField(session.currentProvider.tokenPlaceholder, text: $session.authToken)
-                            .textFieldStyle(.plain)
-                            .font(Typo.mono(11))
-                            .foregroundColor(Palette.text)
-                            .focused($authFieldFocused)
-                            .onSubmit {
-                                session.saveSelectedToken()
-                            }
+                    if session.hasSelectedCredential && !session.isEditingStoredCredential {
+                        HStack(spacing: 8) {
+                            Circle()
+                                .fill(Palette.running)
+                                .frame(width: 6, height: 6)
 
-                        footerButton("save key") {
-                            session.saveSelectedToken()
-                        }
+                            Text("credential saved")
+                                .font(Typo.mono(9))
+                                .foregroundColor(Palette.textDim)
+
+                            Spacer()
+
+                            footerButton("replace") {
+                                session.beginReplacingSelectedCredential()
+                            }
 
-                        if session.hasSelectedCredential {
                             footerButton("clear") {
                                 session.removeSelectedCredential()
                             }
                         }
+                        .padding(.horizontal, 10)
+                        .padding(.vertical, 8)
+                        .background(authCardBackground(tint: Palette.running))
+                    } else {
+                        HStack(spacing: 8) {
+                            SecureField(session.currentProvider.tokenPlaceholder, text: $session.authToken)
+                                .textFieldStyle(.plain)
+                                .font(Typo.mono(11))
+                                .foregroundColor(Palette.text)
+                                .focused($authFieldFocused)
+                                .onSubmit {
+                                    session.saveSelectedToken()
+                                }
+
+                            footerButton("save key") {
+                                session.saveSelectedToken()
+                            }
+
+                            if session.hasSelectedCredential {
+                                footerButton("cancel") {
+                                    session.cancelReplacingSelectedCredential()
+                                }
+                            }
+                        }
+                        .padding(.horizontal, 10)
+                        .padding(.vertical, 8)
+                        .background(authCardBackground(tint: Palette.running))
                     }
-                    .padding(.horizontal, 10)
-                    .padding(.vertical, 8)
-                    .background(authCardBackground(tint: Palette.running))
                 } else {
                     HStack(spacing: 8) {
                         footerButton("connect") {
@@ -347,7 +353,7 @@ struct PiChatDock: View {
                     .font(Typo.geistMonoBold(11))
                     .foregroundColor(Palette.running)
 
-                TextField("Ask Pi something lightweight...", text: $session.draft, axis: .vertical)
+                TextField("Ask about settings...", text: $session.draft, axis: .vertical)
                     .textFieldStyle(.plain)
                     .font(Typo.mono(11))
                     .foregroundColor(Palette.text)
@@ -384,7 +390,7 @@ struct PiChatDock: View {
                 .fill(session.hasPiBinary ? Palette.running : Palette.kill)
                 .frame(width: 6, height: 6)
 
-            Text("PI DOCK")
+            Text("ASSISTANT")
                 .font(Typo.geistMonoBold(9))
                 .foregroundColor(Palette.text)
 
@@ -395,10 +401,8 @@ struct PiChatDock: View {
 
             Spacer()
 
-            if session.hasPiBinary && !session.needsProviderSetup {
-                footerButton(session.isAuthPanelVisible ? "auth -" : "auth +") {
-                    session.toggleAuthPanel()
-                }
+            footerIconButton(systemName: "gearshape") {
+                SettingsWindowController.shared.showAssistant()
             }
 
             footerButton("reset") {
@@ -410,6 +414,34 @@ struct PiChatDock: View {
         .background(Color.white.opacity(0.015))
     }
 
+    private var providerSettingsBar: some View {
+        HStack(alignment: .center, spacing: 8) {
+            Circle()
+                .fill(Palette.detach)
+                .frame(width: 6, height: 6)
+
+            VStack(alignment: .leading, spacing: 2) {
+                Text("CONNECT A PROVIDER")
+                    .font(Typo.geistMonoBold(9))
+                    .foregroundColor(Palette.text)
+
+                Text("Choose a chat provider in Settings.")
+                    .font(Typo.mono(9))
+                    .foregroundColor(Palette.textDim)
+                    .fixedSize(horizontal: false, vertical: true)
+            }
+
+            Spacer()
+
+            footerButton("settings", tint: Palette.running) {
+                SettingsWindowController.shared.showAssistant()
+            }
+        }
+        .padding(.horizontal, 10)
+        .padding(.vertical, 10)
+        .background(Color.black.opacity(0.62))
+    }
+
     private var footerStatusText: String {
         if session.statusText == "idle" || session.needsProviderSetup || session.isAuthenticating || !session.hasPiBinary {
             return session.setupStatusSummary
@@ -455,7 +487,7 @@ struct PiChatDock: View {
         switch role {
         case .system: return "system"
         case .user: return "you"
-        case .assistant: return "pi"
+        case .assistant: return "assistant"
         }
     }
 
@@ -506,6 +538,21 @@ struct PiChatDock: View {
             .disabled(disabled)
     }
 
+    private func footerIconButton(systemName: String, tint: Color = Palette.textMuted, action: @escaping () -> Void) -> some View {
+        Button(action: action) {
+            Image(systemName: systemName)
+                .font(.system(size: 10, weight: .semibold))
+                .foregroundColor(tint)
+                .frame(width: 24, height: 22)
+                .background(
+                    Capsule()
+                        .fill(Color.white.opacity(0.03))
+                        .overlay(Capsule().strokeBorder(Palette.border, lineWidth: 0.5))
+                )
+        }
+        .buttonStyle(.plain)
+    }
+
     private func authCardBackground(tint: Color) -> some View {
         RoundedRectangle(cornerRadius: 6)
             .fill(tint.opacity(0.06))