diff --git a/apps/x/apps/renderer/src/App.tsx b/apps/x/apps/renderer/src/App.tsx
index e6c050b3..8da82501 100644
--- a/apps/x/apps/renderer/src/App.tsx
+++ b/apps/x/apps/renderer/src/App.tsx
@@ -5,10 +5,12 @@ import { RunEvent, ListRunsResponse } from '@x/shared/src/runs.js';
 import type { LanguageModelUsage, ToolUIPart } from 'ai';
 import './App.css'
 import z from 'zod';
-import { CheckIcon, LoaderIcon, PanelLeftIcon, Maximize2, Minimize2, ChevronLeftIcon, ChevronRightIcon, SquarePen, HistoryIcon } from 'lucide-react';
+import { CheckIcon, LoaderIcon, PanelLeftIcon, ArrowRight, MessageSquare, ChevronLeftIcon, ChevronRightIcon, Plus, HistoryIcon } from 'lucide-react';
 import { cn } from '@/lib/utils';
 import { MarkdownEditor, type MarkdownEditorHandle } from './components/markdown-editor';
 import { ChatSidebar } from './components/chat-sidebar';
+import { ChatHeader } from './components/chat-header';
+import { ChatEmptyState } from './components/chat-empty-state';
 import { ChatInputWithMentions, type StagedAttachment } from './components/chat-input-with-mentions';
 import { ChatMessageAttachments } from '@/components/chat-message-attachments'
 import { GraphView, type GraphEdge, type GraphNode } from '@/components/graph-view';
@@ -25,12 +27,15 @@ import { SuggestedTopicsView } from '@/components/suggested-topics-view';
 import { LiveNotesView } from '@/components/live-notes-view';
 import { BgTasksView } from '@/components/bg-tasks-view';
 import { EmailView } from '@/components/email-view';
+import { WorkspaceView } from '@/components/workspace-view';
+import { KnowledgeView } from '@/components/knowledge-view';
+import { ChatHistoryView } from '@/components/chat-history-view';
+import { HomeView } from '@/components/home-view';
 import { MeetingsView } from '@/components/meetings-view';
 import { SidebarSectionProvider } from '@/contexts/sidebar-context';
 import {
   Conversation,
   ConversationContent,
-  ConversationEmptyState,
   ConversationScrollButton,
 } from '@/components/ai-elements/conversation';
 import {
@@ -52,7 +57,6 @@ import { ComposioConnectCard } from '@/components/ai-elements/composio-connect-c
 import { PermissionRequest } from '@/components/ai-elements/permission-request';
 import { TerminalOutput } from '@/components/terminal-output';
 import { AskHumanRequest } from '@/components/ai-elements/ask-human-request';
-import { Suggestions } from '@/components/ai-elements/suggestions';
 import { ToolPermissionRequestEvent, AskHumanRequestEvent } from '@x/shared/src/runs.js';
 import {
   SidebarInset,
@@ -182,6 +186,11 @@ const MEETINGS_TAB_PATH = '__rowboat_meetings__'
 const LIVE_NOTES_TAB_PATH = '__rowboat_live_notes__'
 const BG_TASKS_TAB_PATH = '__rowboat_bg_tasks__'
 const EMAIL_TAB_PATH = '__rowboat_email__'
+const WORKSPACE_TAB_PATH = '__rowboat_workspace__'
+const WORKSPACE_ROOT = 'knowledge/Workspace'
+const KNOWLEDGE_VIEW_TAB_PATH = '__rowboat_knowledge_view__'
+const CHAT_HISTORY_TAB_PATH = '__rowboat_chat_history__'
+const HOME_TAB_PATH = '__rowboat_home__'
 const BASES_DEFAULT_TAB_PATH = '__rowboat_bases_default__'
 
 const clampNumber = (value: number, min: number, max: number) =>
@@ -315,6 +324,10 @@ const isMeetingsTabPath = (path: string) => path === MEETINGS_TAB_PATH
 const isLiveNotesTabPath = (path: string) => path === LIVE_NOTES_TAB_PATH
 const isBgTasksTabPath = (path: string) => path === BG_TASKS_TAB_PATH
 const isEmailTabPath = (path: string) => path === EMAIL_TAB_PATH
+const isWorkspaceTabPath = (path: string) => path === WORKSPACE_TAB_PATH
+const isKnowledgeViewTabPath = (path: string) => path === KNOWLEDGE_VIEW_TAB_PATH
+const isChatHistoryTabPath = (path: string) => path === CHAT_HISTORY_TAB_PATH
+const isHomeTabPath = (path: string) => path === HOME_TAB_PATH
 const isBaseFilePath = (path: string) => path.endsWith('.base') || path === BASES_DEFAULT_TAB_PATH
 
 const getSuggestedTopicTargetFolder = (category?: string) => {
@@ -565,12 +578,17 @@ type ViewState =
   | { type: 'meetings' }
   | { type: 'live-notes' }
   | { type: 'email' }
+  | { type: 'workspace'; path?: string }
+  | { type: 'knowledge-view' }
+  | { type: 'chat-history' }
+  | { type: 'home' }
 
 function viewStatesEqual(a: ViewState, b: ViewState): boolean {
   if (a.type !== b.type) return false
   if (a.type === 'chat' && b.type === 'chat') return a.runId === b.runId
   if (a.type === 'file' && b.type === 'file') return a.path === b.path
   if (a.type === 'task' && b.type === 'task') return a.name === b.name
+  if (a.type === 'workspace' && b.type === 'workspace') return (a.path ?? '') === (b.path ?? '')
   return true // both graph
 }
 
@@ -614,6 +632,16 @@ function parseDeepLink(input: string): ViewState | null {
       return { type: 'meetings' }
     case 'live-notes':
       return { type: 'live-notes' }
+    case 'workspace': {
+      const path = params.get('path')
+      return { type: 'workspace', path: path ?? undefined }
+    }
+    case 'knowledge-view':
+      return { type: 'knowledge-view' }
+    case 'chat-history':
+      return { type: 'chat-history' }
+    case 'home':
+      return { type: 'home' }
     default:
       return null
   }
@@ -627,7 +655,7 @@ function FixedSidebarToggle({
 }) {
   const { toggleSidebar } = useSidebar()
   return (
-    <div className="fixed left-0 top-0 z-50 flex h-10 items-center" style={{ WebkitAppRegion: 'no-drag' } as React.CSSProperties}>
+    <div className="fixed left-0 top-0 z-50 flex h-10 items-center gap-1" style={{ WebkitAppRegion: 'no-drag' } as React.CSSProperties}>
       <div aria-hidden="true" className="h-10 shrink-0" style={{ width: leftInsetPx }} />
       {/* Sidebar toggle */}
       <button
@@ -723,6 +751,14 @@ function App() {
   const [isLiveNotesOpen, setIsLiveNotesOpen] = useState(false)
   const [isBgTasksOpen, setIsBgTasksOpen] = useState(false)
   const [isEmailOpen, setIsEmailOpen] = useState(false)
+  const [isWorkspaceOpen, setIsWorkspaceOpen] = useState(false)
+  const [workspaceInitialPath, setWorkspaceInitialPath] = useState<string | null>(null)
+  const [isKnowledgeViewOpen, setIsKnowledgeViewOpen] = useState(false)
+  const [isChatHistoryOpen, setIsChatHistoryOpen] = useState(false)
+  // Default landing view: Home in the middle with the chat docked on the right.
+  const [isHomeOpen, setIsHomeOpen] = useState(true)
+  const [emailInitialThreadId, setEmailInitialThreadId] = useState<string | null>(null)
+  const [emailThreadIdVersion, setEmailThreadIdVersion] = useState(0)
   const [expandedFrom, setExpandedFrom] = useState<{
     path: string | null
     graph: boolean
@@ -961,13 +997,13 @@ function App() {
 
   // Chat tab state
   const [chatTabs, setChatTabs] = useState<ChatTab[]>([{ id: 'default-chat-tab', runId: null }])
+  const chatTabsRef = useRef(chatTabs)
+  chatTabsRef.current = chatTabs
   const [activeChatTabId, setActiveChatTabId] = useState('default-chat-tab')
   const [chatViewStateByTab, setChatViewStateByTab] = useState<Record<string, ChatTabViewState>>({
     'default-chat-tab': createEmptyChatTabViewState(),
   })
   const chatViewStateByTabRef = useRef(chatViewStateByTab)
-  const chatTabIdCounterRef = useRef(0)
-  const newChatTabId = () => `chat-tab-${++chatTabIdCounterRef.current}`
   const chatDraftsRef = useRef(new Map<string, string>())
   const selectedModelByTabRef = useRef(new Map<string, { provider: string; model: string }>())
   const chatScrollTopByTabRef = useRef(new Map<string, number>())
@@ -1043,8 +1079,8 @@ function App() {
   }, [processingRunIds])
 
   // File tab state
-  const [fileTabs, setFileTabs] = useState<FileTab[]>([])
-  const [activeFileTabId, setActiveFileTabId] = useState<string | null>(null)
+  const [fileTabs, setFileTabs] = useState<FileTab[]>([{ id: 'home-tab', path: HOME_TAB_PATH }])
+  const [activeFileTabId, setActiveFileTabId] = useState<string | null>('home-tab')
   const activeFileTabIdRef = useRef(activeFileTabId)
   activeFileTabIdRef.current = activeFileTabId
   const [editorSessionByTabId, setEditorSessionByTabId] = useState<Record<string, number>>({})
@@ -1059,6 +1095,10 @@ function App() {
     if (isLiveNotesTabPath(tab.path)) return 'Live notes'
     if (isBgTasksTabPath(tab.path)) return 'Background tasks'
     if (isEmailTabPath(tab.path)) return 'Email'
+    if (isWorkspaceTabPath(tab.path)) return 'Workspace'
+    if (isKnowledgeViewTabPath(tab.path)) return 'Notes'
+    if (isChatHistoryTabPath(tab.path)) return 'Chat history'
+    if (isHomeTabPath(tab.path)) return 'Home'
     if (tab.path === BASES_DEFAULT_TAB_PATH) return 'Bases'
     if (tab.path.endsWith('.base')) return tab.path.split('/').pop()?.replace(/\.base$/i, '') || 'Base'
     return tab.path.split('/').pop()?.replace(/\.md$/i, '') || tab.path
@@ -1347,6 +1387,13 @@ function App() {
         loadBackgroundTasks()
       }
 
+      // Reload bg-task summaries if anything under bg-tasks/ changed
+      if (
+        eventPaths.some((p) => p === 'bg-tasks' || p.startsWith('bg-tasks/'))
+      ) {
+        loadBgTaskSummaries()
+      }
+
       // Invalidate cached content for files changed outside the active editor.
       // This prevents stale backlinks after rename-rewrite passes touch many files.
       for (const path of eventPaths) {
@@ -1692,6 +1739,39 @@ function App() {
     loadRuns()
   }, [loadRuns])
 
+  const [bgTaskSummaries, setBgTaskSummaries] = useState<Array<{
+    slug: string
+    name: string
+    active: boolean
+    createdAt: string
+    lastAttemptAt?: string
+    lastRunAt?: string
+    lastRunError?: string
+  }>>([])
+  const [bgTaskInitialSlug, setBgTaskInitialSlug] = useState<string | null>(null)
+  const [bgTaskSlugVersion, setBgTaskSlugVersion] = useState(0)
+
+  const loadBgTaskSummaries = useCallback(async () => {
+    try {
+      const result = await window.ipc.invoke('bg-task:list', { limit: 200 })
+      setBgTaskSummaries(result.items.map((it) => ({
+        slug: it.slug,
+        name: it.name,
+        active: it.active,
+        createdAt: it.createdAt,
+        lastAttemptAt: it.lastAttemptAt,
+        lastRunAt: it.lastRunAt,
+        lastRunError: it.lastRunError,
+      })))
+    } catch (err) {
+      console.error('Failed to load bg-task summaries:', err)
+    }
+  }, [])
+
+  useEffect(() => {
+    loadBgTaskSummaries()
+  }, [loadBgTaskSummaries])
+
   // Load background tasks
   const loadBackgroundTasks = useCallback(async () => {
     try {
@@ -2608,25 +2688,6 @@ function App() {
     return true
   }, [])
 
-  const openChatInNewTab = useCallback((targetRunId: string) => {
-    cancelRecordingIfActive()
-    const existingTab = chatTabs.find(t => t.runId === targetRunId)
-    if (existingTab) {
-      // Cancel stale in-flight loads from previously focused tabs.
-      loadRunRequestIdRef.current += 1
-      setActiveChatTabId(existingTab.id)
-      const restored = restoreChatTabState(existingTab.id, existingTab.runId)
-      if (processingRunIdsRef.current.has(targetRunId) || !restored) {
-        loadRun(targetRunId)
-      }
-      return
-    }
-    const id = newChatTabId()
-    setChatTabs(prev => [...prev, { id, runId: targetRunId }])
-    setActiveChatTabId(id)
-    loadRun(targetRunId)
-  }, [chatTabs, loadRun, restoreChatTabState, cancelRecordingIfActive])
-
   const switchChatTab = useCallback((tabId: string) => {
     const tab = chatTabs.find(t => t.id === tabId)
     if (!tab) return
@@ -2771,7 +2832,7 @@ function App() {
       setActiveFileTabId(existingTab.id)
       setIsGraphOpen(false)
       setIsSuggestedTopicsOpen(false)
-      setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false)
+      setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false); setIsHomeOpen(false)
       setSelectedPath(path)
       return
     }
@@ -2780,7 +2841,7 @@ function App() {
     setActiveFileTabId(id)
     setIsGraphOpen(false)
     setIsSuggestedTopicsOpen(false)
-    setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false)
+    setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false); setIsHomeOpen(false)
     setSelectedPath(path)
   }, [fileTabs, dismissBrowserOverlay])
 
@@ -2799,14 +2860,14 @@ function App() {
       setSelectedPath(null)
       setIsGraphOpen(true)
       setIsSuggestedTopicsOpen(false)
-      setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false)
+      setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false); setIsHomeOpen(false)
       return
     }
     if (isSuggestedTopicsTabPath(tab.path)) {
       setSelectedPath(null)
       setIsGraphOpen(false)
       setIsSuggestedTopicsOpen(true)
-      setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false)
+      setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false); setIsHomeOpen(false)
       return
     }
     if (isLiveNotesTabPath(tab.path)) {
@@ -2816,6 +2877,10 @@ function App() {
       setIsMeetingsOpen(false)
       setIsBgTasksOpen(false)
       setIsEmailOpen(false)
+      setIsWorkspaceOpen(false)
+      setIsKnowledgeViewOpen(false)
+      setIsChatHistoryOpen(false)
+      setIsHomeOpen(false)
       setIsLiveNotesOpen(true)
       return
     }
@@ -2825,6 +2890,11 @@ function App() {
       setIsSuggestedTopicsOpen(false)
       setIsMeetingsOpen(false)
       setIsLiveNotesOpen(false)
+      setIsEmailOpen(false)
+      setIsWorkspaceOpen(false)
+      setIsKnowledgeViewOpen(false)
+      setIsChatHistoryOpen(false)
+      setIsHomeOpen(false)
       setIsBgTasksOpen(true)
       return
     }
@@ -2835,26 +2905,85 @@ function App() {
       setIsMeetingsOpen(true)
       setIsLiveNotesOpen(false)
       setIsBgTasksOpen(false)
+      setIsEmailOpen(false)
+      setIsWorkspaceOpen(false)
+      setIsKnowledgeViewOpen(false)
+      setIsChatHistoryOpen(false)
+      setIsHomeOpen(false)
       return
     }
     if (isEmailTabPath(tab.path)) {
       setSelectedPath(null)
       setIsGraphOpen(false)
       setIsSuggestedTopicsOpen(false)
+      setIsMeetingsOpen(false)
       setIsLiveNotesOpen(false)
       setIsBgTasksOpen(false)
+      setIsWorkspaceOpen(false)
+      setIsKnowledgeViewOpen(false)
+      setIsChatHistoryOpen(false)
+      setIsHomeOpen(false)
       setIsEmailOpen(true)
       return
     }
+    if (isWorkspaceTabPath(tab.path)) {
+      setSelectedPath(null)
+      setIsGraphOpen(false)
+      setIsSuggestedTopicsOpen(false)
+      setIsMeetingsOpen(false)
+      setIsLiveNotesOpen(false)
+      setIsBgTasksOpen(false)
+      setIsEmailOpen(false)
+      setIsKnowledgeViewOpen(false)
+      setIsChatHistoryOpen(false)
+      setIsHomeOpen(false)
+      setIsWorkspaceOpen(true)
+      return
+    }
+    if (isKnowledgeViewTabPath(tab.path)) {
+      setSelectedPath(null)
+      setIsGraphOpen(false)
+      setIsSuggestedTopicsOpen(false)
+      setIsMeetingsOpen(false)
+      setIsLiveNotesOpen(false)
+      setIsBgTasksOpen(false)
+      setIsEmailOpen(false)
+      setIsWorkspaceOpen(false)
+      setIsChatHistoryOpen(false)
+      setIsHomeOpen(false)
+      setIsKnowledgeViewOpen(true)
+      return
+    }
+    if (isChatHistoryTabPath(tab.path)) {
+      setSelectedPath(null)
+      setIsGraphOpen(false)
+      setIsSuggestedTopicsOpen(false)
+      setIsMeetingsOpen(false)
+      setIsLiveNotesOpen(false)
+      setIsBgTasksOpen(false)
+      setIsEmailOpen(false)
+      setIsWorkspaceOpen(false)
+      setIsKnowledgeViewOpen(false)
+      setIsChatHistoryOpen(true); setIsHomeOpen(false)
+      return
+    }
+    if (isHomeTabPath(tab.path)) {
+      setSelectedPath(null)
+      setIsGraphOpen(false)
+      setIsSuggestedTopicsOpen(false)
+      setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false)
+      setIsHomeOpen(true)
+      return
+    }
     setIsGraphOpen(false)
     setIsSuggestedTopicsOpen(false)
-    setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false)
+    setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false); setIsHomeOpen(false)
     setSelectedPath(tab.path)
   }, [fileTabs, isRightPaneMaximized, dismissBrowserOverlay])
 
   const closeFileTab = useCallback((tabId: string) => {
     const closingTab = fileTabs.find(t => t.id === tabId)
-    if (closingTab && !isGraphTabPath(closingTab.path) && !isSuggestedTopicsTabPath(closingTab.path) && !isLiveNotesTabPath(closingTab.path) && !isBgTasksTabPath(closingTab.path) && !isEmailTabPath(closingTab.path) && !isBaseFilePath(closingTab.path)) {
+    if (closingTab && !isGraphTabPath(closingTab.path) && !isSuggestedTopicsTabPath(closingTab.path) && !isLiveNotesTabPath(closingTab.path) && !isBgTasksTabPath(closingTab.path) && !isEmailTabPath(closingTab.path) && !isWorkspaceTabPath(closingTab.path) && !isKnowledgeViewTabPath(closingTab.path) && !isChatHistoryTabPath(closingTab.path) && !isHomeTabPath(closingTab.path) && !isBaseFilePath(closingTab.path)) {
       removeEditorCacheForPath(closingTab.path)
       initialContentByPathRef.current.delete(closingTab.path)
       untitledRenameReadyPathsRef.current.delete(closingTab.path)
@@ -2877,7 +3006,7 @@ function App() {
         setSelectedPath(null)
         setIsGraphOpen(false)
         setIsSuggestedTopicsOpen(false)
-        setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false)
+        setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false); setIsHomeOpen(false)
           return []
       }
       const idx = prev.findIndex(t => t.id === tabId)
@@ -2891,12 +3020,12 @@ function App() {
           setSelectedPath(null)
           setIsGraphOpen(true)
           setIsSuggestedTopicsOpen(false)
-          setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false)
+          setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false); setIsHomeOpen(false)
         } else if (isSuggestedTopicsTabPath(newActiveTab.path)) {
           setSelectedPath(null)
           setIsGraphOpen(false)
           setIsSuggestedTopicsOpen(true)
-          setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false)
+          setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false); setIsHomeOpen(false)
         } else if (isMeetingsTabPath(newActiveTab.path)) {
           setSelectedPath(null)
           setIsGraphOpen(false)
@@ -2905,6 +3034,10 @@ function App() {
           setIsLiveNotesOpen(false)
           setIsBgTasksOpen(false)
           setIsEmailOpen(false)
+          setIsWorkspaceOpen(false)
+          setIsKnowledgeViewOpen(false)
+          setIsChatHistoryOpen(false)
+      setIsHomeOpen(false)
         } else if (isLiveNotesTabPath(newActiveTab.path)) {
           setSelectedPath(null)
           setIsGraphOpen(false)
@@ -2912,6 +3045,10 @@ function App() {
           setIsMeetingsOpen(false)
           setIsBgTasksOpen(false)
           setIsEmailOpen(false)
+          setIsWorkspaceOpen(false)
+          setIsKnowledgeViewOpen(false)
+          setIsChatHistoryOpen(false)
+      setIsHomeOpen(false)
           setIsLiveNotesOpen(true)
         } else if (isBgTasksTabPath(newActiveTab.path)) {
           setSelectedPath(null)
@@ -2921,6 +3058,10 @@ function App() {
           setIsLiveNotesOpen(false)
           setIsBgTasksOpen(true)
           setIsEmailOpen(false)
+          setIsWorkspaceOpen(false)
+          setIsKnowledgeViewOpen(false)
+          setIsChatHistoryOpen(false)
+      setIsHomeOpen(false)
         } else if (isEmailTabPath(newActiveTab.path)) {
           setSelectedPath(null)
           setIsGraphOpen(false)
@@ -2928,11 +3069,56 @@ function App() {
           setIsMeetingsOpen(false)
           setIsLiveNotesOpen(false)
           setIsBgTasksOpen(false)
+          setIsWorkspaceOpen(false)
+          setIsKnowledgeViewOpen(false)
+          setIsChatHistoryOpen(false)
+      setIsHomeOpen(false)
           setIsEmailOpen(true)
+        } else if (isWorkspaceTabPath(newActiveTab.path)) {
+          setSelectedPath(null)
+          setIsGraphOpen(false)
+          setIsSuggestedTopicsOpen(false)
+          setIsMeetingsOpen(false)
+          setIsLiveNotesOpen(false)
+          setIsBgTasksOpen(false)
+          setIsEmailOpen(false)
+          setIsKnowledgeViewOpen(false)
+          setIsChatHistoryOpen(false)
+      setIsHomeOpen(false)
+          setIsWorkspaceOpen(true)
+        } else if (isKnowledgeViewTabPath(newActiveTab.path)) {
+          setSelectedPath(null)
+          setIsGraphOpen(false)
+          setIsSuggestedTopicsOpen(false)
+          setIsMeetingsOpen(false)
+          setIsLiveNotesOpen(false)
+          setIsBgTasksOpen(false)
+          setIsEmailOpen(false)
+          setIsWorkspaceOpen(false)
+          setIsChatHistoryOpen(false)
+      setIsHomeOpen(false)
+          setIsKnowledgeViewOpen(true)
+        } else if (isChatHistoryTabPath(newActiveTab.path)) {
+          setSelectedPath(null)
+          setIsGraphOpen(false)
+          setIsSuggestedTopicsOpen(false)
+          setIsMeetingsOpen(false)
+          setIsLiveNotesOpen(false)
+          setIsBgTasksOpen(false)
+          setIsEmailOpen(false)
+          setIsWorkspaceOpen(false)
+          setIsKnowledgeViewOpen(false)
+          setIsChatHistoryOpen(true); setIsHomeOpen(false)
+        } else if (isHomeTabPath(newActiveTab.path)) {
+          setSelectedPath(null)
+          setIsGraphOpen(false)
+          setIsSuggestedTopicsOpen(false)
+          setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false)
+          setIsHomeOpen(true)
         } else {
           setIsGraphOpen(false)
           setIsSuggestedTopicsOpen(false)
-          setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false)
+          setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false); setIsHomeOpen(false)
               setSelectedPath(newActiveTab.path)
         }
       }
@@ -2948,22 +3134,13 @@ function App() {
   }, [activeFileTabId, fileTabs, removeEditorCacheForPath])
 
   const handleNewChatTab = useCallback(() => {
-    // If there's already an empty "New chat" tab, switch to it
-    const emptyTab = chatTabs.find(t => !t.runId)
-    if (emptyTab) {
-      if (emptyTab.id !== activeChatTabId) {
-        setActiveChatTabId(emptyTab.id)
-      }
-    } else {
-      // Create a new tab
-      const id = newChatTabId()
-      setChatTabs(prev => [...prev, { id, runId: null }])
-        setActiveChatTabId(id)
-    }
+    // Single-chat model: reset the one conversation in place instead of
+    // opening a new tab.
+    setChatTabs([{ id: activeChatTabIdRef.current, runId: null }])
     dismissBrowserOverlay()
     handleNewChat()
     // Left-pane "new chat" should always open full chat view.
-    if (selectedPath || isGraphOpen || isSuggestedTopicsOpen || isMeetingsOpen || isLiveNotesOpen || isBgTasksOpen || isEmailOpen) {
+    if (selectedPath || isGraphOpen || isSuggestedTopicsOpen || isMeetingsOpen || isLiveNotesOpen || isBgTasksOpen || isEmailOpen || isWorkspaceOpen || isKnowledgeViewOpen || isChatHistoryOpen || isHomeOpen) {
       setExpandedFrom({
         path: selectedPath,
         graph: isGraphOpen,
@@ -2980,23 +3157,14 @@ function App() {
     setSelectedPath(null)
     setIsGraphOpen(false)
     setIsSuggestedTopicsOpen(false)
-    setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false)
-  }, [chatTabs, activeChatTabId, dismissBrowserOverlay, handleNewChat, selectedPath, isGraphOpen, isSuggestedTopicsOpen, isMeetingsOpen, isLiveNotesOpen, isBgTasksOpen, isEmailOpen])
+    setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false); setIsHomeOpen(false)
+  }, [dismissBrowserOverlay, handleNewChat, selectedPath, isGraphOpen, isSuggestedTopicsOpen, isMeetingsOpen, isLiveNotesOpen, isBgTasksOpen, isEmailOpen, isWorkspaceOpen, isKnowledgeViewOpen, isChatHistoryOpen, isHomeOpen])
 
-  // Sidebar variant: create/switch chat tab without leaving file/graph context.
+  // Sidebar variant: reset the chat in place without leaving file/graph context.
   const handleNewChatTabInSidebar = useCallback(() => {
-    const emptyTab = chatTabs.find(t => !t.runId)
-    if (emptyTab) {
-      if (emptyTab.id !== activeChatTabId) {
-        setActiveChatTabId(emptyTab.id)
-      }
-    } else {
-      const id = newChatTabId()
-      setChatTabs(prev => [...prev, { id, runId: null }])
-      setActiveChatTabId(id)
-    }
+    setChatTabs([{ id: activeChatTabIdRef.current, runId: null }])
     handleNewChat()
-  }, [chatTabs, activeChatTabId, handleNewChat])
+  }, [handleNewChat])
 
   // Palette → sidebar submission. Opens the sidebar (if closed), forces a fresh chat tab,
   // queues the message; the pending-submit effect (below) flushes it once state has settled
@@ -3083,9 +3251,10 @@ function App() {
     return () => window.removeEventListener('rowboat:open-copilot-prompt', handler as EventListener)
   }, [submitFromPalette])
 
-  const toggleKnowledgePane = useCallback(() => {
+  // Reveal the chat in the right side pane (from the middle-panel chat icon).
+  const openChatSidePane = useCallback(() => {
     setIsRightPaneMaximized(false)
-    setIsChatSidebarOpen(prev => !prev)
+    setIsChatSidebarOpen(true)
   }, [])
 
   // Browser is an overlay on the middle pane: opening it forces the chat
@@ -3113,7 +3282,7 @@ function App() {
 
   const handleOpenFullScreenChat = useCallback(() => {
     // Remember where we came from so the close button can return
-    if (selectedPath || isGraphOpen || isSuggestedTopicsOpen || isMeetingsOpen || isLiveNotesOpen || isBgTasksOpen || isEmailOpen) {
+    if (selectedPath || isGraphOpen || isSuggestedTopicsOpen || isMeetingsOpen || isLiveNotesOpen || isBgTasksOpen || isEmailOpen || isWorkspaceOpen || isKnowledgeViewOpen || isChatHistoryOpen || isHomeOpen) {
       setExpandedFrom({
         path: selectedPath,
         graph: isGraphOpen,
@@ -3129,19 +3298,19 @@ function App() {
     setSelectedPath(null)
     setIsGraphOpen(false)
     setIsSuggestedTopicsOpen(false)
-    setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false)
-  }, [selectedPath, isGraphOpen, isSuggestedTopicsOpen, isMeetingsOpen, isLiveNotesOpen, isBgTasksOpen, isEmailOpen, dismissBrowserOverlay])
+    setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false); setIsHomeOpen(false)
+  }, [selectedPath, isGraphOpen, isSuggestedTopicsOpen, isMeetingsOpen, isLiveNotesOpen, isBgTasksOpen, isEmailOpen, isWorkspaceOpen, isKnowledgeViewOpen, isChatHistoryOpen, dismissBrowserOverlay])
 
   const handleCloseFullScreenChat = useCallback(() => {
     if (expandedFrom) {
       if (expandedFrom.graph) {
         setIsGraphOpen(true)
         setIsSuggestedTopicsOpen(false)
-        setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false)
+        setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false); setIsHomeOpen(false)
       } else if (expandedFrom.suggestedTopics) {
         setIsGraphOpen(false)
         setIsSuggestedTopicsOpen(true)
-        setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false)
+        setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false); setIsHomeOpen(false)
       } else if (expandedFrom.meetings) {
         setIsGraphOpen(false)
         setIsSuggestedTopicsOpen(false)
@@ -3173,7 +3342,7 @@ function App() {
       } else if (expandedFrom.path) {
         setIsGraphOpen(false)
         setIsSuggestedTopicsOpen(false)
-        setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false)
+        setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false); setIsHomeOpen(false)
         setSelectedPath(expandedFrom.path)
       }
       setExpandedFrom(null)
@@ -3187,10 +3356,14 @@ function App() {
     if (isMeetingsOpen) return { type: 'meetings' }
     if (isLiveNotesOpen) return { type: 'live-notes' }
     if (isSuggestedTopicsOpen) return { type: 'suggested-topics' }
+    if (isWorkspaceOpen) return { type: 'workspace', path: workspaceInitialPath ?? undefined }
+    if (isKnowledgeViewOpen) return { type: 'knowledge-view' }
+    if (isChatHistoryOpen) return { type: 'chat-history' }
+    if (isHomeOpen) return { type: 'home' }
     if (selectedPath) return { type: 'file', path: selectedPath }
     if (isGraphOpen) return { type: 'graph' }
     return { type: 'chat', runId }
-  }, [selectedBackgroundTask, isEmailOpen, isMeetingsOpen, isLiveNotesOpen, isBgTasksOpen, isSuggestedTopicsOpen, selectedPath, isGraphOpen, runId])
+  }, [selectedBackgroundTask, isEmailOpen, isMeetingsOpen, isLiveNotesOpen, isBgTasksOpen, isSuggestedTopicsOpen, selectedPath, isGraphOpen, isWorkspaceOpen, isKnowledgeViewOpen, isChatHistoryOpen, isHomeOpen, workspaceInitialPath, runId])
 
   const appendUnique = useCallback((stack: ViewState[], entry: ViewState) => {
     const last = stack[stack.length - 1]
@@ -3291,7 +3464,51 @@ function App() {
     setActiveFileTabId(id)
   }, [fileTabs])
 
-  const openEmailView = useCallback(() => {
+  const ensureWorkspaceFileTab = useCallback(() => {
+    const existing = fileTabs.find((tab) => isWorkspaceTabPath(tab.path))
+    if (existing) {
+      setActiveFileTabId(existing.id)
+      return
+    }
+    const id = newFileTabId()
+    setFileTabs((prev) => [...prev, { id, path: WORKSPACE_TAB_PATH }])
+    setActiveFileTabId(id)
+  }, [fileTabs])
+
+  const ensureKnowledgeViewFileTab = useCallback(() => {
+    const existing = fileTabs.find((tab) => isKnowledgeViewTabPath(tab.path))
+    if (existing) {
+      setActiveFileTabId(existing.id)
+      return
+    }
+    const id = newFileTabId()
+    setFileTabs((prev) => [...prev, { id, path: KNOWLEDGE_VIEW_TAB_PATH }])
+    setActiveFileTabId(id)
+  }, [fileTabs])
+
+  const ensureChatHistoryFileTab = useCallback(() => {
+    const existing = fileTabs.find((tab) => isChatHistoryTabPath(tab.path))
+    if (existing) {
+      setActiveFileTabId(existing.id)
+      return
+    }
+    const id = newFileTabId()
+    setFileTabs((prev) => [...prev, { id, path: CHAT_HISTORY_TAB_PATH }])
+    setActiveFileTabId(id)
+  }, [fileTabs])
+
+  const ensureHomeFileTab = useCallback(() => {
+    const existing = fileTabs.find((tab) => isHomeTabPath(tab.path))
+    if (existing) {
+      setActiveFileTabId(existing.id)
+      return
+    }
+    const id = newFileTabId()
+    setFileTabs((prev) => [...prev, { id, path: HOME_TAB_PATH }])
+    setActiveFileTabId(id)
+  }, [fileTabs])
+
+  const openEmailView = useCallback((threadId?: string) => {
     setSelectedPath(null)
     setIsGraphOpen(false)
     setIsBrowserOpen(false)
@@ -3299,10 +3516,18 @@ function App() {
     setIsMeetingsOpen(false)
     setIsLiveNotesOpen(false)
     setIsBgTasksOpen(false)
+    setIsWorkspaceOpen(false)
+    setIsKnowledgeViewOpen(false)
+    setIsChatHistoryOpen(false)
+    setIsHomeOpen(false)
     setSelectedBackgroundTask(null)
     setExpandedFrom(null)
     setIsRightPaneMaximized(false)
     setIsEmailOpen(true)
+    if (threadId) {
+      setEmailInitialThreadId(threadId)
+      setEmailThreadIdVersion((v) => v + 1)
+    }
     ensureEmailFileTab()
   }, [ensureEmailFileTab])
 
@@ -3311,7 +3536,7 @@ function App() {
     setIsGraphOpen(false)
     setIsBrowserOpen(false)
     setIsSuggestedTopicsOpen(false)
-    setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false)
+    setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false); setIsHomeOpen(false)
     setSelectedBackgroundTask(null)
     setExpandedFrom(null)
     setIsRightPaneMaximized(false)
@@ -3328,6 +3553,10 @@ function App() {
     setIsLiveNotesOpen(false)
     setIsBgTasksOpen(false)
     setIsEmailOpen(false)
+    setIsWorkspaceOpen(false)
+    setIsKnowledgeViewOpen(false)
+    setIsChatHistoryOpen(false)
+    setIsHomeOpen(false)
     setSelectedBackgroundTask(null)
     setExpandedFrom(null)
     setIsRightPaneMaximized(false)
@@ -3343,7 +3572,7 @@ function App() {
         // visible in the middle pane.
         setIsBrowserOpen(false)
         setIsSuggestedTopicsOpen(false)
-        setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false)
+        setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false); setIsHomeOpen(false)
         setExpandedFrom(null)
         // Preserve split vs knowledge-max mode when navigating knowledge files.
         // Only exit chat-only maximize, because that would hide the selected file.
@@ -3358,7 +3587,7 @@ function App() {
         setSelectedPath(null)
         setIsBrowserOpen(false)
         setIsSuggestedTopicsOpen(false)
-        setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false)
+        setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false); setIsHomeOpen(false)
         setExpandedFrom(null)
         setIsGraphOpen(true)
         ensureGraphFileTab()
@@ -3371,7 +3600,7 @@ function App() {
         setIsGraphOpen(false)
         setIsBrowserOpen(false)
         setIsSuggestedTopicsOpen(false)
-        setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false)
+        setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false); setIsHomeOpen(false)
         setExpandedFrom(null)
         setIsRightPaneMaximized(false)
         setSelectedBackgroundTask(view.name)
@@ -3384,7 +3613,7 @@ function App() {
         setIsRightPaneMaximized(false)
         setSelectedBackgroundTask(null)
         setIsSuggestedTopicsOpen(true)
-        setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false)
+        setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false); setIsHomeOpen(false)
         ensureSuggestedTopicsFileTab()
         return
       case 'meetings':
@@ -3399,6 +3628,10 @@ function App() {
         setIsLiveNotesOpen(false)
         setIsBgTasksOpen(false)
         setIsEmailOpen(false)
+        setIsWorkspaceOpen(false)
+        setIsKnowledgeViewOpen(false)
+        setIsChatHistoryOpen(false)
+      setIsHomeOpen(false)
         ensureMeetingsFileTab()
         return
       case 'live-notes':
@@ -3412,6 +3645,10 @@ function App() {
         setIsMeetingsOpen(false)
         setIsBgTasksOpen(false)
         setIsEmailOpen(false)
+        setIsWorkspaceOpen(false)
+        setIsKnowledgeViewOpen(false)
+        setIsChatHistoryOpen(false)
+      setIsHomeOpen(false)
         setIsLiveNotesOpen(true)
         ensureLiveNotesFileTab()
         return
@@ -3427,8 +3664,84 @@ function App() {
         setIsLiveNotesOpen(false)
         setIsBgTasksOpen(false)
         setIsEmailOpen(true)
+        setIsWorkspaceOpen(false)
+        setIsKnowledgeViewOpen(false)
+        setIsChatHistoryOpen(false)
+      setIsHomeOpen(false)
         ensureEmailFileTab()
         return
+      case 'workspace':
+        setSelectedPath(null)
+        setIsGraphOpen(false)
+        setIsBrowserOpen(false)
+        setExpandedFrom(null)
+        setIsRightPaneMaximized(false)
+        setSelectedBackgroundTask(null)
+        setIsSuggestedTopicsOpen(false)
+        setIsMeetingsOpen(false)
+        setIsLiveNotesOpen(false)
+        setIsBgTasksOpen(false)
+        setIsEmailOpen(false)
+        setIsWorkspaceOpen(true)
+        setIsKnowledgeViewOpen(false)
+        setIsChatHistoryOpen(false)
+      setIsHomeOpen(false)
+        setWorkspaceInitialPath(view.path ?? null)
+        ensureWorkspaceFileTab()
+        return
+      case 'knowledge-view':
+        setSelectedPath(null)
+        setIsGraphOpen(false)
+        setIsBrowserOpen(false)
+        setExpandedFrom(null)
+        setIsRightPaneMaximized(false)
+        setSelectedBackgroundTask(null)
+        setIsSuggestedTopicsOpen(false)
+        setIsMeetingsOpen(false)
+        setIsLiveNotesOpen(false)
+        setIsBgTasksOpen(false)
+        setIsEmailOpen(false)
+        setIsWorkspaceOpen(false)
+        setIsKnowledgeViewOpen(true)
+        setIsChatHistoryOpen(false)
+      setIsHomeOpen(false)
+        ensureKnowledgeViewFileTab()
+        return
+      case 'chat-history':
+        setSelectedPath(null)
+        setIsGraphOpen(false)
+        setIsBrowserOpen(false)
+        setExpandedFrom(null)
+        setIsRightPaneMaximized(false)
+        setSelectedBackgroundTask(null)
+        setIsSuggestedTopicsOpen(false)
+        setIsMeetingsOpen(false)
+        setIsLiveNotesOpen(false)
+        setIsBgTasksOpen(false)
+        setIsEmailOpen(false)
+        setIsWorkspaceOpen(false)
+        setIsKnowledgeViewOpen(false)
+        setIsChatHistoryOpen(true); setIsHomeOpen(false)
+        ensureChatHistoryFileTab()
+        return
+      case 'home':
+        setSelectedPath(null)
+        setIsGraphOpen(false)
+        setIsBrowserOpen(false)
+        setExpandedFrom(null)
+        setIsRightPaneMaximized(false)
+        setSelectedBackgroundTask(null)
+        setIsSuggestedTopicsOpen(false)
+        setIsMeetingsOpen(false)
+        setIsLiveNotesOpen(false)
+        setIsBgTasksOpen(false)
+        setIsEmailOpen(false)
+        setIsWorkspaceOpen(false)
+        setIsKnowledgeViewOpen(false)
+        setIsChatHistoryOpen(false)
+        setIsHomeOpen(true)
+        ensureHomeFileTab()
+        return
       case 'chat':
         setSelectedPath(null)
         setIsGraphOpen(false)
@@ -3437,15 +3750,27 @@ function App() {
         setIsRightPaneMaximized(false)
         setSelectedBackgroundTask(null)
         setIsSuggestedTopicsOpen(false)
-        setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false)
+        setIsMeetingsOpen(false); setIsLiveNotesOpen(false); setIsBgTasksOpen(false); setIsEmailOpen(false); setIsWorkspaceOpen(false); setIsKnowledgeViewOpen(false); setIsChatHistoryOpen(false); setIsHomeOpen(false)
         if (view.runId) {
-          await loadRun(view.runId)
+          const targetRunId = view.runId
+          // Bind the loaded run to a chat tab so its title (derived from
+          // tab.runId) updates. Reuse an existing tab for this run if one is
+          // open, otherwise rebind the active tab.
+          const existingTab = chatTabsRef.current.find((tab) => tab.runId === targetRunId)
+          if (existingTab) {
+            setActiveChatTabId(existingTab.id)
+          } else {
+            setChatTabs((prev) => prev.map((tab) => (
+              tab.id === activeChatTabIdRef.current ? { ...tab, runId: targetRunId } : tab
+            )))
+          }
+          await loadRun(targetRunId)
         } else {
           handleNewChat()
         }
         return
     }
-  }, [ensureEmailFileTab, ensureMeetingsFileTab, ensureLiveNotesFileTab, ensureFileTabForPath, ensureGraphFileTab, ensureSuggestedTopicsFileTab, handleNewChat, isRightPaneMaximized, loadRun])
+  }, [ensureEmailFileTab, ensureMeetingsFileTab, ensureLiveNotesFileTab, ensureFileTabForPath, ensureGraphFileTab, ensureSuggestedTopicsFileTab, ensureWorkspaceFileTab, ensureKnowledgeViewFileTab, ensureChatHistoryFileTab, ensureHomeFileTab, handleNewChat, isRightPaneMaximized, loadRun])
 
   const navigateToView = useCallback(async (nextView: ViewState) => {
     const current = currentViewState
@@ -3465,6 +3790,18 @@ function App() {
     await applyViewState(nextView)
   }, [appendUnique, applyViewState, cancelRecordingIfActive, currentViewState, setHistory, isBrowserOpen, dismissBrowserOverlay])
 
+  // Move the maximized/full-screen chat into the right side pane: restore the
+  // view we expanded from (or fall back to Home) and dock the chat on the right.
+  const pushChatToSidePane = useCallback(() => {
+    setIsRightPaneMaximized(false)
+    setIsChatSidebarOpen(true)
+    if (expandedFrom) {
+      handleCloseFullScreenChat()
+    } else {
+      void navigateToView({ type: 'home' })
+    }
+  }, [expandedFrom, handleCloseFullScreenChat, navigateToView])
+
   const navigateBack = useCallback(async () => {
     const { back, forward } = historyRef.current
     if (back.length === 0) return
@@ -3767,7 +4104,7 @@ function App() {
   }, [])
 
   // Keyboard shortcut: Ctrl+L to toggle main chat view
-  const isFullScreenChat = !selectedPath && !isGraphOpen && !isSuggestedTopicsOpen && !isMeetingsOpen && !isLiveNotesOpen && !isBgTasksOpen && !isEmailOpen && !selectedBackgroundTask && !isBrowserOpen
+  const isFullScreenChat = !selectedPath && !isGraphOpen && !isSuggestedTopicsOpen && !isMeetingsOpen && !isLiveNotesOpen && !isBgTasksOpen && !isEmailOpen && !isWorkspaceOpen && !isKnowledgeViewOpen && !isChatHistoryOpen && !isHomeOpen && !selectedBackgroundTask && !isBrowserOpen
   useEffect(() => {
     const handleKeyDown = (e: KeyboardEvent) => {
       if ((e.ctrlKey || e.metaKey) && e.key === 'l') {
@@ -3795,6 +4132,18 @@ function App() {
     return () => document.removeEventListener('keydown', handleKeyDown)
   }, [])
 
+  // Keyboard shortcut: Cmd+N / Ctrl+N opens a new chat tab.
+  useEffect(() => {
+    const handleKeyDown = (e: KeyboardEvent) => {
+      if ((e.ctrlKey || e.metaKey) && !e.shiftKey && !e.altKey && e.key.toLowerCase() === 'n') {
+        e.preventDefault()
+        handleNewChatTab()
+      }
+    }
+    document.addEventListener('keydown', handleKeyDown)
+    return () => document.removeEventListener('keydown', handleKeyDown)
+  }, [handleNewChatTab])
+
   // Route undo/redo to the active markdown tab only (prevents cross-tab browser undo behavior).
   useEffect(() => {
     const handleHistoryKeyDown = (e: KeyboardEvent) => {
@@ -3840,11 +4189,11 @@ function App() {
     const handleTabKeyDown = (e: KeyboardEvent) => {
       const mod = e.metaKey || e.ctrlKey
       if (!mod) return
-      const rightPaneAvailable = Boolean((selectedPath || isGraphOpen || isSuggestedTopicsOpen || isMeetingsOpen || isLiveNotesOpen || isBgTasksOpen || isEmailOpen) && isChatSidebarOpen)
+      const rightPaneAvailable = Boolean((selectedPath || isGraphOpen || isSuggestedTopicsOpen || isMeetingsOpen || isLiveNotesOpen || isBgTasksOpen || isEmailOpen || isWorkspaceOpen || isKnowledgeViewOpen || isChatHistoryOpen || isHomeOpen) && isChatSidebarOpen)
       const targetPane: ShortcutPane = rightPaneAvailable
         ? (isRightPaneMaximized ? 'right' : activeShortcutPane)
         : 'left'
-      const inFileView = targetPane === 'left' && Boolean(selectedPath || isGraphOpen || isSuggestedTopicsOpen || isMeetingsOpen || isLiveNotesOpen || isBgTasksOpen || isEmailOpen)
+      const inFileView = targetPane === 'left' && Boolean(selectedPath || isGraphOpen || isSuggestedTopicsOpen || isMeetingsOpen || isLiveNotesOpen || isBgTasksOpen || isEmailOpen || isWorkspaceOpen || isKnowledgeViewOpen || isChatHistoryOpen || isHomeOpen)
       const selectedKnowledgePath = isGraphOpen
         ? GRAPH_TAB_PATH
         : isSuggestedTopicsOpen
@@ -3857,6 +4206,14 @@ function App() {
             ? BG_TASKS_TAB_PATH
           : isEmailOpen
             ? EMAIL_TAB_PATH
+          : isWorkspaceOpen
+            ? WORKSPACE_TAB_PATH
+          : isKnowledgeViewOpen
+            ? KNOWLEDGE_VIEW_TAB_PATH
+          : isChatHistoryOpen
+            ? CHAT_HISTORY_TAB_PATH
+          : isHomeOpen
+            ? HOME_TAB_PATH
           : selectedPath
       const targetFileTabId = activeFileTabId ?? (
         selectedKnowledgePath
@@ -3911,7 +4268,7 @@ function App() {
     }
     document.addEventListener('keydown', handleTabKeyDown)
     return () => document.removeEventListener('keydown', handleTabKeyDown)
-  }, [selectedPath, isGraphOpen, isSuggestedTopicsOpen, isMeetingsOpen, isLiveNotesOpen, isBgTasksOpen, isEmailOpen, isChatSidebarOpen, isRightPaneMaximized, activeShortcutPane, chatTabs, fileTabs, activeChatTabId, activeFileTabId, closeChatTab, closeFileTab, switchChatTab, switchFileTab])
+  }, [selectedPath, isGraphOpen, isSuggestedTopicsOpen, isMeetingsOpen, isLiveNotesOpen, isBgTasksOpen, isEmailOpen, isWorkspaceOpen, isKnowledgeViewOpen, isChatHistoryOpen, isChatSidebarOpen, isRightPaneMaximized, activeShortcutPane, chatTabs, fileTabs, activeChatTabId, activeFileTabId, closeChatTab, closeFileTab, switchChatTab, switchFileTab])
 
   const toggleExpand = (path: string, kind: 'file' | 'dir') => {
     if (kind === 'file') {
@@ -3936,7 +4293,7 @@ function App() {
           }),
         },
       }))
-      if (!selectedPath && !isGraphOpen && !isSuggestedTopicsOpen && !isMeetingsOpen && !isLiveNotesOpen && !isBgTasksOpen && !isEmailOpen && !selectedBackgroundTask) {
+      if (!selectedPath && !isGraphOpen && !isSuggestedTopicsOpen && !isMeetingsOpen && !isLiveNotesOpen && !isBgTasksOpen && !isEmailOpen && !isWorkspaceOpen && !isKnowledgeViewOpen && !isChatHistoryOpen && !selectedBackgroundTask) {
         setIsChatSidebarOpen(false)
         setIsRightPaneMaximized(false)
       }
@@ -4047,14 +4404,23 @@ function App() {
       }
     },
     createFolder: async (parentPath: string = 'knowledge'): Promise<string> => {
-      const newPath = `${parentPath}/new-folder-${Date.now()}`
       try {
+        let index = 1
+        let name = 'New folder'
+        let fullPath = `${parentPath}/${name}`
+        while (index < 1000) {
+          const exists = await window.ipc.invoke('workspace:exists', { path: fullPath })
+          if (!exists.exists) break
+          index += 1
+          name = `New folder ${index}`
+          fullPath = `${parentPath}/${name}`
+        }
         await window.ipc.invoke('workspace:mkdir', {
-          path: newPath,
+          path: fullPath,
           recursive: true
         })
         setExpandedPaths(prev => new Set([...prev, parentPath]))
-        return newPath
+        return fullPath
       } catch (err) {
         console.error('Failed to create folder:', err)
         throw err
@@ -4062,19 +4428,49 @@ function App() {
     },
     openGraph: () => {
       // From chat-only landing state, open graph directly in full knowledge view.
-      if (!selectedPath && !isGraphOpen && !isSuggestedTopicsOpen && !isMeetingsOpen && !isLiveNotesOpen && !isBgTasksOpen && !isEmailOpen && !selectedBackgroundTask) {
+      if (!selectedPath && !isGraphOpen && !isSuggestedTopicsOpen && !isMeetingsOpen && !isLiveNotesOpen && !isBgTasksOpen && !isEmailOpen && !isWorkspaceOpen && !isKnowledgeViewOpen && !isChatHistoryOpen && !selectedBackgroundTask) {
         setIsChatSidebarOpen(false)
         setIsRightPaneMaximized(false)
       }
       void navigateToView({ type: 'graph' })
     },
     openBases: () => {
-      if (!selectedPath && !isGraphOpen && !isSuggestedTopicsOpen && !isMeetingsOpen && !isLiveNotesOpen && !isBgTasksOpen && !isEmailOpen && !selectedBackgroundTask) {
+      if (!selectedPath && !isGraphOpen && !isSuggestedTopicsOpen && !isMeetingsOpen && !isLiveNotesOpen && !isBgTasksOpen && !isEmailOpen && !isWorkspaceOpen && !isKnowledgeViewOpen && !isChatHistoryOpen && !selectedBackgroundTask) {
         setIsChatSidebarOpen(false)
         setIsRightPaneMaximized(false)
       }
       void navigateToView({ type: 'file', path: BASES_DEFAULT_TAB_PATH })
     },
+    openWorkspaceAt: (path?: string) => {
+      if (!selectedPath && !isGraphOpen && !isSuggestedTopicsOpen && !isMeetingsOpen && !isLiveNotesOpen && !isBgTasksOpen && !isEmailOpen && !isWorkspaceOpen && !isKnowledgeViewOpen && !isChatHistoryOpen && !selectedBackgroundTask) {
+        setIsChatSidebarOpen(false)
+        setIsRightPaneMaximized(false)
+      }
+      void navigateToView({ type: 'workspace', path })
+    },
+    openKnowledgeView: () => {
+      if (!selectedPath && !isGraphOpen && !isSuggestedTopicsOpen && !isMeetingsOpen && !isLiveNotesOpen && !isBgTasksOpen && !isEmailOpen && !isWorkspaceOpen && !isKnowledgeViewOpen && !isChatHistoryOpen && !selectedBackgroundTask) {
+        setIsChatSidebarOpen(false)
+        setIsRightPaneMaximized(false)
+      }
+      void navigateToView({ type: 'knowledge-view' })
+    },
+    createWorkspace: async (name: string): Promise<string> => {
+      const trimmed = name.trim()
+      if (!trimmed) throw new Error('Name is required')
+      if (trimmed.includes('/')) throw new Error('Name cannot contain "/"')
+      const rootExists = await window.ipc.invoke('workspace:exists', { path: WORKSPACE_ROOT })
+      if (!rootExists.exists) {
+        await window.ipc.invoke('workspace:mkdir', { path: WORKSPACE_ROOT, recursive: true })
+      }
+      const target = `${WORKSPACE_ROOT}/${trimmed}`
+      const exists = await window.ipc.invoke('workspace:exists', { path: target })
+      if (exists.exists) {
+        throw new Error(`A workspace named "${trimmed}" already exists`)
+      }
+      await window.ipc.invoke('workspace:mkdir', { path: target, recursive: true })
+      return target
+    },
     expandAll: () => setExpandedPaths(new Set(collectDirPaths(tree))),
     collapseAll: () => setExpandedPaths(new Set()),
     rename: async (oldPath: string, newName: string, isDir: boolean) => {
@@ -4226,12 +4622,14 @@ function App() {
   const pendingCalendarEventRef = useRef<CalendarEventMeta | undefined>(undefined)
   const [meetingSummarizing, setMeetingSummarizing] = useState(false)
   const [showMeetingPermissions, setShowMeetingPermissions] = useState(false)
+  const [recordingMeetingSource, setRecordingMeetingSource] = useState<string | null>(null)
 
   const [checkingPermission, setCheckingPermission] = useState(false)
 
   const startMeetingNow = useCallback(async () => {
     const calEvent = pendingCalendarEventRef.current
     pendingCalendarEventRef.current = undefined
+    setRecordingMeetingSource(calEvent?.source ?? null)
     const notePath = await meetingTranscription.start(calEvent)
     if (notePath) {
       meetingNotePathRef.current = notePath
@@ -4259,6 +4657,7 @@ function App() {
   const handleToggleMeeting = useCallback(async () => {
     if (meetingTranscription.state === 'recording') {
       await meetingTranscription.stop()
+      setRecordingMeetingSource(null)
 
       // Read the final transcript and generate meeting notes via LLM
       const notePath = meetingNotePathRef.current
@@ -4661,11 +5060,10 @@ function App() {
     if (tabId === activeChatTabId) return activeChatTabState
     return chatViewStateByTab[tabId] ?? emptyChatTabState
   }, [activeChatTabId, activeChatTabState, chatViewStateByTab, emptyChatTabState])
-  const hasConversation = activeChatTabState.conversation.length > 0 || activeChatTabState.currentAssistantMessage
   const selectedTask = selectedBackgroundTask
     ? backgroundTasks.find(t => t.name === selectedBackgroundTask)
     : null
-  const isRightPaneContext = Boolean(selectedPath || isGraphOpen || isSuggestedTopicsOpen || isMeetingsOpen || isLiveNotesOpen || isBgTasksOpen || isEmailOpen || isBrowserOpen)
+  const isRightPaneContext = Boolean(selectedPath || isGraphOpen || isSuggestedTopicsOpen || isMeetingsOpen || isLiveNotesOpen || isBgTasksOpen || isEmailOpen || isWorkspaceOpen || isKnowledgeViewOpen || isChatHistoryOpen || isHomeOpen || isBrowserOpen)
   const isRightPaneOnlyMode = isRightPaneContext && isChatSidebarOpen && isRightPaneMaximized
   const shouldCollapseLeftPane = isRightPaneOnlyMode
   const openMarkdownTabs = React.useMemo(() => {
@@ -4682,7 +5080,7 @@ function App() {
   return (
     <TooltipProvider delayDuration={0}>
       <SidebarSectionProvider defaultSection="tasks" onSectionChange={(section) => {
-        if (section === 'knowledge' && !selectedPath && !isGraphOpen && !isSuggestedTopicsOpen && !isMeetingsOpen && !isLiveNotesOpen && !isBgTasksOpen && !isEmailOpen) {
+        if (section === 'knowledge' && !selectedPath && !isGraphOpen && !isSuggestedTopicsOpen && !isMeetingsOpen && !isLiveNotesOpen && !isBgTasksOpen && !isEmailOpen && !isWorkspaceOpen && !isKnowledgeViewOpen && !isChatHistoryOpen && !isHomeOpen) {
           void navigateToView({ type: 'file', path: BASES_DEFAULT_TAB_PATH })
         }
       }}>
@@ -4695,101 +5093,31 @@ function App() {
           >
             <SidebarContentPanel
               tree={tree}
-              selectedPath={selectedPath}
-              expandedPaths={expandedPaths}
               onSelectFile={toggleExpand}
-              onToggleFolder={(path) => {
-                setExpandedPaths((prev) => {
-                  const next = new Set(prev)
-                  if (next.has(path)) next.delete(path)
-                  else next.add(path)
-                  return next
-                })
-              }}
               knowledgeActions={knowledgeActions}
-              onVoiceNoteCreated={handleVoiceNoteCreated}
-              runs={runs}
-              currentRunId={runId}
-              processingRunIds={processingRunIds}
-              tasksActions={{
-                onNewChat: handleNewChatTab,
-                onSelectRun: (runIdToLoad) => {
-                  cancelRecordingIfActive()
-                  if (selectedPath || isGraphOpen || isSuggestedTopicsOpen || isMeetingsOpen || isLiveNotesOpen || isBgTasksOpen || isEmailOpen || isBrowserOpen) {
-                    setIsChatSidebarOpen(true)
-                  }
-
-                  // If already open in a chat tab, switch to it
-                  const existingTab = chatTabs.find(t => t.runId === runIdToLoad)
-                  if (existingTab) {
-                    switchChatTab(existingTab.id)
-                    return
-                  }
-                  // In two-pane mode (file/graph/browser), keep the middle pane and just swap chat context in the right sidebar.
-                  if (selectedPath || isGraphOpen || isSuggestedTopicsOpen || isMeetingsOpen || isLiveNotesOpen || isBgTasksOpen || isEmailOpen || isBrowserOpen) {
-                    setChatTabs(prev => prev.map(t => t.id === activeChatTabId ? { ...t, runId: runIdToLoad } : t))
-                    loadRun(runIdToLoad)
-                    return
-                  }
-
-                  // Outside two-pane mode, navigate to chat.
-                  setChatTabs(prev => prev.map(t => t.id === activeChatTabId ? { ...t, runId: runIdToLoad } : t))
-                  void navigateToView({ type: 'chat', runId: runIdToLoad })
-                },
-                onOpenInNewTab: (targetRunId) => {
-                  openChatInNewTab(targetRunId)
-                },
-                onDeleteRun: async (runIdToDelete) => {
-                  try {
-                    await window.ipc.invoke('runs:delete', { runId: runIdToDelete })
-                    // Close any chat tab showing the deleted run
-                    const tabForRun = chatTabs.find(t => t.runId === runIdToDelete)
-                    if (tabForRun) {
-                      if (chatTabs.length > 1) {
-                        closeChatTab(tabForRun.id)
-                      } else {
-                        // Only one tab, reset it to new chat
-                        setChatTabs([{ id: tabForRun.id, runId: null }])
-                        if (selectedPath || isGraphOpen || isSuggestedTopicsOpen || isMeetingsOpen || isLiveNotesOpen || isBgTasksOpen || isEmailOpen || isBrowserOpen) {
-                          handleNewChat()
-                        } else {
-                          void navigateToView({ type: 'chat', runId: null })
-                        }
-                      }
-                    } else if (runId === runIdToDelete) {
-                      if (selectedPath || isGraphOpen || isSuggestedTopicsOpen || isMeetingsOpen || isLiveNotesOpen || isBgTasksOpen || isEmailOpen || isBrowserOpen) {
-                        setChatTabs(prev => prev.map(t => t.id === activeChatTabId ? { ...t, runId: null } : t))
-                        handleNewChat()
-                      } else {
-                        void navigateToView({ type: 'chat', runId: null })
-                      }
-                    }
-                    await loadRuns()
-                  } catch (err) {
-                    console.error('Failed to delete run:', err)
-                  }
-                },
-                onSelectBackgroundTask: (taskName) => {
-                  void navigateToView({ type: 'task', name: taskName })
-                },
-              }}
-              backgroundTasks={backgroundTasks}
-              selectedBackgroundTask={selectedBackgroundTask}
-              onNewChat={handleNewChatTab}
-              onOpenSearch={() => setIsSearchOpen(true)}
-              isSearchOpen={isSearchOpen}
-              isBrowserOpen={isBrowserOpen}
-              onToggleBrowser={handleToggleBrowser}
-              isSuggestedTopicsOpen={isSuggestedTopicsOpen}
-              onOpenSuggestedTopics={() => void navigateToView({ type: 'suggested-topics' })}
-              isMeetingsOpen={isMeetingsOpen}
+              bgTaskSummaries={bgTaskSummaries}
+              activeNav={
+                isHomeOpen ? 'home'
+                : isEmailOpen ? 'email'
+                : isMeetingsOpen ? 'meetings'
+                : (isKnowledgeViewOpen || isGraphOpen || (selectedPath != null && selectedPath.startsWith('knowledge/'))) ? 'knowledge'
+                : isBgTasksOpen ? 'agents'
+                : isWorkspaceOpen ? 'workspaces'
+                : null
+              }
               onOpenMeetings={openMeetingsView}
-              isLiveNotesOpen={isLiveNotesOpen}
-              onOpenLiveNotes={() => void navigateToView({ type: 'live-notes' })}
-              isBgTasksOpen={isBgTasksOpen}
-              onOpenBgTasks={openBgTasksView}
-              isEmailOpen={isEmailOpen}
-              onOpenEmail={openEmailView}
+              onOpenBgTasks={() => { setBgTaskInitialSlug(null); setBgTaskSlugVersion((v) => v + 1); openBgTasksView() }}
+              onOpenAgent={(slug) => { setBgTaskInitialSlug(slug); setBgTaskSlugVersion((v) => v + 1); openBgTasksView() }}
+              recentRuns={runs}
+              onOpenRun={(rid) => void navigateToView({ type: 'chat', runId: rid })}
+              onOpenEmail={(threadId) => openEmailView(threadId)}
+              onOpenHome={() => void navigateToView({ type: 'home' })}
+              onNewChat={handleNewChatTab}
+              onToggleBrowser={handleToggleBrowser}
+              onVoiceNoteCreated={handleVoiceNoteCreated}
+              meetingRecordingState={meetingTranscription.state}
+              recordingMeetingSource={recordingMeetingSource}
+              onToggleMeetingRecording={() => { void handleToggleMeeting() }}
             />
             <SidebarInset
               className={cn(
@@ -4809,7 +5137,7 @@ function App() {
                 canNavigateForward={canNavigateForward}
                 collapsedLeftPaddingPx={collapsedLeftPaddingPx}
               >
-                {(selectedPath || isGraphOpen || isSuggestedTopicsOpen || isMeetingsOpen || isLiveNotesOpen || isBgTasksOpen || isEmailOpen) && fileTabs.length >= 1 ? (
+                {(selectedPath || isGraphOpen || isSuggestedTopicsOpen || isMeetingsOpen || isLiveNotesOpen || isBgTasksOpen || isEmailOpen || isWorkspaceOpen || isKnowledgeViewOpen || isChatHistoryOpen || isHomeOpen) && fileTabs.length >= 1 ? (
                   <TabBar
                     tabs={fileTabs}
                     activeTabId={activeFileTabId ?? ''}
@@ -4817,7 +5145,19 @@ function App() {
                     getTabId={(t) => t.id}
                     onSwitchTab={switchFileTab}
                     onCloseTab={closeFileTab}
-                    allowSingleTabClose={fileTabs.length === 1 && (isGraphOpen || isSuggestedTopicsOpen || isMeetingsOpen || isLiveNotesOpen || isBgTasksOpen || isEmailOpen || (selectedPath != null && isBaseFilePath(selectedPath)))}
+                    allowSingleTabClose={fileTabs.length === 1 && (isGraphOpen || isSuggestedTopicsOpen || isMeetingsOpen || isLiveNotesOpen || isBgTasksOpen || isEmailOpen || isWorkspaceOpen || isKnowledgeViewOpen || isChatHistoryOpen || isHomeOpen || (selectedPath != null && isBaseFilePath(selectedPath)))}
+                  />
+                ) : isFullScreenChat ? (
+                  <ChatHeader
+                    activeTitle={(() => {
+                      const activeTab = chatTabs.find((t) => t.id === activeChatTabId)
+                      return activeTab ? getChatTabTitle(activeTab) : 'New chat'
+                    })()}
+                    onNewChatTab={handleNewChatTab}
+                    recentRuns={runs}
+                    activeRunId={runId}
+                    onSelectRun={(rid) => void navigateToView({ type: 'chat', runId: rid })}
+                    onOpenChatHistory={() => void navigateToView({ type: 'chat-history' })}
                   />
                 ) : (
                   <TabBar
@@ -4870,53 +5210,53 @@ function App() {
                     <TooltipContent side="bottom">Version history</TooltipContent>
                   </Tooltip>
                 )}
-                {!selectedPath && !isGraphOpen && !isSuggestedTopicsOpen && !isMeetingsOpen && !isLiveNotesOpen && !isBgTasksOpen && !isEmailOpen && !selectedTask && !isBrowserOpen && (
+                {!isFullScreenChat && !selectedPath && !isGraphOpen && !isSuggestedTopicsOpen && !isMeetingsOpen && !isLiveNotesOpen && !isBgTasksOpen && !isEmailOpen && !isWorkspaceOpen && !isKnowledgeViewOpen && !isChatHistoryOpen && !selectedTask && !isBrowserOpen && (
                   <Tooltip>
                     <TooltipTrigger asChild>
                       <button
                         type="button"
                         onClick={handleNewChatTab}
                         className="titlebar-no-drag flex h-8 w-8 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground transition-colors self-center shrink-0"
-                        aria-label="New chat tab"
+                        aria-label="New chat"
                       >
-                        <SquarePen className="size-5" />
+                        <Plus className="size-5" />
                       </button>
                     </TooltipTrigger>
-                    <TooltipContent side="bottom">New chat tab</TooltipContent>
-                  </Tooltip>
-                )}
-                {!selectedPath && !isGraphOpen && !isSuggestedTopicsOpen && !isMeetingsOpen && !isLiveNotesOpen && !isBgTasksOpen && !isEmailOpen && !isBrowserOpen && expandedFrom && (
-                  <Tooltip>
-                    <TooltipTrigger asChild>
-                      <button
-                        type="button"
-                        onClick={handleCloseFullScreenChat}
-                        className="titlebar-no-drag flex h-8 w-8 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground transition-colors self-center shrink-0"
-                        aria-label="Restore two-pane view"
-                      >
-                        <Minimize2 className="size-5" />
-                      </button>
-                    </TooltipTrigger>
-                    <TooltipContent side="bottom">Restore two-pane view</TooltipContent>
-                  </Tooltip>
-                )}
-                {(selectedPath || isGraphOpen || isSuggestedTopicsOpen || isMeetingsOpen || isLiveNotesOpen || isBgTasksOpen || isEmailOpen) && (
-                  <Tooltip>
-                    <TooltipTrigger asChild>
-                      <button
-                        type="button"
-                        onClick={toggleKnowledgePane}
-                        className="titlebar-no-drag flex h-8 w-8 items-center justify-center rounded-md text-muted-foreground hover:bg-accent hover:text-foreground transition-colors -mr-1 self-center shrink-0"
-                        aria-label={isChatSidebarOpen ? "Maximize knowledge view" : "Restore two-pane view"}
-                      >
-                        {isChatSidebarOpen ? <Maximize2 className="size-5" /> : <Minimize2 className="size-5" />}
-                      </button>
-                    </TooltipTrigger>
-                    <TooltipContent side="bottom">
-                      {isChatSidebarOpen ? "Maximize knowledge view" : "Restore two-pane view"}
-                    </TooltipContent>
+                    <TooltipContent side="bottom">New chat</TooltipContent>
                   </Tooltip>
                 )}
+                {/* Trailing layout control. Always mounted (just toggled invisible
+                    when inactive) so its -webkit-app-region:no-drag rect is stable —
+                    a freshly-mounted no-drag button inside the drag-region header
+                    otherwise has its first click swallowed by the window drag. */}
+                {(() => {
+                  const viewOpen = selectedPath || isGraphOpen || isSuggestedTopicsOpen || isMeetingsOpen || isLiveNotesOpen || isBgTasksOpen || isEmailOpen || isWorkspaceOpen || isKnowledgeViewOpen || isChatHistoryOpen || isHomeOpen
+                  const action = isFullScreenChat
+                    ? { onClick: pushChatToSidePane, icon: <ArrowRight className="size-5" />, label: 'Dock chat to side pane' }
+                    : (viewOpen && !isChatSidebarOpen)
+                      ? { onClick: openChatSidePane, icon: <MessageSquare className="size-5" />, label: 'Open chat' }
+                      : null
+                  return (
+                    <Tooltip>
+                      <TooltipTrigger asChild>
+                        <button
+                          type="button"
+                          onClick={action ? action.onClick : undefined}
+                          disabled={!action}
+                          aria-hidden={!action}
+                          aria-label={action?.label}
+                          className={cn(
+                            'titlebar-no-drag flex h-8 w-8 items-center justify-center rounded-md text-muted-foreground transition-colors -mr-1 self-center shrink-0',
+                            action ? 'hover:bg-accent hover:text-foreground' : 'invisible pointer-events-none',
+                          )}
+                        >
+                          {action?.icon}
+                        </button>
+                      </TooltipTrigger>
+                      {action && <TooltipContent side="bottom">{action.label}</TooltipContent>}
+                    </Tooltip>
+                  )
+                })()}
               </ContentHeader>
 
               {isBrowserOpen ? (
@@ -4924,6 +5264,25 @@ function App() {
                   onClose={handleCloseBrowser}
                   forceHidden={isSearchOpen || showMeetingPermissions}
                 />
+              ) : isHomeOpen ? (
+                <div className="flex-1 min-h-0 flex flex-col overflow-hidden">
+                  <HomeView
+                    tree={tree}
+                    runs={runs}
+                    bgTaskSummaries={bgTaskSummaries}
+                    onOpenEmail={() => openEmailView()}
+                    onOpenMeetings={openMeetingsView}
+                    onOpenAgents={() => { setBgTaskInitialSlug(null); setBgTaskSlugVersion((v) => v + 1); openBgTasksView() }}
+                    onOpenAgent={(slug) => { setBgTaskInitialSlug(slug); setBgTaskSlugVersion((v) => v + 1); openBgTasksView() }}
+                    onOpenNote={(path) => navigateToFile(path)}
+                    onOpenRun={(rid) => void navigateToView({ type: 'chat', runId: rid })}
+                    onTakeMeetingNotes={() => { void handleToggleMeeting() }}
+                    onVoiceNoteCreated={handleVoiceNoteCreated}
+                    onRunBrowserTask={handleToggleBrowser}
+                    onStartResearch={() => submitFromPalette('Do deep, extreme research on a topic and build me a local website that summarizes the findings. Ask me what topic to research.', null)}
+                    onOpenChat={handleNewChatTab}
+                  />
+                </div>
               ) : isSuggestedTopicsOpen ? (
                 <div className="flex-1 min-h-0 flex flex-col overflow-hidden">
                   <SuggestedTopicsView
@@ -4954,6 +5313,8 @@ function App() {
               ) : isBgTasksOpen ? (
                 <div className="flex-1 min-h-0 flex flex-col overflow-hidden">
                   <BgTasksView
+                    initialSlug={bgTaskInitialSlug}
+                    slugVersion={bgTaskSlugVersion}
                     onCreateWithCopilot={(description) => {
                       submitFromPalette(buildBgTaskSetupPrompt(description), null)
                     }}
@@ -4964,7 +5325,60 @@ function App() {
                 </div>
               ) : isEmailOpen ? (
                 <div className="flex-1 min-h-0 flex flex-col overflow-hidden">
-                  <EmailView />
+                  <EmailView initialThreadId={emailInitialThreadId} threadIdVersion={emailThreadIdVersion} />
+                </div>
+              ) : isWorkspaceOpen ? (
+                <div className="flex-1 min-h-0 flex flex-col overflow-hidden">
+                  <WorkspaceView
+                    tree={tree}
+                    initialPath={workspaceInitialPath}
+                    actions={{
+                      remove: knowledgeActions.remove,
+                      copyPath: knowledgeActions.copyPath,
+                      revealInFileManager: knowledgeActions.revealInFileManager,
+                    }}
+                    onOpenNote={(path) => navigateToFile(path)}
+                    onCreateWorkspace={async (name) => { await knowledgeActions.createWorkspace(name) }}
+                  />
+                </div>
+              ) : isKnowledgeViewOpen ? (
+                <div className="flex-1 min-h-0 flex flex-col overflow-hidden">
+                  <KnowledgeView
+                    tree={tree}
+                    actions={{
+                      createNote: knowledgeActions.createNote,
+                      createFolder: knowledgeActions.createFolder,
+                      rename: knowledgeActions.rename,
+                      remove: knowledgeActions.remove,
+                      copyPath: knowledgeActions.copyPath,
+                      revealInFileManager: knowledgeActions.revealInFileManager,
+                      onOpenInNewTab: knowledgeActions.onOpenInNewTab,
+                    }}
+                    onOpenNote={(path) => navigateToFile(path)}
+                    onOpenGraph={() => knowledgeActions.openGraph()}
+                    onOpenSearch={() => setIsSearchOpen(true)}
+                    onOpenBases={() => knowledgeActions.openBases()}
+                    onVoiceNoteCreated={handleVoiceNoteCreated}
+                  />
+                </div>
+              ) : isChatHistoryOpen ? (
+                <div className="flex-1 min-h-0 flex flex-col overflow-hidden">
+                  <ChatHistoryView
+                    runs={runs}
+                    currentRunId={runId}
+                    processingRunIds={processingRunIds}
+                    onSelectRun={(rid) => void navigateToView({ type: 'chat', runId: rid })}
+                    onDeleteRun={async (rid) => {
+                      try {
+                        await window.ipc.invoke('runs:delete', { runId: rid })
+                        await loadRuns()
+                      } catch (err) {
+                        console.error('Failed to delete run:', err)
+                      }
+                    }}
+                    onNewChat={handleNewChatTab}
+                    onOpenSearch={() => setIsSearchOpen(true)}
+                  />
                 </div>
               ) : selectedPath && isBaseFilePath(selectedPath) ? (
                 <div className="flex-1 min-h-0 flex flex-col overflow-hidden">
@@ -5184,11 +5598,13 @@ function App() {
                         >
                           <ConversationContent className={tabConversationContentClassName}>
                             {!tabHasConversation ? (
-                              <ConversationEmptyState className="h-auto">
-                                <div className="text-2xl font-semibold tracking-tight text-foreground/80 sm:text-3xl md:text-4xl">
-                                  What are we working on?
-                                </div>
-                              </ConversationEmptyState>
+                              <ChatEmptyState
+                                wide
+                                recentRuns={runs}
+                                onSelectRun={(rid) => void navigateToView({ type: 'chat', runId: rid })}
+                                onOpenChatHistory={() => void navigateToView({ type: 'chat-history' })}
+                                onPickPrompt={setPresetMessage}
+                              />
                             ) : (
                               <>
                                 {groupConversationItems(
@@ -5266,9 +5682,6 @@ function App() {
                 <div className="rowboat-composer-dock sticky bottom-0 z-10 bg-background pb-12 pt-0 shadow-lg">
                   <div className="pointer-events-none absolute inset-x-0 -top-6 h-6 bg-linear-to-t from-background to-transparent" />
                   <div className="mx-auto w-full max-w-4xl px-4">
-                    {!hasConversation && (
-                      <Suggestions onSelect={setPresetMessage} className="mb-3 justify-center" />
-                    )}
                     {chatTabs.map((tab) => {
                       const isActive = tab.id === activeChatTabId
                       const tabState = getChatTabStateForRender(tab.id)
@@ -5332,11 +5745,20 @@ function App() {
                 chatTabs={chatTabs}
                 activeChatTabId={activeChatTabId}
                 getChatTabTitle={getChatTabTitle}
-                isChatTabProcessing={isChatTabProcessing}
-                onSwitchChatTab={switchChatTab}
-                onCloseChatTab={closeChatTab}
                 onNewChatTab={handleNewChatTabInSidebar}
+                recentRuns={runs}
+                onSelectRun={(rid) => {
+                  const existingTab = chatTabs.find((t) => t.runId === rid)
+                  if (existingTab) {
+                    switchChatTab(existingTab.id)
+                    return
+                  }
+                  setChatTabs((prev) => prev.map((t) => (t.id === activeChatTabId ? { ...t, runId: rid } : t)))
+                  loadRun(rid)
+                }}
+                onOpenChatHistory={() => void navigateToView({ type: 'chat-history' })}
                 onOpenFullScreen={toggleRightPaneMaximize}
+                onCloseChat={() => { setIsRightPaneMaximized(false); setIsChatSidebarOpen(false) }}
                 conversation={conversation}
                 currentAssistantMessage={currentAssistantMessage}
                 chatTabStates={chatViewStateByTab}
diff --git a/apps/x/apps/renderer/src/components/bg-tasks-view.tsx b/apps/x/apps/renderer/src/components/bg-tasks-view.tsx
index bb972eff..7f370355 100644
--- a/apps/x/apps/renderer/src/components/bg-tasks-view.tsx
+++ b/apps/x/apps/renderer/src/components/bg-tasks-view.tsx
@@ -1419,6 +1419,18 @@ export interface BgTasksViewProps {
      * "Edit with Copilot" button in the detail-view sidebar footer.
      */
     onEditWithCopilot?: (slug: string) => void
+    /**
+     * If provided, the view opens with this task already selected. Updates to
+     * this prop sync into internal state so the sidebar can swap which task is
+     * focused without remounting the view.
+     */
+    initialSlug?: string | null
+    /**
+     * Bump this counter to force a re-focus on `initialSlug` even when the
+     * slug value itself didn't change (e.g. user clicks the same task in the
+     * sidebar twice after navigating away inside the view).
+     */
+    slugVersion?: number
 }
 
 function formatLastRanLabel(iso: string | null | undefined): string {
@@ -1426,9 +1438,12 @@ function formatLastRanLabel(iso: string | null | undefined): string {
     return formatRelativeTime(iso) || 'Never'
 }
 
-export function BgTasksView({ onCreateWithCopilot, onEditWithCopilot }: BgTasksViewProps = {}) {
+export function BgTasksView({ onCreateWithCopilot, onEditWithCopilot, initialSlug, slugVersion }: BgTasksViewProps = {}) {
     const [items, setItems] = useState<BackgroundTaskSummary[]>([])
-    const [selectedSlug, setSelectedSlug] = useState<string | null>(null)
+    const [selectedSlug, setSelectedSlug] = useState<string | null>(initialSlug ?? null)
+    useEffect(() => {
+      setSelectedSlug(initialSlug ?? null)
+    }, [initialSlug, slugVersion])
     const [loading, setLoading] = useState(true)
     const [error, setError] = useState<string | null>(null)
     const [showNewDialog, setShowNewDialog] = useState(false)
diff --git a/apps/x/apps/renderer/src/components/chat-empty-state.tsx b/apps/x/apps/renderer/src/components/chat-empty-state.tsx
new file mode 100644
index 00000000..8febf651
--- /dev/null
+++ b/apps/x/apps/renderer/src/components/chat-empty-state.tsx
@@ -0,0 +1,106 @@
+import { ArrowUpRight, Bot, Mail, MessageSquare, Sparkles, Telescope } from 'lucide-react'
+
+import { cn } from '@/lib/utils'
+import { formatRelativeTime } from '@/lib/relative-time'
+
+export interface ChatEmptyStateRun {
+  id: string
+  title?: string
+  createdAt: string
+}
+
+interface ChatEmptyStateProps {
+  recentRuns?: ChatEmptyStateRun[]
+  onSelectRun?: (runId: string) => void
+  onOpenChatHistory?: () => void
+  /** Fill the composer with a starter prompt (does not submit). */
+  onPickPrompt: (prompt: string) => void
+  /** Use a wider column — for the full-screen chat where the narrow column looks cramped. */
+  wide?: boolean
+}
+
+const SUGGESTED_ACTIONS: { icon: typeof Mail; title: string; sub: string; prompt: string }[] = [
+  { icon: Mail, title: 'Draft a reply', sub: 'to an email', prompt: "Let's draft a reply to [name]'s email" },
+  { icon: Bot, title: 'Set up a background agent', sub: 'that automates tasks', prompt: 'Set up a background agent that automates [task]' },
+  { icon: Telescope, title: 'Research a topic', sub: 'create a local wiki for me', prompt: 'Research [topic] and create a local wiki for me' },
+]
+
+/**
+ * Empty-state body for the chat surface: greeting, recent chats, and starter
+ * action cards. Shown in both the side-pane copilot and full-screen chat.
+ */
+export function ChatEmptyState({
+  recentRuns = [],
+  onSelectRun,
+  onOpenChatHistory,
+  onPickPrompt,
+  wide = false,
+}: ChatEmptyStateProps) {
+  return (
+    <div className={cn('mx-auto flex w-full flex-col gap-6 px-2 py-6', wide ? 'max-w-2xl' : 'max-w-md')}>
+      <div className="flex items-center gap-3">
+        <div className="flex size-9 shrink-0 items-center justify-center rounded-[10px] border border-border bg-background text-foreground">
+          <Sparkles className="size-[17px]" />
+        </div>
+        <div>
+          <div className="text-base font-semibold tracking-tight">How can I help?</div>
+          <div className="text-xs text-muted-foreground">Ask anything, or pick up where you left off.</div>
+        </div>
+      </div>
+
+      {recentRuns.length > 0 && (
+        <div>
+          <div className="flex items-center px-1 pb-2 text-[10.5px] font-semibold uppercase tracking-wider text-muted-foreground">
+            <span className="flex-1">Recent chats</span>
+            {onOpenChatHistory && (
+              <button
+                type="button"
+                onClick={onOpenChatHistory}
+                className="inline-flex items-center gap-0.5 text-[11px] font-medium normal-case tracking-normal text-primary hover:underline"
+              >
+                View all
+                <ArrowUpRight className="size-3" />
+              </button>
+            )}
+          </div>
+          <div className="flex flex-col gap-0.5">
+            {recentRuns.slice(0, 4).map((run) => (
+              <button
+                key={run.id}
+                type="button"
+                onClick={() => onSelectRun?.(run.id)}
+                className="flex items-center gap-2.5 rounded-md px-2.5 py-2 text-left hover:bg-accent"
+              >
+                <MessageSquare className="size-3.5 shrink-0 text-muted-foreground" />
+                <span className="min-w-0 flex-1 truncate text-[13px]">{run.title || '(Untitled chat)'}</span>
+                <span className="shrink-0 text-[11px] text-muted-foreground">{formatRelativeTime(run.createdAt)}</span>
+              </button>
+            ))}
+          </div>
+        </div>
+      )}
+
+      <div>
+        <div className="px-1 pb-2 text-[10.5px] font-semibold uppercase tracking-wider text-muted-foreground">
+          {recentRuns.length > 0 ? 'Or start fresh' : 'Get started'}
+        </div>
+        <div className="flex flex-col gap-2">
+          {SUGGESTED_ACTIONS.map((action) => (
+            <button
+              key={action.title}
+              type="button"
+              onClick={() => onPickPrompt(action.prompt)}
+              className="flex items-start gap-2.5 rounded-lg border border-border bg-background px-3 py-2.5 text-left transition-colors hover:bg-accent"
+            >
+              <action.icon className="mt-0.5 size-3.5 shrink-0 text-muted-foreground" />
+              <div className="min-w-0 flex-1">
+                <div className="text-[12.8px] font-medium">{action.title}</div>
+                <div className="mt-0.5 text-[11.5px] text-muted-foreground">{action.sub}</div>
+              </div>
+            </button>
+          ))}
+        </div>
+      </div>
+    </div>
+  )
+}
diff --git a/apps/x/apps/renderer/src/components/chat-header.tsx b/apps/x/apps/renderer/src/components/chat-header.tsx
new file mode 100644
index 00000000..0350f895
--- /dev/null
+++ b/apps/x/apps/renderer/src/components/chat-header.tsx
@@ -0,0 +1,114 @@
+import { ArrowUpRight, ChevronDown, MessageSquare, Plus } from 'lucide-react'
+
+import { Button } from '@/components/ui/button'
+import { cn } from '@/lib/utils'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuLabel,
+  DropdownMenuSeparator,
+  DropdownMenuTrigger,
+} from '@/components/ui/dropdown-menu'
+import { formatRelativeTime } from '@/lib/relative-time'
+
+export interface ChatHeaderRecentRun {
+  id: string
+  title?: string
+  createdAt: string
+}
+
+export interface ChatHeaderProps {
+  activeTitle: string
+  onNewChatTab: () => void
+  recentRuns?: ChatHeaderRecentRun[]
+  activeRunId?: string | null
+  onSelectRun?: (runId: string) => void
+  onOpenChatHistory?: () => void
+}
+
+/**
+ * Header controls for the copilot/chat surface: the active-chat title with a
+ * recent-chats history dropdown, plus the new-chat button. Rendered identically
+ * whether the chat lives in the side pane (ChatSidebar) or full screen (App
+ * content header). There is a single chat conversation at a time — switching
+ * between chats happens through the history dropdown.
+ */
+export function ChatHeader({
+  activeTitle,
+  onNewChatTab,
+  recentRuns = [],
+  activeRunId,
+  onSelectRun,
+  onOpenChatHistory,
+}: ChatHeaderProps) {
+  const hasHistory = recentRuns.length > 0 || Boolean(onOpenChatHistory)
+
+  return (
+    <>
+      {hasHistory ? (
+        <DropdownMenu>
+          <DropdownMenuTrigger asChild>
+            <button
+              type="button"
+              className="titlebar-no-drag flex min-w-0 flex-1 items-center gap-2 rounded-md px-3 text-sm font-medium text-foreground outline-none hover:bg-accent/60"
+              aria-label="Chat history"
+            >
+              <MessageSquare className="size-4 shrink-0 text-muted-foreground" />
+              <span className="truncate">{activeTitle}</span>
+              <ChevronDown className="size-3.5 shrink-0 text-muted-foreground" />
+            </button>
+          </DropdownMenuTrigger>
+          <DropdownMenuContent align="start" className="w-72">
+            {recentRuns.length > 0 && (
+              <DropdownMenuLabel className="text-[10.5px] font-semibold uppercase tracking-wider text-muted-foreground">
+                Recent
+              </DropdownMenuLabel>
+            )}
+            {recentRuns.slice(0, 6).map((run) => (
+              <DropdownMenuItem
+                key={run.id}
+                onClick={() => onSelectRun?.(run.id)}
+                className={cn('gap-2', activeRunId === run.id && 'bg-accent')}
+              >
+                <span className="min-w-0 flex-1 truncate">{run.title || '(Untitled chat)'}</span>
+                <span className="shrink-0 text-[11px] text-muted-foreground">
+                  {formatRelativeTime(run.createdAt)}
+                </span>
+              </DropdownMenuItem>
+            ))}
+            {onOpenChatHistory && (
+              <>
+                {recentRuns.length > 0 && <DropdownMenuSeparator />}
+                <DropdownMenuItem onClick={onOpenChatHistory} className="gap-2 text-primary">
+                  <ArrowUpRight className="size-4" />
+                  View all chats
+                </DropdownMenuItem>
+              </>
+            )}
+          </DropdownMenuContent>
+        </DropdownMenu>
+      ) : (
+        <div className="flex min-w-0 flex-1 items-center gap-2 px-3 text-sm font-medium text-foreground">
+          <MessageSquare className="size-4 shrink-0 text-muted-foreground" />
+          <span className="truncate">{activeTitle}</span>
+        </div>
+      )}
+      <Tooltip>
+        <TooltipTrigger asChild>
+          <Button
+            variant="ghost"
+            size="icon"
+            onClick={onNewChatTab}
+            className="titlebar-no-drag my-1 h-8 w-8 shrink-0 text-muted-foreground hover:text-foreground"
+            aria-label="New chat"
+          >
+            <Plus className="size-5" />
+          </Button>
+        </TooltipTrigger>
+        <TooltipContent side="bottom">New chat</TooltipContent>
+      </Tooltip>
+    </>
+  )
+}
diff --git a/apps/x/apps/renderer/src/components/chat-history-view.tsx b/apps/x/apps/renderer/src/components/chat-history-view.tsx
new file mode 100644
index 00000000..44ab9f4c
--- /dev/null
+++ b/apps/x/apps/renderer/src/components/chat-history-view.tsx
@@ -0,0 +1,177 @@
+import { useCallback, useMemo, useState } from 'react'
+import { ExternalLink, MessageSquare, SearchIcon, SquarePen, Trash2 } from 'lucide-react'
+
+import { Button } from '@/components/ui/button'
+import {
+  ContextMenu,
+  ContextMenuContent,
+  ContextMenuItem,
+  ContextMenuSeparator,
+  ContextMenuTrigger,
+} from '@/components/ui/context-menu'
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@/components/ui/dialog'
+import { formatRelativeTime } from '@/lib/relative-time'
+
+type Run = {
+  id: string
+  title?: string
+  createdAt: string
+  agentId: string
+}
+
+type ChatHistoryViewProps = {
+  runs: Run[]
+  currentRunId?: string | null
+  processingRunIds?: Set<string>
+  onSelectRun: (runId: string) => void
+  onOpenInNewTab?: (runId: string) => void
+  onDeleteRun: (runId: string) => Promise<void> | void
+  onNewChat?: () => void
+  onOpenSearch?: () => void
+}
+
+export function ChatHistoryView({
+  runs,
+  currentRunId,
+  processingRunIds,
+  onSelectRun,
+  onOpenInNewTab,
+  onDeleteRun,
+  onNewChat,
+  onOpenSearch,
+}: ChatHistoryViewProps) {
+  const [pendingDeleteId, setPendingDeleteId] = useState<string | null>(null)
+
+  const sortedRuns = useMemo(() => {
+    return [...runs].sort((a, b) => {
+      const at = new Date(a.createdAt).getTime()
+      const bt = new Date(b.createdAt).getTime()
+      return (Number.isNaN(bt) ? 0 : bt) - (Number.isNaN(at) ? 0 : at)
+    })
+  }, [runs])
+
+  const handleConfirmDelete = useCallback(async () => {
+    if (!pendingDeleteId) return
+    const id = pendingDeleteId
+    setPendingDeleteId(null)
+    await onDeleteRun(id)
+  }, [pendingDeleteId, onDeleteRun])
+
+  return (
+    <div className="flex h-full flex-col overflow-hidden">
+      <div className="shrink-0 flex items-center justify-between gap-3 border-b border-border px-8 py-6">
+        <h1 className="text-2xl font-bold tracking-tight">Chat history</h1>
+        <div className="flex items-center gap-2">
+          {onOpenSearch && (
+            <button
+              type="button"
+              onClick={onOpenSearch}
+              className="inline-flex items-center gap-1.5 rounded-md border border-border bg-background px-3 py-1.5 text-sm text-foreground transition-colors hover:bg-accent"
+            >
+              <SearchIcon className="size-4" />
+              <span>Search</span>
+            </button>
+          )}
+          {onNewChat && (
+            <Button size="sm" onClick={onNewChat}>
+              <SquarePen className="size-4" />
+              New chat
+            </Button>
+          )}
+        </div>
+      </div>
+
+      <div className="flex-1 overflow-y-auto">
+        <div className="min-w-[480px]">
+          <div className="sticky top-0 z-10 flex items-center border-b border-border bg-background px-6 py-2 text-xs font-medium text-muted-foreground">
+            <div className="flex-1">Title</div>
+            <div className="w-32 shrink-0">Created</div>
+          </div>
+
+          {sortedRuns.length === 0 ? (
+            <div className="px-6 py-8 text-sm text-muted-foreground">No chats yet.</div>
+          ) : (
+            sortedRuns.map((run) => {
+              const isActive = currentRunId === run.id
+              const isProcessing = processingRunIds?.has(run.id)
+              return (
+                <ContextMenu key={run.id}>
+                  <ContextMenuTrigger asChild>
+                    <button
+                      type="button"
+                      onClick={(e) => {
+                        if (e.metaKey && onOpenInNewTab) {
+                          onOpenInNewTab(run.id)
+                        } else {
+                          onSelectRun(run.id)
+                        }
+                      }}
+                      className={[
+                        'flex w-full items-center border-b border-border/60 px-6 py-1.5 text-left text-sm transition-colors hover:bg-accent',
+                        isActive ? 'bg-accent/60' : '',
+                      ].join(' ')}
+                    >
+                      <div className="flex flex-1 items-center gap-2 min-w-0">
+                        <MessageSquare className="size-4 shrink-0 text-muted-foreground" />
+                        <span className="min-w-0 truncate">{run.title || '(Untitled chat)'}</span>
+                      </div>
+                      <div className="w-32 shrink-0 text-xs text-muted-foreground tabular-nums">
+                        {formatRelativeTime(run.createdAt)}
+                      </div>
+                    </button>
+                  </ContextMenuTrigger>
+                  <ContextMenuContent className="w-48">
+                    {onOpenInNewTab && (
+                      <>
+                        <ContextMenuItem onClick={() => onOpenInNewTab(run.id)}>
+                          <ExternalLink className="mr-2 size-4" />
+                          Open in new tab
+                        </ContextMenuItem>
+                        <ContextMenuSeparator />
+                      </>
+                    )}
+                    {!isProcessing && (
+                      <ContextMenuItem
+                        variant="destructive"
+                        onClick={() => setPendingDeleteId(run.id)}
+                      >
+                        <Trash2 className="mr-2 size-4" />
+                        Delete
+                      </ContextMenuItem>
+                    )}
+                  </ContextMenuContent>
+                </ContextMenu>
+              )
+            })
+          )}
+        </div>
+      </div>
+
+      <Dialog open={!!pendingDeleteId} onOpenChange={(open) => { if (!open) setPendingDeleteId(null) }}>
+        <DialogContent showCloseButton={false} className="sm:max-w-sm">
+          <DialogHeader>
+            <DialogTitle>Delete chat</DialogTitle>
+            <DialogDescription>
+              Are you sure you want to delete this chat?
+            </DialogDescription>
+          </DialogHeader>
+          <DialogFooter>
+            <Button variant="outline" onClick={() => setPendingDeleteId(null)}>
+              Cancel
+            </Button>
+            <Button variant="destructive" onClick={() => void handleConfirmDelete()}>
+              Delete
+            </Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
+    </div>
+  )
+}
diff --git a/apps/x/apps/renderer/src/components/chat-input-with-mentions.tsx b/apps/x/apps/renderer/src/components/chat-input-with-mentions.tsx
index ccd96805..97386508 100644
--- a/apps/x/apps/renderer/src/components/chat-input-with-mentions.tsx
+++ b/apps/x/apps/renderer/src/components/chat-input-with-mentions.tsx
@@ -274,9 +274,21 @@ function ChatInputInner({
 
   const handleSetWorkDir = useCallback(async () => {
     try {
+      let defaultPath: string | undefined = workDir ?? undefined
+      try {
+        const { root } = await window.ipc.invoke('workspace:getRoot', null)
+        const workspaceRel = 'knowledge/Workspace'
+        const exists = await window.ipc.invoke('workspace:exists', { path: workspaceRel })
+        if (!exists.exists) {
+          await window.ipc.invoke('workspace:mkdir', { path: workspaceRel, recursive: true })
+        }
+        defaultPath = `${root.replace(/\/$/, '')}/${workspaceRel}`
+      } catch (err) {
+        console.error('Failed to resolve Workspace path; falling back to current workDir', err)
+      }
       const { path: chosen } = await window.ipc.invoke('dialog:openDirectory', {
         title: 'Choose work directory',
-        defaultPath: workDir ?? undefined,
+        defaultPath,
       })
       if (!chosen) return
       await window.ipc.invoke('workspace:writeFile', {
diff --git a/apps/x/apps/renderer/src/components/chat-sidebar.tsx b/apps/x/apps/renderer/src/components/chat-sidebar.tsx
index 06680652..4cfbfb73 100644
--- a/apps/x/apps/renderer/src/components/chat-sidebar.tsx
+++ b/apps/x/apps/renderer/src/components/chat-sidebar.tsx
@@ -1,13 +1,14 @@
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { Maximize2, Minimize2, SquarePen } from 'lucide-react'
+import { ArrowRight, X } from 'lucide-react'
 
 import { Button } from '@/components/ui/button'
 import { cn } from '@/lib/utils'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
+import { ChatHeader } from '@/components/chat-header'
+import { ChatEmptyState } from '@/components/chat-empty-state'
 import {
   Conversation,
   ConversationContent,
-  ConversationEmptyState,
   ConversationScrollButton,
 } from '@/components/ai-elements/conversation'
 import {
@@ -22,13 +23,12 @@ import { ComposioConnectCard } from '@/components/ai-elements/composio-connect-c
 import { PermissionRequest } from '@/components/ai-elements/permission-request'
 import { TerminalOutput } from '@/components/terminal-output'
 import { AskHumanRequest } from '@/components/ai-elements/ask-human-request'
-import { Suggestions } from '@/components/ai-elements/suggestions'
 import { type PromptInputMessage, type FileMention } from '@/components/ai-elements/prompt-input'
 import { FileCardProvider } from '@/contexts/file-card-context'
 import { MarkdownPreOverride } from '@/components/ai-elements/markdown-code-override'
 import { defaultRemarkPlugins } from 'streamdown'
 import remarkBreaks from 'remark-breaks'
-import { TabBar, type ChatTab } from '@/components/tab-bar'
+import { type ChatTab } from '@/components/tab-bar'
 import { ChatInputWithMentions, type StagedAttachment, type SelectedModel } from '@/components/chat-input-with-mentions'
 import { ChatMessageAttachments } from '@/components/chat-message-attachments'
 import { useSidebar } from '@/components/ui/sidebar'
@@ -173,11 +173,12 @@ interface ChatSidebarProps {
   chatTabs: ChatTab[]
   activeChatTabId: string
   getChatTabTitle: (tab: ChatTab) => string
-  isChatTabProcessing: (tab: ChatTab) => boolean
-  onSwitchChatTab: (tabId: string) => void
-  onCloseChatTab: (tabId: string) => void
   onNewChatTab: () => void
+  recentRuns?: { id: string; title?: string; createdAt: string }[]
+  onSelectRun?: (runId: string) => void
+  onOpenChatHistory?: () => void
   onOpenFullScreen?: () => void
+  onCloseChat?: () => void
   conversation: ConversationItem[]
   currentAssistantMessage: string
   chatTabStates?: Record<string, ChatTabViewState>
@@ -228,11 +229,12 @@ export function ChatSidebar({
   chatTabs,
   activeChatTabId,
   getChatTabTitle,
-  isChatTabProcessing,
-  onSwitchChatTab,
-  onCloseChatTab,
   onNewChatTab,
+  recentRuns = [],
+  onSelectRun,
+  onOpenChatHistory,
   onOpenFullScreen,
+  onCloseChat,
   conversation,
   currentAssistantMessage,
   chatTabStates = {},
@@ -380,7 +382,6 @@ export function ChatSidebar({
     if (tabId === activeChatTabId) return activeTabState
     return chatTabStates[tabId] ?? emptyTabState
   }, [activeChatTabId, activeTabState, chatTabStates, emptyTabState])
-  const hasConversation = activeTabState.conversation.length > 0 || Boolean(activeTabState.currentAssistantMessage)
 
   const renderConversationItem = (item: ConversationItem, tabId: string) => {
     if (isChatMessage(item)) {
@@ -563,45 +564,51 @@ export function ChatSidebar({
               transition: isMaximized ? 'padding-left 200ms linear' : undefined,
             }}
           >
-            <TabBar
-              tabs={chatTabs}
-              activeTabId={activeChatTabId}
-              getTabTitle={getChatTabTitle}
-              getTabId={(tab) => tab.id}
-              isProcessing={isChatTabProcessing}
-              onSwitchTab={onSwitchChatTab}
-              onCloseTab={onCloseChatTab}
+            <ChatHeader
+              activeTitle={(() => {
+                const activeTab = chatTabs.find((tab) => tab.id === activeChatTabId)
+                return activeTab ? getChatTabTitle(activeTab) : 'New chat'
+              })()}
+              onNewChatTab={onNewChatTab}
+              recentRuns={recentRuns}
+              activeRunId={runId}
+              onSelectRun={onSelectRun}
+              onOpenChatHistory={onOpenChatHistory}
             />
-            <Tooltip>
-              <TooltipTrigger asChild>
-                <Button
-                  variant="ghost"
-                  size="icon"
-                  onClick={onNewChatTab}
-                  className="titlebar-no-drag my-1 h-8 w-8 shrink-0 text-muted-foreground hover:text-foreground"
-                >
-                  <SquarePen className="size-5" />
-                </Button>
-              </TooltipTrigger>
-              <TooltipContent side="bottom">New chat tab</TooltipContent>
-            </Tooltip>
-            {onOpenFullScreen && (
-              <Tooltip>
-                <TooltipTrigger asChild>
-                  <Button
-                    variant="ghost"
-                    size="icon"
-                    onClick={onOpenFullScreen}
-                    className="titlebar-no-drag my-1 mr-2 h-8 w-8 shrink-0 text-muted-foreground hover:text-foreground"
-                    aria-label={isMaximized ? 'Restore two-pane view' : 'Maximize chat view'}
-                  >
-                    {isMaximized ? <Minimize2 className="size-5" /> : <Maximize2 className="size-5" />}
-                  </Button>
-                </TooltipTrigger>
-                <TooltipContent side="bottom">
-                  {isMaximized ? 'Restore two-pane view' : 'Maximize chat view'}
-                </TooltipContent>
-              </Tooltip>
+            {isMaximized ? (
+              onOpenFullScreen && (
+                <Tooltip>
+                  <TooltipTrigger asChild>
+                    <Button
+                      variant="ghost"
+                      size="icon"
+                      onClick={onOpenFullScreen}
+                      className="titlebar-no-drag my-1 mr-2 h-8 w-8 shrink-0 text-muted-foreground hover:text-foreground"
+                      aria-label="Dock chat to side pane"
+                    >
+                      <ArrowRight className="size-5" />
+                    </Button>
+                  </TooltipTrigger>
+                  <TooltipContent side="bottom">Dock to side pane</TooltipContent>
+                </Tooltip>
+              )
+            ) : (
+              onCloseChat && (
+                <Tooltip>
+                  <TooltipTrigger asChild>
+                    <Button
+                      variant="ghost"
+                      size="icon"
+                      onClick={onCloseChat}
+                      className="titlebar-no-drag my-1 mr-2 h-8 w-8 shrink-0 text-muted-foreground hover:text-foreground"
+                      aria-label="Close chat"
+                    >
+                      <X className="size-5" />
+                    </Button>
+                  </TooltipTrigger>
+                  <TooltipContent side="bottom">Close chat</TooltipContent>
+                </Tooltip>
+              )
             )}
           </header>
 
@@ -629,11 +636,19 @@ export function ChatSidebar({
                           anchorRequestKey={viewportAnchors[tab.id]?.requestKey}
                           className="relative flex-1"
                       >
-                        <ConversationContent className={tabHasConversation ? 'mx-auto w-full max-w-4xl px-3 pb-28' : 'mx-auto w-full max-w-4xl min-h-full items-center justify-center px-3 pb-0'}>
+                        <ConversationContent className={cn(
+                          'mx-auto w-full max-w-4xl px-3',
+                          tabHasConversation ? 'pb-28' : 'pb-0',
+                          !tabHasConversation && isMaximized && 'min-h-full items-center justify-center',
+                        )}>
                           {!tabHasConversation ? (
-                            <ConversationEmptyState className="h-auto">
-                              <div className="text-sm text-muted-foreground">Ask anything...</div>
-                            </ConversationEmptyState>
+                            <ChatEmptyState
+                              wide={isMaximized}
+                              recentRuns={recentRuns}
+                              onSelectRun={onSelectRun}
+                              onOpenChatHistory={onOpenChatHistory}
+                              onPickPrompt={setLocalPresetMessage}
+                            />
                           ) : (
                             <>
                               {groupConversationItems(
@@ -711,9 +726,6 @@ export function ChatSidebar({
               <div className="sticky bottom-0 z-10 bg-background pb-12 pt-0 shadow-lg">
                 <div className="pointer-events-none absolute inset-x-0 -top-6 h-6 bg-linear-to-t from-background to-transparent" />
                 <div className="mx-auto w-full max-w-4xl px-3">
-                  {!hasConversation && (
-                    <Suggestions onSelect={setLocalPresetMessage} className="mb-3 justify-center" />
-                  )}
                   {chatTabs.map((tab) => {
                     const isActive = tab.id === activeChatTabId
                     const tabState = getTabState(tab.id)
diff --git a/apps/x/apps/renderer/src/components/email-view.tsx b/apps/x/apps/renderer/src/components/email-view.tsx
index 674547e0..f2fc5ca3 100644
--- a/apps/x/apps/renderer/src/components/email-view.tsx
+++ b/apps/x/apps/renderer/src/components/email-view.tsx
@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { Bold, Forward, Italic, Link as LinkIcon, List, ListOrdered, LoaderIcon, Paperclip, Quote, RefreshCw, Reply, Search, Send, Sparkles, Strikethrough } from 'lucide-react'
+import { Bold, Forward, Italic, Link as LinkIcon, List, ListOrdered, LoaderIcon, Mail, Paperclip, Quote, RefreshCw, Reply, Search, Send, Sparkles, Strikethrough } from 'lucide-react'
 import { useEditor, EditorContent, type Editor } from '@tiptap/react'
 import StarterKit from '@tiptap/starter-kit'
 import Link from '@tiptap/extension-link'
@@ -8,6 +8,7 @@ import type { blocks } from '@x/shared'
 import { cn } from '@/lib/utils'
 import { toast } from '@/lib/toast'
 import { useTheme } from '@/contexts/theme-context'
+import { SettingsDialog } from '@/components/settings-dialog'
 
 type GmailThread = blocks.GmailThread
 type GmailThreadMessage = blocks.GmailThreadMessage
@@ -817,15 +818,49 @@ function clearLoadingFlag(state: SectionState | null): SectionState {
   return { ...state, loadingPage: false }
 }
 
-export function EmailView() {
+export type EmailViewProps = {
+  /** If provided, the view opens with this thread already expanded. */
+  initialThreadId?: string | null
+  /** Bump to re-focus on the same threadId after navigating away inside the view. */
+  threadIdVersion?: number
+}
+
+export function EmailView({ initialThreadId, threadIdVersion }: EmailViewProps = {}) {
   const [important, setImportant] = useState<SectionState>(() => clearLoadingFlag(persistedImportant))
   const [other, setOther] = useState<SectionState>(() => clearLoadingFlag(persistedOther))
   const hadPersistedDataOnMount = useRef(persistedImportant !== null)
-  const [selectedThreadId, setSelectedThreadId] = useState<string | null>(null)
-  const [openedThreadIds, setOpenedThreadIds] = useState<string[]>([])
+  const [selectedThreadId, setSelectedThreadId] = useState<string | null>(initialThreadId ?? null)
+  const [openedThreadIds, setOpenedThreadIds] = useState<string[]>(initialThreadId ? [initialThreadId] : [])
+  useEffect(() => {
+    setSelectedThreadId(initialThreadId ?? null)
+    if (initialThreadId) {
+      setOpenedThreadIds((prev) => {
+        const without = prev.filter((id) => id !== initialThreadId)
+        return [...without, initialThreadId].slice(-MAX_KEPT_OPEN)
+      })
+    }
+  }, [initialThreadId, threadIdVersion])
   const [refreshing, setRefreshing] = useState(!hadPersistedDataOnMount.current)
   const [error, setError] = useState<string | null>(null)
   const [query, setQuery] = useState('')
+  // Gmail connection status — null while checking, false shows the connect prompt.
+  const [emailConnected, setEmailConnected] = useState<boolean | null>(null)
+  const [settingsOpen, setSettingsOpen] = useState(false)
+
+  useEffect(() => {
+    let cancelled = false
+    const check = async () => {
+      try {
+        const result = await window.ipc.invoke('composio:get-connection-status', { toolkitSlug: 'gmail' })
+        if (!cancelled) setEmailConnected(result.isConnected)
+      } catch {
+        if (!cancelled) setEmailConnected(false)
+      }
+    }
+    void check()
+    const cleanup = window.ipc.on('oauth:didConnect', () => { void check() })
+    return () => { cancelled = true; cleanup() }
+  }, [])
 
   useEffect(() => { persistedImportant = important }, [important])
   useEffect(() => { persistedOther = other }, [other])
@@ -1185,12 +1220,26 @@ export function EmailView() {
               </section>
             )}
           </div>
+        ) : emailConnected === false ? (
+          <div className="gmail-empty-state flex flex-col items-center gap-3 py-16 text-center">
+            <Mail size={28} className="opacity-50" />
+            <p>Connect your email to see your inbox here.</p>
+            <button
+              type="button"
+              onClick={() => setSettingsOpen(true)}
+              className="inline-flex items-center gap-1.5 rounded-md border border-border bg-background px-3.5 py-1.5 text-sm font-medium text-foreground transition-colors hover:bg-accent"
+            >
+              <Mail size={15} />
+              Connect your email
+            </button>
+          </div>
         ) : (
           <div className="gmail-empty-state">
             {initialLoading ? 'Loading Gmail threads…' : 'No Gmail threads in your inbox cache yet.'}
           </div>
         )}
       </div>
+      <SettingsDialog open={settingsOpen} onOpenChange={setSettingsOpen} defaultTab="connections" />
     </div>
   )
 }
diff --git a/apps/x/apps/renderer/src/components/help-popover.tsx b/apps/x/apps/renderer/src/components/help-popover.tsx
deleted file mode 100644
index 3ff08a5c..00000000
--- a/apps/x/apps/renderer/src/components/help-popover.tsx
+++ /dev/null
@@ -1,100 +0,0 @@
-"use client"
-
-import * as React from "react"
-import { useState } from "react"
-import { MessageCircle } from "lucide-react"
-
-import {
-  Popover,
-  PopoverContent,
-  PopoverTrigger,
-} from "@/components/ui/popover"
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipTrigger,
-} from "@/components/ui/tooltip"
-import { Button } from "@/components/ui/button"
-
-interface HelpPopoverProps {
-  children: React.ReactNode
-  tooltip?: string
-}
-
-export function HelpPopover({ children, tooltip }: HelpPopoverProps) {
-  const [open, setOpen] = useState(false)
-
-  const handleDiscordClick = () => {
-    window.open("https://discord.com/invite/wajrgmJQ6b", "_blank")
-  }
-
-  return (
-    <Popover open={open} onOpenChange={setOpen}>
-      {tooltip ? (
-        <Tooltip open={open ? false : undefined}>
-          <TooltipTrigger asChild>
-            <PopoverTrigger asChild>
-              {children}
-            </PopoverTrigger>
-          </TooltipTrigger>
-          <TooltipContent side="right" sideOffset={8}>
-            {tooltip}
-          </TooltipContent>
-        </Tooltip>
-      ) : (
-        <PopoverTrigger asChild>
-          {children}
-        </PopoverTrigger>
-      )}
-      <PopoverContent
-        side="right"
-        align="end"
-        sideOffset={4}
-        className="w-80 p-0"
-      >
-        <div className="p-4 border-b">
-          <h4 className="font-semibold text-sm">Help & Support</h4>
-          <p className="text-xs text-muted-foreground mt-1">
-            Get help from our community
-          </p>
-        </div>
-        <div className="p-2">
-          <Button
-            variant="ghost"
-            className="w-full justify-start gap-3 h-auto py-3"
-            onClick={handleDiscordClick}
-          >
-            <div className="flex size-8 items-center justify-center rounded-md bg-[#5865F2]">
-              <MessageCircle className="size-4 text-white" />
-            </div>
-            <div className="flex flex-col items-start">
-              <span className="text-sm font-medium">Join our Discord</span>
-              <span className="text-xs text-muted-foreground">
-                Chat with the community
-              </span>
-            </div>
-          </Button>
-        </div>
-        <div className="px-4 py-3 border-t flex justify-center gap-3 text-xs text-muted-foreground">
-          <a
-            href="https://www.rowboatlabs.com/terms-of-service"
-            target="_blank"
-            rel="noopener noreferrer"
-            className="hover:text-foreground transition-colors"
-          >
-            Terms of Service
-          </a>
-          <span>·</span>
-          <a
-            href="https://www.rowboatlabs.com/privacy-policy"
-            target="_blank"
-            rel="noopener noreferrer"
-            className="hover:text-foreground transition-colors"
-          >
-            Privacy Policy
-          </a>
-        </div>
-      </PopoverContent>
-    </Popover>
-  )
-}
diff --git a/apps/x/apps/renderer/src/components/home-view.tsx b/apps/x/apps/renderer/src/components/home-view.tsx
new file mode 100644
index 00000000..21034f56
--- /dev/null
+++ b/apps/x/apps/renderer/src/components/home-view.tsx
@@ -0,0 +1,539 @@
+import { useCallback, useEffect, useMemo, useState } from 'react'
+import { ArrowRight, Bot, Calendar, Clock, FileText, Globe, Mail, MessageSquare, Mic, Plus, Telescope, Video } from 'lucide-react'
+
+import { VoiceNoteButton } from '@/components/sidebar-content'
+import { extractConferenceLink } from '@/lib/calendar-event'
+
+interface TreeNode {
+  path: string
+  name: string
+  kind: 'file' | 'dir'
+  children?: TreeNode[]
+  stat?: { size: number; mtimeMs: number }
+}
+
+type RunItem = { id: string; title?: string; createdAt: string }
+type TaskItem = { slug: string; name: string; active: boolean; lastRunAt?: string; lastAttemptAt?: string }
+
+type HomeViewProps = {
+  tree: TreeNode[]
+  runs: RunItem[]
+  bgTaskSummaries: TaskItem[]
+  onOpenEmail: () => void
+  onOpenMeetings: () => void
+  onOpenAgents: () => void
+  onOpenAgent: (slug: string) => void
+  onOpenNote: (path: string) => void
+  onOpenRun: (runId: string) => void
+  onTakeMeetingNotes: () => void
+  onVoiceNoteCreated?: (path: string) => void
+  onRunBrowserTask?: () => void
+  onStartResearch?: () => void
+  onOpenChat?: () => void
+}
+
+type CalEvent = {
+  id: string
+  summary: string
+  start: Date
+  end: Date | null
+  isAllDay: boolean
+  conferenceLink: string | null
+  rawStart: { dateTime?: string; date?: string } | undefined
+  rawEnd: { dateTime?: string; date?: string } | undefined
+  location: string | null
+  htmlLink: string | null
+  source: string
+}
+
+type RawCalEvent = {
+  id?: string
+  summary?: string
+  start?: { dateTime?: string; date?: string }
+  end?: { dateTime?: string; date?: string }
+  location?: string
+  htmlLink?: string
+  status?: string
+  attendees?: Array<{ self?: boolean; responseStatus?: string }>
+}
+
+type EmailThread = { threadId: string; subject: string; from: string }
+
+function greeting(): string {
+  const h = new Date().getHours()
+  if (h < 12) return 'Good morning'
+  if (h < 18) return 'Good afternoon'
+  return 'Good evening'
+}
+
+function todayLabel(): string {
+  return new Date().toLocaleDateString([], { weekday: 'short', day: 'numeric', month: 'short' })
+}
+
+function timeOfDay(d: Date): string {
+  return d.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })
+}
+
+function relativeFromNow(start: Date): string {
+  const ms = start.getTime() - Date.now()
+  if (ms <= 0) return 'now'
+  const min = Math.round(ms / 60000)
+  if (min < 60) return `in ${min}m`
+  const hr = Math.round(min / 60)
+  if (hr < 24) return `in ${hr}h`
+  return start.toLocaleDateString([], { weekday: 'short' })
+}
+
+function relativeAgo(iso?: string): string {
+  if (!iso) return ''
+  const t = new Date(iso).getTime()
+  if (Number.isNaN(t)) return ''
+  const min = Math.round((Date.now() - t) / 60000)
+  if (min < 1) return 'just now'
+  if (min < 60) return `${min}m ago`
+  const hr = Math.round(min / 60)
+  if (hr < 24) return `${hr}h ago`
+  const d = Math.round(hr / 24)
+  return `${d}d ago`
+}
+
+function parseAllDay(s: string): Date | null {
+  const m = /^(\d{4})-(\d{2})-(\d{2})/.exec(s)
+  if (!m) return null
+  return new Date(Number(m[1]), Number(m[2]) - 1, Number(m[3]))
+}
+
+function normalizeCalEvent(raw: RawCalEvent, sourcePath: string): CalEvent | null {
+  if (raw.status === 'cancelled') return null
+  const declined = raw.attendees?.find((a) => a.self)?.responseStatus === 'declined'
+  if (declined) return null
+  const timed = raw.start?.dateTime
+  const allDay = raw.start?.date
+  const isAllDay = !timed && Boolean(allDay)
+  let start: Date | null = null
+  let end: Date | null = null
+  if (timed) {
+    start = new Date(timed)
+    end = raw.end?.dateTime ? new Date(raw.end.dateTime) : null
+  } else if (allDay) {
+    start = parseAllDay(allDay)
+    end = raw.end?.date ? parseAllDay(raw.end.date) : null
+  }
+  if (!start || Number.isNaN(start.getTime())) return null
+  return {
+    id: raw.id ?? sourcePath,
+    summary: raw.summary?.trim() || '(No title)',
+    start,
+    end,
+    isAllDay,
+    conferenceLink: extractConferenceLink(raw as unknown as Record<string, unknown>) ?? null,
+    rawStart: raw.start,
+    rawEnd: raw.end,
+    location: raw.location?.trim() || null,
+    htmlLink: raw.htmlLink ?? null,
+    source: sourcePath,
+  }
+}
+
+function noteLabel(node: TreeNode): string {
+  if (node.kind === 'file' && node.name.toLowerCase().endsWith('.md')) return node.name.slice(0, -3)
+  return node.name
+}
+
+function triggerMeetingCapture(event: CalEvent, openConference: boolean) {
+  window.__pendingCalendarEvent = {
+    summary: event.summary,
+    start: event.rawStart,
+    end: event.rawEnd,
+    location: event.location ?? undefined,
+    htmlLink: event.htmlLink ?? undefined,
+    conferenceLink: event.conferenceLink ?? undefined,
+    source: event.source,
+  }
+  if (openConference && event.conferenceLink) {
+    window.open(event.conferenceLink, '_blank')
+  }
+  window.dispatchEvent(new Event('calendar-block:join-meeting'))
+}
+
+const CARD = 'rounded-xl border border-border bg-card p-4'
+
+export function HomeView({
+  tree,
+  runs,
+  bgTaskSummaries,
+  onOpenEmail,
+  onOpenMeetings,
+  onOpenAgents,
+  onOpenAgent,
+  onOpenNote,
+  onOpenRun,
+  onTakeMeetingNotes,
+  onVoiceNoteCreated,
+  onRunBrowserTask,
+  onStartResearch,
+  onOpenChat,
+}: HomeViewProps) {
+  const [events, setEvents] = useState<CalEvent[]>([])
+  const [emails, setEmails] = useState<EmailThread[]>([])
+
+  const loadEvents = useCallback(async () => {
+    try {
+      const exists = await window.ipc.invoke('workspace:exists', { path: 'calendar_sync' })
+      if (!exists.exists) { setEvents([]); return }
+      const entries = await window.ipc.invoke('workspace:readdir', {
+        path: 'calendar_sync',
+        opts: { recursive: false, includeHidden: false, includeStats: false },
+      })
+      const jsonEntries = entries.filter((e) => e.kind === 'file' && e.name.endsWith('.json'))
+      const settled = await Promise.allSettled(
+        jsonEntries.map(async (entry): Promise<CalEvent | null> => {
+          const result = await window.ipc.invoke('workspace:readFile', { path: entry.path, encoding: 'utf8' })
+          return normalizeCalEvent(JSON.parse(result.data) as RawCalEvent, entry.path)
+        }),
+      )
+      const out: CalEvent[] = []
+      for (const r of settled) if (r.status === 'fulfilled' && r.value) out.push(r.value)
+      out.sort((a, b) => a.start.getTime() - b.start.getTime())
+      setEvents(out)
+    } catch (err) {
+      console.error('Home: failed to load events', err)
+    }
+  }, [])
+
+  const loadEmails = useCallback(async () => {
+    try {
+      const result = await window.ipc.invoke('gmail:getImportant', { limit: 25 })
+      setEmails(
+        result.threads
+          .filter((t) => t.unread === true)
+          .slice(0, 3)
+          .map((t) => ({ threadId: t.threadId, subject: t.subject ?? '(No subject)', from: t.from ?? '' })),
+      )
+    } catch (err) {
+      console.error('Home: failed to load emails', err)
+    }
+  }, [])
+
+  useEffect(() => { void loadEvents(); void loadEmails() }, [loadEvents, loadEmails])
+
+  // Upcoming (not-yet-ended) events, soonest first.
+  const upcoming = useMemo(() => {
+    const now = Date.now()
+    return events.filter((e) => {
+      const end = e.end ?? (e.isAllDay ? new Date(e.start.getTime() + 864e5) : e.start)
+      return end.getTime() > now
+    })
+  }, [events])
+
+  const nextEvent = upcoming[0]
+
+  const todaysEvents = useMemo(() => {
+    const now = new Date()
+    return upcoming.filter((e) =>
+      e.start.getFullYear() === now.getFullYear() &&
+      e.start.getMonth() === now.getMonth() &&
+      e.start.getDate() === now.getDate(),
+    )
+  }, [upcoming])
+
+  const activeAgents = useMemo(() => bgTaskSummaries.filter((t) => t.active), [bgTaskSummaries])
+  const recentAgent = useMemo(() => {
+    const t = (s?: string) => (s ? new Date(s).getTime() || 0 : 0)
+    return [...bgTaskSummaries].sort((a, b) =>
+      Math.max(t(b.lastRunAt), t(b.lastAttemptAt)) - Math.max(t(a.lastRunAt), t(a.lastAttemptAt)),
+    )[0]
+  }, [bgTaskSummaries])
+
+  const recentNotes = useMemo<TreeNode[]>(() => {
+    const out: TreeNode[] = []
+    const walk = (nodes: TreeNode[]) => {
+      for (const n of nodes) {
+        if (n.path === 'knowledge/Meetings' || n.path === 'knowledge/Workspace') continue
+        if (n.kind === 'file') out.push(n)
+        else if (n.children?.length) walk(n.children)
+      }
+    }
+    walk(tree)
+    return out
+      .filter((n) => n.stat?.mtimeMs)
+      .sort((a, b) => (b.stat?.mtimeMs ?? 0) - (a.stat?.mtimeMs ?? 0))
+      .slice(0, 2)
+  }, [tree])
+
+  const recentActivity = useMemo(() => {
+    const items: Array<{ key: string; icon: 'note' | 'chat'; label: string; kind: string; when: number; open: () => void }> = []
+    for (const n of recentNotes) {
+      items.push({ key: `n:${n.path}`, icon: 'note', label: noteLabel(n), kind: 'note', when: n.stat?.mtimeMs ?? 0, open: () => onOpenNote(n.path) })
+    }
+    for (const r of runs.slice(0, 4)) {
+      items.push({ key: `r:${r.id}`, icon: 'chat', label: r.title || '(Untitled chat)', kind: 'chat', when: new Date(r.createdAt).getTime() || 0, open: () => onOpenRun(r.id) })
+    }
+    return items.sort((a, b) => b.when - a.when).slice(0, 4)
+  }, [recentNotes, runs, onOpenNote, onOpenRun])
+
+  return (
+    <div className="flex h-full flex-col overflow-hidden bg-muted/30">
+      <div className="flex-1 overflow-y-auto px-9 py-7">
+        <div className="mx-auto flex max-w-[760px] flex-col gap-[18px]">
+
+          {/* Greeting */}
+          <div className="flex items-baseline gap-3">
+            <h1 className="text-[28px] font-semibold tracking-tight">{greeting()}</h1>
+            <span className="text-sm text-muted-foreground">{todayLabel()}</span>
+          </div>
+
+          {/* Up-next hero */}
+          {nextEvent && (
+            <div className="flex items-center gap-[18px] rounded-xl bg-foreground p-[18px] text-background">
+              <div className="flex size-[52px] shrink-0 items-center justify-center rounded-xl bg-background/10">
+                <Mic className="size-[22px]" />
+              </div>
+              <div className="min-w-0 flex-1">
+                <div className="mb-1 text-[11px] uppercase tracking-wide text-background/55">
+                  Up next · {nextEvent.isAllDay ? 'today' : relativeFromNow(nextEvent.start)}
+                </div>
+                <div className="mb-0.5 truncate text-[17px] font-medium">{nextEvent.summary}</div>
+                <div className="truncate text-[13px] text-background/70">
+                  {nextEvent.isAllDay ? 'All day' : `${timeOfDay(nextEvent.start)}${nextEvent.end ? ` – ${timeOfDay(nextEvent.end)}` : ''}`}
+                  {nextEvent.location ? ` · ${nextEvent.location}` : ''}
+                </div>
+              </div>
+              <div className="flex shrink-0 gap-2">
+                <button
+                  type="button"
+                  onClick={onTakeMeetingNotes}
+                  className="rounded-md bg-background px-3.5 py-2 text-[13px] font-medium text-foreground"
+                >
+                  Take notes
+                </button>
+                {nextEvent.conferenceLink && (
+                  <button
+                    type="button"
+                    onClick={() => window.open(nextEvent.conferenceLink!, '_blank')}
+                    className="rounded-md border border-background/20 px-3 py-2 text-background"
+                    aria-label="Join meeting"
+                  >
+                    <Video className="size-[13px]" />
+                  </button>
+                )}
+              </div>
+            </div>
+          )}
+
+          {/* Inbox + Background agents */}
+          <div className="grid grid-cols-2 gap-[18px]">
+            <div className={CARD}>
+              <div className="mb-3 flex items-center gap-2">
+                <Mail className="size-[15px]" />
+                <span className="text-sm font-medium">Inbox</span>
+                {emails.length > 0 && (
+                  <span className="rounded-lg bg-destructive px-1.5 py-px text-[10.5px] font-semibold uppercase tracking-wide text-white">
+                    {emails.length} new
+                  </span>
+                )}
+                <span className="flex-1" />
+                <button type="button" onClick={onOpenEmail} className="text-xs text-primary hover:underline">Open →</button>
+              </div>
+              {emails.length === 0 ? (
+                <div className="py-1 text-[12.5px] text-muted-foreground">No unread important email.</div>
+              ) : emails.map((e, i) => (
+                <button
+                  key={e.threadId}
+                  type="button"
+                  onClick={onOpenEmail}
+                  className={`flex w-full gap-2.5 py-[7px] text-left text-[12.5px] ${i ? 'border-t border-border' : ''}`}
+                >
+                  <span className="w-[92px] shrink-0 truncate text-muted-foreground">{formatFrom(e.from)}</span>
+                  <span className="flex-1 truncate">{e.subject}</span>
+                </button>
+              ))}
+            </div>
+
+            <div className={CARD}>
+              <div className="mb-3 flex items-center gap-2">
+                <Bot className="size-[15px]" />
+                <span className="text-sm font-medium">Background agents</span>
+                <span className="flex-1" />
+                <span className="text-xs text-muted-foreground">{activeAgents.length} active</span>
+                <button type="button" onClick={onOpenAgents} className="text-xs text-primary hover:underline">Open →</button>
+              </div>
+              {recentAgent ? (
+                <button
+                  type="button"
+                  onClick={() => onOpenAgent(recentAgent.slug)}
+                  className="flex w-full items-center gap-2.5 py-[7px] text-left text-[13px]"
+                >
+                  <span className={`size-2 shrink-0 rounded-full ${recentAgent.active ? 'bg-emerald-500' : 'bg-muted-foreground'}`} />
+                  <span className="flex-1 truncate font-medium">{recentAgent.name}</span>
+                  <span className="text-[11.5px] text-muted-foreground">{relativeAgo(recentAgent.lastRunAt) || '—'}</span>
+                </button>
+              ) : (
+                <div className="py-1 text-[12.5px] text-muted-foreground">No agents yet.</div>
+              )}
+              <button
+                type="button"
+                onClick={onOpenAgents}
+                className="mt-3.5 flex items-center gap-2 border-t border-border pt-3 text-[12.5px] text-primary"
+              >
+                <Plus className="size-3" />
+                Create an agent
+              </button>
+            </div>
+          </div>
+
+          {/* Today's schedule */}
+          <div className={CARD}>
+            <div className="mb-3.5 flex items-center gap-2">
+              <Calendar className="size-[14px]" />
+              <span className="text-sm font-medium">Today's schedule</span>
+              <span className="flex-1" />
+              <button type="button" onClick={onOpenMeetings} className="text-xs text-primary hover:underline">All meetings →</button>
+            </div>
+            {todaysEvents.length === 0 ? (
+              <div className="py-1 text-[13px] italic text-muted-foreground">No more events today.</div>
+            ) : todaysEvents.map((e, i) => (
+              <div key={e.id} className={`group flex items-center gap-3.5 py-2 text-[13px] ${i ? 'border-t border-border' : ''}`}>
+                <span className="w-[90px] shrink-0 font-mono text-[11.5px] text-muted-foreground">
+                  {e.isAllDay ? 'All day' : `${timeOfDay(e.start)}${e.end ? ` – ${timeOfDay(e.end)}` : ''}`}
+                </span>
+                <span className={`size-2 shrink-0 rounded-full ${i === 0 ? 'bg-emerald-500' : 'bg-border'}`} />
+                <span className="min-w-0 flex-1 truncate font-medium">{e.summary}</span>
+                <div className="flex shrink-0 items-center gap-1 opacity-0 transition-opacity group-hover:opacity-100 focus-within:opacity-100">
+                  <button
+                    type="button"
+                    onClick={() => triggerMeetingCapture(e, false)}
+                    className="inline-flex items-center gap-1 rounded-md border border-border px-2 py-1 text-[11.5px] text-foreground transition-colors hover:bg-accent"
+                  >
+                    <Mic className="size-3" />
+                    Take notes
+                  </button>
+                  {e.conferenceLink && (
+                    <button
+                      type="button"
+                      onClick={() => triggerMeetingCapture(e, true)}
+                      className="inline-flex items-center gap-1 rounded-md border border-border px-2 py-1 text-[11.5px] text-foreground transition-colors hover:bg-accent"
+                    >
+                      <Video className="size-3" />
+                      Join &amp; take notes
+                    </button>
+                  )}
+                </div>
+              </div>
+            ))}
+          </div>
+
+          {/* Recent activity */}
+          {recentActivity.length > 0 && (
+            <div className={CARD}>
+              <div className="mb-3 flex items-center gap-2">
+                <Clock className="size-[14px]" />
+                <span className="text-sm font-medium">Recent activity</span>
+              </div>
+              {recentActivity.map((a, i) => (
+                <button
+                  key={a.key}
+                  type="button"
+                  onClick={a.open}
+                  className={`flex w-full items-center gap-3 py-2 text-left text-[13px] ${i ? 'border-t border-border' : ''}`}
+                >
+                  {a.icon === 'note' ? <FileText className="size-[13px] shrink-0 text-muted-foreground" /> : <MessageSquare className="size-[13px] shrink-0 text-muted-foreground" />}
+                  <span className="flex-1 truncate">{a.label}</span>
+                  <span className="w-[60px] text-right text-[11px] text-muted-foreground">{a.kind}</span>
+                </button>
+              ))}
+            </div>
+          )}
+
+          {/* Open chat CTA */}
+          {onOpenChat && (
+            <button
+              type="button"
+              onClick={onOpenChat}
+              className="flex items-center gap-3.5 rounded-xl border border-border bg-card p-4 text-left transition-colors hover:bg-accent"
+            >
+              <div className="flex size-9 shrink-0 items-center justify-center rounded-lg border border-border bg-card text-muted-foreground">
+                <MessageSquare className="size-[15px]" />
+              </div>
+              <div className="min-w-0 flex-1 text-[13.5px] leading-snug">
+                <span className="font-medium">Ask anything</span>
+                <span className="text-muted-foreground"> — create presentations, do research, collaborate on docs.</span>
+              </div>
+              <span className="flex shrink-0 items-center gap-1 text-[12.5px] font-medium text-primary">
+                New chat
+                <ArrowRight className="size-3.5" />
+              </span>
+            </button>
+          )}
+
+        </div>
+      </div>
+    </div>
+  )
+}
+
+type DiscoveryTip = {
+  icon: typeof Mic
+  title: string
+  desc: string
+  /** Provide one of: an action node (e.g. VoiceNoteButton) or an onAction handler. */
+  action?: React.ReactNode
+  onAction?: () => void
+}
+
+function DiscoveryCarousel({ tips }: { tips: DiscoveryTip[] }) {
+  const [index, setIndex] = useState(0)
+  const [paused, setPaused] = useState(false)
+
+  useEffect(() => {
+    if (paused || tips.length <= 1) return
+    const id = setInterval(() => setIndex((i) => (i + 1) % tips.length), 7000)
+    return () => clearInterval(id)
+  }, [paused, tips.length])
+
+  const safeIndex = index % tips.length
+  const tip = tips[safeIndex]
+  const Icon = tip.icon
+
+  return (
+    <div
+      className={`${CARD} flex items-center gap-3.5 border-dashed bg-transparent`}
+      onMouseEnter={() => setPaused(true)}
+      onMouseLeave={() => setPaused(false)}
+    >
+      <div className="flex size-9 shrink-0 items-center justify-center rounded-lg border border-border bg-card">
+        <Icon className="size-[15px]" />
+      </div>
+      <div className="flex-1 text-[13.5px] leading-snug">
+        <span className="font-medium">{tip.title}</span>
+        <span className="text-muted-foreground"> — {tip.desc}</span>
+      </div>
+      {tip.action ?? (
+        <button
+          type="button"
+          onClick={() => tip.onAction?.()}
+          aria-label={tip.title}
+          className="flex size-9 shrink-0 items-center justify-center rounded-lg border border-border bg-card text-muted-foreground transition-colors hover:bg-accent hover:text-foreground"
+        >
+          <ArrowRight className="size-[15px]" />
+        </button>
+      )}
+      <div className="ml-1 flex shrink-0 items-center gap-1">
+        {tips.map((_, i) => (
+          <button
+            key={i}
+            type="button"
+            onClick={() => setIndex(i)}
+            aria-label={`Show tip ${i + 1}`}
+            className={`size-1.5 rounded-full transition-colors ${i === safeIndex ? 'bg-foreground' : 'bg-border hover:bg-muted-foreground/40'}`}
+          />
+        ))}
+      </div>
+    </div>
+  )
+}
+
+function formatFrom(from: string): string {
+  const m = /^\s*"?([^"<]+?)"?\s*<.+>\s*$/.exec(from)
+  return (m ? m[1] : from).trim()
+}
diff --git a/apps/x/apps/renderer/src/components/html-file-viewer.tsx b/apps/x/apps/renderer/src/components/html-file-viewer.tsx
index 994ab73e..8343af28 100644
--- a/apps/x/apps/renderer/src/components/html-file-viewer.tsx
+++ b/apps/x/apps/renderer/src/components/html-file-viewer.tsx
@@ -1,33 +1,11 @@
-import { useEffect, useState } from 'react'
+import { useEffect, useMemo, useState } from 'react'
 import { AlertCircleIcon, ExternalLinkIcon, FileTextIcon, Loader2Icon } from 'lucide-react'
 
 const MAX_SIZE_BYTES = 5 * 1024 * 1024
-const CACHE_MAX_ENTRIES = 20
-
-type CacheEntry = { html: string; mtimeMs: number; size: number }
-const htmlCache = new Map<string, CacheEntry>()
-
-function getCached(path: string, mtimeMs: number, size: number): string | null {
-  const entry = htmlCache.get(path)
-  if (!entry || entry.mtimeMs !== mtimeMs || entry.size !== size) return null
-  // Refresh LRU position
-  htmlCache.delete(path)
-  htmlCache.set(path, entry)
-  return entry.html
-}
-
-function setCached(path: string, html: string, mtimeMs: number, size: number) {
-  htmlCache.set(path, { html, mtimeMs, size })
-  while (htmlCache.size > CACHE_MAX_ENTRIES) {
-    const oldest = htmlCache.keys().next().value
-    if (oldest === undefined) break
-    htmlCache.delete(oldest)
-  }
-}
 
 type ViewerState =
   | { kind: 'loading' }
-  | { kind: 'loaded'; html: string }
+  | { kind: 'loaded' }
   | { kind: 'empty' }
   | { kind: 'tooLarge'; sizeMB: number }
   | { kind: 'error'; message: string }
@@ -36,9 +14,15 @@ interface HtmlFileViewerProps {
   path: string
 }
 
+function toAppWorkspaceUrl(path: string): string {
+  const segments = path.split('/').filter(Boolean).map((seg) => encodeURIComponent(seg))
+  return `app://workspace/${segments.join('/')}`
+}
+
 export function HtmlFileViewer({ path }: HtmlFileViewerProps) {
   const [state, setState] = useState<ViewerState>({ kind: 'loading' })
   const [iframeLoaded, setIframeLoaded] = useState(false)
+  const iframeSrc = useMemo(() => toAppWorkspaceUrl(path), [path])
 
   useEffect(() => {
     let cancelled = false
@@ -57,19 +41,11 @@ export function HtmlFileViewer({ path }: HtmlFileViewerProps) {
           setState({ kind: 'tooLarge', sizeMB: stat.size / (1024 * 1024) })
           return
         }
-        const cachedHtml = getCached(path, stat.mtimeMs, stat.size)
-        if (cachedHtml !== null) {
-          setState(cachedHtml.trim() === '' ? { kind: 'empty' } : { kind: 'loaded', html: cachedHtml })
-          return
-        }
-        const result = await window.ipc.invoke('workspace:readFile', { path })
-        if (cancelled) return
-        setCached(path, result.data, stat.mtimeMs, stat.size)
-        if (!result.data || result.data.trim() === '') {
+        if (stat.size === 0) {
           setState({ kind: 'empty' })
           return
         }
-        setState({ kind: 'loaded', html: result.data })
+        setState({ kind: 'loaded' })
       } catch (err) {
         if (cancelled) return
         const message = err instanceof Error ? err.message : String(err)
@@ -124,20 +100,16 @@ export function HtmlFileViewer({ path }: HtmlFileViewerProps) {
     )
   }
 
-  // We use `srcDoc` here (not `src=app://workspace/<path>`) so the iframe
-  // gets a null origin with no base URL. Trade-off: relative assets inside
-  // the file — `<link href="./style.css">`, `<img src="./pic.png">`,
-  // `<script src="./foo.js">` — will silently 404. Self-contained HTML
-  // works fine; HTML that ships next to sibling assets will look broken.
-  // TODO: switch to `src=app://workspace/<path>` if we want relative-asset
-  // support; that path also resolves through the existing path-traversal
-  // guard in resolveWorkspacePath.
+  // Serve via the `app://workspace/<rel-path>` protocol so the iframe has a
+  // proper base URL — relative `<link>`, `<img>`, `<script>` references next
+  // to the file resolve correctly (the path-traversal guard in
+  // resolveWorkspacePath already gates the protocol handler).
   return (
     <div className="relative h-full w-full">
       {state.kind === 'loaded' && (
         <iframe
           key={path}
-          srcDoc={state.html}
+          src={iframeSrc}
           sandbox="allow-scripts"
           className="h-full w-full border-0 bg-white"
           title="HTML preview"
diff --git a/apps/x/apps/renderer/src/components/knowledge-view.tsx b/apps/x/apps/renderer/src/components/knowledge-view.tsx
new file mode 100644
index 00000000..a757a34c
--- /dev/null
+++ b/apps/x/apps/renderer/src/components/knowledge-view.tsx
@@ -0,0 +1,412 @@
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import {
+  ChevronRight,
+  Copy,
+  ExternalLink,
+  File as FileIcon,
+  FilePlus,
+  Folder as FolderIcon,
+  FolderOpen,
+  FolderPlus,
+  Network,
+  Pencil,
+  SearchIcon,
+  Table2,
+  Trash2,
+} from 'lucide-react'
+
+import {
+  ContextMenu,
+  ContextMenuContent,
+  ContextMenuItem,
+  ContextMenuSeparator,
+  ContextMenuTrigger,
+} from '@/components/ui/context-menu'
+import { Input } from '@/components/ui/input'
+import { VoiceNoteButton } from '@/components/sidebar-content'
+import { formatRelativeTime } from '@/lib/relative-time'
+import { toast } from '@/lib/toast'
+import { cn } from '@/lib/utils'
+
+interface TreeNode {
+  path: string
+  name: string
+  kind: 'file' | 'dir'
+  children?: TreeNode[]
+  stat?: { size: number; mtimeMs: number }
+}
+
+export type KnowledgeViewActions = {
+  createNote: (parentPath?: string) => void
+  createFolder: (parentPath?: string) => Promise<string>
+  rename: (path: string, newName: string, isDir: boolean) => Promise<void>
+  remove: (path: string) => Promise<void>
+  copyPath: (path: string) => void
+  revealInFileManager: (path: string, isDir: boolean) => void
+  onOpenInNewTab?: (path: string) => void
+}
+
+type KnowledgeViewProps = {
+  tree: TreeNode[]
+  actions: KnowledgeViewActions
+  onOpenNote: (path: string) => void
+  onOpenGraph: () => void
+  onOpenSearch: () => void
+  onOpenBases: () => void
+  onVoiceNoteCreated?: (path: string) => void
+}
+
+type FlatRow = {
+  node: TreeNode
+  depth: number
+}
+
+function sortNodes(nodes: TreeNode[]): TreeNode[] {
+  return [...nodes].sort((a, b) => {
+    if (a.kind !== b.kind) return a.kind === 'dir' ? -1 : 1
+    return a.name.localeCompare(b.name)
+  })
+}
+
+function flatten(
+  nodes: TreeNode[],
+  expanded: Set<string>,
+  depth: number,
+  out: FlatRow[],
+): void {
+  for (const node of sortNodes(nodes)) {
+    out.push({ node, depth })
+    if (node.kind === 'dir' && expanded.has(node.path) && node.children?.length) {
+      flatten(node.children, expanded, depth + 1, out)
+    }
+  }
+}
+
+function formatModified(mtimeMs?: number): string {
+  if (!mtimeMs) return ''
+  return formatRelativeTime(new Date(mtimeMs).toISOString())
+}
+
+function getFileManagerName(): string {
+  if (typeof navigator === 'undefined') return 'File Manager'
+  const platform = navigator.platform.toLowerCase()
+  if (platform.includes('mac')) return 'Finder'
+  if (platform.includes('win')) return 'Explorer'
+  return 'File Manager'
+}
+
+function displayName(node: TreeNode): string {
+  if (node.kind === 'file' && node.name.toLowerCase().endsWith('.md')) {
+    return node.name.slice(0, -3)
+  }
+  return node.name
+}
+
+const INDENT_PX = 16
+const ROW_PADDING_PX = 12
+
+export function KnowledgeView({
+  tree,
+  actions,
+  onOpenNote,
+  onOpenGraph,
+  onOpenSearch,
+  onOpenBases,
+  onVoiceNoteCreated,
+}: KnowledgeViewProps) {
+  const [expanded, setExpanded] = useState<Set<string>>(new Set())
+  const [renameTarget, setRenameTarget] = useState<string | null>(null)
+
+  const rows = useMemo<FlatRow[]>(() => {
+    const out: FlatRow[] = []
+    // Meetings and Workspace have dedicated destinations, so hide them here.
+    const visible = tree.filter((n) => n.path !== 'knowledge/Meetings' && n.path !== 'knowledge/Workspace')
+    flatten(visible, expanded, 0, out)
+    return out
+  }, [tree, expanded])
+
+  const handleRowClick = useCallback(
+    (node: TreeNode) => {
+      if (node.kind === 'dir') {
+        setExpanded((prev) => {
+          const next = new Set(prev)
+          if (next.has(node.path)) next.delete(node.path)
+          else next.add(node.path)
+          return next
+        })
+      } else {
+        onOpenNote(node.path)
+      }
+    },
+    [onOpenNote],
+  )
+
+  return (
+    <div className="flex h-full flex-col overflow-hidden">
+      <div className="shrink-0 flex items-center justify-between gap-3 border-b border-border px-8 py-6">
+        <h1 className="text-2xl font-bold tracking-tight">Notes</h1>
+        <div className="flex items-center gap-2">
+          <button
+            type="button"
+            onClick={() => actions.createNote()}
+            className="inline-flex items-center gap-1.5 rounded-md border border-border bg-background px-3 py-1.5 text-sm text-foreground transition-colors hover:bg-accent"
+          >
+            <FilePlus className="size-4" />
+            <span>New note</span>
+          </button>
+          <button
+            type="button"
+            onClick={async () => {
+              try {
+                const path = await actions.createFolder()
+                setRenameTarget(path)
+              } catch { /* ignore */ }
+            }}
+            className="inline-flex items-center gap-1.5 rounded-md border border-border bg-background px-3 py-1.5 text-sm text-foreground transition-colors hover:bg-accent"
+          >
+            <FolderPlus className="size-4" />
+            <span>New folder</span>
+          </button>
+          <VoiceNoteButton onNoteCreated={onVoiceNoteCreated} />
+          <button
+            type="button"
+            onClick={onOpenSearch}
+            className="inline-flex items-center gap-1.5 rounded-md border border-border bg-background px-3 py-1.5 text-sm text-foreground transition-colors hover:bg-accent"
+          >
+            <SearchIcon className="size-4" />
+            <span>Search</span>
+          </button>
+          <button
+            type="button"
+            onClick={onOpenBases}
+            className="inline-flex items-center gap-1.5 rounded-md border border-border bg-background px-3 py-1.5 text-sm text-foreground transition-colors hover:bg-accent"
+          >
+            <Table2 className="size-4" />
+            <span>Bases</span>
+          </button>
+          <button
+            type="button"
+            onClick={onOpenGraph}
+            className="inline-flex items-center gap-1.5 rounded-md border border-border bg-background px-3 py-1.5 text-sm text-foreground transition-colors hover:bg-accent"
+          >
+            <Network className="size-4" />
+            <span>Graph view</span>
+          </button>
+          <button
+            type="button"
+            onClick={() => actions.revealInFileManager('knowledge', true)}
+            className="inline-flex items-center gap-1.5 rounded-md border border-border bg-background px-3 py-1.5 text-sm text-foreground transition-colors hover:bg-accent"
+          >
+            <FolderOpen className="size-4" />
+            <span>Open in {getFileManagerName()}</span>
+          </button>
+        </div>
+      </div>
+
+      <div className="flex-1 overflow-y-auto">
+        <div className="min-w-[480px]">
+          <div className="sticky top-0 z-10 flex items-center border-b border-border bg-background px-6 py-2 text-xs font-medium text-muted-foreground">
+            <div className="flex-1">Page name</div>
+            <div className="w-32 shrink-0">Modified</div>
+          </div>
+
+          {rows.length === 0 ? (
+            <div className="px-6 py-8 text-sm text-muted-foreground">No pages yet.</div>
+          ) : (
+            rows.map(({ node, depth }) => (
+              <KnowledgeRow
+                key={node.path}
+                node={node}
+                depth={depth}
+                isExpanded={expanded.has(node.path)}
+                actions={actions}
+                renameActive={renameTarget === node.path}
+                onRequestRename={(p) => setRenameTarget(p)}
+                onClearRename={() => setRenameTarget(null)}
+                onClick={handleRowClick}
+              />
+            ))
+          )}
+        </div>
+      </div>
+    </div>
+  )
+}
+
+function KnowledgeRow({
+  node,
+  depth,
+  isExpanded,
+  actions,
+  renameActive,
+  onRequestRename,
+  onClearRename,
+  onClick,
+}: {
+  node: TreeNode
+  depth: number
+  isExpanded: boolean
+  actions: KnowledgeViewActions
+  renameActive: boolean
+  onRequestRename: (path: string) => void
+  onClearRename: () => void
+  onClick: (node: TreeNode) => void
+}) {
+  const isDir = node.kind === 'dir'
+  const Icon = isDir ? FolderIcon : FileIcon
+  const paddingLeft = ROW_PADDING_PX + depth * INDENT_PX
+  const baseName = displayName(node)
+
+  const [newName, setNewName] = useState(baseName)
+  const inputRef = useRef<HTMLInputElement | null>(null)
+  const isSubmittingRef = useRef(false)
+
+  useEffect(() => {
+    if (renameActive) {
+      setNewName(baseName)
+      isSubmittingRef.current = false
+      // focus on next tick after mount
+      requestAnimationFrame(() => {
+        inputRef.current?.focus()
+        inputRef.current?.select()
+      })
+    }
+  }, [renameActive, baseName])
+
+  const handleRenameSubmit = useCallback(async () => {
+    if (isSubmittingRef.current) return
+    isSubmittingRef.current = true
+    const trimmed = newName.trim()
+    if (trimmed && trimmed !== baseName) {
+      try {
+        await actions.rename(node.path, trimmed, isDir)
+        toast('Renamed successfully', 'success')
+      } catch {
+        toast('Failed to rename', 'error')
+      }
+    }
+    onClearRename()
+    setTimeout(() => {
+      isSubmittingRef.current = false
+    }, 100)
+  }, [actions, baseName, isDir, newName, node.path, onClearRename])
+
+  const cancelRename = useCallback(() => {
+    isSubmittingRef.current = true
+    setNewName(baseName)
+    onClearRename()
+    setTimeout(() => {
+      isSubmittingRef.current = false
+    }, 100)
+  }, [baseName, onClearRename])
+
+  const handleDelete = useCallback(async () => {
+    try {
+      await actions.remove(node.path)
+      toast('Moved to trash', 'success')
+    } catch {
+      toast('Failed to delete', 'error')
+    }
+  }, [actions, node.path])
+
+  const handleCopyPath = useCallback(() => {
+    actions.copyPath(node.path)
+    toast('Path copied', 'success')
+  }, [actions, node.path])
+
+  const row = (
+    <button
+      type="button"
+      onClick={() => onClick(node)}
+      className="group flex w-full items-center border-b border-border/60 px-6 py-1.5 text-left text-sm transition-colors hover:bg-accent"
+    >
+      <div className="flex flex-1 items-center gap-1.5 min-w-0" style={{ paddingLeft }}>
+        <span className="inline-flex w-4 shrink-0 items-center justify-center text-muted-foreground">
+          {isDir ? (
+            <ChevronRight
+              className={cn(
+                'size-3.5 transition-transform',
+                isExpanded && 'rotate-90',
+              )}
+            />
+          ) : null}
+        </span>
+        <Icon className="size-4 shrink-0 text-muted-foreground" />
+        {renameActive ? (
+          <Input
+            ref={inputRef}
+            value={newName}
+            onChange={(e) => setNewName(e.target.value)}
+            onClick={(e) => e.stopPropagation()}
+            onKeyDown={(e) => {
+              e.stopPropagation()
+              if (e.key === 'Enter') {
+                e.preventDefault()
+                void handleRenameSubmit()
+              } else if (e.key === 'Escape') {
+                e.preventDefault()
+                cancelRename()
+              }
+            }}
+            onBlur={() => {
+              if (!isSubmittingRef.current) void handleRenameSubmit()
+            }}
+            className="h-6 text-sm flex-1"
+          />
+        ) : (
+          <span className="min-w-0 truncate">{baseName}</span>
+        )}
+      </div>
+      <div className="w-32 shrink-0 text-xs text-muted-foreground tabular-nums">
+        {formatModified(node.stat?.mtimeMs)}
+      </div>
+    </button>
+  )
+
+  return (
+    <ContextMenu>
+      <ContextMenuTrigger asChild>{row}</ContextMenuTrigger>
+      <ContextMenuContent className="w-48" onCloseAutoFocus={(e) => e.preventDefault()}>
+        {isDir && (
+          <>
+            <ContextMenuItem onClick={() => actions.createNote(node.path)}>
+              <FilePlus className="mr-2 size-4" />
+              New Note
+            </ContextMenuItem>
+            <ContextMenuItem onClick={() => void actions.createFolder(node.path)}>
+              <FolderPlus className="mr-2 size-4" />
+              New Folder
+            </ContextMenuItem>
+            <ContextMenuSeparator />
+          </>
+        )}
+        {!isDir && actions.onOpenInNewTab && (
+          <>
+            <ContextMenuItem onClick={() => actions.onOpenInNewTab!(node.path)}>
+              <ExternalLink className="mr-2 size-4" />
+              Open in new tab
+            </ContextMenuItem>
+            <ContextMenuSeparator />
+          </>
+        )}
+        <ContextMenuItem onClick={handleCopyPath}>
+          <Copy className="mr-2 size-4" />
+          Copy Path
+        </ContextMenuItem>
+        <ContextMenuItem onClick={() => actions.revealInFileManager(node.path, isDir)}>
+          <FolderOpen className="mr-2 size-4" />
+          Open in {getFileManagerName()}
+        </ContextMenuItem>
+        <ContextMenuSeparator />
+        <ContextMenuItem onClick={() => onRequestRename(node.path)}>
+          <Pencil className="mr-2 size-4" />
+          Rename
+        </ContextMenuItem>
+        <ContextMenuItem variant="destructive" onClick={handleDelete}>
+          <Trash2 className="mr-2 size-4" />
+          Delete
+        </ContextMenuItem>
+      </ContextMenuContent>
+    </ContextMenu>
+  )
+}
diff --git a/apps/x/apps/renderer/src/components/meetings-view.tsx b/apps/x/apps/renderer/src/components/meetings-view.tsx
index 28f32312..436fe42b 100644
--- a/apps/x/apps/renderer/src/components/meetings-view.tsx
+++ b/apps/x/apps/renderer/src/components/meetings-view.tsx
@@ -2,6 +2,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { Calendar, ChevronDown, Loader2, Mic, Square, Video } from 'lucide-react'
 
 import { Button } from '@/components/ui/button'
+import { SettingsDialog } from '@/components/settings-dialog'
 import { formatRelativeTime } from '@/lib/relative-time'
 import { extractConferenceLink } from '@/lib/calendar-event'
 import { cn } from '@/lib/utils'
@@ -189,6 +190,24 @@ function UpcomingEvents() {
   const [loading, setLoading] = useState(true)
   const [error, setError] = useState<string | null>(null)
   const [refreshTick, setRefreshTick] = useState(0)
+  // Calendar connection status — null while checking, false shows the connect prompt.
+  const [calendarConnected, setCalendarConnected] = useState<boolean | null>(null)
+  const [settingsOpen, setSettingsOpen] = useState(false)
+
+  useEffect(() => {
+    let cancelled = false
+    const check = async () => {
+      try {
+        const result = await window.ipc.invoke('composio:get-connection-status', { toolkitSlug: 'googlecalendar' })
+        if (!cancelled) setCalendarConnected(result.isConnected)
+      } catch {
+        if (!cancelled) setCalendarConnected(false)
+      }
+    }
+    void check()
+    const cleanup = window.ipc.on('oauth:didConnect', () => { void check() })
+    return () => { cancelled = true; cleanup() }
+  }, [])
 
   const loadEvents = useCallback(async () => {
     setLoading(true)
@@ -313,7 +332,20 @@ function UpcomingEvents() {
           )}
         </div>
 
-        {loading && events.length === 0 ? (
+        {calendarConnected === false && events.length === 0 ? (
+          <div className="flex flex-col items-center gap-3 py-12 text-center">
+            <Calendar className="size-7 text-muted-foreground opacity-50" />
+            <p className="text-sm text-muted-foreground">Connect your calendar to see upcoming meetings here.</p>
+            <button
+              type="button"
+              onClick={() => setSettingsOpen(true)}
+              className="inline-flex items-center gap-1.5 rounded-md border border-border bg-background px-3.5 py-1.5 text-sm font-medium text-foreground transition-colors hover:bg-accent"
+            >
+              <Calendar className="size-4" />
+              Connect your calendar
+            </button>
+          </div>
+        ) : loading && events.length === 0 ? (
           <div className="flex items-center justify-center py-6">
             <Loader2 className="size-4 animate-spin text-muted-foreground" />
           </div>
@@ -335,6 +367,7 @@ function UpcomingEvents() {
           </div>
         )}
       </div>
+      <SettingsDialog open={settingsOpen} onOpenChange={setSettingsOpen} defaultTab="connections" />
     </section>
   )
 }
@@ -348,7 +381,7 @@ function UpcomingDayRow({ day, isToday, isLast }: { day: DayGroup; isToday: bool
     <div
       className="grid"
       style={{
-        gridTemplateColumns: '96px 1fr',
+        gridTemplateColumns: '96px minmax(0, 1fr)',
         borderBottom: isLast ? undefined : '1px dashed var(--gm-border-strong)',
       }}
     >
@@ -376,7 +409,7 @@ function UpcomingDayRow({ day, isToday, isLast }: { day: DayGroup; isToday: bool
           <span style={{ fontSize: 12, color: 'var(--gm-text-faint)' }}>{weekday}</span>
         </span>
       </div>
-      <div className="flex flex-col py-3 pr-3">
+      <div className="flex min-w-0 flex-col py-3 pr-3">
         {day.events.length === 0 ? (
           <div
             className="flex w-full items-center gap-3 px-3 py-2 text-sm"
diff --git a/apps/x/apps/renderer/src/components/settings-dialog.tsx b/apps/x/apps/renderer/src/components/settings-dialog.tsx
index a1554a56..3a93e1c5 100644
--- a/apps/x/apps/renderer/src/components/settings-dialog.tsx
+++ b/apps/x/apps/renderer/src/components/settings-dialog.tsx
@@ -2,7 +2,7 @@
 
 import * as React from "react"
 import { useState, useEffect, useCallback, useMemo } from "react"
-import { Server, Key, Shield, Palette, Monitor, Sun, Moon, Loader2, CheckCircle2, Plus, X, Wrench, Search, ChevronRight, Link2, Tags, Mail, BookOpen, User, Plug } from "lucide-react"
+import { Server, Key, Shield, Palette, Monitor, Sun, Moon, Loader2, CheckCircle2, Plus, X, Wrench, Search, ChevronRight, Link2, Tags, Mail, BookOpen, User, Plug, HelpCircle, MessageCircle } from "lucide-react"
 
 import {
   Dialog,
@@ -11,6 +11,7 @@ import {
 } from "@/components/ui/dialog"
 import { Button } from "@/components/ui/button"
 import { Input } from "@/components/ui/input"
+import { Separator } from "@/components/ui/separator"
 import {
   Select,
   SelectContent,
@@ -25,7 +26,7 @@ import { toast } from "sonner"
 import { AccountSettings } from "@/components/settings/account-settings"
 import { ConnectedAccountsSettings } from "@/components/settings/connected-accounts-settings"
 
-type ConfigTab = "account" | "connected-accounts" | "models" | "mcp" | "security" | "appearance" | "tools" | "note-tagging"
+type ConfigTab = "account" | "connections" | "models" | "mcp" | "security" | "appearance" | "note-tagging" | "help"
 
 interface TabConfig {
   id: ConfigTab
@@ -43,10 +44,10 @@ const tabs: TabConfig[] = [
     description: "Manage your Rowboat account",
   },
   {
-    id: "connected-accounts",
-    label: "Connected Accounts",
+    id: "connections",
+    label: "Connections",
     icon: Plug,
-    description: "Manage connected services",
+    description: "Manage accounts and tools",
   },
   {
     id: "models",
@@ -75,12 +76,6 @@ const tabs: TabConfig[] = [
     icon: Palette,
     description: "Customize the look and feel",
   },
-  {
-    id: "tools",
-    label: "Tools Library",
-    icon: Wrench,
-    description: "Browse and enable toolkits",
-  },
   {
     id: "note-tagging",
     label: "Note Tagging",
@@ -88,10 +83,80 @@ const tabs: TabConfig[] = [
     path: "config/tags.json",
     description: "Configure tags for notes and emails",
   },
+  {
+    id: "help",
+    label: "Help",
+    icon: HelpCircle,
+    description: "Get help and support",
+  },
 ]
 
 interface SettingsDialogProps {
-  children: React.ReactNode
+  /** Optional trigger element. Omit when controlling `open` externally. */
+  children?: React.ReactNode
+  /** Tab to open on when the dialog is shown. Defaults to "account". */
+  defaultTab?: ConfigTab
+  /** Controlled open state. When provided, the dialog is fully controlled. */
+  open?: boolean
+  onOpenChange?: (open: boolean) => void
+}
+
+// --- Help & Support tab ---
+
+function HelpSettings() {
+  return (
+    <div className="space-y-4">
+      <div>
+        <h4 className="text-sm font-medium">Help &amp; Support</h4>
+        <p className="text-xs text-muted-foreground mt-0.5">Get help from our community</p>
+      </div>
+      <Button
+        variant="outline"
+        className="w-full justify-start gap-3 h-auto py-3"
+        onClick={() => window.open("https://discord.com/invite/wajrgmJQ6b", "_blank")}
+      >
+        <div className="flex size-8 items-center justify-center rounded-md bg-[#5865F2]">
+          <MessageCircle className="size-4 text-white" />
+        </div>
+        <div className="flex flex-col items-start">
+          <span className="text-sm font-medium">Join our Discord</span>
+          <span className="text-xs text-muted-foreground">Chat with the community</span>
+        </div>
+      </Button>
+      <Button
+        variant="outline"
+        className="w-full justify-start gap-3 h-auto py-3"
+        onClick={() => window.open("mailto:contact@rowboatlabs.com", "_blank")}
+      >
+        <div className="flex size-8 items-center justify-center rounded-md bg-muted">
+          <Mail className="size-4" />
+        </div>
+        <div className="flex flex-col items-start">
+          <span className="text-sm font-medium">Contact us</span>
+          <span className="text-xs text-muted-foreground">contact@rowboatlabs.com</span>
+        </div>
+      </Button>
+      <div className="flex gap-3 text-xs text-muted-foreground">
+        <a
+          href="https://www.rowboatlabs.com/terms-of-service"
+          target="_blank"
+          rel="noopener noreferrer"
+          className="hover:text-foreground transition-colors"
+        >
+          Terms of Service
+        </a>
+        <span>·</span>
+        <a
+          href="https://www.rowboatlabs.com/privacy-policy"
+          target="_blank"
+          rel="noopener noreferrer"
+          className="hover:text-foreground transition-colors"
+        >
+          Privacy Policy
+        </a>
+      </div>
+    </div>
+  )
 }
 
 // --- Theme option for Appearance tab ---
@@ -1572,9 +1637,14 @@ function NoteTaggingSettings({ dialogOpen }: { dialogOpen: boolean }) {
 
 // --- Main Settings Dialog ---
 
-export function SettingsDialog({ children }: SettingsDialogProps) {
-  const [open, setOpen] = useState(false)
-  const [activeTab, setActiveTab] = useState<ConfigTab>("account")
+export function SettingsDialog({ children, defaultTab = "account", open: controlledOpen, onOpenChange }: SettingsDialogProps) {
+  const [internalOpen, setInternalOpen] = useState(false)
+  const open = controlledOpen ?? internalOpen
+  const setOpen = useCallback((next: boolean) => {
+    if (onOpenChange) onOpenChange(next)
+    else setInternalOpen(next)
+  }, [onOpenChange])
+  const [activeTab, setActiveTab] = useState<ConfigTab>(defaultTab)
   const [content, setContent] = useState("")
   const [originalContent, setOriginalContent] = useState("")
   const [loading, setLoading] = useState(false)
@@ -1582,6 +1652,11 @@ export function SettingsDialog({ children }: SettingsDialogProps) {
   const [error, setError] = useState<string | null>(null)
   const [rowboatConnected, setRowboatConnected] = useState(false)
 
+  // Reset to the requested default tab each time the dialog is opened
+  useEffect(() => {
+    if (open) setActiveTab(defaultTab)
+  }, [open, defaultTab])
+
   // Check if user is signed in to Rowboat
   useEffect(() => {
     if (!open) return
@@ -1607,7 +1682,7 @@ export function SettingsDialog({ children }: SettingsDialogProps) {
   }
 
   const loadConfig = useCallback(async (tab: ConfigTab) => {
-    if (tab === "appearance" || tab === "models" || tab === "note-tagging" || tab === "account" || tab === "connected-accounts") return
+    if (tab === "appearance" || tab === "models" || tab === "note-tagging" || tab === "account" || tab === "connections" || tab === "help") return
     const tabConfig = tabs.find((t) => t.id === tab)!
     if (!tabConfig.path) return
     setLoading(true)
@@ -1673,7 +1748,7 @@ export function SettingsDialog({ children }: SettingsDialogProps) {
 
   return (
     <Dialog open={open} onOpenChange={setOpen}>
-      <DialogTrigger asChild>{children}</DialogTrigger>
+      {children && <DialogTrigger asChild>{children}</DialogTrigger>}
       <DialogContent
         className="max-w-[900px]! w-[900px] h-[600px] p-0 gap-0 overflow-hidden"
       >
@@ -1715,11 +1790,21 @@ export function SettingsDialog({ children }: SettingsDialogProps) {
             </div>
 
             {/* Content */}
-            <div className={cn("flex-1 p-4 min-h-0", (activeTab === "models" || activeTab === "tools" || activeTab === "account" || activeTab === "connected-accounts") ? "overflow-y-auto" : activeTab === "note-tagging" ? "overflow-hidden flex flex-col" : "overflow-hidden")}>
+            <div className={cn("flex-1 p-4 min-h-0", (activeTab === "models" || activeTab === "connections" || activeTab === "account") ? "overflow-y-auto" : activeTab === "note-tagging" ? "overflow-hidden flex flex-col" : "overflow-hidden")}>
               {activeTab === "account" ? (
                 <AccountSettings dialogOpen={open} />
-              ) : activeTab === "connected-accounts" ? (
-                <ConnectedAccountsSettings dialogOpen={open} />
+              ) : activeTab === "connections" ? (
+                <div className="space-y-6">
+                  <div className="space-y-2">
+                    <h4 className="text-sm font-semibold">Primary accounts</h4>
+                    <ConnectedAccountsSettings dialogOpen={open} />
+                  </div>
+                  <Separator />
+                  <div className="space-y-2">
+                    <h4 className="text-sm font-semibold">Library</h4>
+                    <ToolsLibrarySettings dialogOpen={open} rowboatConnected={rowboatConnected} />
+                  </div>
+                </div>
               ) : activeTab === "models" ? (
                 rowboatConnected
                   ? <RowboatModelSettings dialogOpen={open} />
@@ -1728,8 +1813,8 @@ export function SettingsDialog({ children }: SettingsDialogProps) {
                 <NoteTaggingSettings dialogOpen={open} />
               ) : activeTab === "appearance" ? (
                 <AppearanceSettings />
-              ) : activeTab === "tools" ? (
-                <ToolsLibrarySettings dialogOpen={open} rowboatConnected={rowboatConnected} />
+              ) : activeTab === "help" ? (
+                <HelpSettings />
               ) : loading ? (
                 <div className="h-full flex items-center justify-center text-muted-foreground text-sm">
                   Loading...
diff --git a/apps/x/apps/renderer/src/components/settings/connected-accounts-settings.tsx b/apps/x/apps/renderer/src/components/settings/connected-accounts-settings.tsx
index 8b90f619..e0c0b900 100644
--- a/apps/x/apps/renderer/src/components/settings/connected-accounts-settings.tsx
+++ b/apps/x/apps/renderer/src/components/settings/connected-accounts-settings.tsx
@@ -26,10 +26,10 @@ export function ConnectedAccountsSettings({ dialogOpen }: ConnectedAccountsSetti
     return (
       <div
         key={provider}
-        className="flex items-center justify-between gap-3 rounded-lg px-4 py-3 hover:bg-accent/50 transition-colors"
+        className="flex items-center justify-between gap-2 rounded-md px-3 py-2 hover:bg-accent/50 transition-colors"
       >
-        <div className="flex items-center gap-3 min-w-0">
-          <div className="flex size-9 items-center justify-center rounded-lg bg-muted">
+        <div className="flex items-center gap-2.5 min-w-0">
+          <div className="flex size-8 items-center justify-center rounded-md bg-muted">
             {icon}
           </div>
           <div className="flex flex-col min-w-0">
@@ -119,15 +119,15 @@ export function ConnectedAccountsSettings({ dialogOpen }: ConnectedAccountsSetti
         {/* Email & Calendar Section */}
         {(c.useComposioForGoogle || c.useComposioForGoogleCalendar || c.providers.includes('google')) && (
           <>
-            <div className="px-4 py-2">
+            <div className="px-3 pt-1 pb-0.5">
               <span className="text-xs font-medium text-muted-foreground uppercase tracking-wider">
                 Email & Calendar
               </span>
             </div>
             {c.useComposioForGoogle ? (
-              <div className="flex items-center justify-between gap-3 rounded-lg px-4 py-3 hover:bg-accent/50 transition-colors">
-                <div className="flex items-center gap-3 min-w-0">
-                  <div className="flex size-9 items-center justify-center rounded-lg bg-muted">
+              <div className="flex items-center justify-between gap-2 rounded-md px-3 py-2 hover:bg-accent/50 transition-colors">
+                <div className="flex items-center gap-2.5 min-w-0">
+                  <div className="flex size-8 items-center justify-center rounded-md bg-muted">
                     <Mail className="size-4" />
                   </div>
                   <div className="flex flex-col min-w-0">
@@ -174,9 +174,9 @@ export function ConnectedAccountsSettings({ dialogOpen }: ConnectedAccountsSetti
               c.providers.includes('google') && renderOAuthProvider('google', 'Google', <Mail className="size-4" />, 'Sync emails and calendar')
             )}
             {c.useComposioForGoogleCalendar && (
-              <div className="flex items-center justify-between gap-3 rounded-lg px-4 py-3 hover:bg-accent/50 transition-colors">
-                <div className="flex items-center gap-3 min-w-0">
-                  <div className="flex size-9 items-center justify-center rounded-lg bg-muted">
+              <div className="flex items-center justify-between gap-2 rounded-md px-3 py-2 hover:bg-accent/50 transition-colors">
+                <div className="flex items-center gap-2.5 min-w-0">
+                  <div className="flex size-8 items-center justify-center rounded-md bg-muted">
                     <Calendar className="size-4" />
                   </div>
                   <div className="flex flex-col min-w-0">
@@ -220,14 +220,14 @@ export function ConnectedAccountsSettings({ dialogOpen }: ConnectedAccountsSetti
                 </div>
               </div>
             )}
-            <Separator className="my-3" />
+            <Separator className="my-2" />
           </>
         )}
 
         {/* Meeting Notes Section */}
         {c.providers.includes('fireflies-ai') && (
           <>
-            <div className="px-4 py-2">
+            <div className="px-3 pt-1 pb-0.5">
               <span className="text-xs font-medium text-muted-foreground uppercase tracking-wider">
                 Meeting Notes
               </span>
diff --git a/apps/x/apps/renderer/src/components/sidebar-content.tsx b/apps/x/apps/renderer/src/components/sidebar-content.tsx
index f4c469bc..822aa8f1 100644
--- a/apps/x/apps/renderer/src/components/sidebar-content.tsx
+++ b/apps/x/apps/renderer/src/components/sidebar-content.tsx
@@ -5,47 +5,22 @@ import { useCallback, useEffect, useRef, useState } from "react"
 import {
   Bot,
   ChevronRight,
-  ChevronsDownUp,
-  ChevronsUpDown,
-  Copy,
-  ExternalLink,
+  FileText,
   FilePlus,
   Folder,
-  FolderOpen,
-  FolderPlus,
   Globe,
   AlertTriangle,
-  HelpCircle,
+  Home,
   Mic,
-  Network,
-  Pencil,
-  Radio,
-  SearchIcon,
   SquarePen,
-  Table2,
   Plug,
-  Lightbulb,
-  ListChecks,
   LoaderIcon,
   Mail,
+  MessageSquare,
   Settings,
   Square,
-  Trash2,
+  Video,
 } from "lucide-react"
-
-import {
-  Collapsible,
-  CollapsibleContent,
-  CollapsibleTrigger,
-} from "@/components/ui/collapsible"
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from "@/components/ui/dialog"
 import {
   AlertDialog,
   AlertDialogAction,
@@ -57,7 +32,6 @@ import {
   AlertDialogTitle,
   AlertDialogTrigger,
 } from "@/components/ui/alert-dialog"
-import { Button } from "@/components/ui/button"
 import {
   Sidebar,
   SidebarContent,
@@ -66,10 +40,8 @@ import {
   SidebarGroupContent,
   SidebarHeader,
   SidebarMenu,
-  SidebarMenuAction,
   SidebarMenuButton,
   SidebarMenuItem,
-  SidebarMenuSub,
   SidebarRail,
   useSidebar,
 } from "@/components/ui/sidebar"
@@ -83,21 +55,9 @@ import {
   TooltipContent,
   TooltipTrigger,
 } from "@/components/ui/tooltip"
-import {
-  ContextMenu,
-  ContextMenuContent,
-  ContextMenuItem,
-  ContextMenuSeparator,
-  ContextMenuTrigger,
-} from "@/components/ui/context-menu"
-import { Input } from "@/components/ui/input"
 import { cn } from "@/lib/utils"
-import { type ActiveSection, useSidebarSection } from "@/contexts/sidebar-context"
-import { ConnectorsPopover } from "@/components/connectors-popover"
-import { HelpPopover } from "@/components/help-popover"
 import { SettingsDialog } from "@/components/settings-dialog"
-import { toast } from "@/lib/toast"
-import { formatRelativeTime as formatRunTime } from "@/lib/relative-time"
+import { extractConferenceLink } from "@/lib/calendar-event"
 import { useBilling } from "@/hooks/useBilling"
 import { ServiceEvent } from "@x/shared/src/service-events.js"
 import z from "zod"
@@ -108,6 +68,7 @@ interface TreeNode {
   kind: "file" | "dir"
   children?: TreeNode[]
   loaded?: boolean
+  stat?: { size: number; mtimeMs: number }
 }
 
 type KnowledgeActions = {
@@ -115,6 +76,9 @@ type KnowledgeActions = {
   createFolder: (parentPath?: string) => Promise<string>
   openGraph: () => void
   openBases: () => void
+  openKnowledgeView: () => void
+  openWorkspaceAt: (path?: string) => void
+  createWorkspace: (name: string) => Promise<string>
   expandAll: () => void
   collapseAll: () => void
   rename: (path: string, newName: string, isDir: boolean) => Promise<void>
@@ -124,36 +88,36 @@ type KnowledgeActions = {
   onOpenInNewTab?: (path: string) => void
 }
 
-function getFileManagerName(): string {
-  if (typeof navigator === 'undefined') return 'File Manager'
-  const platform = navigator.platform.toLowerCase()
-  if (platform.includes('mac')) return 'Finder'
-  if (platform.includes('win')) return 'Explorer'
-  return 'File Manager'
-}
-
-type RunListItem = {
-  id: string
-  title?: string
-  createdAt: string
-  agentId: string
-}
-
-type BackgroundTaskItem = {
-  name: string
-  description?: string
-  schedule: {
-    type: "cron" | "window" | "once"
-    expression?: string
-    cron?: string
-    startTime?: string
-    endTime?: string
-    runAt?: string
+function displayNoteName(node: TreeNode): string {
+  if (node.kind === 'file' && node.name.toLowerCase().endsWith('.md')) {
+    return node.name.slice(0, -3)
   }
-  enabled: boolean
-  status?: "scheduled" | "running" | "finished" | "failed" | "triggered"
-  nextRunAt?: string | null
-  lastRunAt?: string | null
+  return node.name
+}
+
+function formatAgo(ms: number): string {
+  const diffMs = Math.max(0, Date.now() - ms)
+  const min = Math.floor(diffMs / 60000)
+  if (min < 1) return 'just now'
+  if (min < 60) return `${min}m ago`
+  const hr = Math.floor(min / 60)
+  if (hr < 24) return `${hr}h ago`
+  const day = Math.floor(hr / 24)
+  if (day < 7) return `${day}d ago`
+  const wk = Math.floor(day / 7)
+  if (wk < 4) return `${wk}w ago`
+  const mo = Math.max(1, Math.floor(day / 30))
+  return `${mo}mo ago`
+}
+
+type TaskSummary = {
+  slug: string
+  name: string
+  active: boolean
+  createdAt: string
+  lastAttemptAt?: string
+  lastRunAt?: string
+  lastRunError?: string
 }
 
 type ServiceEventType = z.infer<typeof ServiceEvent>
@@ -192,50 +156,29 @@ function collectServiceErrors(events: ServiceEventType[]): Map<string, string> {
   return errors
 }
 
-type TasksActions = {
-  onNewChat: () => void
-  onSelectRun: (runId: string) => void
-  onDeleteRun: (runId: string) => void
-  onOpenInNewTab?: (runId: string) => void
-  onSelectBackgroundTask?: (taskName: string) => void
-}
-
 type SidebarContentPanelProps = {
   tree: TreeNode[]
-  selectedPath: string | null
-  expandedPaths: Set<string>
   onSelectFile: (path: string, kind: "file" | "dir") => void
-  onToggleFolder?: (path: string) => void
   knowledgeActions: KnowledgeActions
-  onVoiceNoteCreated?: (path: string) => void
-  runs?: RunListItem[]
-  currentRunId?: string | null
-  processingRunIds?: Set<string>
-  tasksActions?: TasksActions
-  backgroundTasks?: BackgroundTaskItem[]
-  selectedBackgroundTask?: string | null
-  onNewChat?: () => void
-  onOpenSearch?: () => void
-  isSearchOpen?: boolean
-  isBrowserOpen?: boolean
-  onToggleBrowser?: () => void
-  isSuggestedTopicsOpen?: boolean
-  onOpenSuggestedTopics?: () => void
-  isMeetingsOpen?: boolean
+  bgTaskSummaries?: TaskSummary[]
   onOpenMeetings?: () => void
-  isLiveNotesOpen?: boolean
-  onOpenLiveNotes?: () => void
-  isBgTasksOpen?: boolean
   onOpenBgTasks?: () => void
-  isEmailOpen?: boolean
-  onOpenEmail?: () => void
+  onOpenAgent?: (slug: string) => void
+  recentRuns?: { id: string; title?: string; createdAt: string }[]
+  onOpenRun?: (runId: string) => void
+  onOpenEmail?: (threadId?: string) => void
+  onOpenHome?: () => void
+  onNewChat?: () => void
+  onToggleBrowser?: () => void
+  onVoiceNoteCreated?: (path: string) => void
+  /** Which primary destination is currently active, for nav highlighting. */
+  activeNav?: 'home' | 'email' | 'meetings' | 'knowledge' | 'agents' | 'workspaces' | null
+  /** Live meeting recording state, so the recording row can show its indicator/stop. */
+  meetingRecordingState?: 'idle' | 'connecting' | 'recording' | 'stopping'
+  recordingMeetingSource?: string | null
+  onToggleMeetingRecording?: () => void
 } & React.ComponentProps<typeof Sidebar>
 
-const sectionTabs: { id: ActiveSection; label: string }[] = [
-  { id: "tasks", label: "Chat" },
-  { id: "knowledge", label: "Knowledge" },
-]
-
 function formatEventTime(ts: string): string {
   const date = new Date(ts)
   if (Number.isNaN(date.getTime())) return ""
@@ -463,51 +406,225 @@ function SyncStatusBar() {
 
 export function SidebarContentPanel({
   tree,
-  selectedPath,
-  expandedPaths,
   onSelectFile,
-  onToggleFolder,
   knowledgeActions,
-  onVoiceNoteCreated,
-  runs = [],
-  currentRunId,
-  processingRunIds,
-  tasksActions,
-  backgroundTasks = [],
-  selectedBackgroundTask,
-  onNewChat,
-  onOpenSearch,
-  isSearchOpen = false,
-  isBrowserOpen = false,
-  onToggleBrowser,
-  isSuggestedTopicsOpen = false,
-  onOpenSuggestedTopics,
-  isMeetingsOpen = false,
+  bgTaskSummaries = [],
   onOpenMeetings,
-  isLiveNotesOpen = false,
-  onOpenLiveNotes,
-  isBgTasksOpen = false,
   onOpenBgTasks,
-  isEmailOpen = false,
+  onOpenAgent,
+  recentRuns = [],
+  onOpenRun,
   onOpenEmail,
+  onOpenHome,
+  onNewChat,
+  onToggleBrowser,
+  onVoiceNoteCreated,
+  activeNav,
+  meetingRecordingState = 'idle',
+  recordingMeetingSource = null,
+  onToggleMeetingRecording,
   ...props
 }: SidebarContentPanelProps) {
-  const { activeSection, setActiveSection } = useSidebarSection()
   const [hasOauthError, setHasOauthError] = useState(false)
   const [showOauthAlert, setShowOauthAlert] = useState(true)
-  const [connectorsOpen, setConnectorsOpen] = useState(false)
-  const [openConnectorsAfterClose, setOpenConnectorsAfterClose] = useState(false)
+  const [connectionsSettingsOpen, setConnectionsSettingsOpen] = useState(false)
+  const [openConnectionsAfterClose, setOpenConnectionsAfterClose] = useState(false)
   const connectorsButtonRef = useRef<HTMLButtonElement | null>(null)
   const [isRowboatConnected, setIsRowboatConnected] = useState(false)
   const [loggingIn, setLoggingIn] = useState(false)
   const [appUrl, setAppUrl] = useState<string | null>(null)
   const { billing } = useBilling(isRowboatConnected)
-  const isBrowserQuickActionSelected = isBrowserOpen && !isSearchOpen
-  const isSuggestedTopicsQuickActionSelected = isSuggestedTopicsOpen && !isBrowserOpen
-  const isMeetingsQuickActionSelected = isMeetingsOpen && !isBrowserOpen
-  const isLiveNotesQuickActionSelected = isLiveNotesOpen && !isBrowserOpen
-  const isBgTasksQuickActionSelected = isBgTasksOpen && !isBrowserOpen
-  const isEmailQuickActionSelected = isEmailOpen && !isBrowserOpen
+
+  // Nav previews: unread important emails + next upcoming meetings (top 2 each).
+  const [unreadEmailCount, setUnreadEmailCount] = useState(0)
+  const [emailThreads, setEmailThreads] = useState<SidebarEmailThread[]>([])
+  const [meetings, setMeetings] = useState<UpcomingMeeting[]>([])
+  const [quickAccessExpanded, setQuickAccessExpanded] = useState(true)
+
+  useEffect(() => {
+    let cancelled = false
+    const loadEmail = async () => {
+      try {
+        const result = await window.ipc.invoke('gmail:getImportant', { limit: 50 })
+        if (cancelled) return
+        const unread = result.threads.filter((t) => t.unread === true)
+        setUnreadEmailCount(unread.length)
+        setEmailThreads(unread.slice(0, 1).map((t) => ({
+          threadId: t.threadId,
+          subject: t.subject ?? '(No subject)',
+          from: t.from ?? '',
+          date: t.date ?? '',
+        })))
+      } catch { /* ignore */ }
+    }
+    void loadEmail()
+    const cleanup = window.ipc.on('workspace:didChange', (event) => {
+      const paths = event.type === 'bulkChanged' ? (event.paths ?? [])
+        : event.type === 'moved' ? [event.from, event.to]
+        : 'path' in event ? [event.path] : []
+      if (paths.some((p) => typeof p === 'string' && p.startsWith('gmail_sync'))) void loadEmail()
+    })
+    return () => { cancelled = true; cleanup() }
+  }, [])
+
+  useEffect(() => {
+    let cancelled = false
+    const loadNext = async () => {
+      try {
+        const exists = await window.ipc.invoke('workspace:exists', { path: 'calendar_sync' })
+        if (!exists.exists) { if (!cancelled) setNextMeetingLabel(null); return }
+        const entries = await window.ipc.invoke('workspace:readdir', {
+          path: 'calendar_sync',
+          opts: { recursive: false, includeHidden: false, includeStats: false },
+        })
+        const jsonEntries = entries.filter((e) => e.kind === 'file' && e.name.endsWith('.json'))
+        const settled = await Promise.allSettled(jsonEntries.map(async (entry) => {
+          const result = await window.ipc.invoke('workspace:readFile', { path: entry.path, encoding: 'utf8' })
+          return normalizeUpcomingMeeting(JSON.parse(result.data) as RawCalendarEvent, entry.path)
+        }))
+        const items: UpcomingMeeting[] = []
+        for (const r of settled) if (r.status === 'fulfilled' && r.value) items.push(r.value)
+        items.sort((a, b) => {
+          if (a.isAllDay !== b.isAllDay) return a.isAllDay ? -1 : 1
+          return a.start.getTime() - b.start.getTime()
+        })
+        if (!cancelled) setMeetings(items.slice(0, 1))
+      } catch { /* ignore */ }
+    }
+    void loadNext()
+    const cleanup = window.ipc.on('workspace:didChange', (event) => {
+      const paths = event.type === 'bulkChanged' ? (event.paths ?? [])
+        : event.type === 'moved' ? [event.from, event.to]
+        : 'path' in event ? [event.path] : []
+      if (paths.some((p) => typeof p === 'string' && p.startsWith('calendar_sync'))) void loadNext()
+    })
+    const tick = setInterval(() => void loadNext(), 60 * 60 * 1000)
+    return () => { cancelled = true; clearInterval(tick); cleanup() }
+  }, [])
+
+  const recentNotes = React.useMemo<TreeNode[]>(() => {
+    const out: TreeNode[] = []
+    const walk = (nodes: TreeNode[]) => {
+      for (const n of nodes) {
+        if (n.path === 'knowledge/Meetings' || n.path === 'knowledge/Workspace') continue
+        if (n.kind === 'file') out.push(n)
+        else if (n.children?.length) walk(n.children)
+      }
+    }
+    walk(tree)
+    return out
+      .filter((n) => n.stat?.mtimeMs)
+      .sort((a, b) => (b.stat?.mtimeMs ?? 0) - (a.stat?.mtimeMs ?? 0))
+      .slice(0, 5)
+  }, [tree])
+
+  // Recents: most recently touched notes / agents / chats, interleaved by
+  // recency. Capped per type (3 notes, 2 agents, 1 chat) and 5 overall.
+  type QuickAccessItem = {
+    key: string
+    label: string
+    recency: number
+    type: 'note' | 'agent' | 'chat'
+    onClick: () => void
+  }
+  const quickAccessItems = React.useMemo<QuickAccessItem[]>(() => {
+    const items: QuickAccessItem[] = []
+
+    for (const note of recentNotes.slice(0, 3)) {
+      items.push({
+        key: `note:${note.path}`,
+        label: displayNoteName(note),
+        recency: note.stat?.mtimeMs ?? 0,
+        type: 'note',
+        onClick: () => onSelectFile(note.path, 'file'),
+      })
+    }
+
+    const agentRecency = (t: TaskSummary) => {
+      const ts = t.lastRunAt ?? t.lastAttemptAt ?? t.createdAt
+      const ms = ts ? new Date(ts).getTime() : 0
+      return Number.isFinite(ms) ? ms : 0
+    }
+    for (const t of [...bgTaskSummaries].sort((a, b) => agentRecency(b) - agentRecency(a)).slice(0, 2)) {
+      items.push({
+        key: `agent:${t.slug}`,
+        label: t.name,
+        recency: agentRecency(t),
+        type: 'agent',
+        onClick: () => onOpenAgent?.(t.slug),
+      })
+    }
+
+    const chatRecency = (r: { createdAt: string }) => {
+      const ms = new Date(r.createdAt).getTime()
+      return Number.isFinite(ms) ? ms : 0
+    }
+    for (const r of [...recentRuns].sort((a, b) => chatRecency(b) - chatRecency(a)).slice(0, 1)) {
+      items.push({
+        key: `chat:${r.id}`,
+        label: r.title || '(Untitled chat)',
+        recency: chatRecency(r),
+        type: 'chat',
+        onClick: () => onOpenRun?.(r.id),
+      })
+    }
+
+    return items.sort((a, b) => b.recency - a.recency).slice(0, 5)
+  }, [recentNotes, bgTaskSummaries, recentRuns, onSelectFile, onOpenAgent, onOpenRun])
+
+  // Workspace count for the Workspaces sublabel — top-level dir children of
+  // knowledge/Workspace (matches WorkspaceView's root listing).
+  const workspaceCount = React.useMemo(() => {
+    const find = (nodes: TreeNode[]): TreeNode | null => {
+      for (const n of nodes) {
+        if (n.path === 'knowledge/Workspace') return n
+        if (n.kind === 'dir' && n.children?.length) {
+          const found = find(n.children)
+          if (found) return found
+        }
+      }
+      return null
+    }
+    const node = find(tree)
+    return node?.children?.filter((c) => c.kind === 'dir').length ?? 0
+  }, [tree])
+
+  // "Updated 4m ago" sublabel under Knowledge, based on the most recently
+  // modified note. Recomputed in an effect (not during render) and ticked so
+  // the relative time stays fresh.
+  const latestNoteMtime = recentNotes[0]?.stat?.mtimeMs ?? null
+  const [knowledgeUpdatedLabel, setKnowledgeUpdatedLabel] = useState<string | null>(null)
+  useEffect(() => {
+    if (!latestNoteMtime) { setKnowledgeUpdatedLabel(null); return }
+    const update = () => setKnowledgeUpdatedLabel(`Updated ${formatAgo(latestNoteMtime)}`)
+    update()
+    const tick = setInterval(update, 60 * 1000)
+    return () => clearInterval(tick)
+  }, [latestNoteMtime])
+
+  // "2 active · Last run 3m ago" sublabel under Background agents, overridden by
+  // "N failed · Needs review" when any task's last run errored.
+  const [bgAgentsLabel, setBgAgentsLabel] = useState<string | null>(null)
+  useEffect(() => {
+    const update = () => {
+      const failed = bgTaskSummaries.filter((t) => t.lastRunError).length
+      if (failed > 0) {
+        setBgAgentsLabel(`${failed} failed · Needs review`)
+        return
+      }
+      const active = bgTaskSummaries.filter((t) => t.active).length
+      const lastRunMs = bgTaskSummaries.reduce((max, t) => {
+        const ms = t.lastRunAt ? new Date(t.lastRunAt).getTime() : 0
+        return Number.isFinite(ms) && ms > max ? ms : max
+      }, 0)
+      const parts: string[] = [active > 0 ? `${active} active` : 'No active agents']
+      if (lastRunMs > 0) parts.push(`Last run ${formatAgo(lastRunMs)}`)
+      setBgAgentsLabel(parts.join(' · '))
+    }
+    update()
+    const tick = setInterval(update, 60 * 1000)
+    return () => clearInterval(tick)
+  }, [bgTaskSummaries])
 
   const handleRowboatLogin = useCallback(async () => {
     try {
@@ -565,171 +682,237 @@ export function SidebarContentPanel({
     }
   }, [])
 
+  // Single preview shown as a sublabel on the Email / Meetings nav buttons.
+  const previewEmail = emailThreads[0]
+  const previewMeeting = meetings[0]
+  const meetingIsRecording = previewMeeting != null
+    && recordingMeetingSource === previewMeeting.source
+    && (meetingRecordingState === 'recording' || meetingRecordingState === 'connecting' || meetingRecordingState === 'stopping')
+  const meetingIsBusy = meetingIsRecording && (meetingRecordingState === 'connecting' || meetingRecordingState === 'stopping')
+
   return (
     <Sidebar className="rowboat-sidebar border-r-0" {...props}>
       <SidebarHeader className="titlebar-drag-region">
         {/* Top spacer to clear the traffic lights + fixed toggle row */}
         <div className="h-8" />
-        {/* Tab switcher - centered below the traffic lights row */}
-        <div className="flex items-center px-2 py-1.5">
-          <div className="rowboat-section-switcher titlebar-no-drag flex w-full rounded-lg bg-sidebar-accent/50 p-0.5">
-            {sectionTabs.map((tab) => (
-              <button
-                key={tab.id}
-                onClick={() => setActiveSection(tab.id)}
-                className={cn(
-                  "flex-1 rounded-md px-3 py-1 text-sm font-medium transition-colors",
-                  activeSection === tab.id
-                    ? "bg-sidebar-accent text-sidebar-accent-foreground shadow-sm"
-                    : "text-sidebar-foreground/70 hover:text-sidebar-foreground"
-                )}
-              >
-                {tab.label}
-              </button>
-            ))}
-          </div>
-        </div>
-        {/* Quick action buttons */}
-        <div className="rowboat-quick-actions titlebar-no-drag flex flex-col gap-0.5 px-2 pb-1">
+        {/* Quick actions */}
+        <div className="titlebar-no-drag flex items-center gap-1.5 px-3 pb-2">
           {onNewChat && (
-            <button
-              type="button"
-              onClick={onNewChat}
-              className="flex w-full items-center gap-2 rounded-md px-2 py-1.5 text-sm text-sidebar-foreground/80 hover:bg-sidebar-accent hover:text-sidebar-accent-foreground transition-colors"
-            >
-              <SquarePen className="size-4" />
-              <span>New chat</span>
-            </button>
-          )}
-          {onOpenSearch && (
-            <button
-              type="button"
-              onClick={onOpenSearch}
-              className={cn(
-                "flex w-full items-center gap-2 rounded-md px-2 py-1.5 text-sm transition-colors",
-                isSearchOpen
-                  ? "bg-sidebar-accent text-sidebar-accent-foreground"
-                  : "text-sidebar-foreground/80 hover:bg-sidebar-accent hover:text-sidebar-accent-foreground"
-              )}
-            >
-              <SearchIcon className="size-4" />
-              <span>Search</span>
-            </button>
+            <ActionButton icon={SquarePen} label="New chat" onClick={onNewChat} />
           )}
+          <ActionButton icon={FilePlus} label="New note" onClick={() => knowledgeActions.createNote()} />
+          <VoiceNoteButton onNoteCreated={onVoiceNoteCreated} variant="action" />
           {onToggleBrowser && (
-            <button
-              type="button"
-              onClick={onToggleBrowser}
-              className={cn(
-                "flex w-full items-center gap-2 rounded-md px-2 py-1.5 text-sm transition-colors",
-                isBrowserQuickActionSelected
-                  ? "bg-sidebar-accent text-sidebar-accent-foreground"
-                  : "text-sidebar-foreground/80 hover:bg-sidebar-accent hover:text-sidebar-accent-foreground"
-              )}
-            >
-              <Globe className="size-4" />
-              <span>Run browser task</span>
-            </button>
-          )}
-          {onOpenSuggestedTopics && (
-            <button
-              type="button"
-              onClick={onOpenSuggestedTopics}
-              className={cn(
-                "flex w-full items-center gap-2 rounded-md px-2 py-1.5 text-sm transition-colors",
-                isSuggestedTopicsQuickActionSelected
-                  ? "bg-sidebar-accent text-sidebar-accent-foreground"
-                  : "text-sidebar-foreground/80 hover:bg-sidebar-accent hover:text-sidebar-accent-foreground"
-              )}
-            >
-              <Lightbulb className="size-4" />
-              <span>Suggested Topics</span>
-            </button>
-          )}
-          {onOpenBgTasks && (
-            <button
-              type="button"
-              onClick={onOpenBgTasks}
-              className={cn(
-                "flex w-full items-center gap-2 rounded-md px-2 py-1.5 text-sm transition-colors",
-                isBgTasksQuickActionSelected
-                  ? "bg-sidebar-accent text-sidebar-accent-foreground"
-                  : "text-sidebar-foreground/80 hover:bg-sidebar-accent hover:text-sidebar-accent-foreground"
-              )}
-            >
-              <ListChecks className="size-4" />
-              <span>Background tasks</span>
-            </button>
-          )}
-          {onOpenEmail && (
-            <button
-              type="button"
-              onClick={onOpenEmail}
-              className={cn(
-                "flex w-full items-center gap-2 rounded-md px-2 py-1.5 text-sm transition-colors",
-                isEmailQuickActionSelected
-                  ? "bg-sidebar-accent text-sidebar-accent-foreground"
-                  : "text-sidebar-foreground/80 hover:bg-sidebar-accent hover:text-sidebar-accent-foreground"
-              )}
-            >
-              <Mail className="size-4" />
-              <span>Email</span>
-            </button>
-          )}
-          {onOpenMeetings && (
-            <button
-              type="button"
-              onClick={onOpenMeetings}
-              className={cn(
-                "flex w-full items-center gap-2 rounded-md px-2 py-1.5 text-sm transition-colors",
-                isMeetingsQuickActionSelected
-                  ? "bg-sidebar-accent text-sidebar-accent-foreground"
-                  : "text-sidebar-foreground/80 hover:bg-sidebar-accent hover:text-sidebar-accent-foreground"
-              )}
-            >
-              <Mic className="size-4" />
-              <span>Meetings</span>
-            </button>
-          )}
-          {onOpenLiveNotes && (
-            <button
-              type="button"
-              onClick={onOpenLiveNotes}
-              className={cn(
-                "flex w-full items-center gap-2 rounded-md px-2 py-1.5 text-sm transition-colors",
-                isLiveNotesQuickActionSelected
-                  ? "bg-sidebar-accent text-sidebar-accent-foreground"
-                  : "text-sidebar-foreground/80 hover:bg-sidebar-accent hover:text-sidebar-accent-foreground"
-              )}
-            >
-              <Radio className="size-4" />
-              <span>Live notes</span>
-            </button>
+            <ActionButton icon={Globe} label="Run browser task" onClick={onToggleBrowser} />
           )}
         </div>
       </SidebarHeader>
       <SidebarContent>
-        {activeSection === "knowledge" && (
-          <KnowledgeSection
-            tree={tree}
-            selectedPath={selectedPath}
-            expandedPaths={expandedPaths}
-            onSelectFile={onSelectFile}
-            onToggleFolder={onToggleFolder}
-            actions={knowledgeActions}
-            onVoiceNoteCreated={onVoiceNoteCreated}
-          />
-        )}
-        {activeSection === "tasks" && (
-          <TasksSection
-            runs={runs}
-            currentRunId={currentRunId}
-            processingRunIds={processingRunIds}
-            actions={tasksActions}
-            backgroundTasks={backgroundTasks}
-            selectedBackgroundTask={selectedBackgroundTask}
-          />
-        )}
+        {/* Primary navigation */}
+        <SidebarGroup className="flex flex-col">
+          <SidebarGroupContent>
+            <SidebarMenu>
+              <SidebarMenuItem>
+                <SidebarMenuButton isActive={activeNav === 'home'} onClick={onOpenHome}>
+                  <Home className="size-4 shrink-0" />
+                  <span className="flex-1 truncate">Home</span>
+                </SidebarMenuButton>
+              </SidebarMenuItem>
+              <SidebarMenuItem>
+                <SidebarMenuButton
+                  isActive={activeNav === 'email'}
+                  onClick={() => onOpenEmail?.()}
+                  className={previewEmail ? 'h-auto py-1.5' : undefined}
+                >
+                  <Mail className="size-4 shrink-0" />
+                  <div className="flex min-w-0 flex-1 flex-col">
+                    <span className="truncate">Email</span>
+                    {previewEmail && (
+                      <span className="truncate text-[11px] text-muted-foreground">
+                        {formatEmailFrom(previewEmail.from)} · {previewEmail.subject}
+                      </span>
+                    )}
+                  </div>
+                  {unreadEmailCount > 0 && (
+                    <span className="shrink-0 self-center rounded-full bg-sidebar-accent px-1.5 text-[10px] font-medium text-sidebar-accent-foreground tabular-nums">
+                      {unreadEmailCount}
+                    </span>
+                  )}
+                </SidebarMenuButton>
+              </SidebarMenuItem>
+              <SidebarMenuItem>
+                <SidebarMenuButton
+                  isActive={activeNav === 'meetings'}
+                  onClick={onOpenMeetings}
+                  className={previewMeeting ? 'h-auto py-1.5' : undefined}
+                >
+                  <Mic className="size-4 shrink-0" />
+                  <div className="flex min-w-0 flex-1 flex-col">
+                    <span className="truncate">Meetings</span>
+                    {previewMeeting && (
+                      <span className="truncate text-[11px] text-muted-foreground">
+                        {meetingIsRecording ? previewMeeting.summary : `${previewMeeting.summary} · ${formatMeetingTime(previewMeeting)}`}
+                      </span>
+                    )}
+                  </div>
+                </SidebarMenuButton>
+                {previewMeeting && (meetingIsRecording ? (
+                  <div className="absolute inset-y-0 right-1 flex items-center gap-1.5">
+                    <span className="relative flex size-2">
+                      <span className="absolute inline-flex h-full w-full animate-ping rounded-full bg-red-500 opacity-75" />
+                      <span className="relative inline-flex size-2 rounded-full bg-red-500" />
+                    </span>
+                    <Tooltip>
+                      <TooltipTrigger asChild>
+                        <button
+                          type="button"
+                          aria-label="Stop recording"
+                          disabled={meetingIsBusy}
+                          onClick={(e) => { e.stopPropagation(); onToggleMeetingRecording?.() }}
+                          onMouseDown={(e) => e.stopPropagation()}
+                          className="flex aspect-square w-5 items-center justify-center rounded-md text-destructive hover:bg-destructive/10 disabled:opacity-50"
+                        >
+                          {meetingIsBusy ? <LoaderIcon className="size-4 animate-spin" /> : <Square className="size-3.5 fill-current" />}
+                        </button>
+                      </TooltipTrigger>
+                      <TooltipContent side="bottom">
+                        {meetingRecordingState === 'connecting' ? 'Starting…' : meetingRecordingState === 'stopping' ? 'Stopping…' : 'Stop recording'}
+                      </TooltipContent>
+                    </Tooltip>
+                  </div>
+                ) : (
+                  <div className="absolute inset-y-0 right-1 flex items-center gap-0.5 opacity-0 transition-opacity group-focus-within/menu-item:opacity-100 group-hover/menu-item:opacity-100">
+                    <Tooltip>
+                      <TooltipTrigger asChild>
+                        <button
+                          type="button"
+                          aria-label="Take notes"
+                          onClick={(e) => { e.stopPropagation(); triggerMeetingCapture(previewMeeting, false) }}
+                          onMouseDown={(e) => e.stopPropagation()}
+                          className="flex aspect-square w-5 items-center justify-center rounded-md text-sidebar-foreground hover:bg-sidebar-accent hover:text-sidebar-accent-foreground"
+                        >
+                          <Mic className="size-4" />
+                        </button>
+                      </TooltipTrigger>
+                      <TooltipContent side="bottom">Take notes</TooltipContent>
+                    </Tooltip>
+                    {previewMeeting.conferenceLink && (
+                      <Tooltip>
+                        <TooltipTrigger asChild>
+                          <button
+                            type="button"
+                            aria-label="Join & take notes"
+                            onClick={(e) => { e.stopPropagation(); triggerMeetingCapture(previewMeeting, true) }}
+                            onMouseDown={(e) => e.stopPropagation()}
+                            className="flex aspect-square w-5 items-center justify-center rounded-md text-sidebar-foreground hover:bg-sidebar-accent hover:text-sidebar-accent-foreground"
+                          >
+                            <Video className="size-4" />
+                          </button>
+                        </TooltipTrigger>
+                        <TooltipContent side="bottom">Join & take notes</TooltipContent>
+                      </Tooltip>
+                    )}
+                  </div>
+                ))}
+              </SidebarMenuItem>
+              <SidebarMenuItem>
+                <SidebarMenuButton
+                  isActive={activeNav === 'knowledge'}
+                  onClick={() => knowledgeActions.openKnowledgeView()}
+                  className={knowledgeUpdatedLabel ? 'h-auto py-1.5' : undefined}
+                >
+                  <FileText className="size-4 shrink-0" />
+                  <div className="flex min-w-0 flex-1 flex-col">
+                    <span className="truncate">Knowledge</span>
+                    {knowledgeUpdatedLabel && (
+                      <span className="truncate text-[11px] text-muted-foreground">{knowledgeUpdatedLabel}</span>
+                    )}
+                  </div>
+                </SidebarMenuButton>
+              </SidebarMenuItem>
+            </SidebarMenu>
+
+            <div className="mx-3 my-2 border-t border-sidebar-border" />
+
+            <SidebarMenu>
+              <SidebarMenuItem>
+                <SidebarMenuButton
+                  isActive={activeNav === 'agents'}
+                  onClick={onOpenBgTasks}
+                  className={bgAgentsLabel ? 'h-auto py-1.5' : undefined}
+                >
+                  <Bot className="size-4 shrink-0 text-muted-foreground" />
+                  <div className="flex min-w-0 flex-1 flex-col">
+                    <span className="truncate text-muted-foreground">Background agents</span>
+                    {bgAgentsLabel && (
+                      <span className={cn(
+                        'truncate text-[11px]',
+                        bgTaskSummaries.some((t) => t.lastRunError) ? 'text-destructive' : 'text-muted-foreground',
+                      )}>
+                        {bgAgentsLabel}
+                      </span>
+                    )}
+                  </div>
+                </SidebarMenuButton>
+              </SidebarMenuItem>
+              <SidebarMenuItem>
+                <SidebarMenuButton
+                  isActive={activeNav === 'workspaces'}
+                  onClick={() => knowledgeActions.openWorkspaceAt()}
+                  className="h-auto py-1.5"
+                >
+                  <Folder className="size-4 shrink-0 text-muted-foreground" />
+                  <div className="flex min-w-0 flex-1 flex-col">
+                    <span className="truncate text-muted-foreground">Workspaces</span>
+                    <span className="truncate text-[11px] text-muted-foreground">
+                      {workspaceCount === 0 ? 'No workspaces' : `${workspaceCount} workspace${workspaceCount === 1 ? '' : 's'}`}
+                    </span>
+                  </div>
+                </SidebarMenuButton>
+              </SidebarMenuItem>
+            </SidebarMenu>
+          </SidebarGroupContent>
+        </SidebarGroup>
+
+        <div className="mx-3 border-t border-sidebar-border" />
+
+        {/* Recents */}
+        <SidebarGroup className="flex flex-col">
+          <SidebarGroupContent>
+            <button
+              type="button"
+              onClick={() => setQuickAccessExpanded((v) => !v)}
+              className="flex w-full items-center gap-1.5 px-3 py-1 text-[10.5px] font-semibold uppercase tracking-wider text-muted-foreground"
+            >
+              <ChevronRight className={cn('size-3 transition-transform', quickAccessExpanded && 'rotate-90')} />
+              <span className="flex-1 text-left">Recents</span>
+            </button>
+            {quickAccessExpanded && (
+              quickAccessItems.length === 0 ? (
+                <div className="px-4 pb-2 text-[11.5px] italic text-muted-foreground">
+                  Recent notes and agents show up here.
+                </div>
+              ) : (
+                <SidebarMenu>
+                  {quickAccessItems.map((item) => (
+                    <SidebarMenuItem key={item.key}>
+                      <SidebarMenuButton onClick={item.onClick}>
+                        {item.type === 'agent' ? (
+                          <Bot className="size-4 shrink-0 text-muted-foreground" />
+                        ) : item.type === 'chat' ? (
+                          <MessageSquare className="size-4 shrink-0 text-muted-foreground" />
+                        ) : (
+                          <FileText className="size-4 shrink-0 text-muted-foreground" />
+                        )}
+                        <span className="flex-1 truncate">{item.label}</span>
+                      </SidebarMenuButton>
+                    </SidebarMenuItem>
+                  ))}
+                </SidebarMenu>
+              )
+            )}
+          </SidebarGroupContent>
+        </SidebarGroup>
       </SidebarContent>
       {/* Billing / upgrade CTA or Log in CTA */}
       {isRowboatConnected && billing ? (
@@ -773,15 +956,14 @@ export function SidebarContentPanel({
       <div className="border-t border-sidebar-border px-2 py-2">
         <div className="flex flex-col gap-1">
           <div className="flex items-center gap-2">
-            <ConnectorsPopover open={connectorsOpen} onOpenChange={setConnectorsOpen} mode="unconnected">
-              <button
-                ref={connectorsButtonRef}
-                className="flex w-full items-center gap-2 rounded-md px-2 py-1 text-xs text-sidebar-foreground/70 hover:bg-sidebar-accent hover:text-sidebar-accent-foreground transition-colors"
-              >
-                <Plug className="size-4" />
-                <span>Connect Accounts</span>
-              </button>
-            </ConnectorsPopover>
+            <button
+              ref={connectorsButtonRef}
+              onClick={() => setConnectionsSettingsOpen(true)}
+              className="flex w-full items-center gap-2 rounded-md px-2 py-1 text-xs text-sidebar-foreground/70 hover:bg-sidebar-accent hover:text-sidebar-accent-foreground transition-colors"
+            >
+              <Plug className="size-4" />
+              <span>Connect Accounts</span>
+            </button>
             {hasOauthError && (
               <AlertDialog
                 open={showOauthAlert}
@@ -799,9 +981,9 @@ export function SidebarContentPanel({
                 <AlertDialogContent
                   onCloseAutoFocus={(event) => {
                     event.preventDefault()
-                    if (openConnectorsAfterClose) {
-                      setOpenConnectorsAfterClose(false)
-                      setConnectorsOpen(true)
+                    if (openConnectionsAfterClose) {
+                      setOpenConnectionsAfterClose(false)
+                      setConnectionsSettingsOpen(true)
                     }
                     connectorsButtonRef.current?.focus()
                   }}
@@ -824,7 +1006,7 @@ export function SidebarContentPanel({
                     </AlertDialogCancel>
                     <AlertDialogAction
                       onClick={() => {
-                        setOpenConnectorsAfterClose(true)
+                        setOpenConnectionsAfterClose(true)
                         setShowOauthAlert(false)
                       }}
                     >
@@ -841,14 +1023,13 @@ export function SidebarContentPanel({
               <span>Settings</span>
             </button>
           </SettingsDialog>
-          <HelpPopover>
-            <button className="flex w-full items-center gap-2 rounded-md px-2 py-1 text-xs text-sidebar-foreground/70 hover:bg-sidebar-accent hover:text-sidebar-accent-foreground transition-colors">
-              <HelpCircle className="size-4" />
-              <span>Help</span>
-            </button>
-          </HelpPopover>
         </div>
       </div>
+      <SettingsDialog
+        defaultTab="connections"
+        open={connectionsSettingsOpen}
+        onOpenChange={setConnectionsSettingsOpen}
+      />
       <SyncStatusBar />
       <SidebarRail />
     </Sidebar>
@@ -886,7 +1067,7 @@ async function transcribeWithDeepgram(audioBlob: Blob): Promise<string | null> {
 }
 
 // Voice Note Recording Button
-function VoiceNoteButton({ onNoteCreated }: { onNoteCreated?: (path: string) => void }) {
+export function VoiceNoteButton({ onNoteCreated, variant = 'icon' }: { onNoteCreated?: (path: string) => void; variant?: 'icon' | 'action' }) {
   const [isRecording, setIsRecording] = React.useState(false)
   const [hasDeepgramKey, setHasDeepgramKey] = React.useState(false)
   const mediaRecorderRef = React.useRef<MediaRecorder | null>(null)
@@ -1077,12 +1258,17 @@ path: ${currentRelativePath}
 
   if (!hasDeepgramKey) return null
 
+  const actionClass = "flex h-9 flex-1 items-center justify-center rounded-md border border-sidebar-border text-sidebar-foreground/70 hover:bg-sidebar-accent hover:text-sidebar-accent-foreground transition-colors"
+  const iconClass = "text-sidebar-foreground/70 hover:text-sidebar-foreground hover:bg-sidebar-accent rounded p-1.5 transition-colors"
+
   return (
     <Tooltip>
       <TooltipTrigger asChild>
         <button
+          type="button"
           onClick={isRecording ? stopRecording : startRecording}
-          className="text-sidebar-foreground/70 hover:text-sidebar-foreground hover:bg-sidebar-accent rounded p-1.5 transition-colors"
+          className={variant === 'action' ? actionClass : iconClass}
+          aria-label={isRecording ? 'Stop recording' : 'New voice note'}
         >
           {isRecording ? (
             <Square className="size-4 fill-red-500 text-red-500 animate-pulse" />
@@ -1098,644 +1284,130 @@ path: ${currentRelativePath}
   )
 }
 
-// Knowledge Section
-function KnowledgeSection({
-  tree,
-  selectedPath,
-  expandedPaths,
-  onSelectFile,
-  onToggleFolder,
-  actions,
-  onVoiceNoteCreated,
-}: {
-  tree: TreeNode[]
-  selectedPath: string | null
-  expandedPaths: Set<string>
-  onSelectFile: (path: string, kind: "file" | "dir") => void
-  onToggleFolder?: (path: string) => void
-  actions: KnowledgeActions
-  onVoiceNoteCreated?: (path: string) => void
-}) {
-  const isExpanded = expandedPaths.size > 0
-  const treeContainerRef = React.useRef<HTMLDivElement | null>(null)
-  const [selectedFolderPath, setSelectedFolderPath] = useState<string | null>(null)
-  const [renameTarget, setRenameTarget] = useState<string | null>(null)
-  const visibleTree = React.useMemo(
-    () => tree.filter((item) => item.path !== 'knowledge/Meetings'),
-    [tree],
-  )
-
-  useEffect(() => {
-    if (!selectedPath) return
-
-    let cancelled = false
-    let rafId: number | null = null
-    let attempts = 0
-    const maxAttempts = 20
-
-    const revealActiveFile = () => {
-      if (cancelled) return
-      const container = treeContainerRef.current
-      if (!container) return
-      const activeRow = container.querySelector<HTMLElement>('[data-knowledge-active="true"]')
-      if (activeRow) {
-        activeRow.scrollIntoView({ block: "nearest", inline: "nearest" })
-        return
-      }
-      if (attempts >= maxAttempts) return
-      attempts += 1
-      rafId = requestAnimationFrame(revealActiveFile)
-    }
-
-    rafId = requestAnimationFrame(revealActiveFile)
-    return () => {
-      cancelled = true
-      if (rafId !== null) cancelAnimationFrame(rafId)
-    }
-  }, [selectedPath, expandedPaths, visibleTree])
-
-  // Folder clicks highlight the folder; file clicks clear folder highlight
-  const handleSelect = React.useCallback((path: string, kind: "file" | "dir") => {
-    if (kind === 'dir') {
-      setSelectedFolderPath(path)
-    } else {
-      setSelectedFolderPath(null)
-    }
-    onSelectFile(path, kind)
-  }, [onSelectFile])
-
-  // Resolve the parent path for new items: explicit folder > open file's parent > root
-  const deriveParent = React.useCallback((): string => {
-    if (selectedFolderPath) return selectedFolderPath
-    if (selectedPath) {
-      const parts = selectedPath.split('/')
-      if (parts.length > 1) return parts.slice(0, -1).join('/')
-    }
-    return 'knowledge'
-  }, [selectedFolderPath, selectedPath])
-
-  // Wrap actions to inject context-aware parent and capture rename target
-  const wrappedActions = React.useMemo<KnowledgeActions>(() => ({
-    ...actions,
-    createNote: (parentPath?: string) => actions.createNote(parentPath ?? deriveParent()),
-    createFolder: async (parentPath?: string): Promise<string> => {
-      const newPath = await actions.createFolder(parentPath ?? deriveParent())
-      setRenameTarget(newPath)
-      return newPath
-    },
-  }), [actions, deriveParent])
-
-  const fileManagerName = getFileManagerName()
-  const quickActions = [
-    { icon: FilePlus, label: "New Note", action: () => wrappedActions.createNote() },
-    { icon: FolderPlus, label: "New Folder", action: () => void wrappedActions.createFolder() },
-    { icon: Network, label: "Graph View", action: () => actions.openGraph() },
-    { icon: Table2, label: "Bases", action: () => actions.openBases() },
-    { icon: FolderOpen, label: `Open in ${fileManagerName}`, action: () => actions.revealInFileManager('knowledge', true) },
-  ]
-
+function ActionButton({ icon: Icon, label, onClick }: { icon: typeof Mic; label: string; onClick: () => void }) {
   return (
-    <ContextMenu>
-      <ContextMenuTrigger asChild>
-        <SidebarGroup className="flex-1 flex flex-col overflow-hidden">
-          <div className="flex items-center justify-center gap-1 py-1 sticky top-0 z-10 bg-sidebar border-b border-sidebar-border">
-            {quickActions.map((action) => (
-              <Tooltip key={action.label}>
-                <TooltipTrigger asChild>
-                  <button
-                    onClick={action.action}
-                    className="text-sidebar-foreground/70 hover:text-sidebar-foreground hover:bg-sidebar-accent rounded p-1.5 transition-colors"
-                  >
-                    <action.icon className="size-4" />
-                  </button>
-                </TooltipTrigger>
-                <TooltipContent side="bottom">{action.label}</TooltipContent>
-              </Tooltip>
-            ))}
-            <VoiceNoteButton onNoteCreated={onVoiceNoteCreated} />
-            <Tooltip>
-              <TooltipTrigger asChild>
-                <button
-                  onClick={isExpanded ? actions.collapseAll : actions.expandAll}
-                  className="text-sidebar-foreground/70 hover:text-sidebar-foreground hover:bg-sidebar-accent rounded p-1.5 transition-colors"
-                >
-                  {isExpanded ? (
-                    <ChevronsDownUp className="size-4" />
-                  ) : (
-                    <ChevronsUpDown className="size-4" />
-                  )}
-                </button>
-              </TooltipTrigger>
-              <TooltipContent side="bottom">
-                {isExpanded ? "Collapse All" : "Expand All"}
-              </TooltipContent>
-            </Tooltip>
-          </div>
-          <SidebarGroupContent className="flex-1 overflow-y-auto">
-            <div ref={treeContainerRef}>
-              <SidebarMenu>
-                {visibleTree.map((item, index) => (
-                  <Tree
-                    key={index}
-                    item={item}
-                    selectedPath={selectedPath}
-                    expandedPaths={expandedPaths}
-                    onSelect={handleSelect}
-                    onToggleFolder={onToggleFolder}
-                    actions={wrappedActions}
-                    selectedFolderPath={selectedFolderPath}
-                    renameTarget={renameTarget}
-                    onRenameTargetConsumed={() => setRenameTarget(null)}
-                  />
-                ))}
-              </SidebarMenu>
-            </div>
-          </SidebarGroupContent>
-        </SidebarGroup>
-      </ContextMenuTrigger>
-      <ContextMenuContent className="w-48">
-        <ContextMenuItem onClick={() => wrappedActions.createNote()}>
-          <FilePlus className="mr-2 size-4" />
-          New Note
-        </ContextMenuItem>
-        <ContextMenuItem onClick={() => void wrappedActions.createFolder()}>
-          <FolderPlus className="mr-2 size-4" />
-          New Folder
-        </ContextMenuItem>
-      </ContextMenuContent>
-    </ContextMenu>
+    <Tooltip>
+      <TooltipTrigger asChild>
+        <button
+          type="button"
+          onClick={onClick}
+          aria-label={label}
+          className="flex h-9 flex-1 items-center justify-center rounded-md border border-sidebar-border text-sidebar-foreground/70 hover:bg-sidebar-accent hover:text-sidebar-accent-foreground transition-colors"
+        >
+          <Icon className="size-4" />
+        </button>
+      </TooltipTrigger>
+      <TooltipContent side="bottom">{label}</TooltipContent>
+    </Tooltip>
   )
 }
 
-function countFiles(node: TreeNode): number {
-  if (node.kind === 'file') return 1
-  return (node.children ?? []).reduce((sum, child) => sum + countFiles(child), 0)
+type UpcomingMeeting = {
+  id: string
+  summary: string
+  start: Date
+  isAllDay: boolean
+  location: string | null
+  htmlLink: string | null
+  conferenceLink: string | null
+  source: string
+  rawStart: { dateTime?: string; date?: string } | undefined
+  rawEnd: { dateTime?: string; date?: string } | undefined
 }
 
-/** Display name overrides for top-level knowledge folders */
-const FOLDER_DISPLAY_NAMES: Record<string, string> = {}
-
-// Tree component for file browser
-function Tree({
-  item,
-  selectedPath,
-  expandedPaths,
-  onSelect,
-  onToggleFolder,
-  actions,
-  selectedFolderPath,
-  renameTarget,
-  onRenameTargetConsumed,
-}: {
-  item: TreeNode
-  selectedPath: string | null
-  expandedPaths: Set<string>
-  onSelect: (path: string, kind: "file" | "dir") => void
-  onToggleFolder?: (path: string) => void
-  actions: KnowledgeActions
-  selectedFolderPath?: string | null
-  renameTarget?: string | null
-  onRenameTargetConsumed?: () => void
-}) {
-  const isDir = item.kind === 'dir'
-  const isExpanded = expandedPaths.has(item.path)
-  const isSelected = selectedPath === item.path
-  const isFolderSelected = isDir && selectedFolderPath === item.path
-  const [isRenaming, setIsRenaming] = useState(false)
-  const isSubmittingRef = React.useRef(false)
-  const displayName = (isDir && FOLDER_DISPLAY_NAMES[item.name]) || item.name
-
-  // For files, strip .md extension for editing
-  const baseName = !isDir && item.name.endsWith('.md')
-    ? item.name.slice(0, -3)
-    : item.name
-  const [newName, setNewName] = useState(baseName)
-
-  // Auto-enter rename mode when this node is the rename target
-  React.useEffect(() => {
-    if (renameTarget === item.path) {
-      setNewName(baseName)
-      isSubmittingRef.current = false
-      setIsRenaming(true)
-      onRenameTargetConsumed?.()
-    }
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [renameTarget, item.path])
-
-  // Sync newName when baseName changes (e.g., after external rename)
-  React.useEffect(() => {
-    setNewName(baseName)
-  }, [baseName])
-
-  const handleRename = async () => {
-    // Prevent double submission
-    if (isSubmittingRef.current) return
-    isSubmittingRef.current = true
-
-    const trimmedName = newName.trim()
-    if (trimmedName && trimmedName !== baseName) {
-      try {
-        await actions.rename(item.path, trimmedName, isDir)
-        toast('Renamed successfully', 'success')
-      } catch {
-        toast('Failed to rename', 'error')
-      }
-    }
-    setIsRenaming(false)
-    // Reset after a small delay to prevent blur from re-triggering
-    setTimeout(() => {
-      isSubmittingRef.current = false
-    }, 100)
-  }
-
-  const handleDelete = async () => {
-    try {
-      await actions.remove(item.path)
-      toast('Moved to trash', 'success')
-    } catch {
-      toast('Failed to delete', 'error')
-    }
-  }
-
-  const handleCopyPath = () => {
-    actions.copyPath(item.path)
-    toast('Path copied', 'success')
-  }
-
-  const cancelRename = () => {
-    isSubmittingRef.current = true // Prevent blur from triggering rename
-    setIsRenaming(false)
-    setNewName(baseName) // Reset to original name
-    setTimeout(() => {
-      isSubmittingRef.current = false
-    }, 100)
-  }
-
-  const contextMenuContent = (
-    <ContextMenuContent className="w-48">
-      {isDir && (
-        <>
-          <ContextMenuItem onClick={() => actions.createNote(item.path)}>
-            <FilePlus className="mr-2 size-4" />
-            New Note
-          </ContextMenuItem>
-          <ContextMenuItem onClick={() => actions.createFolder(item.path)}>
-            <FolderPlus className="mr-2 size-4" />
-            New Folder
-          </ContextMenuItem>
-          <ContextMenuSeparator />
-        </>
-      )}
-      {!isDir && actions.onOpenInNewTab && (
-        <>
-          <ContextMenuItem onClick={() => actions.onOpenInNewTab!(item.path)}>
-            <ExternalLink className="mr-2 size-4" />
-            Open in new tab
-          </ContextMenuItem>
-          <ContextMenuSeparator />
-        </>
-      )}
-      <ContextMenuItem onClick={handleCopyPath}>
-        <Copy className="mr-2 size-4" />
-        Copy Path
-      </ContextMenuItem>
-      <ContextMenuItem onClick={() => actions.revealInFileManager(item.path, isDir)}>
-        <FolderOpen className="mr-2 size-4" />
-        Open in {getFileManagerName()}
-      </ContextMenuItem>
-      <ContextMenuSeparator />
-      <ContextMenuItem onClick={() => { setNewName(baseName); isSubmittingRef.current = false; setIsRenaming(true) }}>
-        <Pencil className="mr-2 size-4" />
-        Rename
-      </ContextMenuItem>
-      <ContextMenuItem variant="destructive" onClick={handleDelete}>
-        <Trash2 className="mr-2 size-4" />
-        Delete
-      </ContextMenuItem>
-    </ContextMenuContent>
-  )
-
-  // Inline rename input
-  if (isRenaming) {
-    return (
-      <SidebarMenuItem>
-        <div className="flex items-center px-2 py-1">
-          <Input
-            value={newName}
-            onChange={(e) => setNewName(e.target.value)}
-            onKeyDown={async (e) => {
-              e.stopPropagation()
-              if (e.key === 'Enter') {
-                e.preventDefault()
-                await handleRename()
-              } else if (e.key === 'Escape') {
-                e.preventDefault()
-                cancelRename()
-              }
-            }}
-            onBlur={() => {
-              // Only trigger rename if not already submitting
-              if (!isSubmittingRef.current) {
-                handleRename()
-              }
-            }}
-            className="h-6 text-sm flex-1"
-            autoFocus
-          />
-        </div>
-      </SidebarMenuItem>
-    )
-  }
-
-  // Top-level knowledge folders open bases view — render as flat items
-  const parts = item.path.split('/')
-  const isBasesFolder = isDir && parts.length === 2 && parts[0] === 'knowledge'
-
-  if (isBasesFolder) {
-    return (
-      <ContextMenu>
-        <ContextMenuTrigger asChild>
-          <SidebarMenuItem className="group/file-item">
-            <SidebarMenuButton isActive={isFolderSelected} onClick={() => onSelect(item.path, item.kind)}>
-              <Folder className="size-4 shrink-0" />
-              <div className="flex w-full items-center gap-1 min-w-0">
-                <span className="min-w-0 flex-1 truncate">{displayName}</span>
-                <span className="text-xs text-sidebar-foreground/50 tabular-nums shrink-0">{countFiles(item)}</span>
-              </div>
-            </SidebarMenuButton>
-            {onToggleFolder && (item.children?.length ?? 0) > 0 && (
-              <SidebarMenuAction
-                showOnHover
-                aria-label={isExpanded ? "Collapse folder" : "Expand folder"}
-                onClick={(e) => {
-                  e.stopPropagation()
-                  onToggleFolder(item.path)
-                }}
-              >
-                <ChevronRight
-                  className={cn(
-                    "transition-transform",
-                    isExpanded && "rotate-90",
-                  )}
-                />
-              </SidebarMenuAction>
-            )}
-            {isExpanded && (
-              <SidebarMenuSub>
-                {(item.children ?? []).map((subItem, index) => (
-                  <Tree
-                    key={index}
-                    item={subItem}
-                    selectedPath={selectedPath}
-                    expandedPaths={expandedPaths}
-                    onSelect={onSelect}
-                    onToggleFolder={onToggleFolder}
-                    actions={actions}
-                    selectedFolderPath={selectedFolderPath}
-                    renameTarget={renameTarget}
-                    onRenameTargetConsumed={onRenameTargetConsumed}
-                  />
-                ))}
-              </SidebarMenuSub>
-            )}
-          </SidebarMenuItem>
-        </ContextMenuTrigger>
-        {contextMenuContent}
-      </ContextMenu>
-    )
-  }
-
-  if (!isDir) {
-    return (
-      <ContextMenu>
-        <ContextMenuTrigger asChild>
-          <SidebarMenuItem
-            className="group/file-item"
-            data-knowledge-file-path={item.path}
-            data-knowledge-active={isSelected ? "true" : "false"}
-          >
-            <SidebarMenuButton
-              isActive={isSelected}
-              onClick={(e) => {
-                if (e.metaKey && actions.onOpenInNewTab) {
-                  actions.onOpenInNewTab(item.path)
-                } else {
-                  onSelect(item.path, item.kind)
-                }
-              }}
-            >
-              <div className="flex w-full items-center gap-1 min-w-0">
-                <span className="min-w-0 flex-1 truncate">{item.name}</span>
-              </div>
-            </SidebarMenuButton>
-          </SidebarMenuItem>
-        </ContextMenuTrigger>
-        {contextMenuContent}
-      </ContextMenu>
-    )
-  }
-
-  return (
-    <ContextMenu>
-      <ContextMenuTrigger asChild>
-        <SidebarMenuItem>
-          <Collapsible
-            open={isExpanded}
-            onOpenChange={() => onSelect(item.path, item.kind)}
-            className="group/collapsible [&[data-state=open]>button>svg:first-child]:rotate-90"
-          >
-            <CollapsibleTrigger asChild>
-              <SidebarMenuButton isActive={isFolderSelected}>
-                <ChevronRight className="transition-transform size-4" />
-                <div className="flex w-full items-center gap-1 min-w-0">
-                  <span className="min-w-0 flex-1 truncate">{displayName}</span>
-                  <span className="text-xs text-sidebar-foreground/50 tabular-nums shrink-0">{countFiles(item)}</span>
-                </div>
-              </SidebarMenuButton>
-            </CollapsibleTrigger>
-            <CollapsibleContent>
-              <SidebarMenuSub>
-                {(item.children ?? []).map((subItem, index) => (
-                  <Tree
-                    key={index}
-                    item={subItem}
-                    selectedPath={selectedPath}
-                    expandedPaths={expandedPaths}
-                    onSelect={onSelect}
-                    onToggleFolder={onToggleFolder}
-                    actions={actions}
-                    selectedFolderPath={selectedFolderPath}
-                    renameTarget={renameTarget}
-                    onRenameTargetConsumed={onRenameTargetConsumed}
-                  />
-                ))}
-              </SidebarMenuSub>
-            </CollapsibleContent>
-          </Collapsible>
-        </SidebarMenuItem>
-      </ContextMenuTrigger>
-      {contextMenuContent}
-    </ContextMenu>
-  )
+type RawCalendarEvent = {
+  id?: string
+  summary?: string
+  start?: { dateTime?: string; date?: string }
+  end?: { dateTime?: string; date?: string }
+  location?: string
+  htmlLink?: string
+  status?: string
+  attendees?: Array<{ self?: boolean; responseStatus?: string }>
 }
 
-// Get status indicator color
-function getStatusColor(status?: string, enabled?: boolean): string {
-  // Disabled agents always show gray
-  if (enabled === false) {
-    return "bg-gray-400"
+function parseAllDayDate(s: string): Date | null {
+  const m = /^(\d{4})-(\d{2})-(\d{2})/.exec(s)
+  if (!m) return null
+  return new Date(Number(m[1]), Number(m[2]) - 1, Number(m[3]))
+}
+
+function normalizeUpcomingMeeting(raw: RawCalendarEvent, sourcePath: string): UpcomingMeeting | null {
+  if (raw.status === 'cancelled') return null
+  const declined = raw.attendees?.find((a) => a.self)?.responseStatus === 'declined'
+  if (declined) return null
+  const allDayStart = raw.start?.date
+  const timedStart = raw.start?.dateTime
+  const isAllDay = !timedStart && Boolean(allDayStart)
+  let start: Date | null = null
+  let end: Date | null = null
+  if (timedStart) {
+    start = new Date(timedStart)
+    end = raw.end?.dateTime ? new Date(raw.end.dateTime) : null
+  } else if (allDayStart) {
+    start = parseAllDayDate(allDayStart)
+    end = raw.end?.date ? parseAllDayDate(raw.end.date) : null
   }
-  switch (status) {
-    case "running":
-      return "bg-blue-500"
-    case "finished":
-      return "bg-green-500"
-    case "failed":
-      return "bg-red-500"
-    case "triggered":
-      return "bg-gray-400"
-    case "scheduled":
-    default:
-      return "bg-yellow-500"
+  if (!start || Number.isNaN(start.getTime())) return null
+  const now = new Date()
+  const effectiveEnd = end ?? (isAllDay ? new Date(start.getTime() + 24 * 60 * 60 * 1000) : start)
+  if (effectiveEnd <= now) return null
+  const conferenceLink = extractConferenceLink(raw as unknown as Record<string, unknown>) ?? null
+  return {
+    id: raw.id ?? sourcePath,
+    summary: raw.summary?.trim() || '(No title)',
+    start,
+    isAllDay,
+    location: raw.location?.trim() || null,
+    htmlLink: raw.htmlLink ?? null,
+    conferenceLink,
+    source: sourcePath,
+    rawStart: raw.start,
+    rawEnd: raw.end,
   }
 }
 
-// Tasks Section
-function TasksSection({
-  runs,
-  currentRunId,
-  processingRunIds,
-  actions,
-  backgroundTasks = [],
-  selectedBackgroundTask,
-}: {
-  runs: RunListItem[]
-  currentRunId?: string | null
-  processingRunIds?: Set<string>
-  actions?: TasksActions
-  backgroundTasks?: BackgroundTaskItem[]
-  selectedBackgroundTask?: string | null
-}) {
-  const [pendingDeleteRunId, setPendingDeleteRunId] = useState<string | null>(null)
-
-  return (
-    <SidebarGroup className="flex-1 flex flex-col overflow-hidden">
-      <SidebarGroupContent className="flex-1 overflow-y-auto">
-        {/* Background Tasks Section */}
-        {backgroundTasks.length > 0 && (
-          <>
-            <div className="px-3 py-1.5 text-xs font-medium text-muted-foreground">
-              Background Tasks
-            </div>
-            <SidebarMenu>
-              {backgroundTasks.map((task) => (
-                <SidebarMenuItem key={task.name}>
-                  <SidebarMenuButton
-                    isActive={selectedBackgroundTask === task.name}
-                    onClick={() => actions?.onSelectBackgroundTask?.(task.name)}
-                    className="gap-2"
-                  >
-                    <div className="relative">
-                      <Bot className="size-4 shrink-0" />
-                      <span
-                        className={`absolute -bottom-0.5 -right-0.5 size-2 rounded-full ${getStatusColor(task.status, task.enabled)} ${task.status === "running" && task.enabled ? "animate-pulse" : ""}`}
-                      />
-                    </div>
-                    <span className={`truncate text-sm ${!task.enabled ? "text-muted-foreground" : ""}`}>
-                      {task.name}
-                    </span>
-                  </SidebarMenuButton>
-                </SidebarMenuItem>
-              ))}
-            </SidebarMenu>
-          </>
-        )}
-        {runs.length > 0 && (
-          <>
-            <div className="px-3 py-1.5 mt-4 text-xs font-medium text-muted-foreground">
-              Chat history
-            </div>
-            <SidebarMenu>
-              {runs.map((run) => (
-                <ContextMenu key={run.id}>
-                  <ContextMenuTrigger asChild>
-                    <SidebarMenuItem className="group/chat-item">
-                      <SidebarMenuButton
-                        isActive={currentRunId === run.id}
-                        onClick={(e) => {
-                          if (e.metaKey && actions?.onOpenInNewTab) {
-                            actions.onOpenInNewTab(run.id)
-                          } else {
-                            actions?.onSelectRun(run.id)
-                          }
-                        }}
-                      >
-                        <div className="flex w-full items-center gap-2 min-w-0">
-                          <span className="min-w-0 flex-1 truncate text-sm">{run.title || '(Untitled chat)'}</span>
-                          {run.createdAt ? (
-                            <span className="shrink-0 text-[10px] text-muted-foreground">
-                              {formatRunTime(run.createdAt)}
-                            </span>
-                          ) : null}
-                        </div>
-                      </SidebarMenuButton>
-                    </SidebarMenuItem>
-                  </ContextMenuTrigger>
-                  <ContextMenuContent className="w-48">
-                    {actions?.onOpenInNewTab && (
-                      <ContextMenuItem onClick={() => actions.onOpenInNewTab!(run.id)}>
-                        <ExternalLink className="mr-2 size-4" />
-                        Open in new tab
-                      </ContextMenuItem>
-                    )}
-                    {!processingRunIds?.has(run.id) && (
-                      <>
-                        {actions?.onOpenInNewTab && <ContextMenuSeparator />}
-                        <ContextMenuItem
-                          variant="destructive"
-                          onClick={() => setPendingDeleteRunId(run.id)}
-                        >
-                          <Trash2 className="mr-2 size-4" />
-                          Delete
-                        </ContextMenuItem>
-                      </>
-                    )}
-                  </ContextMenuContent>
-                </ContextMenu>
-              ))}
-            </SidebarMenu>
-          </>
-        )}
-      </SidebarGroupContent>
-
-      {/* Delete confirmation dialog */}
-      <Dialog open={!!pendingDeleteRunId} onOpenChange={(open) => { if (!open) setPendingDeleteRunId(null) }}>
-        <DialogContent showCloseButton={false} className="sm:max-w-sm">
-          <DialogHeader>
-            <DialogTitle>Delete chat</DialogTitle>
-            <DialogDescription>
-              Are you sure you want to delete this chat?
-            </DialogDescription>
-          </DialogHeader>
-          <DialogFooter>
-            <Button variant="outline" size="sm" onClick={() => setPendingDeleteRunId(null)}>
-              Cancel
-            </Button>
-            <Button
-              variant="destructive"
-              size="sm"
-              onClick={() => {
-                if (pendingDeleteRunId) {
-                  actions?.onDeleteRun(pendingDeleteRunId)
-                }
-                setPendingDeleteRunId(null)
-              }}
-            >
-              Delete
-            </Button>
-          </DialogFooter>
-        </DialogContent>
-      </Dialog>
-    </SidebarGroup>
-  )
+function isSameLocalDay(a: Date, b: Date): boolean {
+  return a.getFullYear() === b.getFullYear() && a.getMonth() === b.getMonth() && a.getDate() === b.getDate()
 }
+
+function formatMeetingTime(event: UpcomingMeeting): string {
+  if (event.isAllDay) return 'All day'
+  const now = new Date()
+  const tomorrow = new Date(now)
+  tomorrow.setDate(tomorrow.getDate() + 1)
+  const time = event.start.toLocaleTimeString([], { hour: 'numeric', minute: '2-digit' })
+  if (isSameLocalDay(event.start, now)) return time
+  if (isSameLocalDay(event.start, tomorrow)) return `Tmrw ${time}`
+  return event.start.toLocaleDateString([], { month: 'numeric', day: 'numeric' })
+}
+
+function triggerMeetingCapture(event: UpcomingMeeting, openConference: boolean) {
+  window.__pendingCalendarEvent = {
+    summary: event.summary,
+    start: event.rawStart,
+    end: event.rawEnd,
+    location: event.location ?? undefined,
+    htmlLink: event.htmlLink ?? undefined,
+    conferenceLink: event.conferenceLink ?? undefined,
+    source: event.source,
+  }
+  if (openConference && event.conferenceLink) {
+    window.open(event.conferenceLink, '_blank')
+  }
+  window.dispatchEvent(new Event('calendar-block:join-meeting'))
+}
+
+type SidebarEmailThread = {
+  threadId: string
+  subject: string
+  from: string
+  date: string
+}
+
+function formatEmailFrom(from: string): string {
+  const match = /^\s*"?([^"<]+?)"?\s*<.+>\s*$/.exec(from)
+  if (match) return match[1].trim()
+  return from
+}
+
diff --git a/apps/x/apps/renderer/src/components/ui/sidebar.tsx b/apps/x/apps/renderer/src/components/ui/sidebar.tsx
index 9c413735..ffe40957 100644
--- a/apps/x/apps/renderer/src/components/ui/sidebar.tsx
+++ b/apps/x/apps/renderer/src/components/ui/sidebar.tsx
@@ -380,7 +380,7 @@ function SidebarContent({ className, ...props }: React.ComponentProps<"div">) {
       data-slot="sidebar-content"
       data-sidebar="content"
       className={cn(
-        "flex min-h-0 flex-1 flex-col gap-2 overflow-auto group-data-[collapsible=icon]:overflow-hidden",
+        "flex min-h-0 flex-1 flex-col gap-1 overflow-auto group-data-[collapsible=icon]:overflow-hidden",
         className
       )}
       {...props}
@@ -393,7 +393,7 @@ function SidebarGroup({ className, ...props }: React.ComponentProps<"div">) {
     <div
       data-slot="sidebar-group"
       data-sidebar="group"
-      className={cn("relative flex w-full min-w-0 flex-col p-2", className)}
+      className={cn("relative flex w-full min-w-0 flex-col px-2 py-1", className)}
       {...props}
     />
   )
@@ -462,7 +462,7 @@ function SidebarMenu({ className, ...props }: React.ComponentProps<"ul">) {
     <ul
       data-slot="sidebar-menu"
       data-sidebar="menu"
-      className={cn("flex w-full min-w-0 flex-col gap-1", className)}
+      className={cn("flex w-full min-w-0 flex-col gap-0", className)}
       {...props}
     />
   )
diff --git a/apps/x/apps/renderer/src/components/workspace-view.tsx b/apps/x/apps/renderer/src/components/workspace-view.tsx
new file mode 100644
index 00000000..6cbd1075
--- /dev/null
+++ b/apps/x/apps/renderer/src/components/workspace-view.tsx
@@ -0,0 +1,531 @@
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import {
+  ChevronRight,
+  Copy,
+  File as FileIcon,
+  FilePlus,
+  Folder as FolderIcon,
+  FolderOpen,
+  FolderPlus,
+  Home,
+  Pencil,
+  Plus,
+  Trash2,
+  UploadCloud,
+} from 'lucide-react'
+
+import { Button } from '@/components/ui/button'
+import {
+  ContextMenu,
+  ContextMenuContent,
+  ContextMenuItem,
+  ContextMenuSeparator,
+  ContextMenuTrigger,
+} from '@/components/ui/context-menu'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from '@/components/ui/dropdown-menu'
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@/components/ui/dialog'
+import { Input } from '@/components/ui/input'
+import { toast } from '@/lib/toast'
+import { cn } from '@/lib/utils'
+
+const WORKSPACE_ROOT = 'knowledge/Workspace'
+
+interface TreeNode {
+  path: string
+  name: string
+  kind: 'file' | 'dir'
+  children?: TreeNode[]
+}
+
+type WorkspaceActions = {
+  remove: (path: string) => Promise<void>
+  copyPath: (path: string) => void
+  revealInFileManager: (path: string, isDir: boolean) => void
+}
+
+type WorkspaceViewProps = {
+  tree: TreeNode[]
+  initialPath?: string | null
+  actions: WorkspaceActions
+  onOpenNote: (path: string) => void
+  onCreateWorkspace: (name: string) => Promise<void>
+}
+
+function getFileManagerName(): string {
+  if (typeof navigator === 'undefined') return 'File Manager'
+  const platform = navigator.platform.toLowerCase()
+  if (platform.includes('mac')) return 'Finder'
+  if (platform.includes('win')) return 'Explorer'
+  return 'File Manager'
+}
+
+function findNode(nodes: TreeNode[] | undefined, path: string): TreeNode | null {
+  if (!nodes) return null
+  for (const node of nodes) {
+    if (node.path === path) return node
+    if (node.kind === 'dir' && path.startsWith(`${node.path}/`)) {
+      const found = findNode(node.children, path)
+      if (found) return found
+    }
+  }
+  return null
+}
+
+function countChildren(node: TreeNode | null): number {
+  if (!node || node.kind !== 'dir' || !node.children) return 0
+  return node.children.length
+}
+
+async function uniqueChildPath(parent: string, name: string): Promise<string> {
+  const dot = name.lastIndexOf('.')
+  const base = dot > 0 ? name.slice(0, dot) : name
+  const ext = dot > 0 ? name.slice(dot) : ''
+  let candidate = `${parent}/${name}`
+  let i = 1
+  while ((await window.ipc.invoke('workspace:exists', { path: candidate })).exists) {
+    candidate = `${parent}/${base} (${i})${ext}`
+    i += 1
+  }
+  return candidate
+}
+
+function readFileAsBase64(file: File): Promise<string> {
+  return new Promise((resolve, reject) => {
+    const reader = new FileReader()
+    reader.onload = () => {
+      const result = reader.result as string
+      resolve(result.split(',')[1] ?? '')
+    }
+    reader.onerror = reject
+    reader.readAsDataURL(file)
+  })
+}
+
+export function WorkspaceView({ tree, initialPath, actions, onOpenNote, onCreateWorkspace }: WorkspaceViewProps) {
+  const [currentPath, setCurrentPath] = useState<string>(initialPath || WORKSPACE_ROOT)
+  const [addOpen, setAddOpen] = useState(false)
+  const [newName, setNewName] = useState('')
+  const [creating, setCreating] = useState(false)
+  const [error, setError] = useState<string | null>(null)
+  const [renameTarget, setRenameTarget] = useState<string | null>(null)
+  const [renameValue, setRenameValue] = useState('')
+  const [isDraggingOver, setIsDraggingOver] = useState(false)
+  const [uploading, setUploading] = useState(false)
+  const dragDepthRef = useRef(0)
+  const filesInputRef = useRef<HTMLInputElement | null>(null)
+  const folderInputRef = useRef<HTMLInputElement | null>(null)
+
+  useEffect(() => {
+    if (initialPath) setCurrentPath(initialPath)
+  }, [initialPath])
+
+  const isRoot = currentPath === WORKSPACE_ROOT
+  const fileManagerName = getFileManagerName()
+
+  const currentNode = useMemo(() => findNode(tree, currentPath), [tree, currentPath])
+
+  const items = useMemo<TreeNode[]>(() => {
+    const children = currentNode?.children ?? []
+    const filtered = isRoot ? children.filter((c) => c.kind === 'dir') : children
+    return [...filtered].sort((a, b) => {
+      if (a.kind !== b.kind) return a.kind === 'dir' ? -1 : 1
+      return a.name.localeCompare(b.name)
+    })
+  }, [currentNode, isRoot])
+
+  const breadcrumbs = useMemo(() => {
+    if (isRoot) return [] as { path: string; name: string }[]
+    const rel = currentPath.slice(WORKSPACE_ROOT.length + 1)
+    const parts = rel.split('/').filter(Boolean)
+    let acc = WORKSPACE_ROOT
+    return parts.map((seg) => {
+      acc = `${acc}/${seg}`
+      return { path: acc, name: seg }
+    })
+  }, [currentPath, isRoot])
+
+  const handleItemClick = useCallback(
+    (item: TreeNode) => {
+      if (renameTarget) return
+      if (item.kind === 'dir') {
+        setCurrentPath(item.path)
+      } else {
+        onOpenNote(item.path)
+      }
+    },
+    [onOpenNote, renameTarget],
+  )
+
+  const beginRename = useCallback((item: TreeNode) => {
+    setRenameTarget(item.path)
+    setRenameValue(item.name)
+  }, [])
+
+  const commitRename = useCallback(async () => {
+    if (!renameTarget) return
+    const node = items.find((i) => i.path === renameTarget)
+    const trimmed = renameValue.trim()
+    setRenameTarget(null)
+    if (!node || !trimmed || trimmed === node.name || trimmed.includes('/')) return
+    const parent = renameTarget.slice(0, renameTarget.lastIndexOf('/'))
+    try {
+      await window.ipc.invoke('workspace:rename', { from: renameTarget, to: `${parent}/${trimmed}` })
+      toast('Renamed', 'success')
+    } catch {
+      toast('Failed to rename', 'error')
+    }
+  }, [renameTarget, renameValue, items])
+
+  const handleDelete = useCallback(async (item: TreeNode) => {
+    try {
+      await actions.remove(item.path)
+      toast('Moved to trash', 'success')
+    } catch {
+      toast('Failed to delete', 'error')
+    }
+  }, [actions])
+
+  const uploadFiles = useCallback(async (files: FileList | File[], preserveStructure = false) => {
+    const list = Array.from(files)
+    if (list.length === 0) return
+    setUploading(true)
+    try {
+      for (const file of list) {
+        const data = await readFileAsBase64(file)
+        const rel = (file as File & { webkitRelativePath?: string }).webkitRelativePath
+        const target = preserveStructure && rel
+          ? `${currentPath}/${rel}`
+          : await uniqueChildPath(currentPath, file.name)
+        await window.ipc.invoke('workspace:writeFile', {
+          path: target,
+          data,
+          opts: { encoding: 'base64', mkdirp: true },
+        })
+      }
+      toast(list.length === 1 ? 'Added' : `${list.length} items added`, 'success')
+    } catch (err) {
+      console.error('Failed to add files:', err)
+      toast('Failed to add', 'error')
+    } finally {
+      setUploading(false)
+    }
+  }, [currentPath])
+
+  // Drag-and-drop (only inside a workspace folder, not at the root grid).
+  // stopPropagation keeps the drop from also reaching the copilot's
+  // document-level drop listener when it lands on the workspace area.
+  const dropEnabled = !isRoot
+  const handleDragEnter = useCallback((e: React.DragEvent) => {
+    if (!dropEnabled) return
+    if (!Array.from(e.dataTransfer.types).includes('Files')) return
+    e.preventDefault()
+    e.stopPropagation()
+    dragDepthRef.current += 1
+    setIsDraggingOver(true)
+  }, [dropEnabled])
+  const handleDragOver = useCallback((e: React.DragEvent) => {
+    if (!dropEnabled) return
+    if (!Array.from(e.dataTransfer.types).includes('Files')) return
+    e.preventDefault()
+    e.stopPropagation()
+    e.dataTransfer.dropEffect = 'copy'
+  }, [dropEnabled])
+  const handleDragLeave = useCallback((e: React.DragEvent) => {
+    if (!dropEnabled) return
+    e.preventDefault()
+    e.stopPropagation()
+    dragDepthRef.current -= 1
+    if (dragDepthRef.current <= 0) {
+      dragDepthRef.current = 0
+      setIsDraggingOver(false)
+    }
+  }, [dropEnabled])
+  const handleDrop = useCallback((e: React.DragEvent) => {
+    if (!dropEnabled) return
+    e.preventDefault()
+    e.stopPropagation()
+    dragDepthRef.current = 0
+    setIsDraggingOver(false)
+    if (e.dataTransfer.files?.length) void uploadFiles(e.dataTransfer.files)
+  }, [dropEnabled, uploadFiles])
+
+  const resetAddDialog = useCallback(() => {
+    setNewName('')
+    setError(null)
+    setCreating(false)
+  }, [])
+
+  const handleCreate = useCallback(async () => {
+    const trimmed = newName.trim()
+    if (!trimmed) {
+      setError('Name is required')
+      return
+    }
+    if (trimmed.includes('/')) {
+      setError('Name cannot contain "/"')
+      return
+    }
+    setCreating(true)
+    setError(null)
+    try {
+      await onCreateWorkspace(trimmed)
+      setAddOpen(false)
+      resetAddDialog()
+    } catch (err) {
+      setError(err instanceof Error ? err.message : 'Failed to create workspace')
+      setCreating(false)
+    }
+  }, [newName, onCreateWorkspace, resetAddDialog])
+
+  return (
+    <div className="flex h-full flex-col overflow-hidden">
+      <div className="flex shrink-0 items-center justify-between gap-3 border-b border-border px-6 py-4">
+        <div className="flex min-w-0 items-center gap-1 text-sm">
+          <button
+            type="button"
+            onClick={() => setCurrentPath(WORKSPACE_ROOT)}
+            className={cn(
+              'inline-flex items-center gap-1.5 rounded-md px-2 py-1 transition-colors',
+              isRoot ? 'text-foreground' : 'text-muted-foreground hover:text-foreground hover:bg-accent',
+            )}
+          >
+            <Home className="size-4" />
+            <span className="font-medium">Workspace</span>
+          </button>
+          {breadcrumbs.map((crumb, idx) => {
+            const isLast = idx === breadcrumbs.length - 1
+            return (
+              <span key={crumb.path} className="flex items-center gap-1">
+                <ChevronRight className="size-4 text-muted-foreground/60" />
+                {isLast ? (
+                  <span className="rounded-md px-2 py-1 font-medium text-foreground truncate">
+                    {crumb.name}
+                  </span>
+                ) : (
+                  <button
+                    type="button"
+                    onClick={() => setCurrentPath(crumb.path)}
+                    className="rounded-md px-2 py-1 text-muted-foreground transition-colors hover:bg-accent hover:text-foreground truncate"
+                  >
+                    {crumb.name}
+                  </button>
+                )}
+              </span>
+            )
+          })}
+        </div>
+        {isRoot ? (
+          <Button size="sm" onClick={() => setAddOpen(true)}>
+            <Plus className="size-4" />
+            Add workspace
+          </Button>
+        ) : (
+          <DropdownMenu>
+            <DropdownMenuTrigger asChild>
+              <Button size="sm">
+                <Plus className="size-4" />
+                Add
+              </Button>
+            </DropdownMenuTrigger>
+            <DropdownMenuContent align="end">
+              <DropdownMenuItem onClick={() => filesInputRef.current?.click()}>
+                <FilePlus className="mr-2 size-4" />
+                Add files…
+              </DropdownMenuItem>
+              <DropdownMenuItem onClick={() => folderInputRef.current?.click()}>
+                <FolderPlus className="mr-2 size-4" />
+                Add folder…
+              </DropdownMenuItem>
+            </DropdownMenuContent>
+          </DropdownMenu>
+        )}
+      </div>
+      <input
+        ref={filesInputRef}
+        type="file"
+        multiple
+        className="hidden"
+        onChange={(e) => {
+          if (e.target.files?.length) void uploadFiles(e.target.files, false)
+          e.target.value = ''
+        }}
+      />
+      <input
+        ref={folderInputRef}
+        type="file"
+        // @ts-expect-error non-standard but supported in Chromium/Electron
+        webkitdirectory=""
+        directory=""
+        multiple
+        className="hidden"
+        onChange={(e) => {
+          if (e.target.files?.length) void uploadFiles(e.target.files, true)
+          e.target.value = ''
+        }}
+      />
+
+      <div
+        className="relative flex-1 overflow-y-auto px-6 py-6"
+        onDragEnter={handleDragEnter}
+        onDragOver={handleDragOver}
+        onDragLeave={handleDragLeave}
+        onDrop={handleDrop}
+      >
+        {items.length === 0 ? (
+          <div className="flex h-full flex-col items-center justify-center gap-3 text-center text-muted-foreground">
+            <FolderIcon className="size-10 opacity-50" />
+            <div className="text-sm">
+              {isRoot
+                ? 'No workspaces yet. Create one to get started.'
+                : 'This folder is empty. Drag files in or use New note / New folder.'}
+            </div>
+            {isRoot && (
+              <Button size="sm" variant="outline" onClick={() => setAddOpen(true)}>
+                <Plus className="size-4" />
+                Add workspace
+              </Button>
+            )}
+          </div>
+        ) : (
+          <div className="grid grid-cols-[repeat(auto-fill,minmax(180px,1fr))] gap-3">
+            {items.map((item) => {
+              const childCount = item.kind === 'dir' ? countChildren(item) : 0
+              const Icon = item.kind === 'dir' ? FolderIcon : FileIcon
+              const isRenaming = renameTarget === item.path
+              const card = (
+                <button
+                  type="button"
+                  onClick={() => handleItemClick(item)}
+                  className="group flex w-full flex-col items-start gap-2 rounded-lg border border-border bg-card p-4 text-left transition-colors hover:border-foreground/20 hover:bg-accent"
+                >
+                  <Icon className="size-6 text-muted-foreground group-hover:text-foreground" />
+                  <div className="min-w-0 w-full">
+                    {isRenaming ? (
+                      <Input
+                        autoFocus
+                        value={renameValue}
+                        onClick={(e) => e.stopPropagation()}
+                        onChange={(e) => setRenameValue(e.target.value)}
+                        onBlur={() => void commitRename()}
+                        onKeyDown={(e) => {
+                          e.stopPropagation()
+                          if (e.key === 'Enter') { e.preventDefault(); void commitRename() }
+                          else if (e.key === 'Escape') { e.preventDefault(); setRenameTarget(null) }
+                        }}
+                        className="h-6 text-sm"
+                      />
+                    ) : (
+                      <div className="truncate text-sm font-medium">{item.name}</div>
+                    )}
+                    {item.kind === 'dir' && !isRenaming && (
+                      <div className="text-xs text-muted-foreground">
+                        {childCount} {childCount === 1 ? 'item' : 'items'}
+                      </div>
+                    )}
+                  </div>
+                </button>
+              )
+              return (
+                <ContextMenu key={item.path}>
+                  <ContextMenuTrigger asChild>{card}</ContextMenuTrigger>
+                  <ContextMenuContent className="w-48">
+                    <ContextMenuItem onClick={() => beginRename(item)}>
+                      <Pencil className="mr-2 size-4" />
+                      Rename
+                    </ContextMenuItem>
+                    <ContextMenuItem onClick={() => { actions.copyPath(item.path); toast('Path copied', 'success') }}>
+                      <Copy className="mr-2 size-4" />
+                      Copy Path
+                    </ContextMenuItem>
+                    <ContextMenuItem onClick={() => actions.revealInFileManager(item.path, item.kind === 'dir')}>
+                      <FolderOpen className="mr-2 size-4" />
+                      Show in {fileManagerName}
+                    </ContextMenuItem>
+                    <ContextMenuSeparator />
+                    <ContextMenuItem variant="destructive" onClick={() => void handleDelete(item)}>
+                      <Trash2 className="mr-2 size-4" />
+                      Delete
+                    </ContextMenuItem>
+                  </ContextMenuContent>
+                </ContextMenu>
+              )
+            })}
+          </div>
+        )}
+
+        {dropEnabled && isDraggingOver && (
+          <div className="pointer-events-none absolute inset-3 z-10 flex flex-col items-center justify-center gap-2 rounded-xl border-2 border-dashed border-primary/60 bg-primary/5 text-primary">
+            <UploadCloud className="size-8" />
+            <span className="text-sm font-medium">Drop files to add to this folder</span>
+          </div>
+        )}
+        {uploading && (
+          <div className="pointer-events-none absolute bottom-4 right-4 z-10 rounded-md bg-foreground/80 px-3 py-1.5 text-xs text-background">
+            Adding files…
+          </div>
+        )}
+      </div>
+
+      <Dialog
+        open={addOpen}
+        onOpenChange={(open) => {
+          setAddOpen(open)
+          if (!open) resetAddDialog()
+        }}
+      >
+        <DialogContent>
+          <DialogHeader>
+            <DialogTitle>New workspace</DialogTitle>
+            <DialogDescription>
+              Workspaces are top-level folders inside knowledge/Workspace.
+            </DialogDescription>
+          </DialogHeader>
+          <div className="grid gap-2">
+            <label htmlFor="workspace-name" className="text-sm font-medium">Name</label>
+            <Input
+              id="workspace-name"
+              value={newName}
+              onChange={(e) => setNewName(e.target.value)}
+              placeholder="e.g. Alpha"
+              autoFocus
+              onKeyDown={(e) => {
+                if (e.key === 'Enter' && !creating) {
+                  e.preventDefault()
+                  void handleCreate()
+                }
+              }}
+            />
+            {error && <p className="text-xs text-destructive">{error}</p>}
+          </div>
+          <DialogFooter>
+            <Button
+              variant="outline"
+              onClick={() => {
+                setAddOpen(false)
+                resetAddDialog()
+              }}
+              disabled={creating}
+            >
+              Cancel
+            </Button>
+            <Button onClick={() => void handleCreate()} disabled={creating || !newName.trim()}>
+              {creating ? 'Creating…' : 'Create'}
+            </Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
+    </div>
+  )
+}
diff --git a/apps/x/apps/renderer/src/lib/calendar-event.ts b/apps/x/apps/renderer/src/lib/calendar-event.ts
index b7ace75a..fd532963 100644
--- a/apps/x/apps/renderer/src/lib/calendar-event.ts
+++ b/apps/x/apps/renderer/src/lib/calendar-event.ts
@@ -1,7 +1,23 @@
+/**
+ * Matches a video-conference join URL for the providers we support (Zoom,
+ * Microsoft Teams, Google Meet). Captures the full URL up to the first
+ * whitespace, quote, or angle/round/square bracket.
+ */
+const MEETING_URL_RE =
+  /https?:\/\/(?:[a-z0-9-]+\.)*(?:zoom\.us|zoomgov\.com|teams\.microsoft\.com|teams\.live\.com|meet\.google\.com)\/[^\s"'<>)\]]+/i
+
+function findMeetingUrl(value: unknown): string | undefined {
+  if (typeof value !== 'string') return undefined
+  const match = MEETING_URL_RE.exec(value)
+  // Calendar descriptions are often HTML, so decode &amp; back to & in the URL.
+  return match ? match[0].replace(/&amp;/g, '&') : undefined
+}
+
 /**
  * Extract a video conference link from raw Google Calendar event JSON.
- * Checks conferenceData.entryPoints (video type), hangoutLink, then falls back
- * to a top-level conferenceLink if present.
+ * Checks conferenceData.entryPoints (video type), hangoutLink, a top-level
+ * conferenceLink, then falls back to scanning the location/description for a
+ * known meeting URL (Zoom, Microsoft Teams, Google Meet).
  */
 export function extractConferenceLink(raw: Record<string, unknown>): string | undefined {
   const confData = raw.conferenceData as { entryPoints?: { entryPointType?: string; uri?: string }[] } | undefined
@@ -11,5 +27,5 @@ export function extractConferenceLink(raw: Record<string, unknown>): string | un
   }
   if (typeof raw.hangoutLink === 'string') return raw.hangoutLink
   if (typeof raw.conferenceLink === 'string') return raw.conferenceLink
-  return undefined
+  return findMeetingUrl(raw.location) ?? findMeetingUrl(raw.description)
 }