feat(desktop): embed chat in Dashboard, move conversations to its own page (#6496)

kodjima33 · web-flow · commit 2c9e43f445e2 · 2026-04-09T04:48:20.000-04:00
## Summary - Dashboard now hosts the chat (messages + sticky input) where the conversations list used to live, with a top/bottom gradient mask so messages fade into the background instead of clipping under the input. - Conversations list moved to its own sidebar page (replaces the standalone Chat sidebar item). Cmd+2 navigates to Conversations; \`navigateToChat\` notifications route to Dashboard. - Goals widget empty state drops the duplicate "Tap to add goal" tile and centers the Generate AI Goal action — the header + button is the way to add manually. - Trimmed the suggestion banner: removed the small "Suggested first ask" label to give the chat a few more vertical pixels. - Dashboard chat input placeholder reads "Ask omi anything". ## Test plan - [ ] Dashboard renders Tasks + Goals row at top, chat in the middle, sticky input at the bottom - [ ] Sending a message from the dashboard input works and replies stream in - [ ] Top + bottom of the chat fade into the dashboard background - [ ] Sidebar item 2 is "Conversations"; clicking it opens the standalone conversations list with detail navigation - [ ] Cmd+2 navigates to Conversations - [ ] Goals card with no goals shows only the centered Generate AI Goal button (plus the header + button) 🤖 Generated with [Claude Code](https://claude.com/claude-code)
diff --git a/desktop/CHANGELOG.json b/desktop/CHANGELOG.json
@@ -1,5 +1,7 @@
 {
-  "unreleased": [],
+  "unreleased": [
+    "Replaced Conversations on Dashboard with embedded Chat (Ask omi anything) and moved the Conversations list to its own sidebar page"
+  ],
   "releases": [
     {
       "version": "0.11.275",
diff --git a/desktop/Desktop/Sources/MainWindow/Components/GoalsWidget.swift b/desktop/Desktop/Sources/MainWindow/Components/GoalsWidget.swift
@@ -37,25 +37,11 @@ struct GoalsWidget: View {
 
 
             if goals.isEmpty {
-                // Empty state with AI suggestion
-                VStack(spacing: 16) {
-                    Button(action: { showingCreateSheet = true }) {
-                        HStack {
-                            Spacer()
-                            Image(systemName: "plus")
-                                .scaledFont(size: 14)
-                                .foregroundColor(OmiColors.textTertiary)
-                            Text("Tap to add goal")
-                                .scaledFont(size: 13)
-                                .foregroundColor(OmiColors.textTertiary)
-                            Spacer()
-                        }
-                        .frame(maxWidth: .infinity)
-                        .padding(.vertical, 20)
-                    }
-                    .buttonStyle(.plain)
+                // Empty state — header already has a + button, so just offer
+                // the AI generation action centered in the empty area.
+                VStack {
+                    Spacer(minLength: 0)
 
-                    // AI goal generation button
                     Button(action: { triggerGoalGeneration() }) {
                         HStack(spacing: 6) {
                             if isGeneratingGoal {
@@ -67,7 +53,7 @@ struct GoalsWidget: View {
                                     .scaledFont(size: 12)
                             }
                             Text(isGeneratingGoal ? "Generating..." : "Generate AI Goal")
-                                .scaledFont(size: 12, weight: .medium)
+                                .scaledFont(size: 13, weight: .medium)
                         }
                         .foregroundColor(OmiColors.purplePrimary)
                         .padding(.horizontal, 14)
@@ -76,8 +62,10 @@ struct GoalsWidget: View {
                     }
                     .buttonStyle(.plain)
                     .disabled(isGeneratingGoal)
+
+                    Spacer(minLength: 0)
                 }
-                .padding(.vertical, 12)
+                .frame(maxWidth: .infinity, maxHeight: .infinity)
             } else {
                 // Goals list
                 VStack(spacing: 14) {
diff --git a/desktop/Desktop/Sources/MainWindow/DesktopHomeView.swift b/desktop/Desktop/Sources/MainWindow/DesktopHomeView.swift
@@ -423,7 +423,8 @@ struct DesktopHomeView: View {
     ]
     if currentTierLevel >= 2 { visibleRawValues.insert(SidebarNavItem.memories.rawValue) }
     if currentTierLevel >= 3 { visibleRawValues.insert(SidebarNavItem.tasks.rawValue) }
-    if currentTierLevel >= 4 { visibleRawValues.insert(SidebarNavItem.chat.rawValue) }
+    // Conversations replaced Chat in the sidebar; tier 1 unlocks it.
+    if currentTierLevel >= 1 { visibleRawValues.insert(SidebarNavItem.conversations.rawValue) }
 
     if !visibleRawValues.contains(selectedIndex) {
       selectedIndex = SidebarNavItem.dashboard.rawValue
@@ -709,8 +710,9 @@ struct DesktopHomeView: View {
       }
     }
     .onReceive(NotificationCenter.default.publisher(for: .navigateToChat)) { _ in
+      // Chat now lives on the Dashboard page.
       withAnimation(.easeInOut(duration: 0.2)) {
-        selectedIndex = SidebarNavItem.chat.rawValue
+        selectedIndex = SidebarNavItem.dashboard.rawValue
       }
     }
     .onReceive(NotificationCenter.default.publisher(for: .navigateToTasks)) { _ in
@@ -764,12 +766,13 @@ private struct PageContentView: View {
       switch selectedIndex {
       case 0:
         DashboardPage(
-          viewModel: viewModelContainer.dashboardViewModel, appState: appState,
+          viewModel: viewModelContainer.dashboardViewModel,
+          appState: appState,
+          appProvider: viewModelContainer.appProvider,
+          chatProvider: viewModelContainer.chatProvider,
           selectedIndex: $selectedTabIndex)
       case 1:
-        DashboardPage(
-          viewModel: viewModelContainer.dashboardViewModel, appState: appState,
-          selectedIndex: $selectedTabIndex)
+        ConversationsPageHost(appState: appState)
       case 2:
         ChatPage(
           appProvider: viewModelContainer.appProvider, chatProvider: viewModelContainer.chatProvider
@@ -804,13 +807,27 @@ private struct PageContentView: View {
         HelpPage()
       default:
         DashboardPage(
-          viewModel: viewModelContainer.dashboardViewModel, appState: appState,
+          viewModel: viewModelContainer.dashboardViewModel,
+          appState: appState,
+          appProvider: viewModelContainer.appProvider,
+          chatProvider: viewModelContainer.chatProvider,
           selectedIndex: $selectedTabIndex)
       }
     }
   }
 }
 
+/// Hosts the standalone Conversations page with its own selection state
+/// so tapping a row navigates to the detail view.
+private struct ConversationsPageHost: View {
+  let appState: AppState
+  @State private var selectedConversation: ServerConversation? = nil
+
+  var body: some View {
+    ConversationsPage(appState: appState, selectedConversation: $selectedConversation)
+  }
+}
+
 #Preview {
   DesktopHomeView()
 }
diff --git a/desktop/Desktop/Sources/MainWindow/Pages/DashboardPage.swift b/desktop/Desktop/Sources/MainWindow/Pages/DashboardPage.swift
@@ -196,26 +196,107 @@ class DashboardViewModel: ObservableObject {
 struct DashboardPage: View {
     @ObservedObject var viewModel: DashboardViewModel
     @ObservedObject var appState: AppState
+    @ObservedObject var appProvider: AppProvider
+    @ObservedObject var chatProvider: ChatProvider
     @Binding var selectedIndex: Int
-    @State private var selectedConversation: ServerConversation? = nil
+    @State private var citedConversation: ServerConversation? = nil
+    @State private var isLoadingCitation = false
+
+    private var selectedApp: OmiApp? {
+        guard let appId = chatProvider.selectedAppId else { return nil }
+        return appProvider.chatApps.first { $0.id == appId }
+    }
 
     var body: some View {
-        Group {
-            if selectedConversation != nil {
-                // Full-page conversation detail (hides dashboard)
-                ConversationsPage(appState: appState, selectedConversation: $selectedConversation)
-            } else {
-                // Dashboard + conversations in one scrollable page
-                ScrollView {
-                    VStack(spacing: 0) {
-                        dashboardWidgets
-                        ConversationsPage(appState: appState, selectedConversation: $selectedConversation, embedded: true)
+        VStack(spacing: 0) {
+            dashboardWidgets
+
+            // Chat messages — fills remaining vertical space, scrolls internally,
+            // morphs into the dashboard background (no card chrome).
+            // A bottom gradient mask softens messages into the background near
+            // the input field so they fade out instead of clipping abruptly.
+            ChatMessagesView(
+                messages: chatProvider.messages,
+                isSending: chatProvider.isSending,
+                hasMoreMessages: chatProvider.hasMoreMessages,
+                isLoadingMoreMessages: chatProvider.isLoadingMoreMessages,
+                isLoadingInitial: (chatProvider.isLoading || chatProvider.isLoadingSessions)
+                    && !chatProvider.isClearing,
+                app: selectedApp,
+                onLoadMore: { await chatProvider.loadMoreMessages() },
+                onRate: { messageId, rating in
+                    Task { await chatProvider.rateMessage(messageId, rating: rating) }
+                },
+                onCitationTap: { citation in
+                    handleCitationTap(citation)
+                },
+                sessionsLoadError: chatProvider.sessionsLoadError,
+                onRetry: { Task { await chatProvider.retryLoad() } },
+                welcomeContent: { dashboardChatWelcome }
+            )
+            .frame(maxWidth: .infinity, maxHeight: .infinity)
+            .mask(
+                LinearGradient(
+                    stops: [
+                        .init(color: .clear, location: 0.0),
+                        .init(color: .black, location: 0.08),
+                        .init(color: .black, location: 0.92),
+                        .init(color: .clear, location: 1.0),
+                    ],
+                    startPoint: .top,
+                    endPoint: .bottom
+                )
+            )
+
+            ChatInputView(
+                onSend: { text in
+                    AnalyticsManager.shared.chatMessageSent(
+                        messageLength: text.count, hasContext: selectedApp != nil, source: "dashboard_chat")
+                    Task { await chatProvider.sendMessage(text) }
+                },
+                onFollowUp: { text in
+                    Task { await chatProvider.sendFollowUp(text) }
+                },
+                onStop: {
+                    chatProvider.stopAgent()
+                },
+                isSending: chatProvider.isSending,
+                isStopping: chatProvider.isStopping,
+                placeholder: "Ask omi anything",
+                mode: $chatProvider.chatMode,
+                inputText: $chatProvider.draftText
+            )
+            .padding(.horizontal, 30)
+            .padding(.top, 12)
+            .padding(.bottom, 20)
+        }
+        .frame(maxWidth: .infinity, maxHeight: .infinity)
+        .background(Color.clear)
+        .sheet(item: $citedConversation) { conversation in
+            ConversationDetailView(
+                conversation: conversation,
+                onBack: {
+                    citedConversation = nil
+                }
+            )
+            .frame(minWidth: 500, minHeight: 500)
+        }
+        .overlay {
+            if isLoadingCitation {
+                ZStack {
+                    Color.black.opacity(0.3)
+                    VStack(spacing: 12) {
+                        ProgressView()
+                        Text("Loading source...")
+                            .scaledFont(size: 13)
+                            .foregroundColor(.white)
                     }
+                    .padding(20)
+                    .background(OmiColors.backgroundSecondary)
+                    .cornerRadius(12)
                 }
             }
         }
-        .frame(maxWidth: .infinity, maxHeight: .infinity)
-        .background(Color.clear)
         .onAppear {
             if PostOnboardingPromptSuggestions.shouldShowPopup && !postOnboardingSuggestions.isEmpty {
                 NotificationCenter.default.post(name: .showTryAskingPopup, object: nil)
@@ -226,6 +307,58 @@ struct DashboardPage: View {
         }
     }
 
+    /// Welcome message shown when there are no chat messages yet.
+    /// Transparent — no card chrome — so it morphs into the dashboard background.
+    private var dashboardChatWelcome: some View {
+        VStack(spacing: 12) {
+            if let logoURL = Bundle.resourceBundle.url(forResource: "herologo", withExtension: "png"),
+                let logoImage = NSImage(contentsOf: logoURL)
+            {
+                Image(nsImage: logoImage)
+                    .resizable()
+                    .scaledToFit()
+                    .frame(width: 40, height: 40)
+            }
+
+            Text("Ask omi anything")
+                .scaledFont(size: 16, weight: .semibold)
+                .foregroundColor(OmiColors.textPrimary)
+
+            Text("Your personal AI assistant — knows you through your memories and conversations")
+                .scaledFont(size: 13)
+                .foregroundColor(OmiColors.textSecondary)
+                .multilineTextAlignment(.center)
+                .padding(.horizontal, 40)
+        }
+        .frame(maxWidth: .infinity)
+        .padding(.vertical, 32)
+    }
+
+    /// Handle tapping on a citation card — opens the cited conversation in a sheet.
+    private func handleCitationTap(_ citation: Citation) {
+        guard citation.sourceType == .conversation else {
+            log("Citation tapped: \(citation.title) (memory - no detail view)")
+            return
+        }
+
+        isLoadingCitation = true
+
+        Task {
+            do {
+                let conversation = try await APIClient.shared.getConversation(id: citation.id)
+                await MainActor.run {
+                    citedConversation = conversation
+                    isLoadingCitation = false
+                }
+            } catch {
+                logError("Failed to fetch cited conversation", error: error)
+                await MainActor.run {
+                    isLoadingCitation = false
+                }
+            }
+        }
+    }
+
     private var dashboardWidgets: some View {
         VStack(alignment: .leading, spacing: 28) {
             if shouldShowSuggestionBanner {
@@ -290,8 +423,8 @@ struct DashboardPage: View {
             }
         }
         .padding(.horizontal, 30)
-        .padding(.top, 40)
-        .padding(.bottom, 16)
+        .padding(.top, 32)
+        .padding(.bottom, 12)
     }
 
     private var postOnboardingSuggestions: [String] {
@@ -315,7 +448,13 @@ struct DashboardPage: View {
 }
 
 #Preview {
-    DashboardPage(viewModel: DashboardViewModel(), appState: AppState(), selectedIndex: .constant(0))
-        .frame(width: 800, height: 600)
-        .background(OmiColors.backgroundPrimary)
+    DashboardPage(
+        viewModel: DashboardViewModel(),
+        appState: AppState(),
+        appProvider: AppProvider(),
+        chatProvider: ChatProvider(),
+        selectedIndex: .constant(0)
+    )
+    .frame(width: 800, height: 600)
+    .background(OmiColors.backgroundPrimary)
 }
diff --git a/desktop/Desktop/Sources/MainWindow/SidebarView.swift b/desktop/Desktop/Sources/MainWindow/SidebarView.swift
@@ -67,7 +67,7 @@ enum SidebarNavItem: Int, CaseIterable {
 
   /// Items shown in the main navigation (top section)
   static var mainItems: [SidebarNavItem] {
-    [.dashboard, .chat, .memories, .tasks, .rewind, .apps]
+    [.dashboard, .conversations, .memories, .tasks, .rewind, .apps]
   }
 }
 
diff --git a/desktop/Desktop/Sources/OmiApp.swift b/desktop/Desktop/Sources/OmiApp.swift
@@ -147,10 +147,10 @@ struct OMIApp: App {
         }
         .keyboardShortcut("1", modifiers: .command)
 
-        Button("Chat") {
+        Button("Conversations") {
           NotificationCenter.default.post(
             name: .navigateToSidebarItem, object: nil,
-            userInfo: ["rawValue": SidebarNavItem.chat.rawValue])
+            userInfo: ["rawValue": SidebarNavItem.conversations.rawValue])
         }
         .keyboardShortcut("2", modifiers: .command)
 
diff --git a/desktop/Desktop/Sources/PostOnboardingPromptViews.swift b/desktop/Desktop/Sources/PostOnboardingPromptViews.swift
@@ -167,21 +167,7 @@ struct PromptSuggestionBanner: View {
   var body: some View {
     VStack(alignment: .leading, spacing: 14) {
       Button(action: onOpen) {
-        VStack(alignment: .leading, spacing: 14) {
-          HStack(spacing: 8) {
-            Image(systemName: "sparkles")
-              .font(.system(size: 11, weight: .semibold))
-            Text("Suggested first ask")
-              .font(.system(size: 12, weight: .semibold))
-          }
-          .foregroundColor(calloutAmber)
-          .padding(.horizontal, 10)
-          .padding(.vertical, 6)
-          .background(
-            Capsule()
-              .fill(calloutAmber.opacity(0.14))
-          )
-
+        VStack(alignment: .leading, spacing: 12) {
           Text("Next step -> Ask omi")
             .font(.system(size: 20, weight: .semibold, design: .serif))
             .foregroundColor(bannerPrimaryText)
@@ -219,7 +205,8 @@ struct PromptSuggestionBanner: View {
       }
     }
     .frame(maxWidth: .infinity, alignment: .leading)
-    .padding(22)
+    .padding(.horizontal, 22)
+    .padding(.vertical, 18)
     .background(
       RoundedRectangle(cornerRadius: 20, style: .continuous)
         .fill(
diff --git a/desktop/Desktop/Sources/ViewExporter.swift b/desktop/Desktop/Sources/ViewExporter.swift

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`{`
`2`		`- "unreleased": [],`
	`2`	`+ "unreleased": [`
	`3`	`+ "Replaced Conversations on Dashboard with embedded Chat (Ask omi anything) and moved the Conversations list to its own sidebar page"`
	`4`	`+ ],`
`3`	`5`	`"releases": [`
`4`	`6`	`{`
`5`	`7`	`"version": "0.11.275",`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ enum SidebarNavItem: Int, CaseIterable {`
`67`	`67`
`68`	`68`	`/// Items shown in the main navigation (top section)`
`69`	`69`	`static var mainItems: [SidebarNavItem] {`
`70`		`- [.dashboard, .chat, .memories, .tasks, .rewind, .apps]`
	`70`	`+ [.dashboard, .conversations, .memories, .tasks, .rewind, .apps]`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`
Original file line number	Diff line number	Diff line change
`@@ -147,10 +147,10 @@ struct OMIApp: App {`
`147`	`147`	`}`
`148`	`148`	`.keyboardShortcut("1", modifiers: .command)`
`149`	`149`
`150`		`- Button("Chat") {`
	`150`	`+ Button("Conversations") {`
`151`	`151`	`NotificationCenter.default.post(`
`152`	`152`	`name: .navigateToSidebarItem, object: nil,`
`153`		`- userInfo: ["rawValue": SidebarNavItem.chat.rawValue])`
	`153`	`+ userInfo: ["rawValue": SidebarNavItem.conversations.rawValue])`
`154`	`154`	`}`
`155`	`155`	`.keyboardShortcut("2", modifiers: .command)`
`156`	`156`