diff --git a/.github/workflows/build-and-notarize.yml b/.github/workflows/build-and-notarize.yml
index 39b8e1ba7..d29829d52 100644
--- a/.github/workflows/build-and-notarize.yml
+++ b/.github/workflows/build-and-notarize.yml
@@ -54,6 +54,11 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN || github.token }}
 
+      - name: Download Qdrant binary
+        run: node scripts/download-qdrant.js --current
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN || github.token }}
+
       - name: Cache Electron
         uses: actions/cache@v4
         with:
@@ -124,6 +129,11 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN || github.token }}
 
+      - name: Download Qdrant binary
+        run: node scripts/download-qdrant.js --current
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN || github.token }}
+
       - name: Download nircmd.exe
         run: node scripts/download-nircmd.js
         env:
@@ -132,12 +142,17 @@ jobs:
       - name: Download windows-fast-paste.exe
         run: node scripts/download-windows-fast-paste.js
         env:
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN || github.token }}
 
       - name: Download windows-key-listener.exe
         run: node scripts/download-windows-key-listener.js
         env:
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN || github.token }}
+
+      - name: Download windows-mic-listener.exe
+        run: node scripts/download-windows-mic-listener.js
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN || github.token }}
 
       - name: Cache Electron
         uses: actions/cache@v4
@@ -152,13 +167,16 @@ jobs:
           echo "GOOGLE_CALENDAR_CLIENT_ID=${{ secrets.GOOGLE_CALENDAR_CLIENT_ID }}" >> .env
           echo "GOOGLE_CALENDAR_CLIENT_SECRET=${{ secrets.GOOGLE_CALENDAR_CLIENT_SECRET }}" >> .env
 
-      - name: Build Application
+      - name: Build and Sign Application
         run: npm run build:win -- --publish never
         env:
           GH_TOKEN: ${{ secrets.GH_TOKEN || github.token }}
           VITE_NEON_AUTH_URL: ${{ vars.VITE_NEON_AUTH_URL }}
           VITE_OPENWHISPR_API_URL: ${{ vars.VITE_OPENWHISPR_API_URL }}
           VITE_OPENWHISPR_OAUTH_CALLBACK_URL: ${{ vars.VITE_OPENWHISPR_OAUTH_CALLBACK_URL }}
+          AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
+          AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
+          AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
 
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
@@ -212,6 +230,11 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN || github.token }}
 
+      - name: Download Qdrant binary
+        run: node scripts/download-qdrant.js --current --platform darwin --arch ${{ matrix.arch }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN || github.token }}
+
       - name: Cache Electron
         uses: actions/cache@v4
         with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d691d9737..7b3cc63ab 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -53,6 +53,11 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
 
+      - name: Download Qdrant binary
+        run: node scripts/download-qdrant.js --current
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+
       - name: Cache Electron
         uses: actions/cache@v4
         with:
@@ -116,6 +121,11 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
 
+      - name: Download Qdrant binary
+        run: node scripts/download-qdrant.js --current
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+
       - name: Download nircmd.exe
         run: node scripts/download-nircmd.js
         env:
@@ -131,6 +141,11 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
 
+      - name: Download windows-mic-listener.exe
+        run: node scripts/download-windows-mic-listener.js
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+
       - name: Cache Electron
         uses: actions/cache@v4
         with:
@@ -144,13 +159,16 @@ jobs:
           echo "GOOGLE_CALENDAR_CLIENT_ID=${{ secrets.GOOGLE_CALENDAR_CLIENT_ID }}" >> .env
           echo "GOOGLE_CALENDAR_CLIENT_SECRET=${{ secrets.GOOGLE_CALENDAR_CLIENT_SECRET }}" >> .env
 
-      - name: Build Application
+      - name: Build and Sign Application
         run: npm run build:win -- --publish always
         env:
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
           VITE_NEON_AUTH_URL: ${{ vars.VITE_NEON_AUTH_URL }}
           VITE_OPENWHISPR_API_URL: ${{ vars.VITE_OPENWHISPR_API_URL }}
           VITE_OPENWHISPR_OAUTH_CALLBACK_URL: ${{ vars.VITE_OPENWHISPR_OAUTH_CALLBACK_URL }}
+          AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
+          AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
+          AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
 
   build-macos:
     runs-on: macos-latest
@@ -197,6 +215,11 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
 
+      - name: Download Qdrant binary
+        run: node scripts/download-qdrant.js --current --platform darwin --arch ${{ matrix.arch }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+
       - name: Cache Electron
         uses: actions/cache@v4
         with:
diff --git a/.gitignore b/.gitignore
index 0e3eb2931..d57c43b08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -314,3 +314,4 @@ Thumbs.db
 .macos-fast-paste.hash
 .macos-fast-paste.*.hash
 .linux-fast-paste.hash
+.qdrant-initialized
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b064dd202..7b1a057d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,58 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.6.7] - 2026-04-02
+
+### Added
+
+- **Save Notes as Files**: Export notes to the local filesystem as Markdown files, mirroring folder hierarchy
+- **Responsive Settings Dialog**: Settings dialog adapts to narrow windows — sidebar collapses to icon rail, rows stack vertically, plan grid reflows
+- **Chat Sidebar**: Full sidebar chat tab with conversation history, cloud sync, and semantic search
+- **Chat UX Polish**: Empty state with illustration, shimmer thinking/streaming indicator, stop button, action buttons and search dialog
+- **Local Semantic Search**: Always-on Qdrant vector DB sidecar for offline semantic search across notes — hybrid FTS5 + vector with Reciprocal Rank Fusion
+- **Agent Tool Calling**: Agentic tool-calling system with note management tools (get, create, update, search), cloud agent support with NDJSON streaming, and local model tool calling with RAG context injection
+- **Embedded Chat in Notes**: Embedded chat panel in the note editor with floating and sidebar modes
+- **Per-GPU Device Selector**: Choose a specific GPU for transcription and intelligence processing (#539)
+- **Settings Keyboard Shortcut**: Cmd+, / Ctrl+, keyboard shortcut to open Settings
+- **Notes Actions Button**: Actions sidebar button with redesigned action editor dialog
+- **Notes Folder Picker**: Folder picker in the note metadata row with cleaned-up input styles
+- **Notes Sidebar Buttons**: New note and search notes buttons in the sidebar
+- **Meeting Echo Cancellation**: Echo cancellation on mic input and note metadata chips in meeting view
+- **Linux Wrapper Script**: Wrapper script to force XWayland and support user flags (#507)
+
+### Changed
+
+- **Vercel AI SDK Migration**: Agent mode migrated from raw API calls to Vercel AI SDK
+- **Notes Bottom Bar Redesign**: Redesigned bottom bar with compact action picker
+- **Dialog Design System Alignment**: All dialogs aligned with design system guidelines
+- **Removed Note Word Count**: Removed word count from note editor
+- **Cloud Agent Streaming**: Stream cloud agent responses directly from the renderer via IPC
+
+### Fixed
+
+- **Meeting Auto-Detection**: Fix auto-detection not firing for browser meetings
+- **Meeting Transcription Provider**: Use local transcription provider for notes/meeting recording (#530)
+- **Meeting Partial Transcript Spam**: Prevent partial transcript spam and duplicate final segments
+- **Meeting Notification Timing**: Resolve notification popup timing and detection lifecycle bugs
+- **Folder/Note Race Conditions**: Resolve race conditions when switching folders quickly, prevent meeting view from exiting when changing folder, fix rapid delete/switch state management
+- **Clipboard Preservation**: Preserve images and HTML in clipboard during paste-and-restore (#381)
+- **Transcription Retry Provider**: Retry transcription uses configured provider instead of forcing Parakeet
+- **JSON Parse Validation**: Validate JSON.parse result type before calling .replace() in prompts (#541)
+- **GPU Selector Polish**: Address code review feedback, rename Intelligence GPU label, fix dropdown chevron padding (#539)
+- **Chat Duplicate Conversations**: Fix duplicate conversations — includeArchived filter returned all instead of only archived
+- **Linux Wayland Fixes**: Force XWayland on KDE/GNOME Wayland, fix hotkey startup race; use uinput before portal on GNOME Wayland (#468, #494)
+- **Mic Permission Gate**: Remove mic permission gate, fix system audio detection
+- **Windows Build Signing**: Fix Windows build signing on PRs, add missing mic-listener download, add missing publisherName to Azure signing config
+- **Dead optimizeAudio Crash**: Remove dead optimizeAudio call that crashes on recordings over 90 seconds (#524)
+- **Download URL Logging**: Remove URL truncation from download log and add failure logging (#540)
+
+### Security
+
+- **picomatch**: Bump to 4.0.4
+- **brace-expansion**: Bump to 1.1.13 (security backport)
+- **yaml**: Bump to 2.8.3
+- **tar**: Bump to 7.5.13
+
 ## [1.6.6] - 2026-03-19
 
 ### Added
diff --git a/CLAUDE.md b/CLAUDE.md
index b556ee40a..b94cd01fa 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -104,6 +104,9 @@ OpenWhispr is an Electron-based desktop dictation application that uses whisper.
 - **whisper.js**: Local whisper.cpp integration and model management
 - **parakeet.js**: NVIDIA Parakeet model management via sherpa-onnx
 - **parakeetServer.js**: sherpa-onnx CLI wrapper for transcription
+- **qdrantManager.js**: Qdrant vector DB sidecar process lifecycle (spawn, health check, shutdown)
+- **localEmbeddings.js**: Local text embedding via ONNX Runtime + all-MiniLM-L6-v2 (384-dim vectors)
+- **vectorIndex.js**: Qdrant collection management — upsert, delete, search, batch reindex
 - **windowConfig.js**: Centralized window configuration
 - **windowManager.js**: Window creation and lifecycle management
 
@@ -161,6 +164,32 @@ OpenWhispr is an Electron-based desktop dictation application that uses whisper.
 
 - **Download URLs**: Models from sherpa-onnx ASR models release on GitHub
 
+### Local Semantic Search (Qdrant + MiniLM)
+
+Always-on offline semantic search that finds notes by meaning, not just keywords. Used by the AI agent's `search_notes` tool. Qdrant starts automatically on app launch; embedding model auto-downloads on first run if missing.
+
+**Architecture**:
+- **Qdrant sidecar**: Rust binary spawned as child process (`qdrantManager.js`), port 6333–6350
+- **Embedding model**: `all-MiniLM-L6-v2` via ONNX Runtime (`localEmbeddings.js`), 384-dim vectors
+- **Vector index**: Qdrant collection management (`vectorIndex.js`), cosine distance
+- **Hybrid search**: FTS5 + Qdrant in parallel → Reciprocal Rank Fusion (K=60) with 0.3 cosine score threshold
+
+**Pipeline**:
+1. App launches → Qdrant binary starts → collection created. Embedding model auto-downloads if missing (~22MB)
+2. Note create/update/delete → SQLite write → background vector upsert/delete via `_asyncVectorUpsert()`/`_asyncVectorDelete()`
+3. Agent searches → `db-semantic-search-notes` IPC → parallel FTS5 + vector search → RRF merge → ranked results
+
+**Search fallback chain** (in `searchNotesTool.ts`): cloud search → local semantic → FTS5 keyword
+
+**Storage**:
+- Qdrant data: `~/.cache/openwhispr/qdrant-data/`
+- Qdrant binary: `resources/bin/qdrant-{platform}-{arch}` (bundled — downloaded during `prebuild` / `predev`)
+- Embedding model: `~/.cache/openwhispr/embedding-models/all-MiniLM-L6-v2/` (auto-downloaded on first launch)
+
+**Dependencies**: `@qdrant/js-client-rest`, `onnxruntime-node`
+
+**Dev setup**: The Qdrant binary downloads automatically via `predev`/`prestart`. The embedding model auto-downloads on first app launch. To manually download: `npm run download:qdrant` and `npm run download:embedding-model`.
+
 ### Build Scripts (scripts/)
 
 - **download-whisper-cpp.js**: Downloads whisper.cpp binaries from GitHub releases
@@ -169,6 +198,8 @@ OpenWhispr is an Electron-based desktop dictation application that uses whisper.
 - **download-windows-key-listener.js**: Downloads prebuilt Windows key listener binary
 - **download-windows-mic-listener.js**: Downloads prebuilt Windows mic listener binary
 - **download-sherpa-onnx.js**: Downloads sherpa-onnx binaries for Parakeet support
+- **download-qdrant.js**: Downloads Qdrant vector DB binary for local semantic search
+- **download-minilm.js**: Downloads all-MiniLM-L6-v2 ONNX model + tokenizer for local embeddings
 - **build-globe-listener.js**: Compiles macOS Globe key listener from Swift source
 - **build-macos-mic-listener.js**: Compiles macOS mic listener from Swift source
 - **build-windows-key-listener.js**: Compiles Windows key listener (for local development)
@@ -230,9 +261,9 @@ CREATE TABLE transcriptions (
 Settings stored in localStorage with these keys:
 - `whisperModel`: Selected Whisper model
 - `useLocalWhisper`: Boolean for local vs cloud
-- `openaiApiKey`: Encrypted API key
-- `anthropicApiKey`: Encrypted API key
-- `geminiApiKey`: Encrypted API key
+- `openaiApiKey`: API key (plaintext)
+- `anthropicApiKey`: API key (plaintext)
+- `geminiApiKey`: API key (plaintext)
 - `language`: Selected language code
 - `agentName`: User's custom agent name
 - `reasoningModel`: Selected AI model for processing
@@ -520,7 +551,8 @@ const { t } = useTranslation();
 2. **New Setting**: Update useSettings.ts and SettingsPage.tsx
 3. **New UI Component**: Follow shadcn/ui patterns in src/components/ui
 4. **New Manager**: Create in src/helpers/, initialize in main.js
-5. **New UI Strings**: Add translation keys to all 9 language files (see i18n section above)
+5. **New UI Strings**: Add translation keys to all 10 language files (see i18n section above)
+6. **New Sidecar Binary**: Add download script in `scripts/`, add to `prebuild*` scripts in package.json, add manager in `src/helpers/`, initialize in `main.js`, shutdown in `will-quit` handler
 
 ### Testing Checklist
 
@@ -539,6 +571,9 @@ const { t } = useTranslation();
 - [ ] Verify meeting detection works with event-driven mode (check debug logs for "event-driven")
 - [ ] Test meeting notification suppression during recording
 - [ ] Test post-recording cooldown (notifications shouldn't flash immediately)
+- [ ] Create a note about "quarterly revenue projections", search via agent for "financial forecast" — should match semantically
+- [ ] Verify Qdrant starts on app launch (check debug logs for "qdrant started successfully")
+- [ ] Kill Qdrant process manually — verify FTS5 keyword search still works as fallback
 
 ### Common Issues and Solutions
 
@@ -583,6 +618,14 @@ const { t } = useTranslation();
    - Linux: Verify `pactl` is installed (`pulseaudio-utils` or `pipewire-pulse` package)
    - If event-driven binary is missing, detection falls back to polling automatically
 
+7. **Local Semantic Search Not Working**:
+   - Qdrant binary should be in `resources/bin/qdrant-{platform}-{arch}` (auto-downloaded during `predev`/`prebuild`)
+   - Embedding model should be in `~/.cache/openwhispr/embedding-models/all-MiniLM-L6-v2/model.onnx` (auto-downloaded on first app launch)
+   - Run `npm run download:qdrant` and `npm run download:embedding-model` manually if missing
+   - Check debug logs for "qdrant" entries (port, health check, errors)
+   - If Qdrant fails to start, search still works via FTS5 keyword fallback
+   - Semantic search is only available through the AI agent's `search_notes` tool, not the manual search UI
+
 ### Platform-Specific Notes
 
 **macOS**:
@@ -650,7 +693,7 @@ const { t } = useTranslation();
 
 ## Security Considerations
 
-- API keys stored in system keychain when possible
+- API keys stored in plaintext in userData `.env` and localStorage (not yet encrypted — see #532)
 - Context isolation enabled
 - No remote code execution
 - Sanitized file paths
diff --git a/README.md b/README.md
index c061b19f5..fc713dd14 100644
--- a/README.md
+++ b/README.md
@@ -45,6 +45,7 @@ This project is licensed under the MIT License - see the [LICENSE](LICENSE) file
   - **Google**: Gemini 3.1 Pro, Gemini 3 Flash, Gemini 2.5 Flash Lite
   - **Groq**: Ultra-fast inference with Llama and Mixtral models
   - **Local**: Qwen, LLaMA, Mistral, Gemma models via llama.cpp
+- 🛠️ **Agent Tool Calling**: Agentic tools for searching, creating, and updating notes — with RAG context injection for local models
 - 🤖 **AI Actions**: Apply AI-powered actions to notes with customizable processing templates
 
 ### Meeting Transcription
@@ -59,8 +60,11 @@ This project is licensed under the MIT License - see the [LICENSE](LICENSE) file
 
 - 📝 **Notes System**: Create, edit, and organize notes with folders, audio upload, and real-time dictation
 - 🔎 **Full-Text Search**: FTS5-powered search across all note content with Cmd+K command palette
+- 🧠 **Local Semantic Search**: Always-on Qdrant vector DB with MiniLM embeddings for offline meaning-based search across notes
 - ☁️ **Cloud Sync**: Local-first storage with cloud backup and semantic search
+- 💬 **Embedded Chat**: Chat panel in the note editor with floating and sidebar modes
 - 📁 **Folder Organization**: Organize notes into custom folders with drag-and-drop
+- 💾 **Save Notes as Files**: Export notes to the local filesystem as Markdown files, mirroring your folder hierarchy
 
 ### Cloud & Account
 
@@ -73,6 +77,7 @@ This project is licensed under the MIT License - see the [LICENSE](LICENSE) file
 
 - 🌐 **Cross-Platform**: Works on macOS, Windows, and Linux
 - 🎨 **Modern UI**: Built with React 19, TypeScript, and Tailwind CSS v4
+- 📱 **Responsive Settings**: Settings dialog adapts to narrow windows with collapsible icon-rail sidebar and stacked layouts
 - 🖱️ **Draggable Interface**: Move the dictation panel anywhere on your screen with configurable start position
 - 🌐 **Globe Key Toggle (macOS)**: Optional Fn/Globe key listener for a hardware-level dictation trigger — no Input Monitoring permission required
 - ⌨️ **Compound Hotkeys**: Support for multi-key combinations like `Cmd+Shift+K`
@@ -849,7 +854,7 @@ A: No. As of v1.6.0, OpenWhispr uses NSEvent monitors instead of CGEvent taps, e
 
 ## Project Status
 
-OpenWhispr is actively maintained and ready for production use. Current version: 1.6.6
+OpenWhispr is actively maintained and ready for production use. Current version: 1.6.7
 
 - ✅ Core dictation with local and cloud processing
 - ✅ Cross-platform support (macOS, Windows, Linux)
diff --git a/SECURITY.md b/SECURITY.md
index ff934f7fa..f2c816f35 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -39,8 +39,11 @@ Out of scope:
 - **Local-first audio processing** — Audio is transcribed on-device using
   whisper.cpp or nvidia parakeet. Recordings are not sent to external servers unless explicitly
   configured by the user.
-- **Credential storage** — Sensitive credentials are stored using Electron's
-  `safeStorage` API where available.
+- **Credential storage** — API keys provided by users (BYOK) are stored in
+  plaintext in the app's `userData` directory (`.env` file and Electron
+  `localStorage`). They are readable by any process running as the current OS
+  user. Migrating to Electron's `safeStorage` API for platform-native
+  encryption is tracked in [#532](https://github.com/OpenWhispr/openwhispr/issues/532).
 - **Native binaries** — Platform-specific helpers (key listeners, paste
   utilities) are compiled from source during the build process.
 - **Context isolation** — The Electron renderer runs with context isolation
diff --git a/electron-builder.json b/electron-builder.json
index 204767707..4502e751f 100644
--- a/electron-builder.json
+++ b/electron-builder.json
@@ -83,7 +83,7 @@
     "!**/node_modules/**/CHANGELOG*",
     "!**/node_modules/**/.github/**"
   ],
-  "asarUnpack": ["**/node_modules/ffmpeg-static/**/*", "**/node_modules/better-sqlite3/**/*"],
+  "asarUnpack": ["**/node_modules/ffmpeg-static/**/*", "**/node_modules/better-sqlite3/**/*", "**/node_modules/onnxruntime-node/**/*"],
   "extraResources": [
     ".env",
     "src/assets/**/*",
@@ -103,10 +103,12 @@
         "whisper-server-*",
         "llama-server-*",
         "sherpa-onnx-*",
+        "qdrant-*",
         "windows-key-listener*",
         "windows-mic-listener*",
         "windows-text-monitor*",
         "windows-fast-paste*",
+        "all-MiniLM-L6-v2/**/*",
         "*.dylib",
         "*.dll",
         "*.so*"
@@ -133,6 +135,12 @@
   "win": {
     "target": ["nsis", "portable"],
     "icon": "src/assets/icon.ico",
+    "azureSignOptions": {
+      "endpoint": "https://eus.codesigning.azure.net/",
+      "certificateProfileName": "openwhispr-release",
+      "codeSigningAccountName": "OpenWhispr",
+      "publisherName": "CN=Gizmo Labs Inc., O=Gizmo Labs Inc., L=Wilmington, S=Delaware, C=US"
+    },
     "extraResources": [
       {
         "from": "resources/bin/nircmd.exe",
diff --git a/main.js b/main.js
index 02d7c8a04..8454dea35 100644
--- a/main.js
+++ b/main.js
@@ -1,3 +1,21 @@
+// KDE/GNOME Wayland: self-relaunch with --ozone-platform=x11 to force XWayland.
+// Chromium picks the display backend before JS runs, so appendSwitch is too late.
+if (
+  process.platform === "linux" &&
+  process.env.XDG_SESSION_TYPE === "wayland" &&
+  !process.argv.includes("--ozone-platform=x11")
+) {
+  const desktop = (process.env.XDG_CURRENT_DESKTOP || "").toLowerCase();
+  if (desktop.includes("kde") || /gnome|ubuntu|unity/.test(desktop)) {
+    const { spawn } = require("child_process");
+    spawn(process.execPath, [...process.argv.slice(1), "--ozone-platform=x11"], {
+      stdio: "inherit",
+      detached: true,
+    }).unref();
+    process.exit(0);
+  }
+}
+
 const {
   app,
   globalShortcut,
@@ -62,6 +80,13 @@ function configureChannelUserDataPath() {
 
 configureChannelUserDataPath();
 
+// Load userData .env (contains DICTATION_KEY, API keys, etc.) early — before
+// hotkey registration, which needs DICTATION_KEY before the renderer loads.
+require("dotenv").config({
+  path: path.join(app.getPath("userData"), ".env"),
+  override: false,
+});
+
 // Fix transparent window flickering on Linux: --enable-transparent-visuals requires
 // the compositor to set up an ARGB visual before any windows are created.
 // --disable-gpu-compositing prevents GPU compositing conflicts with the compositor.
@@ -79,13 +104,7 @@ if (process.platform === "win32") {
 // force --ozone-platform=x11 before Electron starts. appendSwitch below is a
 // best-effort fallback for unpackaged dev mode (may not take effect on E39+).
 if (process.platform === "linux" && process.env.XDG_SESSION_TYPE === "wayland") {
-  const desktop = (process.env.XDG_CURRENT_DESKTOP || "").toLowerCase();
-  if (desktop.includes("kde")) {
-    app.commandLine.appendSwitch("ozone-platform-hint", "x11");
-  } else {
-    app.commandLine.appendSwitch("ozone-platform-hint", "auto");
-  }
-  app.commandLine.appendSwitch("enable-features", "UseOzonePlatform,WaylandWindowDecorations");
+  app.commandLine.appendSwitch("enable-features", "WaylandWindowDecorations");
 }
 
 // Set desktop filename so Wayland compositors can match windows to the .desktop entry.
@@ -209,6 +228,7 @@ let whisperCudaManager = null;
 let googleCalendarManager = null;
 let meetingDetectionEngine = null;
 let audioTapManager = null;
+let qdrantManager = null;
 let ipcHandlers = null;
 let globeKeyAlertShown = false;
 let authBridgeServer = null;
@@ -664,6 +684,32 @@ async function startApp() {
     });
   }
 
+  const QdrantManager = require("./src/helpers/qdrantManager");
+  qdrantManager = new QdrantManager();
+  if (qdrantManager.isAvailable()) {
+    qdrantManager
+      .start()
+      .then(() => {
+        if (qdrantManager.isReady()) {
+          const vectorIndex = require("./src/helpers/vectorIndex");
+          vectorIndex.init(qdrantManager.getPort());
+          vectorIndex.ensureCollection().catch((err) => {
+            debugLogger.debug("Qdrant collection setup error (non-fatal)", { error: err.message });
+          });
+        }
+      })
+      .catch((err) => {
+        debugLogger.debug("Qdrant startup error (non-fatal)", { error: err.message });
+      });
+  }
+
+  const localEmbeddings = require("./src/helpers/localEmbeddings");
+  if (!localEmbeddings.isAvailable()) {
+    localEmbeddings.downloadModel().catch((err) => {
+      debugLogger.debug("Embedding model download error (non-fatal)", { error: err.message });
+    });
+  }
+
   if (process.platform === "win32") {
     const nircmdStatus = clipboardManager.getNircmdStatus();
     debugLogger.debug("Windows paste tool status", nircmdStatus);
@@ -1144,5 +1190,8 @@ if (gotSingleInstanceLock) {
     // Stop llama-server if running
     const modelManager = require("./src/helpers/modelManagerBridge").default;
     modelManager.stopServer().catch(() => {});
+    if (qdrantManager) {
+      qdrantManager.stop().catch(() => {});
+    }
   });
 }
diff --git a/package-lock.json b/package-lock.json
index 92e705617..37c1f9b53 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,17 +1,22 @@
 {
   "name": "open-whispr",
-  "version": "1.6.6",
+  "version": "1.6.7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "open-whispr",
-      "version": "1.6.6",
+      "version": "1.6.7",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
+        "@ai-sdk/anthropic": "^3.0.58",
+        "@ai-sdk/google": "^3.0.43",
+        "@ai-sdk/groq": "^3.0.29",
+        "@ai-sdk/openai": "^3.0.41",
         "@neondatabase/auth": "^0.2.0-beta.1",
         "@neondatabase/neon-js": "^0.1.0-beta.22",
+        "@qdrant/js-client-rest": "^1.12.0",
         "@radix-ui/react-accordion": "^1.1.2",
         "@radix-ui/react-dialog": "^1.1.14",
         "@radix-ui/react-dropdown-menu": "^2.1.15",
@@ -20,6 +25,7 @@
         "@radix-ui/react-select": "^2.2.5",
         "@radix-ui/react-slot": "^1.2.3",
         "@radix-ui/react-tabs": "^1.1.12",
+        "@tanstack/react-virtual": "^3.13.2",
         "@tiptap/core": "^3.20.4",
         "@tiptap/extension-placeholder": "^3.20.4",
         "@tiptap/extension-task-item": "^3.20.4",
@@ -27,6 +33,7 @@
         "@tiptap/react": "^3.20.4",
         "@tiptap/starter-kit": "^3.20.4",
         "@vercel/blob": "^2.3.0",
+        "ai": "^6.0.116",
         "better-sqlite3": "^12.8.0",
         "class-variance-authority": "^0.7.1",
         "clsx": "^2.1.1",
@@ -39,6 +46,7 @@
         "kysely": "^0.28.14",
         "lucide-react": "^0.518.0",
         "object-assign": "^4.1.1",
+        "onnxruntime-node": "^1.21.0",
         "ps-list": "^9.0.0",
         "react": "^19.1.0",
         "react-dom": "^19.1.0",
@@ -82,6 +90,116 @@
         "node": ">=22"
       }
     },
+    "node_modules/@ai-sdk/anthropic": {
+      "version": "3.0.64",
+      "resolved": "https://registry.npmjs.org/@ai-sdk/anthropic/-/anthropic-3.0.64.tgz",
+      "integrity": "sha512-rwLi/Rsuj2pYniQXIrvClHvXDzgM4UQHHnvHTWEF14efnlKclG/1ghpNC+adsRujAbCTr6gRsSbDE2vEqriV7g==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@ai-sdk/provider": "3.0.8",
+        "@ai-sdk/provider-utils": "4.0.21"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "zod": "^3.25.76 || ^4.1.8"
+      }
+    },
+    "node_modules/@ai-sdk/gateway": {
+      "version": "3.0.84",
+      "resolved": "https://registry.npmjs.org/@ai-sdk/gateway/-/gateway-3.0.84.tgz",
+      "integrity": "sha512-RnUw6UNvkaw9MEaJU9cIjA+WBP+ZR5+M/9nfbfJHcGKtTbcWXijJuYKx9nYRnm+qU+iiakb0XvQA/vvho6lTsw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@ai-sdk/provider": "3.0.8",
+        "@ai-sdk/provider-utils": "4.0.21",
+        "@vercel/oidc": "3.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "zod": "^3.25.76 || ^4.1.8"
+      }
+    },
+    "node_modules/@ai-sdk/google": {
+      "version": "3.0.55",
+      "resolved": "https://registry.npmjs.org/@ai-sdk/google/-/google-3.0.55.tgz",
+      "integrity": "sha512-lIID7kDdeqzSR/eg+LrEFJGoe/mIwuW4eBdjS84Bi0cIY4cmGwSsvwYILSdiad0197Ha+DUbCxOUuSOnORUx7g==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@ai-sdk/provider": "3.0.8",
+        "@ai-sdk/provider-utils": "4.0.21"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "zod": "^3.25.76 || ^4.1.8"
+      }
+    },
+    "node_modules/@ai-sdk/groq": {
+      "version": "3.0.32",
+      "resolved": "https://registry.npmjs.org/@ai-sdk/groq/-/groq-3.0.32.tgz",
+      "integrity": "sha512-cKa+viBUgkY0GVWDAMYYOaRS+r9PNJvstfLujqi8YQSlpknQsE+J9TeG8b8bjkAnMnCpUd8s/ZEJHMuKzp+rYQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@ai-sdk/provider": "3.0.8",
+        "@ai-sdk/provider-utils": "4.0.21"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "zod": "^3.25.76 || ^4.1.8"
+      }
+    },
+    "node_modules/@ai-sdk/openai": {
+      "version": "3.0.49",
+      "resolved": "https://registry.npmjs.org/@ai-sdk/openai/-/openai-3.0.49.tgz",
+      "integrity": "sha512-U2f0pCyNn/jQH3wjgxr8o9VvCkuDFTtXbIhbFFtgXqCzMbed6rBnvzQcAMEK0/Pa44byL9zfcvCOFOflvkRA8w==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@ai-sdk/provider": "3.0.8",
+        "@ai-sdk/provider-utils": "4.0.21"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "zod": "^3.25.76 || ^4.1.8"
+      }
+    },
+    "node_modules/@ai-sdk/provider": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@ai-sdk/provider/-/provider-3.0.8.tgz",
+      "integrity": "sha512-oGMAgGoQdBXbZqNG0Ze56CHjDZ1IDYOwGYxYjO5KLSlz5HiNQ9udIXsPZ61VWaHGZ5XW/jyjmr6t2xz2jGVwbQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "json-schema": "^0.4.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@ai-sdk/provider-utils": {
+      "version": "4.0.21",
+      "resolved": "https://registry.npmjs.org/@ai-sdk/provider-utils/-/provider-utils-4.0.21.tgz",
+      "integrity": "sha512-MtFUYI1/8mgDvRmaBDjbLJPFFrMG777AvSgyIFQtZHIMzm88R/12vYBBpnk7pfiWLFE1DSZzY4WDYzGbKAcmiw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@ai-sdk/provider": "3.0.8",
+        "@standard-schema/spec": "^1.1.0",
+        "eventsource-parser": "^3.0.6"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "zod": "^3.25.76 || ^4.1.8"
+      }
+    },
     "node_modules/@babel/code-frame": {
       "version": "7.29.0",
       "dev": true,
@@ -3441,6 +3559,33 @@
         "@opentelemetry/api": "^1.8"
       }
     },
+    "node_modules/@qdrant/js-client-rest": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/@qdrant/js-client-rest/-/js-client-rest-1.17.0.tgz",
+      "integrity": "sha512-aZFQeirWVqWAa1a8vJ957LMzcXkFHGbsoRhzc8AkGfg6V0jtK8PlG8/eyyc2xhYsR961FDDx1Tx6nyE0K7lS+A==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@qdrant/openapi-typescript-fetch": "1.2.6",
+        "undici": "^6.23.0"
+      },
+      "engines": {
+        "node": ">=18.17.0",
+        "pnpm": ">=8"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.7"
+      }
+    },
+    "node_modules/@qdrant/openapi-typescript-fetch": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@qdrant/openapi-typescript-fetch/-/openapi-typescript-fetch-1.2.6.tgz",
+      "integrity": "sha512-oQG/FejNpItrxRHoyctYvT3rwGZOnK4jr3JdppO/c78ktDvkWiPXPHNsrDf33K9sZdRb6PR7gi4noIapu5q4HA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.0.0",
+        "pnpm": ">=8"
+      }
+    },
     "node_modules/@radix-ui/number": {
       "version": "1.1.1",
       "license": "MIT"
@@ -5693,6 +5838,33 @@
         "react": "^18 || ^19"
       }
     },
+    "node_modules/@tanstack/react-virtual": {
+      "version": "3.13.23",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-virtual/-/react-virtual-3.13.23.tgz",
+      "integrity": "sha512-XnMRnHQ23piOVj2bzJqHrRrLg4r+F86fuBcwteKfbIjJrtGxb4z7tIvPVAe4B+4UVwo9G4Giuz5fmapcrnZ0OQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@tanstack/virtual-core": "3.13.23"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/tannerlinsley"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+      }
+    },
+    "node_modules/@tanstack/virtual-core": {
+      "version": "3.13.23",
+      "resolved": "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.13.23.tgz",
+      "integrity": "sha512-zSz2Z2HNyLjCplANTDyl3BcdQJc2k1+yyFoKhNRmCr7V7dY8o8q5m8uFTI1/Pg1kL+Hgrz6u3Xo6eFUB7l66cg==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/tannerlinsley"
+      }
+    },
     "node_modules/@tiptap/core": {
       "version": "3.21.0",
       "resolved": "https://registry.npmjs.org/@tiptap/core/-/core-3.21.0.tgz",
@@ -6684,6 +6856,15 @@
         "node": ">=20.0.0"
       }
     },
+    "node_modules/@vercel/oidc": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@vercel/oidc/-/oidc-3.1.0.tgz",
+      "integrity": "sha512-Fw28YZpRnA3cAHHDlkt7xQHiJ0fcL+NRcIqsocZQUSmbzeIKRpwttJjik5ZGanXP+vlA4SbTg+AbA3bP363l+w==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">= 20"
+      }
+    },
     "node_modules/@vitejs/plugin-react": {
       "version": "4.7.0",
       "dev": true,
@@ -6775,6 +6956,15 @@
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
+    "node_modules/adm-zip": {
+      "version": "0.5.17",
+      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.17.tgz",
+      "integrity": "sha512-+Ut8d9LLqwEvHHJl1+PIHqoyDxFgVN847JTVM3Izi3xHDWPE4UtzzXysMZQs64DMcrJfBeS/uoEP4AD3HQHnQQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.0"
+      }
+    },
     "node_modules/agent-base": {
       "version": "7.1.4",
       "dev": true,
@@ -6783,6 +6973,24 @@
         "node": ">= 14"
       }
     },
+    "node_modules/ai": {
+      "version": "6.0.142",
+      "resolved": "https://registry.npmjs.org/ai/-/ai-6.0.142.tgz",
+      "integrity": "sha512-ZoxAsnTL/dFg5WdcwC8QNhKVlLtqwwT3I7p/4i8IJJP+6ZwqF1ljuwMsAsPYYvppZ+RzUxjxxFGb1cbEhNH3dg==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@ai-sdk/gateway": "3.0.84",
+        "@ai-sdk/provider": "3.0.8",
+        "@ai-sdk/provider-utils": "4.0.21",
+        "@opentelemetry/api": "1.9.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "zod": "^3.25.76 || ^4.1.8"
+      }
+    },
     "node_modules/ajv": {
       "version": "6.14.0",
       "dev": true,
@@ -7359,9 +7567,7 @@
     },
     "node_modules/boolean": {
       "version": "3.2.0",
-      "dev": true,
-      "license": "MIT",
-      "optional": true
+      "license": "MIT"
     },
     "node_modules/brace-expansion": {
       "version": "2.0.3",
@@ -8114,9 +8320,7 @@
     },
     "node_modules/define-data-property": {
       "version": "1.1.4",
-      "dev": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "es-define-property": "^1.0.0",
         "es-errors": "^1.3.0",
@@ -8131,9 +8335,7 @@
     },
     "node_modules/define-properties": {
       "version": "1.2.1",
-      "dev": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "define-data-property": "^1.0.1",
         "has-property-descriptors": "^1.0.0",
@@ -8194,9 +8396,7 @@
     },
     "node_modules/detect-node": {
       "version": "2.1.0",
-      "dev": true,
-      "license": "MIT",
-      "optional": true
+      "license": "MIT"
     },
     "node_modules/detect-node-es": {
       "version": "1.1.0",
@@ -8756,7 +8956,6 @@
     },
     "node_modules/es-define-property": {
       "version": "1.0.1",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -8764,7 +8963,6 @@
     },
     "node_modules/es-errors": {
       "version": "1.3.0",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -8797,9 +8995,7 @@
     },
     "node_modules/es6-error": {
       "version": "4.1.1",
-      "dev": true,
-      "license": "MIT",
-      "optional": true
+      "license": "MIT"
     },
     "node_modules/esbuild": {
       "version": "0.25.12",
@@ -9088,7 +9284,6 @@
       "resolved": "https://registry.npmjs.org/eventsource-parser/-/eventsource-parser-3.0.6.tgz",
       "integrity": "sha512-Vo1ab+QXPzZ4tCa8SwIHJFaSzy4R6SHf7BY79rFBDf0idraZWAkYrDjDj8uWaSm3S2TK+hJ7/t1CEmZ7jXw+pg==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=18.0.0"
       }
@@ -9689,9 +9884,7 @@
     },
     "node_modules/global-agent": {
       "version": "3.0.0",
-      "dev": true,
       "license": "BSD-3-Clause",
-      "optional": true,
       "dependencies": {
         "boolean": "^3.0.1",
         "es6-error": "^4.1.1",
@@ -9717,9 +9910,7 @@
     },
     "node_modules/globalthis": {
       "version": "1.0.4",
-      "dev": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "define-properties": "^1.2.1",
         "gopd": "^1.0.1"
@@ -9733,7 +9924,6 @@
     },
     "node_modules/gopd": {
       "version": "1.2.0",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -9780,9 +9970,7 @@
     },
     "node_modules/has-property-descriptors": {
       "version": "1.0.2",
-      "dev": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "es-define-property": "^1.0.0"
       },
@@ -10445,6 +10633,12 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/json-schema": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
+      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
+      "license": "(AFL-2.1 OR BSD-3-Clause)"
+    },
     "node_modules/json-schema-ref-resolver": {
       "version": "1.0.1",
       "license": "MIT",
@@ -10479,9 +10673,7 @@
     },
     "node_modules/json-stringify-safe": {
       "version": "5.0.1",
-      "dev": true,
-      "license": "ISC",
-      "optional": true
+      "license": "ISC"
     },
     "node_modules/json5": {
       "version": "2.2.3",
@@ -10788,9 +10980,7 @@
     },
     "node_modules/matcher": {
       "version": "3.0.0",
-      "dev": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "escape-string-regexp": "^4.0.0"
       },
@@ -11798,9 +11988,7 @@
     },
     "node_modules/object-keys": {
       "version": "1.1.1",
-      "dev": true,
       "license": "MIT",
-      "optional": true,
       "engines": {
         "node": ">= 0.4"
       }
@@ -11837,6 +12025,29 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/onnxruntime-common": {
+      "version": "1.24.3",
+      "resolved": "https://registry.npmjs.org/onnxruntime-common/-/onnxruntime-common-1.24.3.tgz",
+      "integrity": "sha512-GeuPZO6U/LBJXvwdaqHbuUmoXiEdeCjWi/EG7Y1HNnDwJYuk6WUbNXpF6luSUY8yASul3cmUlLGrCCL1ZgVXqA==",
+      "license": "MIT"
+    },
+    "node_modules/onnxruntime-node": {
+      "version": "1.24.3",
+      "resolved": "https://registry.npmjs.org/onnxruntime-node/-/onnxruntime-node-1.24.3.tgz",
+      "integrity": "sha512-JH7+czbc8ALA819vlTgcV+Q214/+VjGeBHDjX81+ZCD0PCVCIFGFNtT0V4sXG/1JXypKPgScQcB3ij/hk3YnTg==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "os": [
+        "win32",
+        "darwin",
+        "linux"
+      ],
+      "dependencies": {
+        "adm-zip": "^0.5.16",
+        "global-agent": "^3.0.0",
+        "onnxruntime-common": "1.24.3"
+      }
+    },
     "node_modules/openapi-types": {
       "version": "12.1.3",
       "license": "MIT"
@@ -13235,9 +13446,7 @@
     },
     "node_modules/roarr": {
       "version": "2.15.4",
-      "dev": true,
       "license": "BSD-3-Clause",
-      "optional": true,
       "dependencies": {
         "boolean": "^3.0.1",
         "detect-node": "^2.0.4",
@@ -13393,15 +13602,11 @@
     },
     "node_modules/semver-compare": {
       "version": "1.0.0",
-      "dev": true,
-      "license": "MIT",
-      "optional": true
+      "license": "MIT"
     },
     "node_modules/serialize-error": {
       "version": "7.0.1",
-      "dev": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "type-fest": "^0.13.1"
       },
@@ -13655,9 +13860,7 @@
     },
     "node_modules/sprintf-js": {
       "version": "1.1.3",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "optional": true
+      "license": "BSD-3-Clause"
     },
     "node_modules/sql-formatter": {
       "version": "14.0.0",
@@ -14183,9 +14386,7 @@
     },
     "node_modules/type-fest": {
       "version": "0.13.1",
-      "dev": true,
       "license": "(MIT OR CC0-1.0)",
-      "optional": true,
       "engines": {
         "node": ">=10"
       },
diff --git a/package.json b/package.json
index 35362526b..d3bd57df4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "open-whispr",
-  "version": "1.6.6",
+  "version": "1.6.7",
   "description": "A desktop dictation application using whisper.cpp for speech-to-text transcription",
   "main": "main.js",
   "private": true,
@@ -18,33 +18,33 @@
     "compile:mic-listener": "node scripts/build-macos-mic-listener.js",
     "compile:audio-tap": "node scripts/build-macos-audio-tap.js",
     "compile:native": "npm run compile:globe && npm run compile:fast-paste && npm run compile:winkeys && npm run compile:winpaste && npm run compile:linux-paste && npm run compile:text-monitor && npm run compile:media-remote && npm run compile:mic-listener && npm run compile:audio-tap",
-    "prestart": "npm run compile:native",
+    "prestart": "npm run compile:native && npm run download:qdrant && npm run download:embedding-model",
     "start": "electron .",
-    "predev": "npm run compile:native",
+    "predev": "npm run compile:native && npm run download:qdrant && npm run download:embedding-model",
     "dev": "concurrently -k -r \"npm:dev:renderer\" \"npm:dev:main\"",
-    "predev:main": "npm run compile:native",
+    "predev:main": "npm run compile:native && npm run download:qdrant && npm run download:embedding-model",
     "dev:main": "cross-env NODE_ENV=development node scripts/run-electron.js --dev",
     "dev:renderer": "cd src && vite",
-    "prebuild": "npm run compile:native && npm run download:whisper-cpp && npm run download:llama-server && npm run download:sherpa-onnx",
+    "prebuild": "npm run compile:native && npm run download:whisper-cpp && npm run download:llama-server && npm run download:sherpa-onnx && npm run download:qdrant && npm run download:embedding-model -- --for-build",
     "build": "cd src && vite build && cd .. && electron-builder",
     "postinstall": "electron-builder install-app-deps",
     "build:renderer": "cd src && vite build",
-    "prebuild:mac": "npm run compile:native && npm run download:whisper-cpp && npm run download:llama-server && npm run download:sherpa-onnx",
+    "prebuild:mac": "npm run compile:native && npm run download:whisper-cpp && npm run download:llama-server && npm run download:sherpa-onnx && npm run download:qdrant",
     "build:mac": "npm run build:renderer && electron-builder --mac",
     "build:mac:arm64": "npm run build:renderer && electron-builder --mac --arm64",
     "build:mac:x64": "npm run build:renderer && electron-builder --mac --x64",
-    "prebuild:win": "npm run compile:native && npm run download:whisper-cpp && npm run download:llama-server && npm run download:sherpa-onnx && npm run download:nircmd && npm run download:windows-fast-paste && npm run download:windows-key-listener && npm run download:windows-mic-listener",
+    "prebuild:win": "npm run compile:native && npm run download:whisper-cpp && npm run download:llama-server && npm run download:sherpa-onnx && npm run download:qdrant && npm run download:nircmd && npm run download:windows-fast-paste && npm run download:windows-key-listener && npm run download:windows-mic-listener",
     "build:win": "npm run build:renderer && electron-builder --win",
-    "prebuild:linux": "npm run compile:native && npm run download:whisper-cpp && npm run download:llama-server && npm run download:sherpa-onnx",
+    "prebuild:linux": "npm run compile:native && npm run download:whisper-cpp && npm run download:llama-server && npm run download:sherpa-onnx && npm run download:qdrant",
     "build:linux": "npm run build:renderer && electron-builder --linux",
     "build:linux:appimage": "npm run build:renderer && electron-builder --linux AppImage",
     "build:linux:deb": "npm run build:renderer && electron-builder --linux deb",
     "build:linux:rpm": "npm run build:renderer && electron-builder --linux rpm",
     "build:linux:tar": "npm run build:renderer && electron-builder --linux tar.gz",
     "setup": "node setup.js",
-    "prepack": "npm run compile:native && npm run download:whisper-cpp && npm run download:llama-server && npm run download:sherpa-onnx",
+    "prepack": "npm run compile:native && npm run download:whisper-cpp && npm run download:llama-server && npm run download:sherpa-onnx && npm run download:qdrant",
     "pack": "npm run build:renderer && cross-env CSC_IDENTITY_AUTO_DISCOVERY=false electron-builder --dir",
-    "predist": "npm run compile:native && npm run download:whisper-cpp && npm run download:llama-server && npm run download:sherpa-onnx",
+    "predist": "npm run compile:native && npm run download:whisper-cpp && npm run download:llama-server && npm run download:sherpa-onnx && npm run download:qdrant",
     "dist": "npm run build:renderer && electron-builder",
     "download:whisper-cpp": "node scripts/download-whisper-cpp.js --current",
     "download:whisper-cpp:all": "node scripts/download-whisper-cpp.js --all",
@@ -56,6 +56,9 @@
     "download:windows-fast-paste": "node scripts/download-windows-fast-paste.js",
     "download:windows-key-listener": "node scripts/download-windows-key-listener.js",
     "download:windows-mic-listener": "node scripts/download-windows-mic-listener.js",
+    "download:qdrant": "node scripts/download-qdrant.js --current",
+    "download:qdrant:all": "node scripts/download-qdrant.js --all",
+    "download:embedding-model": "node scripts/download-minilm.js",
     "format:js": "eslint . --fix && cd src && eslint . --fix && prettier --write \"**/*.{js,jsx,ts,tsx,json,css,md}\"",
     "format": "npm run format:js",
     "format:check": "eslint . && cd src && eslint . && prettier --check \"**/*.{js,jsx,ts,tsx,json,css,md}\"",
@@ -103,8 +106,14 @@
     "vite": "^6.3.5"
   },
   "dependencies": {
+    "@ai-sdk/anthropic": "^3.0.58",
+    "@ai-sdk/google": "^3.0.43",
+    "@ai-sdk/groq": "^3.0.29",
+    "@ai-sdk/openai": "^3.0.41",
+    "@qdrant/js-client-rest": "^1.12.0",
     "@neondatabase/auth": "^0.2.0-beta.1",
     "@neondatabase/neon-js": "^0.1.0-beta.22",
+    "@tanstack/react-virtual": "^3.13.2",
     "@radix-ui/react-accordion": "^1.1.2",
     "@radix-ui/react-dialog": "^1.1.14",
     "@radix-ui/react-dropdown-menu": "^2.1.15",
@@ -120,6 +129,7 @@
     "@tiptap/react": "^3.20.4",
     "@tiptap/starter-kit": "^3.20.4",
     "@vercel/blob": "^2.3.0",
+    "ai": "^6.0.116",
     "better-sqlite3": "^12.8.0",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
@@ -132,6 +142,7 @@
     "kysely": "^0.28.14",
     "lucide-react": "^0.518.0",
     "object-assign": "^4.1.1",
+    "onnxruntime-node": "^1.21.0",
     "ps-list": "^9.0.0",
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
diff --git a/preload.js b/preload.js
index 64329fb7e..3688ff95d 100644
--- a/preload.js
+++ b/preload.js
@@ -85,6 +85,14 @@ contextBridge.exposeInMainWorld("electronAPI", {
   deleteNote: (id) => ipcRenderer.invoke("db-delete-note", id),
   exportNote: (noteId, format) => ipcRenderer.invoke("export-note", noteId, format),
   searchNotes: (query, limit) => ipcRenderer.invoke("db-search-notes", query, limit),
+  semanticSearchNotes: (query, limit) =>
+    ipcRenderer.invoke("db-semantic-search-notes", query, limit),
+  semanticReindexAll: () => ipcRenderer.invoke("db-semantic-reindex-all"),
+  onSemanticReindexProgress: (callback) => {
+    const listener = (_event, data) => callback?.(data);
+    ipcRenderer.on("semantic-reindex-progress", listener);
+    return () => ipcRenderer.removeListener("semantic-reindex-progress", listener);
+  },
   updateNoteCloudId: (id, cloudId) => ipcRenderer.invoke("db-update-note-cloud-id", id, cloudId),
 
   // Folder functions
@@ -94,6 +102,16 @@ contextBridge.exposeInMainWorld("electronAPI", {
   renameFolder: (id, name) => ipcRenderer.invoke("db-rename-folder", id, name),
   getFolderNoteCounts: () => ipcRenderer.invoke("db-get-folder-note-counts"),
 
+  // Note files (markdown mirror) functions
+  noteFilesSetEnabled: (enabled, customPath) =>
+    ipcRenderer.invoke("note-files-set-enabled", enabled, customPath),
+  noteFilesSetPath: (path) => ipcRenderer.invoke("note-files-set-path", path),
+  noteFilesRebuild: () => ipcRenderer.invoke("note-files-rebuild"),
+  noteFilesGetDefaultPath: () => ipcRenderer.invoke("note-files-get-default-path"),
+  noteFilesPickFolder: () => ipcRenderer.invoke("note-files-pick-folder"),
+  showNoteFile: (noteId) => ipcRenderer.invoke("show-note-file", noteId),
+  showFolderInExplorer: (folderName) => ipcRenderer.invoke("show-folder-in-explorer", folderName),
+
   // Action functions
   getActions: () => ipcRenderer.invoke("db-get-actions"),
   getAction: (id) => ipcRenderer.invoke("db-get-action", id),
@@ -530,6 +548,9 @@ contextBridge.exposeInMainWorld("electronAPI", {
   },
   onWindowsPushToTalkUnavailable: registerListener("windows-ptt-unavailable"),
 
+  // Settings shortcut (Cmd+, / Ctrl+,)
+  onShowSettings: registerListener("show-settings", (callback) => () => callback()),
+
   // Accessibility permission events (macOS)
   onAccessibilityMissing: (callback) => {
     const listener = () => callback?.();
@@ -581,13 +602,22 @@ contextBridge.exposeInMainWorld("electronAPI", {
   acquireRecordingLock: (pipeline) => ipcRenderer.invoke("acquire-recording-lock", pipeline),
   releaseRecordingLock: (pipeline) => ipcRenderer.invoke("release-recording-lock", pipeline),
 
-  // Agent cloud streaming
-  cloudAgentStream: (messages, opts) => ipcRenderer.invoke("cloud-agent-stream", messages, opts),
+  // Agent cloud streaming (event-based for real-time chunks)
+  startAgentStream: (messages, opts) =>
+    ipcRenderer.send("cloud-agent-stream-start", messages, opts),
   onAgentStreamChunk: registerListener(
-    "agent-stream-chunk",
+    "cloud-agent-stream-chunk",
     (callback) => (_event, chunk) => callback(chunk)
   ),
-  onAgentStreamDone: registerListener("agent-stream-done", (callback) => () => callback()),
+  onAgentStreamError: registerListener(
+    "cloud-agent-stream-error",
+    (callback) => (_event, error) => callback(error)
+  ),
+  onAgentStreamEnd: registerListener("cloud-agent-stream-end", (callback) => () => callback()),
+
+  // Agent cloud tools
+  agentWebSearch: (query, numResults) => ipcRenderer.invoke("agent-web-search", query, numResults),
+  agentOpenNote: (noteId) => ipcRenderer.invoke("agent-open-note", noteId),
 
   // Agent conversation persistence
   createAgentConversation: (title) => ipcRenderer.invoke("db-create-agent-conversation", title),
@@ -596,9 +626,19 @@ contextBridge.exposeInMainWorld("electronAPI", {
   deleteAgentConversation: (id) => ipcRenderer.invoke("db-delete-agent-conversation", id),
   updateAgentConversationTitle: (id, title) =>
     ipcRenderer.invoke("db-update-agent-conversation-title", id, title),
-  addAgentMessage: (conversationId, role, content) =>
-    ipcRenderer.invoke("db-add-agent-message", conversationId, role, content),
+  addAgentMessage: (conversationId, role, content, metadata) =>
+    ipcRenderer.invoke("db-add-agent-message", conversationId, role, content, metadata),
   getAgentMessages: (conversationId) => ipcRenderer.invoke("db-get-agent-messages", conversationId),
+  getAgentConversationsWithPreview: (limit, offset, includeArchived) =>
+    ipcRenderer.invoke("db-get-agent-conversations-with-preview", limit, offset, includeArchived),
+  searchAgentConversations: (query, limit) =>
+    ipcRenderer.invoke("db-search-agent-conversations", query, limit),
+  archiveAgentConversation: (id) => ipcRenderer.invoke("db-archive-agent-conversation", id),
+  unarchiveAgentConversation: (id) => ipcRenderer.invoke("db-unarchive-agent-conversation", id),
+  updateAgentConversationCloudId: (id, cloudId) =>
+    ipcRenderer.invoke("db-update-agent-conversation-cloud-id", id, cloudId),
+  semanticSearchConversations: (query, limit) =>
+    ipcRenderer.invoke("db-semantic-search-conversations", query, limit),
 
   // Google Calendar
   gcalStartOAuth: () => ipcRenderer.invoke("gcal-start-oauth"),
@@ -610,6 +650,7 @@ contextBridge.exposeInMainWorld("electronAPI", {
   gcalSyncEvents: () => ipcRenderer.invoke("gcal-sync-events"),
   gcalGetUpcomingEvents: (windowMinutes) =>
     ipcRenderer.invoke("gcal-get-upcoming-events", windowMinutes),
+  gcalGetEvent: (eventId) => ipcRenderer.invoke("gcal-get-event", eventId),
 
   // Google Calendar event listeners
   onGcalMeetingStarting: registerListener(
@@ -637,8 +678,6 @@ contextBridge.exposeInMainWorld("electronAPI", {
   meetingDetectionGetPreferences: () => ipcRenderer.invoke("meeting-detection-get-preferences"),
   meetingDetectionSetPreferences: (prefs) =>
     ipcRenderer.invoke("meeting-detection-set-preferences", prefs),
-  meetingDetectionRespond: (detectionId, action) =>
-    ipcRenderer.invoke("meeting-detection-respond", detectionId, action),
   onMeetingDetected: registerListener(
     "meeting-detected",
     (callback) => (_event, data) => callback(data)
@@ -659,6 +698,10 @@ contextBridge.exposeInMainWorld("electronAPI", {
     "navigate-to-meeting-note",
     (callback) => (_event, data) => callback(data)
   ),
+  onNavigateToNote: registerListener(
+    "navigate-to-note",
+    (callback) => (_event, data) => callback(data)
+  ),
 
   onUpdateNotificationData: registerListener(
     "update-notification-data",
diff --git a/resources/macos-mic-listener.swift b/resources/macos-mic-listener.swift
index 9154e374a..4baa1eea3 100644
--- a/resources/macos-mic-listener.swift
+++ b/resources/macos-mic-listener.swift
@@ -107,7 +107,7 @@ func getInputDevices() -> [AudioDeviceID] {
 func isDeviceRunning(_ deviceID: AudioDeviceID) -> Bool {
     var address = AudioObjectPropertyAddress(
         mSelector: kAudioDevicePropertyDeviceIsRunningSomewhere,
-        mScope: kAudioObjectPropertyScopeInput,
+        mScope: kAudioObjectPropertyScopeGlobal,
         mElement: kAudioObjectPropertyElementMain
     )
     var isRunning: UInt32 = 0
@@ -187,7 +187,7 @@ let deviceListListener: AudioObjectPropertyListenerProc = {
 func registerRunningListener(on deviceID: AudioDeviceID) {
     var address = AudioObjectPropertyAddress(
         mSelector: kAudioDevicePropertyDeviceIsRunningSomewhere,
-        mScope: kAudioObjectPropertyScopeInput,
+        mScope: kAudioObjectPropertyScopeGlobal,
         mElement: kAudioObjectPropertyElementMain
     )
 
@@ -200,7 +200,7 @@ func registerRunningListener(on deviceID: AudioDeviceID) {
 func removeRunningListener(from deviceID: AudioDeviceID) {
     var address = AudioObjectPropertyAddress(
         mSelector: kAudioDevicePropertyDeviceIsRunningSomewhere,
-        mScope: kAudioObjectPropertyScopeInput,
+        mScope: kAudioObjectPropertyScopeGlobal,
         mElement: kAudioObjectPropertyElementMain
     )
 
@@ -285,5 +285,13 @@ let active = isAnyInputRunning()
 previouslyActive = active
 emit(active ? "MIC_ACTIVE" : "MIC_INACTIVE")
 
+// Heartbeat: periodic check in case property listeners miss events
+let heartbeatTimer = DispatchSource.makeTimerSource(queue: .main)
+heartbeatTimer.schedule(deadline: .now() + 5, repeating: 5)
+heartbeatTimer.setEventHandler {
+    checkAndEmitState()
+}
+heartbeatTimer.resume()
+
 // Keep the process alive
 CFRunLoopRun()
diff --git a/scripts/download-minilm.js b/scripts/download-minilm.js
new file mode 100644
index 000000000..a590d10dd
--- /dev/null
+++ b/scripts/download-minilm.js
@@ -0,0 +1,62 @@
+#!/usr/bin/env node
+const fs = require("fs");
+const os = require("os");
+const path = require("path");
+const { downloadFile, parseArgs } = require("./lib/download-utils");
+
+const forBuild = process.argv.includes("--for-build");
+const MODEL_DIR = forBuild
+  ? path.join(__dirname, "..", "resources", "bin", "all-MiniLM-L6-v2")
+  : path.join(os.homedir(), ".cache", "openwhispr", "embedding-models", "all-MiniLM-L6-v2");
+
+const FILES = [
+  {
+    name: "model.onnx",
+    url: "https://huggingface.co/sentence-transformers/all-MiniLM-L6-v2/resolve/main/onnx/model.onnx",
+  },
+  {
+    name: "tokenizer.json",
+    url: "https://huggingface.co/sentence-transformers/all-MiniLM-L6-v2/resolve/main/tokenizer.json",
+  },
+];
+
+async function main() {
+  console.log("\n[embedding-model] Downloading all-MiniLM-L6-v2 ONNX model...\n");
+
+  const args = parseArgs();
+
+  const allExist = FILES.every((f) => fs.existsSync(path.join(MODEL_DIR, f.name)));
+  if (allExist && !args.isForce) {
+    console.log("[embedding-model] Model files already exist (use --force to re-download)\n");
+    return;
+  }
+
+  fs.mkdirSync(MODEL_DIR, { recursive: true });
+
+  for (const file of FILES) {
+    const destPath = path.join(MODEL_DIR, file.name);
+
+    if (fs.existsSync(destPath) && !args.isForce) {
+      console.log(`[embedding-model] ${file.name} already exists, skipping`);
+      continue;
+    }
+
+    console.log(`[embedding-model] Downloading ${file.name} from ${file.url}`);
+
+    try {
+      await downloadFile(file.url, destPath);
+      const stats = fs.statSync(destPath);
+      const sizeMB = (stats.size / 1024 / 1024).toFixed(1);
+      console.log(`[embedding-model] ${file.name} downloaded (${sizeMB}MB)`);
+    } catch (error) {
+      console.error(`[embedding-model] Failed to download ${file.name}: ${error.message}`);
+      if (fs.existsSync(destPath)) fs.unlinkSync(destPath);
+      process.exitCode = 1;
+      return;
+    }
+  }
+
+  console.log(`\n[embedding-model] Model ready at ${MODEL_DIR}\n`);
+}
+
+main().catch(console.error);
diff --git a/scripts/download-qdrant.js b/scripts/download-qdrant.js
new file mode 100644
index 000000000..308645bf7
--- /dev/null
+++ b/scripts/download-qdrant.js
@@ -0,0 +1,180 @@
+#!/usr/bin/env node
+const fs = require("fs");
+const path = require("path");
+const {
+  downloadFile,
+  extractArchive,
+  fetchLatestRelease,
+  findBinaryInDir,
+  parseArgs,
+  setExecutable,
+  cleanupFiles,
+} = require("./lib/download-utils");
+
+const QDRANT_REPO = "qdrant/qdrant";
+
+// Version can be pinned via environment variable for reproducible builds
+const VERSION_OVERRIDE = process.env.QDRANT_VERSION || null;
+
+const BINARIES = {
+  "darwin-arm64": {
+    archiveName: "qdrant-aarch64-apple-darwin.tar.gz",
+    binaryName: "qdrant",
+    outputName: "qdrant-darwin-arm64",
+  },
+  "darwin-x64": {
+    archiveName: "qdrant-x86_64-apple-darwin.tar.gz",
+    binaryName: "qdrant",
+    outputName: "qdrant-darwin-x64",
+  },
+  "linux-x64": {
+    archiveName: "qdrant-x86_64-unknown-linux-gnu.tar.gz",
+    binaryName: "qdrant",
+    outputName: "qdrant-linux-x64",
+  },
+  "win32-x64": {
+    archiveName: "qdrant-x86_64-pc-windows-msvc.zip",
+    binaryName: "qdrant.exe",
+    outputName: "qdrant-win32-x64.exe",
+  },
+};
+
+const BIN_DIR = path.join(__dirname, "..", "resources", "bin");
+
+// Cache the release info to avoid multiple API calls
+let cachedRelease = null;
+
+async function getRelease() {
+  if (cachedRelease) return cachedRelease;
+
+  if (VERSION_OVERRIDE) {
+    cachedRelease = await fetchLatestRelease(QDRANT_REPO, { tagPrefix: VERSION_OVERRIDE });
+  } else {
+    cachedRelease = await fetchLatestRelease(QDRANT_REPO);
+  }
+  return cachedRelease;
+}
+
+function getDownloadUrl(release, archiveName) {
+  const asset = release?.assets?.find((a) => a.name === archiveName);
+  return asset?.url || null;
+}
+
+async function downloadBinary(platformArch, config, release, isForce = false) {
+  if (!config) {
+    console.log(`  [qdrant] ${platformArch}: Not supported`);
+    return false;
+  }
+
+  const outputPath = path.join(BIN_DIR, config.outputName);
+
+  if (fs.existsSync(outputPath) && !isForce) {
+    console.log(`  [qdrant] ${platformArch}: Already exists (use --force to re-download)`);
+    return true;
+  }
+
+  const url = getDownloadUrl(release, config.archiveName);
+  if (!url) {
+    console.error(`  [qdrant] ${platformArch}: Asset ${config.archiveName} not found in release`);
+    return false;
+  }
+  console.log(`  [qdrant] ${platformArch}: Downloading from ${url}`);
+
+  const archivePath = path.join(BIN_DIR, config.archiveName);
+
+  try {
+    await downloadFile(url, archivePath);
+
+    const extractDir = path.join(BIN_DIR, `temp-qdrant-${platformArch}`);
+    fs.mkdirSync(extractDir, { recursive: true });
+    await extractArchive(archivePath, extractDir);
+
+    const binaryPath = findBinaryInDir(extractDir, config.binaryName);
+    if (binaryPath) {
+      fs.copyFileSync(binaryPath, outputPath);
+      setExecutable(outputPath);
+      console.log(`  [qdrant] ${platformArch}: Extracted to ${config.outputName}`);
+    } else {
+      console.error(
+        `  [qdrant] ${platformArch}: Binary "${config.binaryName}" not found in archive`
+      );
+      return false;
+    }
+
+    fs.rmSync(extractDir, { recursive: true, force: true });
+    if (fs.existsSync(archivePath)) fs.unlinkSync(archivePath);
+    return true;
+  } catch (error) {
+    console.error(`  [qdrant] ${platformArch}: Failed - ${error.message}`);
+    if (fs.existsSync(archivePath)) fs.unlinkSync(archivePath);
+    return false;
+  }
+}
+
+async function main() {
+  if (VERSION_OVERRIDE) {
+    console.log(`\n[qdrant] Using pinned version: ${VERSION_OVERRIDE}`);
+  } else {
+    console.log("\n[qdrant] Fetching latest release...");
+  }
+  const release = await getRelease();
+
+  if (!release) {
+    console.error(`[qdrant] Could not fetch release from ${QDRANT_REPO}`);
+    console.log(`\nMake sure release exists: https://github.com/${QDRANT_REPO}/releases`);
+    process.exitCode = 1;
+    return;
+  }
+
+  console.log(`\nDownloading qdrant binaries (${release.tag})...\n`);
+
+  fs.mkdirSync(BIN_DIR, { recursive: true });
+
+  const args = parseArgs();
+
+  if (args.isCurrent) {
+    if (!BINARIES[args.platformArch]) {
+      console.error(`Unsupported platform/arch: ${args.platformArch}`);
+      process.exitCode = 1;
+      return;
+    }
+
+    console.log(`Downloading for target platform (${args.platformArch}):`);
+    const ok = await downloadBinary(
+      args.platformArch,
+      BINARIES[args.platformArch],
+      release,
+      args.isForce
+    );
+    if (!ok) {
+      console.error(`Failed to download binaries for ${args.platformArch}`);
+      process.exitCode = 1;
+      return;
+    }
+
+    if (args.shouldCleanup) {
+      cleanupFiles(BIN_DIR, "qdrant", `qdrant-${args.platformArch}`);
+    }
+  } else {
+    console.log("Downloading binaries for all platforms:");
+    for (const platformArch of Object.keys(BINARIES)) {
+      await downloadBinary(platformArch, BINARIES[platformArch], release, args.isForce);
+    }
+  }
+
+  console.log("\n---");
+
+  const files = fs.readdirSync(BIN_DIR).filter((f) => f.startsWith("qdrant"));
+  if (files.length > 0) {
+    console.log("Available qdrant binaries:\n");
+    files.forEach((f) => {
+      const stats = fs.statSync(path.join(BIN_DIR, f));
+      console.log(`  - ${f} (${Math.round(stats.size / 1024 / 1024)}MB)`);
+    });
+  } else {
+    console.log("No binaries downloaded yet.");
+    console.log(`\nMake sure release exists: https://github.com/${QDRANT_REPO}/releases`);
+  }
+}
+
+main().catch(console.error);
diff --git a/scripts/lib/download-utils.js b/scripts/lib/download-utils.js
index 1135858c9..18d0018b1 100644
--- a/scripts/lib/download-utils.js
+++ b/scripts/lib/download-utils.js
@@ -39,12 +39,15 @@ function fetchJson(url, redirectCount = 0) {
 
     https
       .get(url, options, (res) => {
-        if (res.statusCode === 301 || res.statusCode === 302) {
-          const redirectUrl = res.headers.location;
-          if (!redirectUrl) {
+        if ([301, 302, 303, 307, 308].includes(res.statusCode)) {
+          const location = res.headers.location;
+          if (!location) {
             reject(new Error("Redirect without location header"));
             return;
           }
+          const redirectUrl = location.startsWith("/")
+            ? new URL(location, url).href
+            : location;
           fetchJson(redirectUrl, redirectCount + 1)
             .then(resolve)
             .catch(reject);
@@ -156,13 +159,16 @@ function downloadFile(url, dest, retryCount = 0) {
       }
 
       activeRequest = https.get(currentUrl, (response) => {
-        if (response.statusCode === 302 || response.statusCode === 301) {
-          const redirectUrl = response.headers.location;
-          if (!redirectUrl) {
+        if ([301, 302, 303, 307, 308].includes(response.statusCode)) {
+          const location = response.headers.location;
+          if (!location) {
             cleanup();
             reject(new Error("Redirect without location header"));
             return;
           }
+          const redirectUrl = location.startsWith("/")
+            ? new URL(location, currentUrl).href
+            : location;
           request(redirectUrl, redirectCount + 1);
           return;
         }
diff --git a/scripts/run-electron.js b/scripts/run-electron.js
index 8bb7ae72e..68ec180cd 100644
--- a/scripts/run-electron.js
+++ b/scripts/run-electron.js
@@ -25,8 +25,24 @@ console.log("[run-electron] Electron path:", electronPath);
 console.log("[run-electron] App dir:", appDir);
 console.log("[run-electron] Args:", args);
 
-// Spawn electron with the cleaned environment
-const child = spawn(electronPath, [appDir, ...args], {
+// On KDE/GNOME Wayland, force XWayland so globalShortcut and window positioning work.
+// Adding it here avoids the self-relaunch in main.js which kills concurrently in dev mode.
+if (
+  process.platform === "linux" &&
+  process.env.XDG_SESSION_TYPE === "wayland" &&
+  !args.includes("--ozone-platform=x11")
+) {
+  const desktop = (process.env.XDG_CURRENT_DESKTOP || "").toLowerCase();
+  if (desktop.includes("kde") || /gnome|ubuntu|unity/.test(desktop)) {
+    args.push("--ozone-platform=x11");
+    console.log("[run-electron] KDE/GNOME Wayland detected, forcing XWayland");
+  }
+}
+
+// Chromium flags must come before the app path, app args after.
+const chromiumFlags = args.filter((a) => a.startsWith("--ozone-platform="));
+const appArgs = args.filter((a) => !a.startsWith("--ozone-platform="));
+const child = spawn(electronPath, [...chromiumFlags, appDir, ...appArgs], {
   stdio: "inherit",
   env: process.env,
   cwd: appDir,
diff --git a/src/components/AgentOverlay.tsx b/src/components/AgentOverlay.tsx
index ec0e44329..8bdb82075 100644
--- a/src/components/AgentOverlay.tsx
+++ b/src/components/AgentOverlay.tsx
@@ -1,157 +1,87 @@
 import { useState, useEffect, useRef, useCallback } from "react";
+import { useTranslation } from "react-i18next";
 import { cn } from "./lib/utils";
 import { AgentTitleBar } from "./agent/AgentTitleBar";
 import { AgentChat } from "./agent/AgentChat";
 import { AgentInput } from "./agent/AgentInput";
 import AudioManager from "../helpers/audioManager";
-import ReasoningService from "../services/ReasoningService";
-import { getSettings } from "../stores/settingsStore";
-import { getAgentSystemPrompt } from "../config/prompts";
-
-type AgentState = "idle" | "listening" | "transcribing" | "thinking" | "streaming";
-
-interface Message {
-  id: string;
-  role: "user" | "assistant";
-  content: string;
-  isStreaming: boolean;
-}
+import { useChatPersistence } from "./chat/useChatPersistence";
+import { useChatStreaming } from "./chat/useChatStreaming";
+import type { Message } from "./chat/types";
 
 const MIN_HEIGHT = 200;
 const MIN_WIDTH = 360;
 
 export default function AgentOverlay() {
-  const [messages, setMessages] = useState<Message[]>([]);
-  const [agentState, setAgentState] = useState<AgentState>("idle");
+  const { t } = useTranslation();
   const [partialTranscript, setPartialTranscript] = useState("");
   const audioManagerRef = useRef<InstanceType<typeof AudioManager> | null>(null);
-  const messagesRef = useRef<Message[]>([]);
-  const agentStateRef = useRef<AgentState>("idle");
-  const conversationIdRef = useRef<number | null>(null);
+  const agentStateRef = useRef<string>("idle");
 
-  useEffect(() => {
-    messagesRef.current = messages;
-  }, [messages]);
+  const persistence = useChatPersistence();
+  const { messages, setMessages, handleNewChat: persistenceNewChat } = persistence;
+
+  const streaming = useChatStreaming({
+    messages,
+    setMessages,
+    onStreamComplete: (_assistantId, content, toolCalls) => {
+      persistence.saveAssistantMessage(content, toolCalls);
+    },
+  });
+
+  const { agentState } = streaming;
 
   useEffect(() => {
     agentStateRef.current = agentState;
   }, [agentState]);
 
-  const addSystemMessage = useCallback((content: string) => {
-    setMessages((prev) => [
-      ...prev,
-      { id: crypto.randomUUID(), role: "assistant" as const, content, isStreaming: false },
-    ]);
-  }, []);
+  const addSystemMessage = useCallback(
+    (content: string) => {
+      setMessages((prev) => [
+        ...prev,
+        { id: crypto.randomUUID(), role: "assistant" as const, content, isStreaming: false },
+      ]);
+    },
+    [setMessages]
+  );
 
-  const handleTranscriptionComplete = useCallback(async (text: string) => {
-    if (!text.trim()) {
-      setAgentState("idle");
-      return;
-    }
-
-    // Create conversation on first message
-    if (!conversationIdRef.current) {
-      const conv = await window.electronAPI?.createAgentConversation?.("New conversation");
-      conversationIdRef.current = conv?.id ?? null;
-    }
-
-    const userMsg: Message = {
-      id: crypto.randomUUID(),
-      role: "user",
-      content: text,
-      isStreaming: false,
-    };
-    setMessages((prev) => [...prev, userMsg]);
-
-    if (conversationIdRef.current) {
-      window.electronAPI?.addAgentMessage?.(conversationIdRef.current, "user", text);
-    }
-
-    // Auto-title after first user message
-    const allMessages = messagesRef.current;
-    if (conversationIdRef.current && allMessages.length === 0) {
-      const title = text.slice(0, 50) + (text.length > 50 ? "..." : "");
-      window.electronAPI?.updateAgentConversationTitle?.(conversationIdRef.current, title);
-    }
-
-    setAgentState("thinking");
-
-    const settings = getSettings();
-    const systemPrompt = getAgentSystemPrompt();
-
-    const llmMessages = [
-      { role: "system", content: systemPrompt },
-      ...[...allMessages, userMsg].slice(-20).map((m) => ({ role: m.role, content: m.content })),
-    ];
-
-    const assistantId = crypto.randomUUID();
-    setMessages((prev) => [
-      ...prev,
-      { id: assistantId, role: "assistant", content: "", isStreaming: true },
-    ]);
-    setAgentState("streaming");
-
-    const isCloudAgent = settings.isSignedIn && settings.cloudAgentMode === "openwhispr";
-
-    try {
-      let fullContent = "";
-
-      const streamSource = isCloudAgent
-        ? ReasoningService.processTextStreamingCloud(llmMessages, { systemPrompt })
-        : ReasoningService.processTextStreaming(
-            llmMessages,
-            settings.agentModel,
-            settings.agentProvider,
-            { systemPrompt }
-          );
-
-      for await (const chunk of streamSource) {
-        fullContent += chunk;
-        setMessages((prev) =>
-          prev.map((m) => (m.id === assistantId ? { ...m, content: fullContent } : m))
-        );
+  const handleTranscriptionComplete = useCallback(
+    async (text: string) => {
+      if (!text.trim()) return;
+
+      if (!persistence.conversationId) {
+        await persistence.createConversation(t("agentMode.titleBar.newChat"));
       }
 
-      setMessages((prev) =>
-        prev.map((m) => (m.id === assistantId ? { ...m, isStreaming: false } : m))
-      );
+      const userMsg: Message = {
+        id: crypto.randomUUID(),
+        role: "user",
+        content: text,
+        isStreaming: false,
+      };
+      setMessages((prev) => [...prev, userMsg]);
+
+      await persistence.saveUserMessage(text);
 
-      if (conversationIdRef.current) {
-        window.electronAPI?.addAgentMessage?.(conversationIdRef.current, "assistant", fullContent);
+      if (persistence.conversationId && messages.length === 0) {
+        const title = text.slice(0, 50) + (text.length > 50 ? "..." : "");
+        window.electronAPI?.updateAgentConversationTitle?.(persistence.conversationId, title);
       }
-    } catch (error) {
-      setMessages((prev) =>
-        prev.map((m) =>
-          m.id === assistantId
-            ? { ...m, content: `Error: ${(error as Error).message}`, isStreaming: false }
-            : m
-        )
-      );
-    }
-
-    setAgentState("idle");
-  }, []);
+
+      await streaming.sendToAI(text, [...messages, userMsg]);
+    },
+    [t, messages, setMessages, persistence, streaming]
+  );
 
   useEffect(() => {
     const am = new AudioManager();
     am.setSkipReasoning(true);
     am.setContext("agent");
     am.setCallbacks({
-      onStateChange: ({
-        isRecording,
-        isProcessing,
-      }: {
-        isRecording: boolean;
-        isProcessing: boolean;
-      }) => {
-        if (isRecording) setAgentState("listening");
-        else if (isProcessing) setAgentState("transcribing");
-      },
+      onStateChange: () => {},
       onError: (error: { message?: string }) => {
         const msg = error?.message || (typeof error === "string" ? error : "Transcription failed");
-        addSystemMessage(`Error: ${msg}`);
-        setAgentState("idle");
+        addSystemMessage(`${t("agentMode.chat.errorPrefix")}: ${msg}`);
       },
       onTranscriptionComplete: (result: { text: string }) => {
         handleTranscriptionComplete(result.text);
@@ -163,8 +93,10 @@ export default function AgentOverlay() {
     });
     audioManagerRef.current = am;
     return () => {
+      am.cleanup?.();
       window.removeEventListener("api-key-changed", (am as any)._onApiKeyChanged);
     };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [addSystemMessage, handleTranscriptionComplete]);
 
   const handleResizeStart = useCallback((e: React.MouseEvent, direction: string) => {
@@ -245,11 +177,10 @@ export default function AgentOverlay() {
   }, []);
 
   const handleNewChat = useCallback(() => {
-    setMessages([]);
-    setAgentState("idle");
+    persistenceNewChat();
     setPartialTranscript("");
-    conversationIdRef.current = null;
-  }, []);
+    streaming.cancelStream();
+  }, [persistenceNewChat, streaming]);
 
   const handleClose = useCallback(() => {
     window.electronAPI?.hideAgentOverlay?.();
@@ -268,10 +199,15 @@ export default function AgentOverlay() {
       >
         <AgentTitleBar onNewChat={handleNewChat} onClose={handleClose} />
         <AgentChat messages={messages} />
-        <AgentInput agentState={agentState} partialTranscript={partialTranscript} />
+        <AgentInput
+          agentState={agentState}
+          partialTranscript={partialTranscript}
+          onTextSubmit={handleTranscriptionComplete}
+          onCancel={streaming.cancelStream}
+        />
       </div>
 
-      {/* Resize handles — edges */}
+      {/* Resize handles -- edges */}
       <div
         className="absolute top-0 left-2 right-2 h-[5px] cursor-n-resize"
         onMouseDown={(e) => handleResizeStart(e, "n")}
@@ -289,7 +225,7 @@ export default function AgentOverlay() {
         onMouseDown={(e) => handleResizeStart(e, "e")}
       />
 
-      {/* Resize handles — corners */}
+      {/* Resize handles -- corners */}
       <div
         className="absolute top-0 left-0 w-[10px] h-[10px] cursor-nw-resize"
         onMouseDown={(e) => handleResizeStart(e, "nw")}
diff --git a/src/components/CommandSearch.tsx b/src/components/CommandSearch.tsx
index 15bd3b140..3dfdfd98b 100644
--- a/src/components/CommandSearch.tsx
+++ b/src/components/CommandSearch.tsx
@@ -1,22 +1,32 @@
 import { useState, useEffect, useCallback, useMemo, useRef } from "react";
 import { useTranslation } from "react-i18next";
 import * as DialogPrimitive from "@radix-ui/react-dialog";
-import { Search, FileText, Mic, Folder, Users, Upload } from "lucide-react";
+import { Search, FileText, Mic, Folder, Users, Upload, MessageSquare } from "lucide-react";
 import { cn } from "./lib/utils";
 import type { NoteItem, FolderItem, TranscriptionItem } from "../types/electron.js";
 import { normalizeDbDate } from "../utils/dateFormatting";
 
+interface ConversationResult {
+  id: number;
+  title: string;
+  last_message?: string;
+  updated_at: string;
+}
+
 export interface CommandSearchProps {
   open: boolean;
   onOpenChange: (open: boolean) => void;
-  transcriptions: TranscriptionItem[];
-  onNoteSelect: (noteId: number) => void;
-  onTranscriptSelect: (transcriptId: number) => void;
+  mode?: "all" | "conversations";
+  transcriptions?: TranscriptionItem[];
+  onNoteSelect?: (noteId: number) => void;
+  onTranscriptSelect?: (transcriptId: number) => void;
+  onConversationSelect?: (conversationId: number) => void;
 }
 
 type FlatItem =
   | { kind: "note"; note: NoteItem }
-  | { kind: "transcript"; transcript: TranscriptionItem };
+  | { kind: "transcript"; transcript: TranscriptionItem }
+  | { kind: "conversation"; conversation: ConversationResult };
 
 function relativeTime(
   dateStr: string,
@@ -47,60 +57,115 @@ function stripMarkdownPreview(text: string): string {
 export default function CommandSearch({
   open,
   onOpenChange,
-  transcriptions,
+  mode = "all",
+  transcriptions = [],
   onNoteSelect,
   onTranscriptSelect,
+  onConversationSelect,
 }: CommandSearchProps) {
   const { t } = useTranslation();
   const [query, setQuery] = useState("");
   const [notes, setNotes] = useState<NoteItem[]>([]);
   const [folders, setFolders] = useState<FolderItem[]>([]);
+  const [conversations, setConversations] = useState<ConversationResult[]>([]);
   const [selectedIndex, setSelectedIndex] = useState(0);
   const inputRef = useRef<HTMLInputElement>(null);
   const listRef = useRef<HTMLDivElement>(null);
   const searchTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+  const searchVersionRef = useRef(0);
+  const isConversationsMode = mode === "conversations";
 
   useEffect(() => {
+    if (isConversationsMode) return;
     window.electronAPI
       .getFolders()
       .then(setFolders)
       .catch(() => {});
-  }, []);
+  }, [isConversationsMode]);
 
   useEffect(() => {
     if (!open) return;
     setQuery("");
     setSelectedIndex(0);
-    window.electronAPI
-      .getNotes()
-      .then(setNotes)
-      .catch(() => {});
-  }, [open]);
-
-  useEffect(() => {
-    if (searchTimerRef.current) clearTimeout(searchTimerRef.current);
-
-    if (!query.trim()) {
+    if (isConversationsMode) {
+      window.electronAPI?.getAgentConversationsWithPreview?.(20, 0, false).then((r) => {
+        if (r)
+          setConversations(
+            r.map((c) => ({
+              id: c.id,
+              title: c.title || "Untitled",
+              last_message: c.last_message,
+              updated_at: c.updated_at,
+            }))
+          );
+      });
+    } else {
       window.electronAPI
         .getNotes()
         .then(setNotes)
         .catch(() => {});
-      return;
     }
+  }, [open, isConversationsMode]);
 
-    searchTimerRef.current = setTimeout(async () => {
-      try {
-        const results = await window.electronAPI.searchNotes(query);
-        setNotes(results);
-      } catch {
-        // keep current results
+  useEffect(() => {
+    if (searchTimerRef.current) clearTimeout(searchTimerRef.current);
+    const version = ++searchVersionRef.current;
+
+    if (isConversationsMode) {
+      if (!query.trim()) {
+        window.electronAPI?.getAgentConversationsWithPreview?.(20, 0, false).then((r) => {
+          if (searchVersionRef.current === version && r) {
+            setConversations(
+              r.map((c) => ({
+                id: c.id,
+                title: c.title || "Untitled",
+                last_message: c.last_message,
+                updated_at: c.updated_at,
+              }))
+            );
+          }
+        });
+        return;
+      }
+      searchTimerRef.current = setTimeout(async () => {
+        try {
+          const r = await window.electronAPI?.semanticSearchConversations?.(query, 20);
+          if (searchVersionRef.current === version && r) {
+            setConversations(
+              r.map((c) => ({
+                id: c.id,
+                title: c.title || "Untitled",
+                last_message: c.last_message,
+                updated_at: c.updated_at,
+              }))
+            );
+          }
+        } catch {
+          /* keep current */
+        }
+      }, 200);
+    } else {
+      if (!query.trim()) {
+        window.electronAPI
+          .getNotes()
+          .then(setNotes)
+          .catch(() => {});
+        return;
       }
-    }, 200);
+      searchTimerRef.current = setTimeout(async () => {
+        try {
+          const results = await window.electronAPI.searchNotes(query);
+          setNotes(results);
+        } catch {
+          /* keep current */
+        }
+      }, 200);
+    }
 
     return () => {
       if (searchTimerRef.current) clearTimeout(searchTimerRef.current);
     };
-  }, [query]);
+  }, [query, isConversationsMode]);
 
   useEffect(() => {
     setSelectedIndex(0);
@@ -139,21 +204,25 @@ export default function CommandSearch({
   }, [transcriptions, query]);
 
   const flatItems = useMemo<FlatItem[]>(() => {
+    if (isConversationsMode) {
+      return conversations.map((c) => ({ kind: "conversation" as const, conversation: c }));
+    }
     const items: FlatItem[] = [];
     for (const group of noteGroups) {
       for (const note of group.items) items.push({ kind: "note", note });
     }
     for (const transcript of filteredTranscripts) items.push({ kind: "transcript", transcript });
     return items;
-  }, [noteGroups, filteredTranscripts]);
+  }, [noteGroups, filteredTranscripts, conversations, isConversationsMode]);
 
   const selectItem = useCallback(
     (item: FlatItem) => {
-      if (item.kind === "note") onNoteSelect(item.note.id);
-      else onTranscriptSelect(item.transcript.id);
+      if (item.kind === "note") onNoteSelect?.(item.note.id);
+      else if (item.kind === "transcript") onTranscriptSelect?.(item.transcript.id);
+      else if (item.kind === "conversation") onConversationSelect?.(item.conversation.id);
       onOpenChange(false);
     },
-    [onNoteSelect, onTranscriptSelect, onOpenChange]
+    [onNoteSelect, onTranscriptSelect, onConversationSelect, onOpenChange]
   );
 
   const handleKeyDown = useCallback(
@@ -211,7 +280,7 @@ export default function CommandSearch({
               value={query}
               onChange={(e) => setQuery(e.target.value)}
               onKeyDown={handleKeyDown}
-              placeholder={t("commandSearch.placeholder")}
+              placeholder={isConversationsMode ? t("chat.search") : t("commandSearch.placeholder")}
               autoFocus
               className="flex-1 text-sm text-foreground placeholder:text-muted-foreground/40"
               style={{
@@ -237,9 +306,48 @@ export default function CommandSearch({
             {!hasResults ? (
               <div className="flex items-center justify-center py-10">
                 <p className="text-xs text-muted-foreground/50">
-                  {query.trim() ? t("commandSearch.noResults") : t("commandSearch.emptyState")}
+                  {query.trim()
+                    ? t("commandSearch.noResults")
+                    : isConversationsMode
+                      ? t("chat.noConversations")
+                      : t("commandSearch.emptyState")}
                 </p>
               </div>
+            ) : isConversationsMode ? (
+              conversations.map((conv, idx) => (
+                <button
+                  key={conv.id}
+                  type="button"
+                  data-idx={idx}
+                  onClick={() => selectItem({ kind: "conversation", conversation: conv })}
+                  onMouseEnter={() => setSelectedIndex(idx)}
+                  className={cn(
+                    "flex items-center gap-2.5 w-full px-2.5 py-2 rounded-lg text-left transition-colors duration-100 outline-none",
+                    selectedIndex === idx
+                      ? "bg-primary/8 dark:bg-primary/10"
+                      : "hover:bg-foreground/4 dark:hover:bg-white/4"
+                  )}
+                >
+                  <MessageSquare
+                    size={13}
+                    className={cn(
+                      "shrink-0 mt-px transition-colors",
+                      selectedIndex === idx ? "text-primary" : "text-muted-foreground/40"
+                    )}
+                  />
+                  <div className="flex-1 min-w-0">
+                    <p className="text-xs font-medium text-foreground truncate">{conv.title}</p>
+                    {conv.last_message && (
+                      <p className="text-[11px] text-muted-foreground/55 truncate mt-px">
+                        {conv.last_message.slice(0, 90)}
+                      </p>
+                    )}
+                  </div>
+                  <span className="text-[10px] text-muted-foreground/35 tabular-nums shrink-0">
+                    {relativeTime(conv.updated_at, t)}
+                  </span>
+                </button>
+              ))
             ) : (
               <>
                 {noteGroups.length > 0 && (
diff --git a/src/components/ControlPanel.tsx b/src/components/ControlPanel.tsx
index 0511570b0..02426399f 100644
--- a/src/components/ControlPanel.tsx
+++ b/src/components/ControlPanel.tsx
@@ -34,6 +34,7 @@ const PersonalNotesView = React.lazy(() => import("./notes/PersonalNotesView"));
 const DictionaryView = React.lazy(() => import("./DictionaryView"));
 const UploadAudioView = React.lazy(() => import("./notes/UploadAudioView"));
 const IntegrationsView = React.lazy(() => import("./IntegrationsView"));
+const ChatView = React.lazy(() => import("./chat/ChatView"));
 const CommandSearch = React.lazy(() => import("./CommandSearch"));
 
 export default function ControlPanel() {
@@ -109,6 +110,9 @@ export default function ControlPanel() {
       if (mod && e.key === "k") {
         e.preventDefault();
         setShowSearch(true);
+      } else if (mod && e.key === ",") {
+        e.preventDefault();
+        setShowSettings(true);
       }
     };
     window.addEventListener("keydown", handleKeyDown);
@@ -227,6 +231,21 @@ export default function ControlPanel() {
     return () => cleanup?.();
   }, []);
 
+  useEffect(() => {
+    const cleanup = window.electronAPI?.onNavigateToNote?.((data) => {
+      setActiveNoteId(data.noteId);
+      setActiveView("personal-notes");
+    });
+    return () => cleanup?.();
+  }, []);
+
+  useEffect(() => {
+    const cleanup = window.electronAPI?.onShowSettings?.(() => {
+      setShowSettings(true);
+    });
+    return () => cleanup?.();
+  }, []);
+
   // When accessibility is missing on macOS, open the permissions settings page
   useEffect(() => {
     const cleanup = window.electronAPI?.onAccessibilityMissing?.(() => {
@@ -735,6 +754,11 @@ export default function ControlPanel() {
                 }}
               />
             )}
+            {activeView === "chat" && (
+              <Suspense fallback={null}>
+                <ChatView />
+              </Suspense>
+            )}
             {activeView === "personal-notes" && (
               <Suspense fallback={null}>
                 <PersonalNotesView
@@ -742,6 +766,7 @@ export default function ControlPanel() {
                     setSettingsSection(section);
                     setShowSettings(true);
                   }}
+                  onOpenSearch={() => setShowSearch(true)}
                   meetingRecordingRequest={meetingRecordingRequest}
                   onMeetingRecordingRequestHandled={handleMeetingRecordingRequestHandled}
                   isMeetingMode={isMeetingMode}
diff --git a/src/components/ControlPanelSidebar.tsx b/src/components/ControlPanelSidebar.tsx
index 2c092cb0b..d1c37e444 100644
--- a/src/components/ControlPanelSidebar.tsx
+++ b/src/components/ControlPanelSidebar.tsx
@@ -1,6 +1,7 @@
 import React, { useState } from "react";
 import {
   Home,
+  MessageSquare,
   NotebookPen,
   BookOpen,
   Upload,
@@ -20,7 +21,13 @@ import { getCachedPlatform } from "../utils/platform";
 
 const platform = getCachedPlatform();
 
-export type ControlPanelView = "home" | "personal-notes" | "dictionary" | "upload" | "integrations";
+export type ControlPanelView =
+  | "home"
+  | "chat"
+  | "personal-notes"
+  | "dictionary"
+  | "upload"
+  | "integrations";
 
 interface ControlPanelSidebarProps {
   activeView: ControlPanelView;
@@ -78,6 +85,7 @@ export default function ControlPanelSidebar({
     icon: React.ComponentType<{ size?: number; className?: string }>;
   }[] = [
     { id: "home", label: t("sidebar.home"), icon: Home },
+    { id: "chat", label: t("sidebar.chat"), icon: MessageSquare },
     { id: "personal-notes", label: t("sidebar.notes"), icon: NotebookPen },
     { id: "upload", label: t("sidebar.upload"), icon: Upload },
     { id: "dictionary", label: t("sidebar.dictionary"), icon: BookOpen },
@@ -95,7 +103,7 @@ export default function ControlPanelSidebar({
         <div className="px-2 pt-2 pb-1">
           <button
             onClick={onOpenSearch}
-            className="group flex items-center w-full h-7 px-2.5 rounded-md border border-border/25 dark:border-white/8 bg-foreground/3 dark:bg-white/3 hover:bg-foreground/5 dark:hover:bg-white/5 transition-colors gap-2 outline-none focus-visible:ring-1 focus-visible:ring-primary/30"
+            className="group flex items-center w-full h-7 px-2.5 rounded-md border border-border/70 dark:border-white/25 bg-transparent hover:bg-foreground/5 dark:hover:bg-white/5 transition-colors gap-2 outline-none focus-visible:ring-1 focus-visible:ring-primary/30"
           >
             <Search size={11} className="text-muted-foreground/50 shrink-0" />
             <span className="flex-1 text-[11px] text-left text-muted-foreground/50">
@@ -130,9 +138,6 @@ export default function ControlPanelSidebar({
                   : "hover:bg-foreground/4 dark:hover:bg-white/4 active:bg-foreground/6"
               )}
             >
-              {isActive && (
-                <div className="absolute left-0 top-1/2 -translate-y-1/2 w-0.5 h-3.5 rounded-r-full bg-primary" />
-              )}
               <Icon
                 size={15}
                 className={cn(
diff --git a/src/components/DeveloperSection.tsx b/src/components/DeveloperSection.tsx
index 9c6647c3e..5daedc0f4 100644
--- a/src/components/DeveloperSection.tsx
+++ b/src/components/DeveloperSection.tsx
@@ -4,10 +4,12 @@ import { Button } from "./ui/button";
 import { FolderOpen, Copy, Check } from "lucide-react";
 import { useToast } from "./ui/Toast";
 import { Toggle } from "./ui/toggle";
+import { useSettingsLayout } from "./ui/SidebarModal";
 import logger from "../utils/logger";
 
 export default function DeveloperSection() {
   const { t } = useTranslation();
+  const { isCompact } = useSettingsLayout();
   const [debugEnabled, setDebugEnabled] = useState(false);
   const [logPath, setLogPath] = useState<string | null>(null);
   const [isLoading, setIsLoading] = useState(true);
@@ -197,7 +199,9 @@ export default function DeveloperSection() {
         </div>
         <div className="rounded-xl border border-border/60 dark:border-border-subtle bg-card dark:bg-surface-2">
           <div className="px-5 py-4">
-            <div className="grid grid-cols-2 gap-x-6 gap-y-2">
+            <div
+              className={`grid gap-y-2 ${isCompact ? "grid-cols-1 gap-x-0" : "grid-cols-2 gap-x-6"}`}
+            >
               {[
                 t("developerSection.whatGetsLogged.items.audioProcessing"),
                 t("developerSection.whatGetsLogged.items.apiRequests"),
diff --git a/src/components/IntegrationsView.tsx b/src/components/IntegrationsView.tsx
index 764e848a0..0851a6586 100644
--- a/src/components/IntegrationsView.tsx
+++ b/src/components/IntegrationsView.tsx
@@ -36,12 +36,15 @@ export default function IntegrationsView() {
   }, [setGcalAccounts]);
 
   const handleConnect = useCallback(async () => {
-    if (systemAudio.isMacOS && systemAudio.status === "denied") {
-      setShowPermissionDialog(true);
-      return;
+    if (systemAudio.mode === "native" && !systemAudio.granted) {
+      const granted = await systemAudio.request();
+      if (!granted) {
+        setShowPermissionDialog(true);
+        return;
+      }
     }
     await startOAuth();
-  }, [systemAudio.isMacOS, systemAudio.status, startOAuth]);
+  }, [systemAudio.mode, systemAudio.granted, systemAudio.request, startOAuth]);
 
   const handleDisconnect = useCallback(
     async (email: string) => {
diff --git a/src/components/OnboardingFlow.tsx b/src/components/OnboardingFlow.tsx
index 75fa0e4e5..9d8586902 100644
--- a/src/components/OnboardingFlow.tsx
+++ b/src/components/OnboardingFlow.tsx
@@ -351,8 +351,8 @@ export default function OnboardingFlow({ onComplete }: OnboardingFlowProps) {
           return (
             <div className="space-y-6">
               <div className="text-center">
-                <div className="w-14 h-14 bg-emerald-100 rounded-full flex items-center justify-center mx-auto mb-4">
-                  <Check className="w-7 h-7 text-emerald-600" />
+                <div className="w-14 h-14 bg-green-500/10 rounded-full flex items-center justify-center mx-auto mb-4">
+                  <Check className="w-7 h-7 text-green-500" />
                 </div>
                 <h2 className="text-2xl font-semibold text-foreground mb-2">
                   {t("onboarding.setup.title")}
diff --git a/src/components/PermissionsGate.tsx b/src/components/PermissionsGate.tsx
deleted file mode 100644
index e70f8f100..000000000
--- a/src/components/PermissionsGate.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-import type React from "react";
-import { useTranslation } from "react-i18next";
-import { Shield, Check } from "lucide-react";
-import { Card, CardContent } from "./ui/card";
-import { Button } from "./ui/button";
-import WindowControls from "./WindowControls";
-import PermissionsSection from "./ui/PermissionsSection";
-import { AlertDialog } from "./ui/dialog";
-import { useDialogs } from "../hooks/useDialogs";
-import { usePermissions } from "../hooks/usePermissions";
-import { useSystemAudioPermission } from "../hooks/useSystemAudioPermission";
-import { areRequiredPermissionsMet } from "../utils/permissions";
-
-interface PermissionsGateProps {
-  onComplete: () => void;
-}
-
-export default function PermissionsGate({ onComplete }: PermissionsGateProps) {
-  const { t } = useTranslation();
-  const { alertDialog, showAlertDialog, hideAlertDialog } = useDialogs();
-  const permissions = usePermissions(showAlertDialog);
-  const systemAudio = useSystemAudioPermission();
-
-  const requiredMet =
-    permissions.pasteToolsInfo !== null &&
-    areRequiredPermissionsMet(permissions.micPermissionGranted);
-
-  return (
-    <div
-      className="h-screen flex flex-col bg-background"
-      style={{ paddingTop: "env(safe-area-inset-top, 0px)" }}
-    >
-      <AlertDialog
-        open={alertDialog.open}
-        onOpenChange={(open: boolean) => !open && hideAlertDialog()}
-        title={alertDialog.title}
-        description={alertDialog.description}
-        onOk={() => {}}
-      />
-
-      <div
-        className="flex items-center justify-end w-full h-10 shrink-0"
-        style={{ WebkitAppRegion: "drag" } as React.CSSProperties}
-      >
-        {window.electronAPI?.getPlatform?.() !== "darwin" && (
-          <div className="pr-1" style={{ WebkitAppRegion: "no-drag" } as React.CSSProperties}>
-            <WindowControls />
-          </div>
-        )}
-      </div>
-
-      <div className="flex-1 px-6 overflow-y-auto flex items-center">
-        <div className="w-full max-w-sm mx-auto">
-          <Card className="bg-card/90 backdrop-blur-2xl border border-border/50 dark:border-white/5 shadow-lg rounded-xl overflow-hidden">
-            <CardContent className="p-6 space-y-6">
-              <div className="text-center">
-                <div className="w-14 h-14 bg-primary/10 rounded-full flex items-center justify-center mx-auto mb-4">
-                  <Shield className="w-7 h-7 text-primary" />
-                </div>
-                <h2 className="text-2xl font-semibold text-foreground mb-2">
-                  {t("permissionsGate.title")}
-                </h2>
-                <p className="text-muted-foreground">{t("permissionsGate.description")}</p>
-              </div>
-
-              <PermissionsSection permissions={permissions} systemAudio={systemAudio} />
-
-              <Button onClick={onComplete} disabled={!requiredMet} className="w-full">
-                <Check className="w-4 h-4" />
-                {t("permissionsGate.continue")}
-              </Button>
-            </CardContent>
-          </Card>
-        </div>
-      </div>
-    </div>
-  );
-}
diff --git a/src/components/ReasoningModelSelector.tsx b/src/components/ReasoningModelSelector.tsx
index 3e75b80d3..57bac5dc8 100644
--- a/src/components/ReasoningModelSelector.tsx
+++ b/src/components/ReasoningModelSelector.tsx
@@ -824,7 +824,7 @@ export default function ReasoningModelSelector({
                     </div>
                     <p className="text-xs text-muted-foreground">
                       {t("reasoning.custom.queryPrefix")}{" "}
-                      <code>
+                      <code className="break-all">
                         {hasCustomBase
                           ? `${effectiveReasoningBase}/models`
                           : `${defaultOpenAIBase}/models`}
diff --git a/src/components/SettingsPage.tsx b/src/components/SettingsPage.tsx
index 8ac7c4679..226621e35 100644
--- a/src/components/SettingsPage.tsx
+++ b/src/components/SettingsPage.tsx
@@ -74,6 +74,7 @@ import { useTheme } from "../hooks/useTheme";
 import type { GpuDevice, LocalTranscriptionProvider } from "../types/electron";
 import logger from "../utils/logger";
 import { SettingsRow } from "./ui/SettingsSection";
+import { useSettingsLayout } from "./ui/SidebarModal";
 import { useUsage } from "../hooks/useUsage";
 import { cn } from "./lib/utils";
 import { startMigration, useMigration } from "../stores/noteStore.js";
@@ -137,7 +138,11 @@ function SettingsPanelRow({
   children: React.ReactNode;
   className?: string;
 }) {
-  return <div className={`px-4 py-3 ${className}`}>{children}</div>;
+  const { isCompact } = useSettingsLayout();
+
+  return (
+    <div className={`${isCompact ? "px-3 py-2.5" : "px-4 py-3"} ${className}`}>{children}</div>
+  );
 }
 
 function SectionHeader({ title, description }: { title: string; description?: string }) {
@@ -637,11 +642,13 @@ function GpuDeviceSelector({ purpose }: { purpose: "transcription" | "intelligen
     Promise.all([
       window.electronAPI?.listGpus?.() ?? Promise.resolve([]),
       window.electronAPI?.getGpuDeviceIndex?.(purpose) ?? Promise.resolve("0"),
-    ]).then(([gpuList, idx]) => {
-      setGpus(gpuList);
-      setSelectedIndex(idx);
-      setLoaded(true);
-    }).catch(() => setLoaded(true));
+    ])
+      .then(([gpuList, idx]) => {
+        setGpus(gpuList);
+        setSelectedIndex(idx);
+        setLoaded(true);
+      })
+      .catch(() => setLoaded(true));
   }, [purpose]);
 
   if (!loaded || gpus.length < 2) return null;
@@ -670,7 +677,18 @@ function GpuDeviceSelector({ purpose }: { purpose: "transcription" | "intelligen
                 </option>
               ))}
             </select>
-            <svg className="pointer-events-none absolute right-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"><path d="m6 9 6 6 6-6"/></svg>
+            <svg
+              className="pointer-events-none absolute right-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground"
+              xmlns="http://www.w3.org/2000/svg"
+              viewBox="0 0 24 24"
+              fill="none"
+              stroke="currentColor"
+              strokeWidth="2"
+              strokeLinecap="round"
+              strokeLinejoin="round"
+            >
+              <path d="m6 9 6 6 6-6" />
+            </svg>
           </div>
         </SettingsPanelRow>
       </SettingsPanel>
@@ -679,6 +697,7 @@ function GpuDeviceSelector({ purpose }: { purpose: "transcription" | "intelligen
 }
 
 export default function SettingsPage({ activeSection = "general" }: SettingsPageProps) {
+  const { isCompact } = useSettingsLayout();
   const {
     confirmDialog,
     alertDialog,
@@ -768,6 +787,10 @@ export default function SettingsPage({ activeSection = "general" }: SettingsPage
     setDataRetentionEnabled,
     customDictionary,
     setCustomDictionary,
+    noteFilesEnabled,
+    setNoteFilesEnabled,
+    noteFilesPath,
+    setNoteFilesPath,
   } = useSettings();
 
   const agentKey = useSettingsStore((s) => s.agentKey);
@@ -1008,6 +1031,40 @@ export default function SettingsPage({ activeSection = "general" }: SettingsPage
     }
   };
 
+  const [noteFilesDefaultPath, setNoteFilesDefaultPath] = useState("");
+  const [noteFilesRebuilding, setNoteFilesRebuilding] = useState(false);
+
+  useEffect(() => {
+    if (!noteFilesEnabled) return;
+    window.electronAPI?.noteFilesGetDefaultPath?.().then((p) => {
+      if (p) setNoteFilesDefaultPath(p);
+    });
+  }, [noteFilesEnabled]);
+
+  const handleNoteFilesToggle = useCallback(
+    async (enabled: boolean) => {
+      setNoteFilesEnabled(enabled);
+      await window.electronAPI?.noteFilesSetEnabled?.(enabled, noteFilesPath || undefined);
+    },
+    [setNoteFilesEnabled, noteFilesPath]
+  );
+
+  const handleNoteFilesChangePath = useCallback(async () => {
+    const result = await window.electronAPI?.noteFilesPickFolder?.();
+    if (result?.canceled || !result?.path) return;
+    setNoteFilesPath(result.path);
+    await window.electronAPI?.noteFilesSetPath?.(result.path);
+  }, [setNoteFilesPath]);
+
+  const handleNoteFilesRebuild = useCallback(async () => {
+    setNoteFilesRebuilding(true);
+    try {
+      await window.electronAPI?.noteFilesRebuild?.();
+    } finally {
+      setNoteFilesRebuilding(false);
+    }
+  }, []);
+
   useEffect(() => {
     let mounted = true;
 
@@ -1454,7 +1511,7 @@ export default function SettingsPage({ activeSection = "general" }: SettingsPage
             ) : isLoaded ? (
               <>
                 <SectionHeader title={t("settingsPage.account.pricing.title")} />
-                <div className="grid grid-cols-4 gap-1.5">
+                <div className={`grid gap-1.5 ${isCompact ? "grid-cols-2" : "grid-cols-4"}`}>
                   {/* Free */}
                   <div
                     className={cn(
@@ -1762,7 +1819,7 @@ export default function SettingsPage({ activeSection = "general" }: SettingsPage
                   open={!!switchPreview}
                   onOpenChange={(open) => !open && setSwitchPreview(null)}
                 >
-                  <DialogContent className="sm:max-w-[360px]">
+                  <DialogContent className="sm:max-w-90">
                     <DialogHeader>
                       <DialogTitle>
                         {t("settingsPage.account.pricing.confirmSwitch.title")}
@@ -2212,6 +2269,60 @@ export default function SettingsPage({ activeSection = "general" }: SettingsPage
               </SettingsPanel>
             </div>
 
+            {/* Save Notes as Files */}
+            <div>
+              <SectionHeader title={t("settings.noteFiles.title")} />
+              <SettingsPanel>
+                <SettingsPanelRow>
+                  <SettingsRow
+                    label={t("settings.noteFiles.title")}
+                    description={t("settings.noteFiles.description")}
+                  >
+                    <Toggle checked={noteFilesEnabled} onChange={handleNoteFilesToggle} />
+                  </SettingsRow>
+                </SettingsPanelRow>
+                {noteFilesEnabled && (
+                  <>
+                    <SettingsPanelRow>
+                      <SettingsRow
+                        label={t("settings.noteFiles.path")}
+                        description={noteFilesPath || noteFilesDefaultPath || "..."}
+                      >
+                        <Button
+                          variant="outline"
+                          size="sm"
+                          className="h-7 text-xs"
+                          onClick={handleNoteFilesChangePath}
+                        >
+                          {t("settings.noteFiles.changePath")}
+                        </Button>
+                      </SettingsRow>
+                    </SettingsPanelRow>
+                    <SettingsPanelRow>
+                      <SettingsRow
+                        label={t("settings.noteFiles.rebuild")}
+                        description={t("settings.noteFiles.rebuildDescription")}
+                      >
+                        <Button
+                          variant="outline"
+                          size="sm"
+                          className="h-7 text-xs"
+                          disabled={noteFilesRebuilding}
+                          onClick={handleNoteFilesRebuild}
+                        >
+                          {noteFilesRebuilding ? (
+                            <Loader2 className="h-3 w-3 animate-spin" />
+                          ) : (
+                            t("settings.noteFiles.rebuild")
+                          )}
+                        </Button>
+                      </SettingsRow>
+                    </SettingsPanelRow>
+                  </>
+                )}
+              </SettingsPanel>
+            </div>
+
             {/* Floating Icon */}
             <div>
               <SectionHeader
@@ -2823,7 +2934,6 @@ EOF`,
                 })()}
               </div>
             )}
-
           </div>
         );
 
@@ -3451,7 +3561,6 @@ EOF`,
                 </div>
               )}
             </div>
-
           </div>
         );
 
diff --git a/src/components/UpcomingMeetings.tsx b/src/components/UpcomingMeetings.tsx
index ac5599a50..36b2866b3 100644
--- a/src/components/UpcomingMeetings.tsx
+++ b/src/components/UpcomingMeetings.tsx
@@ -104,7 +104,7 @@ export default function UpcomingMeetings({ events, isLoading }: UpcomingMeetings
       {/* Empty state */}
       {!isLoading && events.length === 0 && (
         <div className="flex flex-col items-center justify-center py-8 px-3">
-          {systemAudio.isMacOS && systemAudio.status === "denied" ? (
+          {systemAudio.mode === "native" && !systemAudio.granted ? (
             <>
               <Monitor size={24} className="text-muted-foreground/30 mb-2.5" />
               <p className="text-xs text-muted-foreground/60 text-center mb-3">
@@ -113,7 +113,7 @@ export default function UpcomingMeetings({ events, isLoading }: UpcomingMeetings
               <Button
                 size="sm"
                 variant="outline"
-                onClick={systemAudio.openSettings}
+                onClick={() => systemAudio.request()}
                 className="text-xs h-7"
               >
                 {t("upcoming.openSettings")}
diff --git a/src/components/agent/AgentChat.tsx b/src/components/agent/AgentChat.tsx
index 923b5d54f..398b58a38 100644
--- a/src/components/agent/AgentChat.tsx
+++ b/src/components/agent/AgentChat.tsx
@@ -1,16 +1,11 @@
-import { useRef, useEffect } from "react";
+import { Mic } from "lucide-react";
 import { useTranslation } from "react-i18next";
-import { cn } from "../lib/utils";
-import { AgentMessage } from "./AgentMessage";
 import { useSettingsStore } from "../../stores/settingsStore";
 import { formatHotkeyLabel } from "../../utils/hotkeys";
+import { ChatMessages } from "../chat/ChatMessages";
+import type { Message } from "../chat/types";
 
-interface Message {
-  id: string;
-  role: "user" | "assistant";
-  content: string;
-  isStreaming: boolean;
-}
+export type { Message, ToolCallInfo } from "../chat/types";
 
 interface AgentChatProps {
   messages: Message[];
@@ -18,37 +13,30 @@ interface AgentChatProps {
 
 export function AgentChat({ messages }: AgentChatProps) {
   const { t } = useTranslation();
-  const scrollRef = useRef<HTMLDivElement>(null);
   const agentKey = useSettingsStore((s) => s.agentKey);
   const hotkeyLabel = formatHotkeyLabel(agentKey);
 
-  useEffect(() => {
-    const el = scrollRef.current;
-    if (el) {
-      el.scrollTop = el.scrollHeight;
-    }
-  }, [messages]);
-
   return (
-    <div ref={scrollRef} className={cn("flex-1 overflow-y-auto agent-chat-scroll", "px-3 py-2")}>
-      {messages.length === 0 ? (
-        <div className="flex items-center justify-center h-full">
-          <p className="text-[12px] text-muted-foreground/60 text-center select-none">
-            {t("agentMode.chat.emptyState", { hotkey: hotkeyLabel })}
-          </p>
-        </div>
-      ) : (
-        <div className="flex flex-col gap-2">
-          {messages.map((msg) => (
-            <AgentMessage
-              key={msg.id}
-              role={msg.role}
-              content={msg.content}
-              isStreaming={msg.isStreaming}
-            />
-          ))}
+    <ChatMessages
+      messages={messages}
+      emptyState={
+        <div className="flex flex-col items-center justify-center h-full gap-2 select-none">
+          <div
+            className="text-muted-foreground/30"
+            style={{ animation: "agent-mic-pulse 3s ease-in-out infinite" }}
+          >
+            <Mic size={20} />
+          </div>
+          <div className="text-center">
+            <p className="text-[12px] text-muted-foreground/50">
+              {t("agentMode.chat.emptyState", { hotkey: hotkeyLabel })}
+            </p>
+            <p className="text-[11px] text-muted-foreground/30 mt-0.5">
+              {t("agentMode.chat.orType")}
+            </p>
+          </div>
         </div>
-      )}
-    </div>
+      }
+    />
   );
 }
diff --git a/src/components/agent/AgentInput.tsx b/src/components/agent/AgentInput.tsx
index a55c7b5cf..298f446c0 100644
--- a/src/components/agent/AgentInput.tsx
+++ b/src/components/agent/AgentInput.tsx
@@ -1,145 +1,13 @@
-import { Mic } from "lucide-react";
-import { useTranslation } from "react-i18next";
-import { cn } from "../lib/utils";
-import { useSettingsStore } from "../../stores/settingsStore";
-import { formatHotkeyLabel, isGlobeLikeHotkey } from "../../utils/hotkeys";
-
-type AgentState = "idle" | "listening" | "transcribing" | "thinking" | "streaming";
+import { ChatInput } from "../chat/ChatInput";
+import type { AgentState } from "../chat/types";
 
 interface AgentInputProps {
   agentState: AgentState;
   partialTranscript: string;
+  onTextSubmit?: (text: string) => void;
+  onCancel?: () => void;
 }
 
-function Kbd({ children }: { children: React.ReactNode }) {
-  return (
-    <kbd
-      className={cn(
-        "inline-flex items-center justify-center",
-        "min-w-5 h-4.5 px-1.5",
-        "text-[10px] font-medium leading-none",
-        "text-muted-foreground/70",
-        "bg-foreground/6 border border-foreground/8",
-        "rounded-sm",
-        "shadow-[0_1px_0_0_rgba(0,0,0,0.04)]"
-      )}
-    >
-      {children}
-    </kbd>
-  );
-}
-
-function HotkeyKeys({ hotkey }: { hotkey: string }) {
-  const label = formatHotkeyLabel(hotkey);
-
-  if (isGlobeLikeHotkey(hotkey) || !label.includes("+")) {
-    return <Kbd>{label}</Kbd>;
-  }
-
-  const parts = label.split("+");
-
-  return (
-    <span className="inline-flex items-center gap-0.5">
-      {parts.map((part, i) => (
-        <Kbd key={i}>{part}</Kbd>
-      ))}
-    </span>
-  );
-}
-
-function WaveBars() {
-  return (
-    <div className="flex items-center justify-center gap-[3px] h-4">
-      {[0, 1, 2, 3].map((i) => (
-        <div
-          key={i}
-          className="w-[3px] bg-primary rounded-full origin-center"
-          style={{
-            animation: `waveform-bar 0.8s ease-in-out ${i * 0.12}s infinite`,
-            height: "16px",
-          }}
-        />
-      ))}
-    </div>
-  );
-}
-
-function InputLoadingDots() {
-  return (
-    <div className="flex items-center gap-1">
-      {[0, 1, 2].map((i) => (
-        <div
-          key={i}
-          className="w-1.5 h-1.5 rounded-full bg-muted-foreground/60"
-          style={{
-            animation: `agent-loading-dot 1.2s ease-in-out ${i * 0.2}s infinite`,
-          }}
-        />
-      ))}
-    </div>
-  );
-}
-
-export function AgentInput({ agentState, partialTranscript }: AgentInputProps) {
-  const { t } = useTranslation();
-  const agentKey = useSettingsStore((s) => s.agentKey);
-
-  return (
-    <div
-      className={cn(
-        "flex items-center gap-3 h-12 px-3 py-2 shrink-0",
-        "bg-surface-1 border-t border-border/30"
-      )}
-    >
-      {agentState === "idle" && (
-        <div className="flex items-center justify-between w-full">
-          <div className="flex items-center gap-2">
-            <div
-              className="text-muted-foreground/50"
-              style={{ animation: "agent-mic-pulse 2.5s ease-in-out infinite" }}
-            >
-              <Mic size={14} />
-            </div>
-            <span className="text-[11px] text-muted-foreground/50 select-none">
-              {t("agentMode.input.holdToSpeak")}
-            </span>
-            <HotkeyKeys hotkey={agentKey} />
-          </div>
-          <div className="flex items-center gap-1.5">
-            <Kbd>Esc</Kbd>
-            <span className="text-[10px] text-muted-foreground/35 select-none">
-              {t("agentMode.input.toClose")}
-            </span>
-          </div>
-        </div>
-      )}
-
-      {agentState === "listening" && (
-        <>
-          <WaveBars />
-          <span className="text-[12px] text-foreground/80 truncate flex-1">
-            {partialTranscript || t("agentMode.input.listening")}
-          </span>
-        </>
-      )}
-
-      {agentState === "transcribing" && (
-        <>
-          <InputLoadingDots />
-          <span className="text-[12px] text-muted-foreground select-none">
-            {t("agentMode.input.transcribing")}
-          </span>
-        </>
-      )}
-
-      {(agentState === "thinking" || agentState === "streaming") && (
-        <>
-          <InputLoadingDots />
-          <span className="text-[12px] text-muted-foreground select-none">
-            {t("agentMode.input.thinking")}
-          </span>
-        </>
-      )}
-    </div>
-  );
+export function AgentInput(props: AgentInputProps) {
+  return <ChatInput {...props} showHotkey={true} />;
 }
diff --git a/src/components/agent/AgentMessage.tsx b/src/components/agent/AgentMessage.tsx
index 1a569c06a..306d0252c 100644
--- a/src/components/agent/AgentMessage.tsx
+++ b/src/components/agent/AgentMessage.tsx
@@ -1,82 +1 @@
-import { useState } from "react";
-import { Copy, Check } from "lucide-react";
-import { cn } from "../lib/utils";
-import { MarkdownRenderer } from "../ui/MarkdownRenderer";
-
-interface AgentMessageProps {
-  role: "user" | "assistant";
-  content: string;
-  isStreaming: boolean;
-}
-
-export function AgentMessage({ role, content, isStreaming }: AgentMessageProps) {
-  const [copied, setCopied] = useState(false);
-
-  const handleCopy = async () => {
-    try {
-      await navigator.clipboard.writeText(content);
-      setCopied(true);
-      setTimeout(() => setCopied(false), 1500);
-    } catch {
-      // clipboard unavailable
-    }
-  };
-
-  if (role === "user") {
-    return (
-      <div
-        className="flex justify-end"
-        style={{ animation: "agent-message-in 200ms ease-out both" }}
-      >
-        <div
-          className={cn(
-            "max-w-[85%] px-3 py-2 rounded-lg rounded-br-sm",
-            "bg-primary/90 text-primary-foreground",
-            "text-[13px] leading-relaxed"
-          )}
-        >
-          {content}
-        </div>
-      </div>
-    );
-  }
-
-  return (
-    <div
-      className="group/msg flex justify-start"
-      style={{ animation: "agent-message-in 200ms ease-out both" }}
-    >
-      <div
-        className={cn(
-          "relative max-w-[85%] px-3 py-2 rounded-lg rounded-bl-sm",
-          "bg-surface-2 border border-border/30 text-foreground",
-          "text-[13px] leading-relaxed"
-        )}
-      >
-        <button
-          onClick={handleCopy}
-          className={cn(
-            "absolute top-1.5 right-1.5 p-1 rounded-sm",
-            "text-muted-foreground hover:text-foreground hover:bg-foreground/10",
-            "opacity-0 group-hover/msg:opacity-100 transition-opacity duration-150",
-            "focus:outline-none focus-visible:ring-1 focus-visible:ring-ring/30"
-          )}
-        >
-          {copied ? <Check size={14} /> : <Copy size={14} />}
-        </button>
-
-        <MarkdownRenderer
-          content={content}
-          className="text-[13px] leading-relaxed [&_p]:text-[13px] [&_li]:text-[13px]"
-        />
-
-        {isStreaming && (
-          <span
-            className="inline-block w-[2px] h-[14px] bg-foreground align-middle ml-0.5"
-            style={{ animation: "agent-cursor-blink 800ms steps(1) infinite" }}
-          />
-        )}
-      </div>
-    </div>
-  );
-}
+export { ChatMessage as AgentMessage } from "../chat/ChatMessage";
diff --git a/src/components/agent/AgentTitleBar.tsx b/src/components/agent/AgentTitleBar.tsx
index 7409a4e6e..d6e868376 100644
--- a/src/components/agent/AgentTitleBar.tsx
+++ b/src/components/agent/AgentTitleBar.tsx
@@ -1,6 +1,7 @@
 import { Plus, X } from "lucide-react";
 import { useTranslation } from "react-i18next";
 import { cn } from "../lib/utils";
+import { getAgentName } from "../../utils/agentName";
 
 interface AgentTitleBarProps {
   onNewChat: () => void;
@@ -9,18 +10,21 @@ interface AgentTitleBarProps {
 
 export function AgentTitleBar({ onNewChat, onClose }: AgentTitleBarProps) {
   const { t } = useTranslation();
+  const agentName = getAgentName();
 
   return (
     <div
       className={cn(
         "flex items-center justify-between h-8 px-3",
-        "bg-surface-1 border-b border-border/30",
+        "bg-surface-1",
+        "border-b border-border/20",
+        "shadow-[0_1px_2px_0_oklch(0_0_0/0.04)]",
         "select-none"
       )}
       style={{ WebkitAppRegion: "drag" } as React.CSSProperties}
     >
       <span className="text-[11px] text-muted-foreground font-medium tracking-wide uppercase">
-        {t("agentMode.titleBar.label")}
+        {agentName}
       </span>
 
       <div
diff --git a/src/components/chat/ChatInput.tsx b/src/components/chat/ChatInput.tsx
new file mode 100644
index 000000000..de1e70bdf
--- /dev/null
+++ b/src/components/chat/ChatInput.tsx
@@ -0,0 +1,216 @@
+import { useState, useRef, useCallback, useEffect } from "react";
+import { Mic, SendHorizontal, Square } from "lucide-react";
+import { useTranslation } from "react-i18next";
+import { cn } from "../lib/utils";
+import { useSettingsStore } from "../../stores/settingsStore";
+import { formatHotkeyLabel, isGlobeLikeHotkey } from "../../utils/hotkeys";
+import type { AgentState } from "./types";
+interface ChatInputProps {
+  agentState: AgentState;
+  partialTranscript: string;
+  onTextSubmit?: (text: string) => void;
+  onCancel?: () => void;
+  showHotkey?: boolean;
+  autoFocus?: boolean;
+}
+
+function Kbd({ children }: { children: React.ReactNode }) {
+  return (
+    <kbd
+      className={cn(
+        "inline-flex items-center justify-center",
+        "min-w-5 h-4.5 px-1.5",
+        "text-[10px] font-medium leading-none",
+        "text-muted-foreground/70",
+        "bg-foreground/6 border border-foreground/8",
+        "rounded-sm",
+        "shadow-[0_1px_0_0_rgba(0,0,0,0.04)]"
+      )}
+    >
+      {children}
+    </kbd>
+  );
+}
+
+function HotkeyKeys({ hotkey }: { hotkey: string }) {
+  const label = formatHotkeyLabel(hotkey);
+
+  if (isGlobeLikeHotkey(hotkey) || !label.includes("+")) {
+    return <Kbd>{label}</Kbd>;
+  }
+
+  const parts = label.split("+");
+
+  return (
+    <span className="inline-flex items-center gap-0.5">
+      {parts.map((part, i) => (
+        <Kbd key={i}>{part}</Kbd>
+      ))}
+    </span>
+  );
+}
+
+function RecordingIndicator() {
+  return (
+    <div className="relative flex items-center justify-center w-5 h-5 shrink-0">
+      <div className="absolute inset-0 rounded-full border-2 border-primary/40 animate-pulse" />
+      <div className="w-2.5 h-2.5 rounded-full bg-primary" />
+    </div>
+  );
+}
+
+function ProcessingIndicator() {
+  return (
+    <div className="flex items-center justify-center w-5 h-5 shrink-0">
+      <div className="flex items-center gap-0.5">
+        {[0, 1, 2, 3].map((i) => (
+          <div
+            key={i}
+            className="w-0.5 bg-accent rounded-full"
+            style={{
+              height: "8px",
+              animation: `waveform-bar 0.6s ease-in-out ${i * 0.1}s infinite`,
+            }}
+          />
+        ))}
+      </div>
+    </div>
+  );
+}
+
+export function ChatInput({
+  agentState,
+  partialTranscript,
+  onTextSubmit,
+  onCancel,
+  showHotkey = false,
+  autoFocus = false,
+}: ChatInputProps) {
+  const { t } = useTranslation();
+  const agentKey = useSettingsStore((s) => s.agentKey);
+  const [inputText, setInputText] = useState("");
+  const inputRef = useRef<HTMLInputElement>(null);
+
+  const handleSubmit = useCallback(() => {
+    const text = inputText.trim();
+    if (!text || !onTextSubmit) return;
+    onTextSubmit(text);
+    setInputText("");
+    requestAnimationFrame(() => inputRef.current?.focus());
+  }, [inputText, onTextSubmit]);
+
+  const handleKeyDown = useCallback(
+    (e: React.KeyboardEvent<HTMLInputElement>) => {
+      if (e.key === "Enter" && !e.shiftKey) {
+        e.preventDefault();
+        handleSubmit();
+      }
+    },
+    [handleSubmit]
+  );
+
+  const isIdle = agentState === "idle";
+  const isListening = agentState === "listening";
+  const isTranscribing = agentState === "transcribing";
+  const isBusy =
+    agentState === "thinking" || agentState === "streaming" || agentState === "tool-executing";
+
+  useEffect(() => {
+    if (isIdle) {
+      requestAnimationFrame(() => inputRef.current?.focus());
+    }
+  }, [isIdle]);
+
+  return (
+    <div className="shrink-0 px-3 pb-3 pt-1">
+      <div
+        className={cn(
+          "flex items-center gap-2 min-h-11 px-3 rounded-lg",
+          "bg-surface-1 border border-border/30",
+          "transition-colors duration-150",
+          isIdle && "focus-within:border-primary/30"
+        )}
+      >
+        {isListening && (
+          <>
+            <RecordingIndicator />
+            <span className="text-[12px] text-foreground/80 truncate flex-1">
+              {partialTranscript || t("agentMode.input.listening")}
+            </span>
+          </>
+        )}
+
+        {isTranscribing && (
+          <>
+            <ProcessingIndicator />
+            <span className="text-[12px] text-muted-foreground select-none">
+              {t("agentMode.input.transcribing")}
+            </span>
+          </>
+        )}
+
+        {(isIdle || isBusy) && (
+          <div className="flex items-center gap-2 w-full">
+            <input
+              ref={inputRef}
+              type="text"
+              value={inputText}
+              onChange={(e) => setInputText(e.target.value)}
+              onKeyDown={handleKeyDown}
+              disabled={isBusy}
+              autoFocus={autoFocus}
+              placeholder={t("agentMode.input.typeMessage")}
+              className={cn(
+                "input-inline flex-1 outline-none bg-transparent",
+                "text-[13px] text-foreground placeholder:text-muted-foreground/40",
+                "min-w-0 p-0",
+                isBusy && "text-muted-foreground/30 cursor-not-allowed"
+              )}
+            />
+            {isBusy && onCancel ? (
+              <button
+                onClick={onCancel}
+                className={cn(
+                  "p-1 rounded-sm shrink-0",
+                  "text-muted-foreground/60 hover:text-foreground hover:bg-foreground/8",
+                  "focus:outline-none focus-visible:ring-1 focus-visible:ring-ring/30",
+                  "transition-colors duration-100"
+                )}
+              >
+                <Square size={12} className="fill-current" />
+              </button>
+            ) : isIdle ? (
+              <div className="flex items-center gap-1 shrink-0">
+                {showHotkey && (
+                  <div className="flex items-center gap-2 mr-1">
+                    <div
+                      className="text-muted-foreground/50"
+                      style={{ animation: "agent-mic-pulse 2.5s ease-in-out infinite" }}
+                    >
+                      <Mic size={14} />
+                    </div>
+                    <HotkeyKeys hotkey={agentKey} />
+                  </div>
+                )}
+                <button
+                  onClick={handleSubmit}
+                  disabled={!inputText.trim()}
+                  className={cn(
+                    "p-1 rounded-sm",
+                    "focus:outline-none focus-visible:ring-1 focus-visible:ring-ring/30",
+                    "transition-colors duration-100",
+                    inputText.trim()
+                      ? "text-primary hover:text-primary/80"
+                      : "text-muted-foreground/25 cursor-default"
+                  )}
+                >
+                  <SendHorizontal size={14} />
+                </button>
+              </div>
+            ) : null}
+          </div>
+        )}
+      </div>
+    </div>
+  );
+}
diff --git a/src/components/chat/ChatMessage.tsx b/src/components/chat/ChatMessage.tsx
new file mode 100644
index 000000000..d5725b0aa
--- /dev/null
+++ b/src/components/chat/ChatMessage.tsx
@@ -0,0 +1,284 @@
+import { useState } from "react";
+import { useTranslation } from "react-i18next";
+import {
+  Copy,
+  Check,
+  Search,
+  FileText,
+  ChevronDown,
+  ChevronRight,
+  CircleAlert,
+} from "lucide-react";
+import { cn } from "../lib/utils";
+import { MarkdownRenderer } from "../ui/MarkdownRenderer";
+import type { ToolCallInfo } from "./types";
+import { toolIcons } from "./toolIcons";
+
+interface ChatMessageProps {
+  role: "user" | "assistant";
+  content: string;
+  isStreaming: boolean;
+  toolCalls?: ToolCallInfo[];
+}
+
+const NOTE_TOOLS = new Set(["create_note", "update_note", "get_note"]);
+
+function ToolCallStep({ toolCall }: { toolCall: ToolCallInfo }) {
+  const { t } = useTranslation();
+  const [expanded, setExpanded] = useState(false);
+  const Icon = toolIcons[toolCall.name] || Search;
+  const isExecuting = toolCall.status === "executing";
+  const isError = toolCall.status === "error";
+  const isCompleted = toolCall.status === "completed";
+  const isClipboard = toolCall.name === "copy_to_clipboard" && isCompleted;
+
+  const resultLines = toolCall.result?.split("\n") ?? [];
+  const hasDetail = resultLines.length > 1 && !isClipboard;
+
+  return (
+    <div
+      className={cn(
+        "relative rounded-md mb-1 overflow-hidden",
+        "border-l-2 transition-colors duration-300",
+        isExecuting && "border-l-primary/60",
+        isCompleted && !isError && "border-l-muted-foreground/20",
+        isClipboard && "border-l-emerald-500/50",
+        isError && "border-l-destructive/50"
+      )}
+    >
+      {isExecuting && (
+        <div
+          className="absolute inset-0 pointer-events-none"
+          style={{ animation: "tool-step-shimmer 2s ease-in-out infinite" }}
+        />
+      )}
+
+      <div
+        className={cn(
+          "flex items-center gap-1.5 px-2.5 py-1.5",
+          "bg-surface-1/60",
+          hasDetail && !isExecuting && "cursor-pointer"
+        )}
+        onClick={hasDetail && !isExecuting ? () => setExpanded((v) => !v) : undefined}
+      >
+        <Icon
+          size={12}
+          className={cn(
+            "shrink-0 transition-colors duration-300",
+            isExecuting && "text-primary/70",
+            isCompleted && !isError && !isClipboard && "text-muted-foreground/50",
+            isClipboard && "text-emerald-500/70",
+            isError && "text-destructive/60"
+          )}
+        />
+
+        {isExecuting ? (
+          <span className="text-[11px] text-muted-foreground/80">
+            {t(`agentMode.tools.${toolCall.name}Status`, { defaultValue: toolCall.name })}
+          </span>
+        ) : isError ? (
+          <div className="flex items-center gap-1">
+            <CircleAlert size={10} className="text-destructive/60 shrink-0" />
+            <span className="text-[11px] text-destructive/70">
+              {toolCall.result || toolCall.name}
+            </span>
+          </div>
+        ) : isClipboard ? (
+          <div className="flex items-center gap-1">
+            <span className="text-[11px] text-emerald-600 dark:text-emerald-400/80">
+              {t("agentMode.tools.copiedToClipboard")}
+            </span>
+            <Check
+              size={10}
+              className="text-emerald-500 shrink-0"
+              style={{ animation: "tool-check-pop 300ms ease-out both" }}
+            />
+          </div>
+        ) : (
+          <span className="text-[11px] text-muted-foreground/70">
+            {toolCall.result || toolCall.name}
+          </span>
+        )}
+
+        {hasDetail && !isExecuting && (
+          <ChevronDown
+            size={10}
+            className={cn(
+              "ml-auto text-muted-foreground/40 shrink-0 transition-transform duration-200",
+              expanded && "rotate-180"
+            )}
+          />
+        )}
+      </div>
+
+      {hasDetail && !isExecuting && (
+        <div
+          className="overflow-hidden transition-all duration-200"
+          style={{ maxHeight: expanded ? `${resultLines.length * 16 + 12}px` : "0px" }}
+        >
+          <pre className="text-[10px] text-muted-foreground/60 px-2.5 pb-1.5 whitespace-pre-wrap leading-tight">
+            {toolCall.result}
+          </pre>
+        </div>
+      )}
+    </div>
+  );
+}
+
+function NoteCard({ noteId, title }: { noteId: number; title: string }) {
+  const { t } = useTranslation();
+
+  return (
+    <button
+      onClick={() => window.electronAPI?.agentOpenNote?.(noteId)}
+      className={cn(
+        "flex items-center gap-2 w-full mt-2 px-2.5 py-2 rounded-md",
+        "bg-primary/6 border border-primary/12",
+        "hover:bg-primary/10 hover:border-primary/20",
+        "active:scale-[0.99]",
+        "transition-all duration-150",
+        "text-left group/note"
+      )}
+    >
+      <div className={cn("shrink-0 p-1 rounded", "bg-primary/10")}>
+        <FileText size={12} className="text-primary/70" />
+      </div>
+      <div className="min-w-0 flex-1">
+        <p className="text-[12px] font-medium text-foreground truncate">{title}</p>
+        <p className="text-[10px] text-muted-foreground/50">{t("agentMode.tools.openNote")}</p>
+      </div>
+      <ChevronRight
+        size={12}
+        className="text-muted-foreground/30 group-hover/note:text-primary/50 shrink-0 transition-colors duration-150"
+      />
+    </button>
+  );
+}
+
+function extractNoteCards(toolCalls?: ToolCallInfo[]): Array<{ noteId: number; title: string }> {
+  if (!toolCalls) return [];
+  const cards: Array<{ noteId: number; title: string }> = [];
+  const seen = new Set<number>();
+
+  for (const tc of toolCalls) {
+    if (tc.status !== "completed" || !NOTE_TOOLS.has(tc.name) || !tc.metadata?.id) continue;
+    const noteId = Number(tc.metadata.id);
+    if (seen.has(noteId)) continue;
+    seen.add(noteId);
+    const title =
+      (tc.metadata.title as string) ||
+      tc.result?.replace(/^(Created|Updated|Retrieved) note: "(.+)"$/, "$2") ||
+      "Note";
+    cards.push({ noteId, title });
+  }
+  return cards;
+}
+
+export function ChatMessage({ role, content, isStreaming, toolCalls }: ChatMessageProps) {
+  const { t } = useTranslation();
+  const [copied, setCopied] = useState(false);
+
+  const handleCopy = async () => {
+    try {
+      await navigator.clipboard.writeText(content);
+      setCopied(true);
+      setTimeout(() => setCopied(false), 1500);
+    } catch {
+      // clipboard unavailable
+    }
+  };
+
+  if (role === "user") {
+    return (
+      <div
+        className="flex justify-end"
+        style={{ animation: "agent-message-in 200ms ease-out both" }}
+      >
+        <div
+          className={cn(
+            "max-w-[80%] px-3 py-2 rounded-lg rounded-br-sm",
+            "bg-primary/90 text-primary-foreground",
+            "text-[13px] leading-relaxed"
+          )}
+        >
+          {content}
+        </div>
+      </div>
+    );
+  }
+
+  const hasToolCalls = toolCalls && toolCalls.length > 0;
+  const hasContent = content.length > 0;
+  const noteCards = extractNoteCards(toolCalls);
+
+  return (
+    <div
+      className="group/msg flex justify-start"
+      style={{ animation: "agent-message-in 200ms ease-out both" }}
+    >
+      <div
+        className={cn(
+          "max-w-[85%] px-3 py-2 rounded-lg rounded-bl-sm",
+          "bg-surface-1 border border-border/30 text-foreground",
+          "text-[13px] leading-relaxed"
+        )}
+      >
+        {hasToolCalls && (
+          <div
+            className={cn(
+              (hasContent || noteCards.length > 0) && "mb-2 pb-1.5 border-b border-border/15"
+            )}
+          >
+            {toolCalls.map((tc) => (
+              <ToolCallStep key={tc.id} toolCall={tc} />
+            ))}
+          </div>
+        )}
+
+        {hasContent && (
+          <MarkdownRenderer
+            content={content}
+            className="text-[13px] leading-relaxed [&_p]:text-[13px] [&_li]:text-[13px]"
+          />
+        )}
+
+        {isStreaming && hasContent && (
+          <span
+            className="inline-block w-[2px] h-[14px] bg-foreground/70 align-middle ml-0.5"
+            style={{ animation: "agent-cursor-blink 1s ease-in-out infinite" }}
+          />
+        )}
+
+        {isStreaming && !hasContent && !hasToolCalls && (
+          <span className="text-[13px] font-medium select-none thinking-shimmer-text">
+            {t("agentMode.input.thinking")}...
+          </span>
+        )}
+
+        {noteCards.length > 0 && !isStreaming && (
+          <div>
+            {noteCards.map((card) => (
+              <NoteCard key={card.noteId} noteId={card.noteId} title={card.title} />
+            ))}
+          </div>
+        )}
+
+        {hasContent && !isStreaming && (
+          <div className="flex justify-start mt-1.5 -mb-0.5">
+            <button
+              onClick={handleCopy}
+              className={cn(
+                "p-1 rounded-sm",
+                "text-muted-foreground/40 hover:text-foreground hover:bg-foreground/8",
+                "opacity-0 group-hover/msg:opacity-100 transition-all duration-150",
+                "focus:outline-none focus-visible:ring-1 focus-visible:ring-ring/30"
+              )}
+            >
+              {copied ? <Check size={12} className="text-emerald-500" /> : <Copy size={12} />}
+            </button>
+          </div>
+        )}
+      </div>
+    </div>
+  );
+}
diff --git a/src/components/chat/ChatMessages.tsx b/src/components/chat/ChatMessages.tsx
new file mode 100644
index 000000000..297990eed
--- /dev/null
+++ b/src/components/chat/ChatMessages.tsx
@@ -0,0 +1,42 @@
+import { useRef, useEffect } from "react";
+import { cn } from "../lib/utils";
+import { ChatMessage } from "./ChatMessage";
+import type { Message } from "./types";
+
+interface ChatMessagesProps {
+  messages: Message[];
+  emptyState?: React.ReactNode;
+}
+
+export function ChatMessages({ messages, emptyState }: ChatMessagesProps) {
+  const scrollRef = useRef<HTMLDivElement>(null);
+
+  useEffect(() => {
+    const el = scrollRef.current;
+    if (el) {
+      el.scrollTop = el.scrollHeight;
+    }
+  }, [messages]);
+
+  return (
+    <div ref={scrollRef} className={cn("flex-1 overflow-y-auto agent-chat-scroll", "px-3 py-2")}>
+      {messages.length === 0 ? (
+        (emptyState ?? null)
+      ) : (
+        <div className="flex flex-col gap-1.5">
+          {messages
+            .filter((msg) => msg.role !== "tool")
+            .map((msg) => (
+              <ChatMessage
+                key={msg.id}
+                role={msg.role as "user" | "assistant"}
+                content={msg.content}
+                isStreaming={msg.isStreaming}
+                toolCalls={msg.toolCalls}
+              />
+            ))}
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/src/components/chat/ChatView.tsx b/src/components/chat/ChatView.tsx
new file mode 100644
index 000000000..a65e656f1
--- /dev/null
+++ b/src/components/chat/ChatView.tsx
@@ -0,0 +1,222 @@
+import { useState, useCallback, useEffect, lazy, Suspense } from "react";
+import { useTranslation } from "react-i18next";
+import { useChatPersistence } from "./useChatPersistence";
+import { useChatStreaming } from "./useChatStreaming";
+import { ChatMessages } from "./ChatMessages";
+import { ChatInput } from "./ChatInput";
+import ConversationList from "./ConversationList";
+import EmptyChatState from "./EmptyChatState";
+import { ConfirmDialog } from "../ui/dialog";
+import { useDialogs } from "../../hooks/useDialogs";
+import { getCachedPlatform } from "../../utils/platform";
+
+const CommandSearch = lazy(() => import("../CommandSearch"));
+
+const platform = getCachedPlatform();
+
+function NewChatEmptyState() {
+  const { t } = useTranslation();
+  return (
+    <div className="flex flex-col items-center justify-center h-full -mt-6 select-none">
+      <svg
+        className="text-foreground dark:text-white mb-4"
+        width="56"
+        height="48"
+        viewBox="0 0 56 48"
+        fill="none"
+      >
+        <rect
+          x="4"
+          y="6"
+          width="36"
+          height="24"
+          rx="4"
+          fill="currentColor"
+          fillOpacity={0.04}
+          stroke="currentColor"
+          strokeOpacity={0.08}
+        />
+        <rect x="10" y="13" width="18" height="2" rx="1" fill="currentColor" fillOpacity={0.06} />
+        <rect x="10" y="18" width="24" height="2" rx="1" fill="currentColor" fillOpacity={0.04} />
+        <rect x="10" y="23" width="14" height="2" rx="1" fill="currentColor" fillOpacity={0.03} />
+        <rect
+          x="16"
+          y="18"
+          width="36"
+          height="24"
+          rx="4"
+          fill="currentColor"
+          fillOpacity={0.03}
+          stroke="currentColor"
+          strokeOpacity={0.06}
+        />
+        <rect x="22" y="25" width="18" height="2" rx="1" fill="currentColor" fillOpacity={0.05} />
+        <rect x="22" y="30" width="24" height="2" rx="1" fill="currentColor" fillOpacity={0.03} />
+      </svg>
+      <p className="text-xs text-foreground/50 dark:text-foreground/25 text-center max-w-48">
+        {t("chat.newChatEmpty")}
+      </p>
+    </div>
+  );
+}
+
+export default function ChatView() {
+  const { t } = useTranslation();
+  const [activeConversationId, setActiveConversationId] = useState<number | null>(null);
+  const [isNewChat, setIsNewChat] = useState(true);
+  const [refreshKey, setRefreshKey] = useState(0);
+  const [showSearch, setShowSearch] = useState(false);
+  const { confirmDialog, showConfirmDialog, hideConfirmDialog } = useDialogs();
+
+  const persistence = useChatPersistence({
+    conversationId: activeConversationId,
+    onConversationCreated: (id) => {
+      setActiveConversationId(id);
+      setRefreshKey((k) => k + 1);
+    },
+  });
+
+  const streaming = useChatStreaming({
+    messages: persistence.messages,
+    setMessages: persistence.setMessages,
+    onStreamComplete: (_id, content, toolCalls) => {
+      persistence.saveAssistantMessage(content, toolCalls);
+    },
+  });
+
+  const handleSelectConversation = useCallback(
+    async (id: number) => {
+      if (id === activeConversationId) return;
+      setActiveConversationId(id);
+      setIsNewChat(false);
+      await persistence.loadConversation(id);
+    },
+    [activeConversationId, persistence]
+  );
+
+  const handleNewChat = useCallback(() => {
+    setActiveConversationId(null);
+    setIsNewChat(true);
+    persistence.handleNewChat();
+  }, [persistence]);
+
+  const handleTextSubmit = useCallback(
+    async (text: string) => {
+      setIsNewChat(false);
+      let convId = activeConversationId;
+      if (!convId) {
+        const title = text.length > 50 ? `${text.slice(0, 50)}...` : text;
+        convId = await persistence.createConversation(title);
+      }
+
+      const userMsg = {
+        id: crypto.randomUUID(),
+        role: "user" as const,
+        content: text,
+        isStreaming: false,
+      };
+      persistence.setMessages((prev) => [...prev, userMsg]);
+      await persistence.saveUserMessage(text);
+
+      const allMessages = [...persistence.messages, userMsg];
+      await streaming.sendToAI(text, allMessages);
+    },
+    [activeConversationId, persistence, streaming]
+  );
+
+  const handleArchive = useCallback(
+    async (id: number) => {
+      await window.electronAPI?.archiveAgentConversation?.(id);
+      if (activeConversationId === id) {
+        handleNewChat();
+      }
+      setRefreshKey((k) => k + 1);
+    },
+    [activeConversationId, handleNewChat]
+  );
+
+  const handleDelete = useCallback(
+    (id: number) => {
+      showConfirmDialog({
+        title: t("chat.delete"),
+        description: t("chat.deleteConfirm"),
+        onConfirm: async () => {
+          await window.electronAPI?.deleteAgentConversation?.(id);
+          if (activeConversationId === id) {
+            handleNewChat();
+          }
+          setRefreshKey((k) => k + 1);
+        },
+        variant: "destructive",
+      });
+    },
+    [activeConversationId, handleNewChat, showConfirmDialog, t]
+  );
+
+  useEffect(() => {
+    const handleKeyDown = (e: KeyboardEvent) => {
+      const mod = platform === "darwin" ? e.metaKey : e.ctrlKey;
+      if (mod && e.key === "n") {
+        e.preventDefault();
+        handleNewChat();
+      }
+    };
+    window.addEventListener("keydown", handleKeyDown);
+    return () => window.removeEventListener("keydown", handleKeyDown);
+  }, [handleNewChat]);
+
+  const hasActiveChat =
+    activeConversationId !== null || persistence.messages.length > 0 || isNewChat;
+
+  return (
+    <>
+      <ConfirmDialog
+        open={confirmDialog.open}
+        onOpenChange={hideConfirmDialog}
+        title={confirmDialog.title}
+        description={confirmDialog.description}
+        onConfirm={confirmDialog.onConfirm}
+        variant={confirmDialog.variant}
+      />
+      {showSearch && (
+        <Suspense fallback={null}>
+          <CommandSearch
+            open={showSearch}
+            onOpenChange={setShowSearch}
+            mode="conversations"
+            onConversationSelect={handleSelectConversation}
+          />
+        </Suspense>
+      )}
+      <div className="flex h-full">
+        <div className="w-56 min-w-50 shrink-0 border-r border-border/15 dark:border-white/6">
+          <ConversationList
+            activeConversationId={activeConversationId}
+            onSelectConversation={handleSelectConversation}
+            onNewChat={handleNewChat}
+            onOpenSearch={() => setShowSearch(true)}
+            onArchive={handleArchive}
+            onDelete={handleDelete}
+            refreshKey={refreshKey}
+          />
+        </div>
+        <div className="flex-1 min-w-80 flex flex-col">
+          {hasActiveChat ? (
+            <>
+              <ChatMessages messages={persistence.messages} emptyState={<NewChatEmptyState />} />
+              <ChatInput
+                agentState={streaming.agentState}
+                partialTranscript=""
+                onTextSubmit={handleTextSubmit}
+                onCancel={streaming.cancelStream}
+                autoFocus={isNewChat}
+              />
+            </>
+          ) : (
+            <EmptyChatState />
+          )}
+        </div>
+      </div>
+    </>
+  );
+}
diff --git a/src/components/chat/ConversationDateGroup.tsx b/src/components/chat/ConversationDateGroup.tsx
new file mode 100644
index 000000000..b73c720dc
--- /dev/null
+++ b/src/components/chat/ConversationDateGroup.tsx
@@ -0,0 +1,19 @@
+import { cn } from "../lib/utils";
+
+interface ConversationDateGroupProps {
+  label: string;
+}
+
+export default function ConversationDateGroup({ label }: ConversationDateGroupProps) {
+  return (
+    <div
+      className={cn(
+        "px-3 pt-3 pb-1",
+        "text-[10px] font-semibold text-muted-foreground/40 uppercase tracking-wider",
+        "select-none"
+      )}
+    >
+      {label}
+    </div>
+  );
+}
diff --git a/src/components/chat/ConversationItem.tsx b/src/components/chat/ConversationItem.tsx
new file mode 100644
index 000000000..591519c3a
--- /dev/null
+++ b/src/components/chat/ConversationItem.tsx
@@ -0,0 +1,131 @@
+import { useTranslation } from "react-i18next";
+import { MoreHorizontal, Archive, ArchiveRestore, Trash2 } from "lucide-react";
+import { Button } from "../ui/button";
+import {
+  DropdownMenu,
+  DropdownMenuTrigger,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuSeparator,
+} from "../ui/dropdown-menu";
+import { cn } from "../lib/utils";
+import { normalizeDbDate } from "../../utils/dateFormatting";
+
+export interface ConversationPreview {
+  id: number;
+  title: string;
+  preview?: string;
+  created_at: string;
+  updated_at: string;
+  is_archived?: boolean;
+}
+
+interface ConversationItemProps {
+  conversation: ConversationPreview;
+  isActive: boolean;
+  onClick: () => void;
+  onArchive: (id: number) => void;
+  onDelete: (id: number) => void;
+}
+
+function formatTimestamp(dateStr: string): string {
+  const date = normalizeDbDate(dateStr);
+  if (Number.isNaN(date.getTime())) return "";
+  const now = new Date();
+  const diff = now.getTime() - date.getTime();
+  const seconds = Math.floor(diff / 1000);
+  const minutes = Math.floor(diff / 60000);
+  const hours = Math.floor(diff / 3600000);
+  const days = Math.floor(diff / 86400000);
+
+  if (seconds < 60) return "<1m";
+  if (minutes < 60) return `${minutes}m`;
+  if (hours < 24) return `${hours}h`;
+  if (days < 7) return `${days}d`;
+  return date.toLocaleDateString(undefined, { month: "short", day: "numeric" });
+}
+
+export default function ConversationItem({
+  conversation,
+  isActive,
+  onClick,
+  onArchive,
+  onDelete,
+}: ConversationItemProps) {
+  const { t } = useTranslation();
+  const isArchived = !!conversation.is_archived;
+
+  return (
+    <button
+      type="button"
+      onClick={onClick}
+      className={cn(
+        "group relative w-full text-left px-3 py-2 cursor-pointer transition-all duration-150",
+        "focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring/30",
+        isActive ? "bg-primary/8 dark:bg-primary/10" : "hover:bg-foreground/4 dark:hover:bg-white/4"
+      )}
+    >
+      <div className="flex-1 min-w-0">
+        <div className="flex items-center justify-between gap-2">
+          <p className={cn("text-xs truncate text-foreground", isActive && "font-medium")}>
+            {conversation.title}
+          </p>
+          <div className="flex items-center gap-0.5 shrink-0">
+            <span className="text-[10px] text-muted-foreground/40 tabular-nums group-hover:opacity-0 transition-opacity">
+              {formatTimestamp(conversation.updated_at)}
+            </span>
+            <DropdownMenu>
+              <DropdownMenuTrigger asChild>
+                <Button
+                  size="icon"
+                  variant="ghost"
+                  onClick={(e) => e.stopPropagation()}
+                  className="h-5 w-5 rounded-sm opacity-0 group-hover:opacity-100 data-[state=open]:opacity-100 transition-opacity absolute right-2 text-muted-foreground/60 dark:text-muted-foreground/40 hover:text-foreground/60 hover:bg-foreground/5 active:bg-foreground/8"
+                >
+                  <MoreHorizontal size={12} />
+                </Button>
+              </DropdownMenuTrigger>
+              <DropdownMenuContent align="end" sideOffset={4} className="min-w-36">
+                <DropdownMenuItem
+                  onClick={(e) => {
+                    e.stopPropagation();
+                    onArchive(conversation.id);
+                  }}
+                  className="text-xs gap-2 rounded-lg px-2.5 py-1.5 cursor-pointer focus:bg-foreground/5"
+                >
+                  {isArchived ? (
+                    <>
+                      <ArchiveRestore size={12} className="text-muted-foreground/80" />
+                      {t("chat.unarchive")}
+                    </>
+                  ) : (
+                    <>
+                      <Archive size={12} className="text-muted-foreground/80" />
+                      {t("chat.archive")}
+                    </>
+                  )}
+                </DropdownMenuItem>
+                <DropdownMenuSeparator />
+                <DropdownMenuItem
+                  onClick={(e) => {
+                    e.stopPropagation();
+                    onDelete(conversation.id);
+                  }}
+                  className="text-xs gap-2 rounded-lg px-2.5 py-1.5 text-destructive focus:text-destructive focus:bg-destructive/10 cursor-pointer"
+                >
+                  <Trash2 size={12} />
+                  {t("chat.delete")}
+                </DropdownMenuItem>
+              </DropdownMenuContent>
+            </DropdownMenu>
+          </div>
+        </div>
+        {conversation.preview && (
+          <p className="text-[11px] text-muted-foreground/50 line-clamp-1 mt-0.5">
+            {conversation.preview}
+          </p>
+        )}
+      </div>
+    </button>
+  );
+}
diff --git a/src/components/chat/ConversationList.tsx b/src/components/chat/ConversationList.tsx
new file mode 100644
index 000000000..df95768ff
--- /dev/null
+++ b/src/components/chat/ConversationList.tsx
@@ -0,0 +1,308 @@
+import { useState, useEffect, useRef, useCallback, useMemo } from "react";
+import { SquarePen, Search, Archive as ArchiveIcon } from "lucide-react";
+import { useTranslation } from "react-i18next";
+import { useVirtualizer } from "@tanstack/react-virtual";
+import { cn } from "../lib/utils";
+import { normalizeDbDate } from "../../utils/dateFormatting";
+import ConversationItem, { type ConversationPreview } from "./ConversationItem";
+import ConversationDateGroup from "./ConversationDateGroup";
+import EmptyConversationList from "./EmptyConversationList";
+
+type FlatItem =
+  | { type: "header"; label: string }
+  | { type: "conversation"; data: ConversationPreview };
+
+interface ConversationListProps {
+  activeConversationId: number | null;
+  onSelectConversation: (id: number) => void;
+  onNewChat: () => void;
+  onOpenSearch: () => void;
+  onArchive: (id: number) => void;
+  onDelete: (id: number) => void;
+  refreshKey: number;
+}
+
+function groupByDate(conversations: ConversationPreview[], t: (key: string) => string): FlatItem[] {
+  if (conversations.length === 0) return [];
+
+  const now = new Date();
+  const today = new Date(now.getFullYear(), now.getMonth(), now.getDate());
+  const yesterday = new Date(today);
+  yesterday.setDate(yesterday.getDate() - 1);
+  const weekAgo = new Date(today);
+  weekAgo.setDate(weekAgo.getDate() - 7);
+
+  const items: FlatItem[] = [];
+  let currentGroup: string | null = null;
+
+  for (const conv of conversations) {
+    const date = normalizeDbDate(conv.updated_at);
+    const target = new Date(date.getFullYear(), date.getMonth(), date.getDate());
+
+    let group: string;
+    if (target.getTime() >= today.getTime()) {
+      group = t("chat.today");
+    } else if (target.getTime() >= yesterday.getTime()) {
+      group = t("chat.yesterday");
+    } else if (target.getTime() >= weekAgo.getTime()) {
+      group = t("chat.previousWeek");
+    } else {
+      group = t("chat.older");
+    }
+
+    if (group !== currentGroup) {
+      items.push({ type: "header", label: group });
+      currentGroup = group;
+    }
+    items.push({ type: "conversation", data: conv });
+  }
+
+  return items;
+}
+
+function SkeletonRows() {
+  return (
+    <div className="px-3 pt-4 space-y-3">
+      {[0, 1, 2, 3].map((i) => (
+        <div key={i} className="space-y-1.5">
+          <div
+            className="h-3 rounded bg-foreground/5"
+            style={{
+              width: `${60 + i * 10}%`,
+              animation: `tool-status-sweep 1.5s ease-in-out ${i * 0.15}s infinite`,
+              backgroundSize: "200% 100%",
+              background: "linear-gradient(90deg, transparent, oklch(0.5 0 0 / 0.06), transparent)",
+            }}
+          />
+          <div
+            className="h-2.5 rounded bg-foreground/3"
+            style={{
+              width: `${80 + (i % 2) * 10}%`,
+              animation: `tool-status-sweep 1.5s ease-in-out ${i * 0.15 + 0.08}s infinite`,
+              backgroundSize: "200% 100%",
+              background: "linear-gradient(90deg, transparent, oklch(0.5 0 0 / 0.04), transparent)",
+            }}
+          />
+        </div>
+      ))}
+    </div>
+  );
+}
+
+export default function ConversationList({
+  activeConversationId,
+  onSelectConversation,
+  onNewChat,
+  onOpenSearch,
+  onArchive,
+  onDelete,
+  refreshKey,
+}: ConversationListProps) {
+  const { t } = useTranslation();
+  const [conversations, setConversations] = useState<ConversationPreview[]>([]);
+  const [isLoading, setIsLoading] = useState(true);
+  const [showArchived, setShowArchived] = useState(false);
+  const scrollRef = useRef<HTMLDivElement>(null);
+  const showSkeletonTimer = useRef<ReturnType<typeof setTimeout> | null>(null);
+  const [showSkeleton, setShowSkeleton] = useState(false);
+
+  const loadConversations = useCallback(async () => {
+    try {
+      const [active, archived] = await Promise.all([
+        window.electronAPI?.getAgentConversationsWithPreview?.(200, 0, false),
+        window.electronAPI?.getAgentConversationsWithPreview?.(200, 0, true),
+      ]);
+      const toPreview = (c: {
+        id: number;
+        title: string;
+        last_message?: string;
+        created_at: string;
+        updated_at: string;
+        archived_at?: string;
+      }) => ({
+        id: c.id,
+        title: c.title || "Untitled",
+        preview: c.last_message,
+        created_at: c.created_at,
+        updated_at: c.updated_at,
+        is_archived: !!c.archived_at,
+      });
+      setConversations([...(active ?? []).map(toPreview), ...(archived ?? []).map(toPreview)]);
+    } catch {
+      // silently fail
+    } finally {
+      setIsLoading(false);
+      setShowSkeleton(false);
+      if (showSkeletonTimer.current) {
+        clearTimeout(showSkeletonTimer.current);
+        showSkeletonTimer.current = null;
+      }
+    }
+  }, []);
+
+  useEffect(() => {
+    setIsLoading(true);
+    showSkeletonTimer.current = setTimeout(() => setShowSkeleton(true), 150);
+    loadConversations();
+    return () => {
+      if (showSkeletonTimer.current) clearTimeout(showSkeletonTimer.current);
+    };
+  }, [loadConversations, refreshKey]);
+
+  const filtered = useMemo(() => {
+    return showArchived
+      ? conversations.filter((c) => c.is_archived)
+      : conversations.filter((c) => !c.is_archived);
+  }, [conversations, showArchived]);
+
+  const flatItems = useMemo(() => groupByDate(filtered, t), [filtered, t]);
+
+  const virtualizer = useVirtualizer({
+    count: flatItems.length,
+    getScrollElement: () => scrollRef.current,
+    estimateSize: (index) => (flatItems[index].type === "header" ? 28 : 52),
+    overscan: 5,
+  });
+
+  const handleKeyDown = useCallback(
+    (e: React.KeyboardEvent) => {
+      if (flatItems.length === 0) return;
+
+      const convItems = flatItems
+        .map((item, index) => ({ item, index }))
+        .filter((entry) => entry.item.type === "conversation");
+      if (convItems.length === 0) return;
+
+      const currentIdx = convItems.findIndex(
+        (entry) => entry.item.type === "conversation" && entry.item.data.id === activeConversationId
+      );
+
+      if (e.key === "ArrowDown") {
+        e.preventDefault();
+        const next = currentIdx < convItems.length - 1 ? currentIdx + 1 : 0;
+        const item = convItems[next].item;
+        if (item.type === "conversation") onSelectConversation(item.data.id);
+        virtualizer.scrollToIndex(convItems[next].index);
+      } else if (e.key === "ArrowUp") {
+        e.preventDefault();
+        const prev = currentIdx > 0 ? currentIdx - 1 : convItems.length - 1;
+        const item = convItems[prev].item;
+        if (item.type === "conversation") onSelectConversation(item.data.id);
+        virtualizer.scrollToIndex(convItems[prev].index);
+      } else if (e.key === "Enter" && activeConversationId) {
+        e.preventDefault();
+      }
+    },
+    [flatItems, activeConversationId, onSelectConversation, virtualizer]
+  );
+
+  if (isLoading && showSkeleton) {
+    return (
+      <div className="flex flex-col h-full">
+        <div className="px-2 pt-2 pb-1 flex items-center gap-1.5">
+          <h2 className="text-xs font-medium text-foreground px-1 flex-1">{t("sidebar.chat")}</h2>
+        </div>
+        <SkeletonRows />
+      </div>
+    );
+  }
+
+  if (isLoading && !showSkeleton) {
+    return (
+      <div className="flex flex-col h-full">
+        <div className="px-2 pt-2 pb-1 flex items-center gap-1.5">
+          <h2 className="text-xs font-medium text-foreground px-1 flex-1">{t("sidebar.chat")}</h2>
+        </div>
+      </div>
+    );
+  }
+
+  return (
+    <div className="flex flex-col h-full" onKeyDown={handleKeyDown} tabIndex={-1}>
+      <div className="px-2 pt-2 pb-1 shrink-0 space-y-0.5">
+        <button
+          onClick={onNewChat}
+          className={cn(
+            "flex items-center gap-2 w-full px-2 py-1.5 rounded-md text-xs",
+            "text-muted-foreground/80 hover:text-foreground hover:bg-foreground/5",
+            "transition-colors duration-150",
+            "focus:outline-none focus-visible:ring-1 focus-visible:ring-ring/30"
+          )}
+        >
+          <SquarePen size={14} className="shrink-0" />
+          {t("chat.newChat")}
+        </button>
+        <button
+          onClick={onOpenSearch}
+          className={cn(
+            "flex items-center gap-2 w-full px-2 py-1.5 rounded-md text-xs",
+            "text-muted-foreground/80 hover:text-foreground hover:bg-foreground/5",
+            "transition-colors duration-150",
+            "focus:outline-none focus-visible:ring-1 focus-visible:ring-ring/30"
+          )}
+        >
+          <Search size={14} className="shrink-0" />
+          {t("chat.searchChats")}
+        </button>
+        {conversations.some((c) => c.is_archived) && (
+          <button
+            onClick={() => setShowArchived((v) => !v)}
+            className={cn(
+              "flex items-center gap-2 w-full px-2 py-1.5 rounded-md text-xs transition-colors duration-150",
+              "focus:outline-none focus-visible:ring-1 focus-visible:ring-primary/30",
+              showArchived
+                ? "bg-primary/8 text-primary"
+                : "text-muted-foreground/80 hover:text-foreground hover:bg-foreground/5"
+            )}
+          >
+            <ArchiveIcon size={14} className="shrink-0" />
+            {t("chat.archived")}
+          </button>
+        )}
+      </div>
+
+      {flatItems.length === 0 ? (
+        <EmptyConversationList onNewChat={onNewChat} />
+      ) : (
+        <div ref={scrollRef} className="flex-1 overflow-y-auto">
+          <div
+            style={{
+              height: `${virtualizer.getTotalSize()}px`,
+              width: "100%",
+              position: "relative",
+            }}
+          >
+            {virtualizer.getVirtualItems().map((virtualItem) => {
+              const item = flatItems[virtualItem.index];
+              return (
+                <div
+                  key={virtualItem.key}
+                  style={{
+                    position: "absolute",
+                    top: 0,
+                    left: 0,
+                    width: "100%",
+                    height: `${virtualItem.size}px`,
+                    transform: `translateY(${virtualItem.start}px)`,
+                  }}
+                >
+                  {item.type === "header" ? (
+                    <ConversationDateGroup label={item.label} />
+                  ) : (
+                    <ConversationItem
+                      conversation={item.data}
+                      isActive={item.data.id === activeConversationId}
+                      onClick={() => onSelectConversation(item.data.id)}
+                      onArchive={onArchive}
+                      onDelete={onDelete}
+                    />
+                  )}
+                </div>
+              );
+            })}
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/src/components/chat/EmptyChatState.tsx b/src/components/chat/EmptyChatState.tsx
new file mode 100644
index 000000000..f7a9f0d0b
--- /dev/null
+++ b/src/components/chat/EmptyChatState.tsx
@@ -0,0 +1,11 @@
+import { useTranslation } from "react-i18next";
+
+export default function EmptyChatState() {
+  const { t } = useTranslation();
+
+  return (
+    <div className="flex items-center justify-center h-full select-none">
+      <p className="text-xs text-muted-foreground/40">{t("chat.selectChat")}</p>
+    </div>
+  );
+}
diff --git a/src/components/chat/EmptyConversationList.tsx b/src/components/chat/EmptyConversationList.tsx
new file mode 100644
index 000000000..cf0fae566
--- /dev/null
+++ b/src/components/chat/EmptyConversationList.tsx
@@ -0,0 +1,29 @@
+import { Plus } from "lucide-react";
+import { useTranslation } from "react-i18next";
+import { cn } from "../lib/utils";
+
+interface EmptyConversationListProps {
+  onNewChat: () => void;
+}
+
+export default function EmptyConversationList({ onNewChat }: EmptyConversationListProps) {
+  const { t } = useTranslation();
+
+  return (
+    <div className="flex flex-col items-center justify-center h-full gap-2 px-4 select-none">
+      <p className="text-xs text-muted-foreground/40 text-center">{t("chat.noConversations")}</p>
+      <button
+        onClick={onNewChat}
+        className={cn(
+          "flex items-center gap-1.5 h-7 px-2.5 rounded-md",
+          "text-xs text-primary hover:bg-primary/8",
+          "transition-colors duration-150",
+          "focus:outline-none focus-visible:ring-1 focus-visible:ring-primary/30"
+        )}
+      >
+        <Plus size={12} />
+        {t("chat.newChat")}
+      </button>
+    </div>
+  );
+}
diff --git a/src/components/chat/toolIcons.ts b/src/components/chat/toolIcons.ts
new file mode 100644
index 000000000..3155c8da1
--- /dev/null
+++ b/src/components/chat/toolIcons.ts
@@ -0,0 +1,11 @@
+import { Search, Globe, ClipboardCheck, Calendar, FileText, FilePlus, FilePen } from "lucide-react";
+
+export const toolIcons: Record<string, typeof Search> = {
+  search_notes: Search,
+  web_search: Globe,
+  copy_to_clipboard: ClipboardCheck,
+  get_calendar_events: Calendar,
+  get_note: FileText,
+  create_note: FilePlus,
+  update_note: FilePen,
+};
diff --git a/src/components/chat/types.ts b/src/components/chat/types.ts
new file mode 100644
index 000000000..987630295
--- /dev/null
+++ b/src/components/chat/types.ts
@@ -0,0 +1,26 @@
+export interface ToolCallInfo {
+  id: string;
+  name: string;
+  arguments: string;
+  status: "executing" | "completed" | "error";
+  result?: string;
+  metadata?: Record<string, unknown>;
+}
+
+export interface Message {
+  id: string;
+  role: "user" | "assistant" | "tool";
+  content: string;
+  isStreaming: boolean;
+  toolCalls?: ToolCallInfo[];
+}
+
+export type AgentState =
+  | "idle"
+  | "listening"
+  | "transcribing"
+  | "thinking"
+  | "streaming"
+  | "tool-executing";
+
+export { toolIcons } from "./toolIcons";
diff --git a/src/components/chat/useChatPersistence.ts b/src/components/chat/useChatPersistence.ts
new file mode 100644
index 000000000..1ed040015
--- /dev/null
+++ b/src/components/chat/useChatPersistence.ts
@@ -0,0 +1,94 @@
+import { useState, useRef, useCallback } from "react";
+import type { Message, ToolCallInfo } from "./types";
+
+interface UseChatPersistenceOptions {
+  conversationId?: number | null;
+  onConversationCreated?: (id: number, title: string) => void;
+}
+
+export interface ChatPersistence {
+  messages: Message[];
+  setMessages: React.Dispatch<React.SetStateAction<Message[]>>;
+  conversationId: number | null;
+  createConversation: (title: string) => Promise<number>;
+  loadConversation: (id: number) => Promise<void>;
+  saveUserMessage: (text: string) => Promise<void>;
+  saveAssistantMessage: (content: string, toolCalls?: ToolCallInfo[]) => Promise<void>;
+  handleNewChat: () => void;
+}
+
+export function useChatPersistence(options: UseChatPersistenceOptions = {}): ChatPersistence {
+  const [messages, setMessages] = useState<Message[]>([]);
+  const conversationIdRef = useRef<number | null>(options.conversationId ?? null);
+
+  const createConversation = useCallback(
+    async (title: string): Promise<number> => {
+      const conv = await window.electronAPI?.createAgentConversation?.(title);
+      const id = conv?.id ?? 0;
+      conversationIdRef.current = id;
+      options.onConversationCreated?.(id, title);
+      return id;
+    },
+    [options]
+  );
+
+  const loadConversation = useCallback(async (id: number) => {
+    const conv = await window.electronAPI?.getAgentConversation?.(id);
+    if (!conv) return;
+    conversationIdRef.current = id;
+    const loaded: Message[] = conv.messages.map((m) => {
+      const parsed = m.metadata ? tryParseMetadata(m.metadata) : undefined;
+      const toolCalls = parsed?.toolCalls as ToolCallInfo[] | undefined;
+      return {
+        id: crypto.randomUUID(),
+        role: m.role as Message["role"],
+        content: m.content,
+        isStreaming: false,
+        ...(toolCalls ? { toolCalls } : {}),
+      };
+    });
+    setMessages(loaded);
+  }, []);
+
+  const saveUserMessage = useCallback(async (text: string) => {
+    if (conversationIdRef.current) {
+      window.electronAPI?.addAgentMessage?.(conversationIdRef.current, "user", text);
+    }
+  }, []);
+
+  const saveAssistantMessage = useCallback(async (content: string, toolCalls?: ToolCallInfo[]) => {
+    if (conversationIdRef.current) {
+      window.electronAPI?.addAgentMessage?.(
+        conversationIdRef.current,
+        "assistant",
+        content,
+        toolCalls?.length ? { toolCalls } : undefined
+      );
+    }
+  }, []);
+
+  const handleNewChat = useCallback(() => {
+    setMessages([]);
+    conversationIdRef.current = null;
+  }, []);
+
+  return {
+    messages,
+    setMessages,
+    conversationId: conversationIdRef.current,
+    createConversation,
+    loadConversation,
+    saveUserMessage,
+    saveAssistantMessage,
+    handleNewChat,
+  };
+}
+
+function tryParseMetadata(raw: string | undefined): Record<string, unknown> | undefined {
+  if (!raw) return undefined;
+  try {
+    return JSON.parse(raw);
+  } catch {
+    return undefined;
+  }
+}
diff --git a/src/components/chat/useChatStreaming.ts b/src/components/chat/useChatStreaming.ts
new file mode 100644
index 000000000..ee99bff30
--- /dev/null
+++ b/src/components/chat/useChatStreaming.ts
@@ -0,0 +1,291 @@
+import { useState, useRef, useEffect, useCallback } from "react";
+import { useTranslation } from "react-i18next";
+import ReasoningService, { type AgentStreamChunk } from "../../services/ReasoningService";
+import { getSettings } from "../../stores/settingsStore";
+import { getAgentSystemPrompt } from "../../config/prompts";
+import { createToolRegistry } from "../../services/tools";
+import type { ToolRegistry } from "../../services/tools/ToolRegistry";
+import type { Message, AgentState, ToolCallInfo } from "./types";
+
+const RAG_NOTE_LIMIT = 5;
+const RAG_NOTE_SNIPPET_LENGTH = 500;
+
+const LOCAL_TOOL_MIN_PARAMS_B = 4;
+
+function estimateModelSizeB(modelId: string): number {
+  const match = modelId.match(/-([\d.]+)[bB]/);
+  return match ? parseFloat(match[1]) : 0;
+}
+
+async function buildRAGContext(userText: string): Promise<string> {
+  if (!window.electronAPI?.semanticSearchNotes) return "";
+  try {
+    const results = await window.electronAPI.semanticSearchNotes(userText, RAG_NOTE_LIMIT);
+    if (!results || results.length === 0) return "";
+
+    const snippets = await Promise.all(
+      results.map(async (r: { id: number; title: string; score?: number }) => {
+        const note = await window.electronAPI.getNote(r.id);
+        if (!note) return null;
+        const content = (note.content || "").slice(0, RAG_NOTE_SNIPPET_LENGTH);
+        return `<note id="${note.id}" title="${note.title}">\n${content}\n</note>`;
+      })
+    );
+
+    return snippets.filter(Boolean).join("\n\n");
+  } catch {
+    return "";
+  }
+}
+
+interface UseChatStreamingOptions {
+  messages: Message[];
+  setMessages: React.Dispatch<React.SetStateAction<Message[]>>;
+  /** Optional note context to prepend to the system prompt (used by embedded note chat). */
+  noteContext?: string;
+  onStreamComplete?: (assistantId: string, content: string, toolCalls?: ToolCallInfo[]) => void;
+}
+
+export interface ChatStreaming {
+  agentState: AgentState;
+  toolStatus: string;
+  activeToolName: string;
+  sendToAI: (userText: string, allMessages: Message[]) => Promise<void>;
+  cancelStream: () => void;
+}
+
+export function useChatStreaming({
+  messages,
+  setMessages,
+  noteContext: externalNoteContext,
+  onStreamComplete,
+}: UseChatStreamingOptions): ChatStreaming {
+  const { t } = useTranslation();
+  const [agentState, setAgentState] = useState<AgentState>("idle");
+  const [toolStatus, setToolStatus] = useState("");
+  const [activeToolName, setActiveToolName] = useState("");
+  const mountedRef = useRef(true);
+  const messagesRef = useRef<Message[]>([]);
+  const noteContextRef = useRef(externalNoteContext);
+  noteContextRef.current = externalNoteContext;
+  const toolRegistryRef = useRef<{ key: string; registry: ToolRegistry } | null>(null);
+
+  useEffect(() => {
+    messagesRef.current = messages;
+  }, [messages]);
+
+  useEffect(() => {
+    mountedRef.current = true;
+    return () => {
+      mountedRef.current = false;
+      ReasoningService.cancelActiveStream();
+    };
+  }, []);
+
+  const cancelStream = useCallback(() => {
+    ReasoningService.cancelActiveStream();
+    setAgentState("idle");
+    setToolStatus("");
+    setActiveToolName("");
+  }, []);
+
+  const sendToAI = useCallback(
+    async (userText: string, allMessages: Message[]) => {
+      setAgentState("thinking");
+
+      const settings = getSettings();
+      const isCloudAgent = settings.isSignedIn && settings.cloudAgentMode === "openwhispr";
+      const isLocalProvider = !["openai", "groq", "custom", "anthropic", "gemini"].includes(
+        settings.agentProvider
+      );
+      const localModelCanUseTool =
+        isLocalProvider && estimateModelSizeB(settings.agentModel) >= LOCAL_TOOL_MIN_PARAMS_B;
+      const supportsTools = isCloudAgent || !isLocalProvider || localModelCanUseTool;
+
+      let registry: ToolRegistry | null = null;
+      if (supportsTools) {
+        const cacheKey = `${settings.isSignedIn}-${settings.gcalConnected}-${settings.cloudBackupEnabled}`;
+        if (toolRegistryRef.current?.key === cacheKey) {
+          registry = toolRegistryRef.current.registry;
+        } else {
+          registry = createToolRegistry({
+            isSignedIn: settings.isSignedIn,
+            gcalConnected: settings.gcalConnected,
+            cloudBackupEnabled: settings.cloudBackupEnabled,
+          });
+          toolRegistryRef.current = { key: cacheKey, registry };
+        }
+      }
+
+      const ragContext = await buildRAGContext(userText);
+      const combinedContext = [noteContextRef.current, ragContext].filter(Boolean).join("\n\n");
+      const systemPrompt = getAgentSystemPrompt(
+        registry?.getAll().map((t) => t.name),
+        combinedContext || undefined
+      );
+
+      const llmMessages = [
+        { role: "system", content: systemPrompt },
+        ...allMessages.slice(-20).map((m) => ({ role: m.role, content: m.content })),
+      ];
+
+      const assistantId = crypto.randomUUID();
+      setMessages((prev) => [
+        ...prev,
+        { id: assistantId, role: "assistant", content: "", isStreaming: true },
+      ]);
+      setAgentState("streaming");
+
+      try {
+        let fullContent = "";
+        let stream: AsyncGenerator<AgentStreamChunk>;
+
+        if (isCloudAgent) {
+          const executeToolCall = registry
+            ? async (name: string, argsJson: string) => {
+                const tool = registry.get(name);
+                if (!tool)
+                  return {
+                    data: `Unknown tool: ${name}`,
+                    displayText: t("agentMode.tools.unknownTool", { name }),
+                  };
+                let args: Record<string, unknown>;
+                try {
+                  args = JSON.parse(argsJson);
+                } catch {
+                  return {
+                    data: `Invalid tool arguments for ${name}`,
+                    displayText: t("agentMode.tools.invalidArgs", { name }),
+                  };
+                }
+                const result = await tool.execute(args);
+                const data = result.success
+                  ? typeof result.data === "string"
+                    ? result.data
+                    : JSON.stringify(result.data)
+                  : result.displayText;
+                const metadata =
+                  result.success && result.data && typeof result.data === "object"
+                    ? (result.data as Record<string, unknown>)
+                    : undefined;
+                return { data, displayText: result.displayText, metadata };
+              }
+            : undefined;
+
+          stream = ReasoningService.processTextStreamingCloud(llmMessages, {
+            systemPrompt,
+            tools: registry?.getAll().map((t) => ({
+              name: t.name,
+              description: t.description,
+              parameters: t.parameters,
+            })),
+            executeToolCall,
+          });
+        } else {
+          const aiTools = registry?.toAISDKFormat();
+          stream = ReasoningService.processTextStreamingAI(
+            llmMessages,
+            settings.agentModel,
+            settings.agentProvider,
+            { systemPrompt },
+            aiTools
+          );
+        }
+
+        for await (const chunk of stream) {
+          if (!mountedRef.current) {
+            ReasoningService.cancelActiveStream();
+            break;
+          }
+          if (chunk.type === "content") {
+            fullContent += chunk.text;
+            setMessages((prev) =>
+              prev.map((m) => (m.id === assistantId ? { ...m, content: fullContent } : m))
+            );
+          } else if (chunk.type === "tool_calls") {
+            for (const call of chunk.calls) {
+              setAgentState("tool-executing");
+              setActiveToolName(call.name);
+              setToolStatus(
+                t(`agentMode.tools.${call.name}Status`, { defaultValue: `Using ${call.name}...` })
+              );
+              setMessages((prev) =>
+                prev.map((m) =>
+                  m.id === assistantId
+                    ? {
+                        ...m,
+                        toolCalls: [
+                          ...(m.toolCalls || []),
+                          {
+                            id: call.id,
+                            name: call.name,
+                            arguments: call.arguments,
+                            status: "executing" as const,
+                          },
+                        ],
+                      }
+                    : m
+                )
+              );
+            }
+          } else if (chunk.type === "tool_result") {
+            setMessages((prev) =>
+              prev.map((m) =>
+                m.id === assistantId && m.toolCalls
+                  ? {
+                      ...m,
+                      toolCalls: m.toolCalls.map((tc) =>
+                        tc.id === chunk.callId
+                          ? {
+                              ...tc,
+                              status: "completed" as const,
+                              result: chunk.displayText,
+                              ...(chunk.metadata ? { metadata: chunk.metadata } : {}),
+                            }
+                          : tc
+                      ),
+                    }
+                  : m
+              )
+            );
+            setAgentState("streaming");
+            setToolStatus("");
+            setActiveToolName("");
+          }
+        }
+
+        setMessages((prev) =>
+          prev.map((m) => (m.id === assistantId ? { ...m, isStreaming: false } : m))
+        );
+
+        const finalMsg = messagesRef.current.find((m) => m.id === assistantId);
+        onStreamComplete?.(assistantId, fullContent, finalMsg?.toolCalls);
+      } catch (error) {
+        setMessages((prev) =>
+          prev.map((m) =>
+            m.id === assistantId
+              ? {
+                  ...m,
+                  content: `${t("agentMode.chat.errorPrefix")}: ${(error as Error).message}`,
+                  isStreaming: false,
+                }
+              : m
+          )
+        );
+      }
+
+      setAgentState("idle");
+      setToolStatus("");
+      setActiveToolName("");
+    },
+    [t, setMessages, onStreamComplete]
+  );
+
+  return {
+    agentState,
+    toolStatus,
+    activeToolName,
+    sendToAI,
+    cancelStream,
+  };
+}
diff --git a/src/components/notes/ActionManagerDialog.tsx b/src/components/notes/ActionManagerDialog.tsx
index 1ec3166a6..5f1fc98cd 100644
--- a/src/components/notes/ActionManagerDialog.tsx
+++ b/src/components/notes/ActionManagerDialog.tsx
@@ -1,16 +1,11 @@
-import { useState, useEffect } from "react";
+import { useState, useEffect, useRef } from "react";
 import { useTranslation } from "react-i18next";
-import { Sparkles, Pencil, Trash2, Loader2 } from "lucide-react";
-import { Dialog, DialogContent, DialogHeader, DialogTitle } from "../ui/dialog";
+import { Sparkles, Trash2, Loader2, Plus, Zap } from "lucide-react";
+import { Dialog, DialogContent, DialogTitle } from "../ui/dialog";
 import { Button } from "../ui/button";
+import { Input } from "../ui/input";
 import { cn } from "../lib/utils";
-import {
-  useActions,
-  initializeActions,
-  getActionName,
-  getActionDescription,
-} from "../../stores/actionStore";
-import { notesInputClass, notesTextareaClass } from "./shared";
+import { useActions, initializeActions, getActionName } from "../../stores/actionStore";
 import type { ActionItem } from "../../types/electron";
 
 interface ActionManagerDialogProps {
@@ -25,16 +20,33 @@ export default function ActionManagerDialog({ open, onOpenChange }: ActionManage
   const [description, setDescription] = useState("");
   const [prompt, setPrompt] = useState("");
   const [editingId, setEditingId] = useState<number | null>(null);
+  const [selectedId, setSelectedId] = useState<number | null>(null);
   const [isSaving, setIsSaving] = useState(false);
+  const [isCreating, setIsCreating] = useState(false);
+  const nameInputRef = useRef<HTMLInputElement>(null);
 
   useEffect(() => {
     if (open) {
       initializeActions();
-    } else {
+      setIsCreating(false);
+      setEditingId(null);
+      setSelectedId(null);
       resetForm();
     }
   }, [open]);
 
+  // Auto-select the first action when actions load and nothing is selected
+  useEffect(() => {
+    if (open && actions.length > 0 && selectedId === null && !isCreating) {
+      const first = actions[0];
+      setSelectedId(first.id);
+      setEditingId(first.id);
+      setName(first.name);
+      setDescription(first.description);
+      setPrompt(first.prompt);
+    }
+  }, [open, actions, selectedId, isCreating]);
+
   const resetForm = () => {
     setName("");
     setDescription("");
@@ -42,16 +54,30 @@ export default function ActionManagerDialog({ open, onOpenChange }: ActionManage
     setEditingId(null);
   };
 
-  const handleEdit = (action: ActionItem) => {
+  const handleSelectAction = (action: ActionItem) => {
+    setSelectedId(action.id);
+    setEditingId(action.id);
     setName(action.name);
     setDescription(action.description);
     setPrompt(action.prompt);
-    setEditingId(action.id);
+    setIsCreating(false);
+  };
+
+  const handleNewAction = () => {
+    resetForm();
+    setSelectedId(null);
+    setIsCreating(true);
+    // Focus name input after state update
+    setTimeout(() => nameInputRef.current?.focus(), 50);
   };
 
   const handleDelete = async (id: number) => {
     await window.electronAPI.deleteAction(id);
-    if (editingId === id) resetForm();
+    if (selectedId === id) {
+      setSelectedId(null);
+      setIsCreating(false);
+      resetForm();
+    }
   };
 
   const handleSave = async () => {
@@ -66,148 +92,245 @@ export default function ActionManagerDialog({ open, onOpenChange }: ActionManage
         });
       } else {
         await window.electronAPI.createAction(name.trim(), description.trim(), prompt.trim());
+        setIsCreating(false);
       }
-      resetForm();
     } finally {
       setIsSaving(false);
     }
   };
 
+  const showEditor = isCreating || selectedId !== null;
+  const selectedAction = actions.find((a) => a.id === selectedId);
+  const hasUnsavedChanges = isCreating
+    ? name.trim() !== "" || prompt.trim() !== ""
+    : selectedAction
+      ? name !== selectedAction.name ||
+        description !== selectedAction.description ||
+        prompt !== selectedAction.prompt
+      : false;
+
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="sm:max-w-lg gap-2.5">
-        <DialogHeader>
-          <DialogTitle className="flex items-center gap-2 text-sm">
-            <Sparkles size={13} className="text-accent" />
-            {t("notes.actions.manageTitle")}
-          </DialogTitle>
-        </DialogHeader>
-
-        <div className="space-y-2">
-          <p className="text-xs font-medium text-foreground/50">
-            {editingId !== null ? t("notes.actions.editAction") : t("notes.actions.addAction")}
-          </p>
-          <input
-            type="text"
-            value={name}
-            onChange={(e) => setName(e.target.value)}
-            placeholder={t("notes.actions.namePlaceholder")}
-            disabled={isSaving}
-            className={cn(notesInputClass, "disabled:opacity-40")}
-          />
-          <input
-            type="text"
-            value={description}
-            onChange={(e) => setDescription(e.target.value)}
-            placeholder={t("notes.actions.descriptionPlaceholder")}
-            disabled={isSaving}
-            className={cn(notesInputClass, "disabled:opacity-40")}
-          />
-          <textarea
-            value={prompt}
-            onChange={(e) => setPrompt(e.target.value)}
-            placeholder={t("notes.actions.promptPlaceholder")}
-            rows={3}
-            disabled={isSaving}
-            className={cn(notesTextareaClass, "disabled:opacity-40")}
-          />
-          <div className="flex items-center justify-end gap-2">
-            {editingId !== null && (
-              <Button
-                variant="ghost"
-                size="sm"
-                onClick={resetForm}
-                disabled={isSaving}
-                className="h-7 text-xs"
+      <DialogContent className="sm:max-w-3xl p-0 gap-0 overflow-hidden">
+        {/* Hidden accessible title */}
+        <DialogTitle className="sr-only">{t("notes.actions.manageTitle")}</DialogTitle>
+
+        <div className="flex h-120">
+          {/* Left panel — action list */}
+          <div className="w-56 shrink-0 border-r border-border/15 dark:border-white/4 flex flex-col bg-card/50 dark:bg-surface-1/30">
+            {/* List header */}
+            <div className="flex items-center justify-between px-3 pt-3.5 pb-2">
+              <span className="text-xs font-semibold tracking-tight text-foreground/70">
+                {t("notes.actions.manageTitle")}
+              </span>
+              <button
+                onClick={handleNewAction}
+                className={cn(
+                  "p-1 rounded-md",
+                  "text-muted-foreground/50 hover:text-foreground/70",
+                  "hover:bg-foreground/5 dark:hover:bg-white/6",
+                  "active:bg-foreground/8 dark:active:bg-white/8",
+                  "transition-colors duration-150"
+                )}
+                aria-label={t("notes.actions.addAction")}
               >
-                {t("notes.actions.cancel")}
-              </Button>
-            )}
-            <Button
-              variant="default"
-              size="sm"
-              onClick={handleSave}
-              disabled={isSaving || !name.trim() || !prompt.trim()}
-              className="h-7 text-xs"
-            >
-              {isSaving ? (
-                <Loader2 size={12} className="animate-spin" />
-              ) : editingId !== null ? (
-                t("notes.actions.update")
-              ) : (
-                t("notes.actions.save")
-              )}
-            </Button>
-          </div>
-        </div>
+                <Plus size={13} />
+              </button>
+            </div>
 
-        <div className="border-t border-border/20 dark:border-white/4 pt-2.5">
-          {actions.length === 0 ? (
-            <p className="text-xs text-muted-foreground/40 text-center py-4">
-              {t("notes.actions.noActions")}
-            </p>
-          ) : (
-            <div className="space-y-0.5 max-h-52 overflow-y-auto">
-              {actions.map((action) => (
-                <div
-                  key={action.id}
-                  className={cn(
-                    "flex items-center gap-2.5 px-2.5 py-2 rounded-md group",
-                    "hover:bg-foreground/3 dark:hover:bg-white/3",
-                    "transition-colors duration-150"
-                  )}
-                >
-                  <Sparkles size={12} className="text-accent/40 shrink-0" />
-                  <div className="flex-1 min-w-0">
-                    <div className="flex items-center gap-1.5">
-                      <span className="text-xs font-medium truncate">
-                        {getActionName(action, t)}
-                      </span>
-                      {action.is_builtin === 1 && (
-                        <span className="text-xs font-medium px-1.5 py-0.5 rounded bg-foreground/5 dark:bg-white/6 text-muted-foreground/50 shrink-0">
-                          {t("notes.actions.builtIn")}
-                        </span>
-                      )}
-                    </div>
-                    {action.description && (
-                      <p className="text-xs text-muted-foreground/40 truncate">
-                        {getActionDescription(action, t)}
-                      </p>
-                    )}
-                  </div>
-                  <div className="flex items-center gap-0.5 opacity-0 group-hover:opacity-100 transition-opacity duration-150 shrink-0">
-                    <button
-                      onClick={() => handleEdit(action)}
-                      aria-label={t("notes.actions.editAction")}
+            {/* Action list */}
+            <div className="flex-1 overflow-y-auto px-1.5 pb-2">
+              {actions.length === 0 && !isCreating ? (
+                <div className="flex flex-col items-center justify-center h-full px-4 text-center">
+                  <Zap size={20} className="text-muted-foreground/20 mb-2" />
+                  <p className="text-xs text-muted-foreground/40 leading-relaxed">
+                    {t("notes.actions.noActions")}
+                  </p>
+                  <button
+                    onClick={handleNewAction}
+                    className="text-xs text-accent/60 hover:text-accent/80 mt-2 transition-colors duration-150 focus:outline-none focus-visible:ring-1 focus-visible:ring-ring/30 rounded"
+                  >
+                    {t("notes.actions.addAction")}
+                  </button>
+                </div>
+              ) : (
+                <div className="space-y-0.5">
+                  {actions.map((action) => (
+                    <div
+                      key={action.id}
+                      onClick={() => handleSelectAction(action)}
                       className={cn(
-                        "p-1.5 rounded-md",
-                        "text-muted-foreground/40 hover:text-foreground/70",
-                        "hover:bg-foreground/5 dark:hover:bg-white/6",
-                        "active:bg-foreground/8 dark:active:bg-white/8",
-                        "transition-colors duration-150"
+                        "flex items-center gap-2 w-full px-2.5 py-2 rounded-md text-left group cursor-pointer",
+                        "transition-colors duration-150",
+                        selectedId === action.id && !isCreating
+                          ? "bg-accent/8 dark:bg-accent/10"
+                          : "hover:bg-foreground/3 dark:hover:bg-white/3"
                       )}
                     >
-                      <Pencil size={11} />
-                    </button>
-                    {action.is_builtin !== 1 && (
-                      <button
-                        onClick={() => handleDelete(action.id)}
-                        aria-label={t("notes.context.delete")}
+                      <Sparkles
+                        size={12}
                         className={cn(
-                          "p-1.5 rounded-md",
-                          "text-muted-foreground/40 hover:text-destructive/70",
-                          "hover:bg-destructive/5 active:bg-destructive/8",
-                          "transition-colors duration-150"
+                          "shrink-0 transition-colors duration-150",
+                          selectedId === action.id && !isCreating
+                            ? "text-accent/60"
+                            : "text-muted-foreground/30"
                         )}
+                      />
+                      <div className="flex-1 min-w-0">
+                        <div className="flex items-center gap-1.5">
+                          <span
+                            className={cn(
+                              "text-xs font-medium truncate",
+                              selectedId === action.id && !isCreating
+                                ? "text-foreground"
+                                : "text-foreground/70"
+                            )}
+                          >
+                            {getActionName(action, t)}
+                          </span>
+                          {action.is_builtin === 1 && (
+                            <span className="text-[10px] font-medium px-1 py-px rounded bg-foreground/5 dark:bg-white/6 text-muted-foreground/40 shrink-0">
+                              {t("notes.actions.builtIn")}
+                            </span>
+                          )}
+                        </div>
+                      </div>
+                      {action.is_builtin !== 1 && (
+                        <button
+                          onClick={(e) => {
+                            e.stopPropagation();
+                            handleDelete(action.id);
+                          }}
+                          aria-label={t("notes.context.delete")}
+                          className={cn(
+                            "p-1 rounded-md shrink-0",
+                            "text-muted-foreground/0 group-hover:text-muted-foreground/30",
+                            "hover:text-destructive/60! hover:bg-destructive/5",
+                            "active:bg-destructive/8",
+                            "transition-all duration-150"
+                          )}
+                        >
+                          <Trash2 size={11} />
+                        </button>
+                      )}
+                    </div>
+                  ))}
+                </div>
+              )}
+            </div>
+          </div>
+
+          {/* Right panel — editor */}
+          <div className="flex-1 flex flex-col min-w-0">
+            {showEditor ? (
+              <>
+                {/* Editor header — pr-12 clears the dialog close X button */}
+                <div className="flex items-center justify-between pl-5 pr-12 pt-4 pb-3 border-b border-border/10 dark:border-white/3">
+                  <span className="text-xs font-medium text-muted-foreground/50">
+                    {isCreating ? t("notes.actions.addAction") : t("notes.actions.editAction")}
+                  </span>
+                  <div className="flex items-center gap-2">
+                    {isCreating && (
+                      <Button
+                        variant="ghost"
+                        size="sm"
+                        onClick={() => {
+                          setIsCreating(false);
+                          resetForm();
+                          // Re-select first action if available
+                          if (actions.length > 0) handleSelectAction(actions[0]);
+                        }}
+                        disabled={isSaving}
+                        className="h-7 text-xs"
                       >
-                        <Trash2 size={11} />
-                      </button>
+                        {t("notes.actions.cancel")}
+                      </Button>
                     )}
+                    <Button
+                      size="sm"
+                      onClick={handleSave}
+                      disabled={isSaving || !name.trim() || !prompt.trim() || !hasUnsavedChanges}
+                      className="h-7 text-xs"
+                    >
+                      {isSaving ? (
+                        <Loader2 size={12} className="animate-spin" />
+                      ) : isCreating ? (
+                        t("notes.actions.save")
+                      ) : (
+                        t("notes.actions.update")
+                      )}
+                    </Button>
                   </div>
                 </div>
-              ))}
-            </div>
-          )}
+
+                {/* Editor form */}
+                <div className="flex-1 overflow-y-auto px-5 py-4 space-y-3">
+                  <Input
+                    ref={nameInputRef}
+                    value={name}
+                    onChange={(e) => setName(e.target.value)}
+                    placeholder={t("notes.actions.namePlaceholder")}
+                    disabled={isSaving}
+                    className="h-9"
+                  />
+                  <Input
+                    value={description}
+                    onChange={(e) => setDescription(e.target.value)}
+                    placeholder={t("notes.actions.descriptionPlaceholder")}
+                    disabled={isSaving}
+                    className="h-9"
+                  />
+
+                  {/* Prompt — the star of the show */}
+                  <div className="flex flex-col flex-1 space-y-1.5 min-h-0">
+                    <label className="text-xs font-medium text-foreground/50">
+                      {t("notes.actions.promptLabel", { defaultValue: "Prompt" })}
+                    </label>
+                    <textarea
+                      value={prompt}
+                      onChange={(e) => setPrompt(e.target.value)}
+                      placeholder={t("notes.actions.promptPlaceholder")}
+                      disabled={isSaving}
+                      className={cn(
+                        "flex-1 min-h-50 w-full rounded border border-border/70 bg-input px-3.5 py-3 text-sm text-foreground leading-relaxed transition-colors duration-200 outline-none resize-none",
+                        "placeholder:text-muted-foreground/40",
+                        "hover:border-border-hover",
+                        "focus-visible:border-primary focus-visible:ring-2 focus-visible:ring-primary/10",
+                        "dark:bg-surface-1 dark:border-border-subtle/50",
+                        "dark:focus-visible:border-border-active dark:focus-visible:ring-ring/10",
+                        "disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 disabled:bg-muted",
+                        "font-mono text-[13px]"
+                      )}
+                    />
+                  </div>
+                </div>
+              </>
+            ) : (
+              /* Empty state — no action selected */
+              <div className="flex-1 flex flex-col items-center justify-center text-center px-8">
+                <div className="w-10 h-10 rounded-xl bg-accent/5 dark:bg-accent/8 flex items-center justify-center mb-3">
+                  <Sparkles size={18} className="text-accent/30" />
+                </div>
+                <p className="text-sm font-medium text-foreground/40 mb-1">
+                  {t("notes.actions.emptyEditorTitle", { defaultValue: "Select an action" })}
+                </p>
+                <p className="text-xs text-muted-foreground/30 mb-4 max-w-52 leading-relaxed">
+                  {t("notes.actions.emptyEditorDescription", {
+                    defaultValue: "Choose an action from the list or create a new one",
+                  })}
+                </p>
+                <Button
+                  variant="outline-flat"
+                  size="sm"
+                  onClick={handleNewAction}
+                  className="h-7 text-xs gap-1.5"
+                >
+                  <Plus size={12} />
+                  {t("notes.actions.addAction")}
+                </Button>
+              </div>
+            )}
+          </div>
         </div>
       </DialogContent>
     </Dialog>
diff --git a/src/components/notes/ActionPicker.tsx b/src/components/notes/ActionPicker.tsx
index 6971fa5be..0c5d4365c 100644
--- a/src/components/notes/ActionPicker.tsx
+++ b/src/components/notes/ActionPicker.tsx
@@ -49,26 +49,24 @@ export default function ActionPicker({
   if (!activeAction) return null;
 
   return (
-    <div className="flex items-center">
+    <div className="flex items-center shrink-0">
       <button
         onClick={() => handleRun(activeAction)}
         disabled={disabled}
         aria-label={t("notes.actions.runAction", { name: getActionName(activeAction, t) })}
         className={cn(
-          "flex items-center gap-2 h-11 pl-5 pr-3 rounded-l-xl",
-          "bg-accent/8 dark:bg-accent/12",
-          "backdrop-blur-xl",
-          "border border-r-0 border-accent/15 dark:border-accent/20",
-          "shadow-sm hover:shadow-md",
-          "text-accent/70 hover:text-accent",
-          "transition-[background-color,color,transform] duration-200",
-          "hover:bg-accent/12 dark:hover:bg-accent/18",
+          "flex items-center gap-1.5 h-7 pl-2.5 pr-1.5 rounded-l-lg",
+          "bg-accent/6 dark:bg-accent/10",
+          "text-accent/60 dark:text-accent/50",
+          "transition-colors duration-150",
+          "hover:bg-accent/10 dark:hover:bg-accent/15",
+          "hover:text-accent/80 dark:hover:text-accent/70",
           "active:scale-[0.98]",
-          "disabled:opacity-40 disabled:pointer-events-none"
+          "disabled:opacity-30 disabled:pointer-events-none"
         )}
       >
-        <Sparkles size={14} />
-        <span className="text-xs font-semibold tracking-tight">
+        <Sparkles size={11} />
+        <span className="text-[11px] font-semibold tracking-tight">
           {getActionName(activeAction, t)}
         </span>
       </button>
@@ -79,18 +77,16 @@ export default function ActionPicker({
             disabled={disabled}
             aria-label={t("notes.actions.selectAction")}
             className={cn(
-              "flex items-center justify-center h-11 w-8 rounded-r-xl",
-              "bg-accent/8 dark:bg-accent/12",
-              "backdrop-blur-xl",
-              "border border-l-0 border-accent/15 dark:border-accent/20",
-              "shadow-sm hover:shadow-md",
-              "text-accent/50 hover:text-accent",
-              "transition-[background-color,color,transform] duration-200",
-              "hover:bg-accent/15 dark:hover:bg-accent/22",
-              "disabled:opacity-40 disabled:pointer-events-none"
+              "flex items-center justify-center h-7 w-5 rounded-r-lg",
+              "bg-accent/6 dark:bg-accent/10",
+              "text-accent/35 dark:text-accent/25",
+              "transition-colors duration-150",
+              "hover:bg-accent/10 dark:hover:bg-accent/15",
+              "hover:text-accent/60",
+              "disabled:opacity-30 disabled:pointer-events-none"
             )}
           >
-            <ChevronDown size={12} />
+            <ChevronDown size={10} />
           </button>
         </DropdownMenuTrigger>
         <DropdownMenuContent align="end" side="top" sideOffset={8} className="min-w-48">
diff --git a/src/components/notes/EmbeddedChat.tsx b/src/components/notes/EmbeddedChat.tsx
new file mode 100644
index 000000000..161d712fe
--- /dev/null
+++ b/src/components/notes/EmbeddedChat.tsx
@@ -0,0 +1,137 @@
+import { useEffect, useCallback } from "react";
+import { useTranslation } from "react-i18next";
+import { X, PanelRight, PanelRightClose } from "lucide-react";
+import { cn } from "../lib/utils";
+import { ChatMessages } from "../chat/ChatMessages";
+import { ChatInput } from "../chat/ChatInput";
+import type { Message, AgentState } from "../chat/types";
+
+export type EmbeddedChatMode = "hidden" | "floating" | "sidebar";
+
+interface EmbeddedChatProps {
+  mode: EmbeddedChatMode;
+  onModeChange: (mode: EmbeddedChatMode) => void;
+  messages: Message[];
+  agentState: AgentState;
+  onTextSubmit: (text: string) => void;
+  onCancel: () => void;
+}
+
+function EmptyState() {
+  const { t } = useTranslation();
+  return (
+    <div className="flex items-center justify-center h-full select-none">
+      <p className="text-xs text-foreground/30 dark:text-foreground/20 text-center max-w-44">
+        {t("embeddedChat.emptyState")}
+      </p>
+    </div>
+  );
+}
+
+export default function EmbeddedChat({
+  mode,
+  onModeChange,
+  messages,
+  agentState,
+  onTextSubmit,
+  onCancel,
+}: EmbeddedChatProps) {
+  const { t } = useTranslation();
+
+  const handleKeyDown = useCallback(
+    (e: KeyboardEvent) => {
+      if (e.key === "Escape" && mode === "floating") {
+        onModeChange("hidden");
+      }
+    },
+    [mode, onModeChange]
+  );
+
+  useEffect(() => {
+    document.addEventListener("keydown", handleKeyDown);
+    return () => document.removeEventListener("keydown", handleKeyDown);
+  }, [handleKeyDown]);
+
+  if (mode === "hidden") return null;
+
+  const header = (
+    <div className="h-9 flex items-center px-3 shrink-0">
+      <span className="text-xs font-medium text-foreground/50">{t("embeddedChat.title")}</span>
+      <div className="flex-1" />
+      <div className="flex items-center gap-0.5">
+        {mode === "floating" ? (
+          <button
+            onClick={() => onModeChange("sidebar")}
+            className="h-6 w-6 flex items-center justify-center rounded-md text-foreground/25 hover:text-foreground/40 hover:bg-foreground/6 transition-colors"
+            aria-label={t("embeddedChat.dock")}
+          >
+            <PanelRight size={13} />
+          </button>
+        ) : (
+          <button
+            onClick={() => onModeChange("floating")}
+            className="h-6 w-6 flex items-center justify-center rounded-md text-foreground/25 hover:text-foreground/40 hover:bg-foreground/6 transition-colors"
+            aria-label={t("embeddedChat.undock")}
+          >
+            <PanelRightClose size={13} />
+          </button>
+        )}
+        <button
+          onClick={() => onModeChange("hidden")}
+          className="h-6 w-6 flex items-center justify-center rounded-md text-foreground/25 hover:text-foreground/40 hover:bg-foreground/6 transition-colors"
+          aria-label={t("embeddedChat.close")}
+        >
+          <X size={13} />
+        </button>
+      </div>
+    </div>
+  );
+
+  const chatContent = (
+    <>
+      {header}
+      <ChatMessages messages={messages} emptyState={<EmptyState />} />
+      <ChatInput
+        agentState={agentState}
+        partialTranscript=""
+        onTextSubmit={onTextSubmit}
+        onCancel={onCancel}
+        showHotkey={false}
+        autoFocus={false}
+      />
+    </>
+  );
+
+  if (mode === "floating") {
+    return (
+      <div
+        className={cn(
+          "absolute bottom-20 right-4 z-20",
+          "w-95 max-h-120 min-h-50",
+          "flex flex-col",
+          "bg-background/95 dark:bg-surface-2/95",
+          "border border-border/20 dark:border-white/8",
+          "rounded-xl",
+          "shadow-elevated",
+          "backdrop-blur-2xl",
+          "animate-[scale-in_200ms_ease-out]"
+        )}
+      >
+        {chatContent}
+      </div>
+    );
+  }
+
+  return (
+    <div
+      className={cn(
+        "w-85 shrink-0",
+        "border-l border-border/15 dark:border-white/6",
+        "flex flex-col",
+        "min-h-0"
+      )}
+    >
+      {chatContent}
+    </div>
+  );
+}
diff --git a/src/components/notes/NoteBottomBar.tsx b/src/components/notes/NoteBottomBar.tsx
new file mode 100644
index 000000000..54fd0bafe
--- /dev/null
+++ b/src/components/notes/NoteBottomBar.tsx
@@ -0,0 +1,210 @@
+import { useState, useRef, useCallback, useEffect } from "react";
+import { useTranslation } from "react-i18next";
+import { Mic, ArrowUp, Square, Loader2 } from "lucide-react";
+import { cn } from "../lib/utils";
+
+const BAR_COUNT = 5;
+
+interface NoteBottomBarProps {
+  isRecording: boolean;
+  isProcessing: boolean;
+  onStartRecording: () => void;
+  onStopRecording: () => void;
+  onAskSubmit: (text: string) => void;
+  askDisabled?: boolean;
+  actionPicker?: React.ReactNode;
+}
+
+export default function NoteBottomBar({
+  isRecording,
+  isProcessing,
+  onStartRecording,
+  onStopRecording,
+  onAskSubmit,
+  askDisabled,
+  actionPicker,
+}: NoteBottomBarProps) {
+  const { t } = useTranslation();
+  const [inputText, setInputText] = useState("");
+  const [isExpanded, setIsExpanded] = useState(false);
+  const inputRef = useRef<HTMLInputElement>(null);
+  const containerRef = useRef<HTMLDivElement>(null);
+  const [elapsed, setElapsed] = useState(0);
+
+  useEffect(() => {
+    if (!isRecording) {
+      setElapsed(0);
+      return;
+    }
+    const id = setInterval(() => setElapsed((s) => s + 1), 1000);
+    return () => clearInterval(id);
+  }, [isRecording]);
+
+  const minutes = String(Math.floor(elapsed / 60)).padStart(2, "0");
+  const seconds = String(elapsed % 60).padStart(2, "0");
+
+  const hasText = inputText.trim().length > 0;
+
+  const handleSubmit = useCallback(() => {
+    const text = inputText.trim();
+    if (!text || askDisabled) return;
+    onAskSubmit(text);
+    setInputText("");
+    setIsExpanded(false);
+  }, [inputText, askDisabled, onAskSubmit]);
+
+  const handleKeyDown = useCallback(
+    (e: React.KeyboardEvent<HTMLInputElement>) => {
+      if (e.key === "Enter" && !e.shiftKey) {
+        e.preventDefault();
+        handleSubmit();
+      }
+      if (e.key === "Escape") {
+        setIsExpanded(false);
+        inputRef.current?.blur();
+      }
+    },
+    [handleSubmit]
+  );
+
+  const handleInputFocus = useCallback(() => {
+    setIsExpanded(true);
+  }, []);
+
+  useEffect(() => {
+    if (!isExpanded) return;
+    const handleClickOutside = (e: MouseEvent) => {
+      if (!hasText && containerRef.current && !containerRef.current.contains(e.target as Node)) {
+        setIsExpanded(false);
+      }
+    };
+    document.addEventListener("mousedown", handleClickOutside);
+    return () => document.removeEventListener("mousedown", handleClickOutside);
+  }, [isExpanded, hasText]);
+
+  return (
+    <div
+      ref={containerRef}
+      className="absolute bottom-0 left-0 right-0 z-10 px-5 pb-4 pointer-events-none"
+    >
+      <div className="flex items-end gap-2 pointer-events-auto">
+        <div
+          className={cn(
+            "shrink-0 transition-all duration-300 ease-out overflow-hidden",
+            isExpanded && !isRecording ? "w-0 opacity-0" : "w-auto opacity-100"
+          )}
+        >
+          {isRecording ? (
+            <button
+              onClick={onStopRecording}
+              className={cn(
+                "flex items-center gap-2 h-10 pl-3.5 pr-3 rounded-xl",
+                "bg-primary/6 dark:bg-primary/10",
+                "border border-primary/20 dark:border-primary/25",
+                "backdrop-blur-sm",
+                "transition-colors duration-150",
+                "hover:bg-primary/10 dark:hover:bg-primary/15"
+              )}
+            >
+              <div className="flex items-end gap-0.5 h-3.5">
+                {Array.from({ length: BAR_COUNT }, (_, i) => (
+                  <div
+                    key={i}
+                    className="w-0.5 rounded-full bg-primary/60 dark:bg-primary/70 origin-bottom"
+                    style={{
+                      height: "100%",
+                      animation: `waveform-bar ${0.5 + i * 0.07}s ease-in-out infinite`,
+                      animationDelay: `${i * 0.04}s`,
+                    }}
+                  />
+                ))}
+              </div>
+              <span className="text-[11px] font-medium tabular-nums text-primary/60 dark:text-primary/70">
+                {minutes}:{seconds}
+              </span>
+              <Square size={9} fill="currentColor" className="text-primary/50" />
+            </button>
+          ) : isProcessing ? (
+            <div
+              className={cn(
+                "flex items-center justify-center w-10 h-10 rounded-xl",
+                "bg-foreground/3 dark:bg-white/4",
+                "border border-border/20 dark:border-white/6"
+              )}
+            >
+              <Loader2 size={14} className="animate-spin text-foreground/25" />
+            </div>
+          ) : (
+            <button
+              onClick={onStartRecording}
+              className={cn(
+                "flex items-center justify-center w-10 h-10 rounded-xl",
+                "bg-foreground/3 dark:bg-white/4",
+                "border border-border/20 dark:border-white/6",
+                "backdrop-blur-sm",
+                "text-foreground/30 dark:text-foreground/20",
+                "transition-all duration-200",
+                "hover:bg-foreground/6 dark:hover:bg-white/8",
+                "hover:text-foreground/50 dark:hover:text-foreground/35",
+                "hover:border-border/30 dark:hover:border-white/10",
+                "active:scale-95"
+              )}
+              aria-label={t("notes.editor.transcribe")}
+            >
+              <Mic size={15} />
+            </button>
+          )}
+        </div>
+
+        <div
+          className={cn(
+            "flex-1 min-w-0 flex items-center h-10 px-3 gap-2",
+            "rounded-xl",
+            "bg-foreground/3 dark:bg-white/4",
+            "border",
+            "transition-all duration-200",
+            isExpanded
+              ? "border-foreground/12 dark:border-white/10 shadow-[0_0_0_3px_rgba(0,0,0,0.02)] dark:shadow-[0_0_0_3px_rgba(255,255,255,0.02)]"
+              : "border-border/20 dark:border-white/6"
+          )}
+        >
+          <input
+            ref={inputRef}
+            type="text"
+            value={inputText}
+            onChange={(e) => setInputText(e.target.value)}
+            onKeyDown={handleKeyDown}
+            onFocus={handleInputFocus}
+            disabled={askDisabled}
+            placeholder={t("embeddedChat.askPlaceholder")}
+            className={cn(
+              "input-inline flex-1 bg-transparent outline-none min-w-0 p-0",
+              "text-[13px] text-foreground",
+              "placeholder:text-foreground/25 dark:placeholder:text-foreground/15"
+            )}
+          />
+
+          {hasText ? (
+            <button
+              onClick={handleSubmit}
+              disabled={askDisabled}
+              className={cn(
+                "flex items-center justify-center w-6 h-6 rounded-md shrink-0",
+                "bg-foreground dark:bg-foreground/90 text-background",
+                "transition-all duration-150",
+                "hover:bg-foreground/85 dark:hover:bg-foreground/80",
+                "active:scale-90",
+                "disabled:opacity-30"
+              )}
+              aria-label={t("embeddedChat.send")}
+            >
+              <ArrowUp size={13} strokeWidth={2.5} />
+            </button>
+          ) : !isExpanded ? (
+            <div className="shrink-0">{actionPicker}</div>
+          ) : null}
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/src/components/notes/NoteEditor.tsx b/src/components/notes/NoteEditor.tsx
index 85ca4bc52..74e3e4f51 100644
--- a/src/components/notes/NoteEditor.tsx
+++ b/src/components/notes/NoteEditor.tsx
@@ -1,6 +1,19 @@
 import { useState, useRef, useEffect, useMemo, useCallback } from "react";
 import { useTranslation } from "react-i18next";
-import { Download, Loader2, FileText, Sparkles, AlignLeft, MessageSquareText } from "lucide-react";
+import {
+  Download,
+  Loader2,
+  FileText,
+  Sparkles,
+  AlignLeft,
+  MessageSquareText,
+  Calendar,
+  LinkIcon,
+  FolderOpen,
+  Search,
+  Plus,
+  Check,
+} from "lucide-react";
 import { RichTextEditor } from "../ui/RichTextEditor";
 import type { Editor } from "@tiptap/react";
 import { MeetingTranscriptChat } from "./MeetingTranscriptChat";
@@ -10,12 +23,15 @@ import {
   DropdownMenuTrigger,
   DropdownMenuContent,
   DropdownMenuItem,
+  DropdownMenuSeparator,
 } from "../ui/dropdown-menu";
 import { cn } from "../lib/utils";
-import type { NoteItem } from "../../types/electron";
+import type { NoteItem, FolderItem } from "../../types/electron";
 import type { ActionProcessingState } from "../../hooks/useActionProcessing";
 import ActionProcessingOverlay from "./ActionProcessingOverlay";
-import DictationWidget from "./DictationWidget";
+import NoteBottomBar from "./NoteBottomBar";
+import EmbeddedChat, { type EmbeddedChatMode } from "./EmbeddedChat";
+import { useEmbeddedChat } from "../../hooks/useEmbeddedChat";
 import { normalizeDbDate } from "../../utils/dateFormatting";
 import { parseTranscriptSegments } from "../../utils/parseTranscriptSegments";
 
@@ -31,6 +47,12 @@ function formatNoteDate(dateStr: string): string {
   return `${datePart} \u00b7 ${timePart}`;
 }
 
+function formatShortDate(dateStr: string): string {
+  const date = normalizeDbDate(dateStr);
+  if (Number.isNaN(date.getTime())) return "";
+  return date.toLocaleDateString(undefined, { month: "short", day: "numeric" });
+}
+
 export interface Enhancement {
   content: string;
   isStale: boolean;
@@ -60,6 +82,11 @@ interface NoteEditorProps {
   meetingSystemPartial?: string;
   onStopMeetingRecording?: () => void;
   liveTranscript?: string;
+  folderName?: string | null;
+  calendarEventName?: string | null;
+  folders?: FolderItem[];
+  onMoveToFolder?: (noteId: number, folderId: number) => void;
+  onCreateFolderAndMove?: (noteId: number, folderName: string) => void;
 }
 
 export default function NoteEditor({
@@ -83,10 +110,26 @@ export default function NoteEditor({
   meetingSystemPartial,
   onStopMeetingRecording,
   liveTranscript,
+  folderName,
+  calendarEventName,
+  folders,
+  onMoveToFolder,
+  onCreateFolderAndMove,
 }: NoteEditorProps) {
   const { t } = useTranslation();
   const [viewMode, setViewMode] = useState<MeetingViewMode>("raw");
+  const [chatMode, setChatMode] = useState<EmbeddedChatMode>("hidden");
+  const [folderSearch, setFolderSearch] = useState("");
+  const [isCreatingFolder, setIsCreatingFolder] = useState(false);
+  const [newFolderName, setNewFolderName] = useState("");
   const editorRef = useRef<Editor | null>(null);
+
+  const embeddedChat = useEmbeddedChat({
+    noteId: note.id,
+    noteTitle: note.title,
+    noteContent: note.content,
+    noteTranscript: note.transcript ?? undefined,
+  });
   const titleRef = useRef<HTMLDivElement>(null);
   const prevNoteIdRef = useRef<number>(note.id);
 
@@ -96,6 +139,14 @@ export default function NoteEditor({
   const effectiveTranscript = liveTranscript || meetingTranscript || note.transcript || "";
   const hasMeetingTranscript = !isMeetingRecording && !!effectiveTranscript;
 
+  const filteredFolders = useMemo(
+    () =>
+      folderSearch && folders
+        ? folders.filter((f) => f.name.toLowerCase().includes(folderSearch.toLowerCase()))
+        : (folders ?? []),
+    [folders, folderSearch]
+  );
+
   const displaySegments = useMemo<TranscriptSegment[]>(() => {
     if (meetingSegments && meetingSegments.length > 0) return meetingSegments;
     return parseTranscriptSegments(note.transcript || "");
@@ -210,12 +261,18 @@ export default function NoteEditor({
     [enhancement]
   );
 
-  const wordCount = useMemo(() => {
-    const trimmed = note.content.trim();
-    return trimmed ? trimmed.split(/\s+/).length : 0;
-  }, [note.content]);
+  const handleAskSubmit = useCallback(
+    (text: string) => {
+      if (chatMode === "hidden") {
+        setChatMode("floating");
+      }
+      embeddedChat.sendMessage(text);
+    },
+    [chatMode, embeddedChat]
+  );
 
   const noteDate = formatNoteDate(note.created_at);
+  const shortDate = formatShortDate(note.created_at);
 
   return (
     <div className="flex flex-col h-full min-h-0">
@@ -232,19 +289,128 @@ export default function NoteEditor({
           role="textbox"
           aria-label={t("notes.editor.noteTitle")}
         />
-        <div className="flex items-center mt-1">
-          <div className="flex items-center text-xs text-foreground/50 dark:text-foreground/20 min-w-0">
-            {noteDate && <span>{noteDate}</span>}
-            {noteDate && (isSaving || wordCount > 0) && <span className="mx-1.5">&middot;</span>}
-            <span className="tabular-nums flex items-center gap-1 shrink-0">
-              {isSaving && <Loader2 size={8} className="animate-spin" />}
-              {isSaving
-                ? t("notes.editor.saving")
-                : wordCount > 0
-                  ? t("notes.editor.wordsCount", { count: wordCount })
-                  : ""}
+        {/* Metadata + toolbar row */}
+        <div className="flex items-center gap-2 mt-1.5">
+          {shortDate && (
+            <span
+              className="inline-flex items-center gap-1.5 text-[11px] text-foreground/50 dark:text-foreground/35"
+              title={noteDate}
+            >
+              <Calendar size={11} className="shrink-0" />
+              {shortDate}
             </span>
-          </div>
+          )}
+          {calendarEventName && (
+            <span className="inline-flex items-center gap-1.5 text-[11px] text-foreground/50 dark:text-foreground/35">
+              <LinkIcon size={11} className="shrink-0" />
+              <span className="truncate max-w-40">{calendarEventName}</span>
+            </span>
+          )}
+          {folders && onMoveToFolder && (
+            <DropdownMenu
+              onOpenChange={(open) => {
+                if (!open) {
+                  setFolderSearch("");
+                  setIsCreatingFolder(false);
+                  setNewFolderName("");
+                }
+              }}
+            >
+              <DropdownMenuTrigger asChild>
+                <button className="inline-flex items-center gap-1.5 text-[11px] px-1.5 py-0.5 rounded-md border border-border/70 dark:border-white/25 text-foreground/50 dark:text-foreground/35 hover:text-foreground/60 hover:border-border/60 hover:bg-foreground/3 dark:hover:text-foreground/40 dark:hover:border-white/10 dark:hover:bg-white/3 transition-all duration-150 cursor-pointer outline-none">
+                  <FolderOpen size={11} className="shrink-0" />
+                  {folderName || t("notes.editor.noFolder")}
+                </button>
+              </DropdownMenuTrigger>
+              <DropdownMenuContent align="start" sideOffset={6} className="min-w-44 p-1">
+                {folders.length > 5 && (
+                  <>
+                    <div className="relative px-1.5 py-0.5">
+                      <Search
+                        size={9}
+                        className="absolute left-3.5 top-1/2 -translate-y-1/2 text-foreground/15 pointer-events-none"
+                      />
+                      <input
+                        value={folderSearch}
+                        onChange={(e) => setFolderSearch(e.target.value)}
+                        onKeyDown={(e) => e.stopPropagation()}
+                        placeholder={t("notes.context.searchFolders")}
+                        className="input-inline w-full pl-4.5 pr-1 py-0.5 text-xs text-foreground placeholder:text-foreground/15 outline-none border-none appearance-none"
+                      />
+                    </div>
+                    <DropdownMenuSeparator />
+                  </>
+                )}
+                <div className="overflow-y-auto max-h-48">
+                  {filteredFolders.map((folder) => {
+                    const isCurrent = folder.id === note.folder_id;
+                    return (
+                      <DropdownMenuItem
+                        key={folder.id}
+                        disabled={isCurrent}
+                        onClick={() => onMoveToFolder(note.id, folder.id)}
+                        className="text-xs gap-2 rounded-md px-2 py-1.5"
+                      >
+                        <FolderOpen size={11} className="text-foreground/30 shrink-0" />
+                        <span className="truncate flex-1">{folder.name}</span>
+                        {isCurrent && <Check size={9} className="text-primary shrink-0" />}
+                      </DropdownMenuItem>
+                    );
+                  })}
+                  {folderSearch && filteredFolders.length === 0 && (
+                    <p className="text-xs text-foreground/20 text-center py-1.5">
+                      {t("notes.context.noResults")}
+                    </p>
+                  )}
+                </div>
+                {onCreateFolderAndMove && (
+                  <>
+                    <DropdownMenuSeparator />
+                    {isCreatingFolder ? (
+                      <div className="px-1">
+                        <input
+                          autoFocus
+                          value={newFolderName}
+                          onChange={(e) => setNewFolderName(e.target.value)}
+                          onKeyDown={(e) => {
+                            e.stopPropagation();
+                            if (e.key === "Enter" && newFolderName.trim()) {
+                              onCreateFolderAndMove(note.id, newFolderName.trim());
+                              setNewFolderName("");
+                              setIsCreatingFolder(false);
+                            }
+                            if (e.key === "Escape") {
+                              setIsCreatingFolder(false);
+                              setNewFolderName("");
+                            }
+                          }}
+                          placeholder={t("notes.folders.folderName")}
+                          className="input-inline w-full px-2 py-1.5 rounded-md bg-transparent text-xs text-foreground placeholder:text-foreground/20 outline-none border-none appearance-none"
+                        />
+                      </div>
+                    ) : (
+                      <DropdownMenuItem
+                        onSelect={(e) => {
+                          e.preventDefault();
+                          setIsCreatingFolder(true);
+                        }}
+                        className="text-xs gap-2 rounded-md px-2 py-1.5 text-foreground/40"
+                      >
+                        <Plus size={10} />
+                        {t("notes.context.newFolder")}
+                      </DropdownMenuItem>
+                    )}
+                  </>
+                )}
+              </DropdownMenuContent>
+            </DropdownMenu>
+          )}
+          {isSaving && (
+            <span className="inline-flex items-center gap-1 text-[11px] text-foreground/30 dark:text-foreground/15 tabular-nums">
+              <Loader2 size={8} className="animate-spin" />
+              {t("notes.editor.saving")}
+            </span>
+          )}
           <div className="flex-1" />
           <div className="flex items-center gap-1">
             {(enhancement || hasMeetingTranscript || hasChatSegments || isMeetingRecording) && (
@@ -314,7 +480,7 @@ export default function NoteEditor({
               <DropdownMenu>
                 <DropdownMenuTrigger asChild>
                   <button
-                    className="shrink-0 h-6 w-6 flex items-center justify-center rounded-md bg-foreground/3 dark:bg-white/3 text-foreground/25 hover:text-foreground/40 hover:bg-foreground/6 dark:hover:bg-white/6 transition-colors duration-150"
+                    className="shrink-0 h-6 w-6 flex items-center justify-center rounded-md bg-foreground/4 dark:bg-white/5 text-foreground/50 dark:text-foreground/40 hover:text-foreground/70 hover:bg-foreground/8 dark:hover:text-foreground/60 dark:hover:bg-white/8 transition-colors duration-150"
                     aria-label={t("notes.editor.export")}
                   >
                     <Download size={11} />
@@ -336,45 +502,70 @@ export default function NoteEditor({
         </div>
       </div>
 
-      <div className="flex-1 relative min-h-0">
-        <div className="h-full overflow-y-auto">
-          {viewMode === "transcript" && (hasChatSegments || isMeetingRecording) ? (
-            <MeetingTranscriptChat
-              segments={displaySegments}
-              micPartial={isMeetingRecording ? meetingMicPartial : undefined}
-              systemPartial={isMeetingRecording ? meetingSystemPartial : undefined}
-            />
-          ) : viewMode === "transcript" && hasMeetingTranscript ? (
-            <RichTextEditor value={effectiveTranscript} disabled />
-          ) : viewMode === "enhanced" && enhancement ? (
-            <RichTextEditor value={enhancement.content} onChange={handleEnhancedChange} />
-          ) : (
-            <RichTextEditor
-              value={note.content}
-              onChange={handleContentChange}
-              editorRef={editorRef}
-              placeholder={t("notes.editor.startWriting")}
-              disabled={actionProcessingState === "processing"}
+      <div className="flex-1 relative min-h-0 flex">
+        <div className="flex-1 min-w-0 relative">
+          <div className="h-full overflow-y-auto">
+            {viewMode === "transcript" && (hasChatSegments || isMeetingRecording) ? (
+              <MeetingTranscriptChat
+                segments={displaySegments}
+                micPartial={isMeetingRecording ? meetingMicPartial : undefined}
+                systemPartial={isMeetingRecording ? meetingSystemPartial : undefined}
+              />
+            ) : viewMode === "transcript" && hasMeetingTranscript ? (
+              <RichTextEditor value={effectiveTranscript} disabled />
+            ) : viewMode === "enhanced" && enhancement ? (
+              <RichTextEditor value={enhancement.content} onChange={handleEnhancedChange} />
+            ) : (
+              <RichTextEditor
+                value={note.content}
+                onChange={handleContentChange}
+                editorRef={editorRef}
+                placeholder={t("notes.editor.startWriting")}
+                disabled={actionProcessingState === "processing"}
+              />
+            )}
+          </div>
+          <ActionProcessingOverlay
+            state={actionProcessingState ?? "idle"}
+            actionName={actionName ?? null}
+          />
+          <div
+            className="absolute bottom-0 left-0 right-0 h-20 pointer-events-none"
+            style={{
+              background: "linear-gradient(to bottom, transparent, var(--color-background))",
+            }}
+          />
+          <NoteBottomBar
+            isRecording={isRecording || !!isMeetingRecording}
+            isProcessing={isProcessing}
+            onStartRecording={onStartRecording}
+            onStopRecording={
+              isMeetingRecording ? (onStopMeetingRecording ?? onStopRecording) : onStopRecording
+            }
+            onAskSubmit={handleAskSubmit}
+            actionPicker={isMeetingRecording ? undefined : actionPicker}
+          />
+          {chatMode === "floating" && (
+            <EmbeddedChat
+              mode="floating"
+              onModeChange={setChatMode}
+              messages={embeddedChat.messages}
+              agentState={embeddedChat.agentState}
+              onTextSubmit={embeddedChat.sendMessage}
+              onCancel={embeddedChat.cancelStream}
             />
           )}
         </div>
-        <ActionProcessingOverlay
-          state={actionProcessingState ?? "idle"}
-          actionName={actionName ?? null}
-        />
-        <div
-          className="absolute bottom-0 left-0 right-0 h-24 pointer-events-none"
-          style={{ background: "linear-gradient(to bottom, transparent, var(--color-background))" }}
-        />
-        <DictationWidget
-          isRecording={isRecording || !!isMeetingRecording}
-          isProcessing={isProcessing}
-          onStart={onStartRecording}
-          onStop={
-            isMeetingRecording ? (onStopMeetingRecording ?? onStopRecording) : onStopRecording
-          }
-          actionPicker={isMeetingRecording ? undefined : actionPicker}
-        />
+        {chatMode === "sidebar" && (
+          <EmbeddedChat
+            mode="sidebar"
+            onModeChange={setChatMode}
+            messages={embeddedChat.messages}
+            agentState={embeddedChat.agentState}
+            onTextSubmit={embeddedChat.sendMessage}
+            onCancel={embeddedChat.cancelStream}
+          />
+        )}
       </div>
     </div>
   );
diff --git a/src/components/notes/NoteListItem.tsx b/src/components/notes/NoteListItem.tsx
index 988cb29ad..58b0be21e 100644
--- a/src/components/notes/NoteListItem.tsx
+++ b/src/components/notes/NoteListItem.tsx
@@ -1,6 +1,14 @@
 import { useState, useMemo } from "react";
 import { useTranslation } from "react-i18next";
-import { MoreHorizontal, FolderOpen, Trash2, Check, Plus, Search } from "lucide-react";
+import {
+  MoreHorizontal,
+  FolderOpen,
+  Trash2,
+  Check,
+  Plus,
+  Search,
+  ExternalLink,
+} from "lucide-react";
 import { Button } from "../ui/button";
 import {
   DropdownMenu,
@@ -38,6 +46,7 @@ interface NoteListItemProps {
     onDragEnd: () => void;
   };
   isDragging?: boolean;
+  noteFilesEnabled?: boolean;
 }
 
 function stripMarkdown(text: string): string {
@@ -81,6 +90,7 @@ export default function NoteListItem({
   onCreateFolderAndMove,
   dragHandlers,
   isDragging,
+  noteFilesEnabled,
 }: NoteListItemProps) {
   const { t } = useTranslation();
   const preview = stripMarkdown(note.content);
@@ -88,6 +98,12 @@ export default function NoteListItem({
   const [newFolderName, setNewFolderName] = useState("");
   const [isCreating, setIsCreating] = useState(false);
 
+  const fileManagerName = navigator.platform.startsWith("Mac")
+    ? "Finder"
+    : navigator.platform.startsWith("Win")
+      ? "Explorer"
+      : "Files";
+
   const filteredFolders = useMemo(
     () =>
       folderSearch
@@ -108,9 +124,6 @@ export default function NoteListItem({
         isDragging && "opacity-40 scale-[0.97]"
       )}
     >
-      {isActive && (
-        <div className="absolute left-0 top-1/2 -translate-y-1/2 w-0.5 h-4 rounded-r-full bg-primary" />
-      )}
       <div className="flex-1 min-w-0">
         <div className="flex items-center justify-between gap-2">
           <p
@@ -145,6 +158,24 @@ export default function NoteListItem({
                 </Button>
               </DropdownMenuTrigger>
               <DropdownMenuContent align="end" sideOffset={4} className="min-w-40">
+                {noteFilesEnabled && (
+                  <>
+                    <DropdownMenuItem
+                      onClick={(e) => {
+                        e.stopPropagation();
+                        window.electronAPI?.showNoteFile?.(note.id);
+                      }}
+                      className="text-xs gap-2 rounded-lg px-2.5 py-1.5 cursor-pointer focus:bg-foreground/5"
+                    >
+                      <ExternalLink
+                        size={12}
+                        className="text-muted-foreground/80 dark:text-muted-foreground/60"
+                      />
+                      {t("notes.context.showInFileManager", { manager: fileManagerName })}
+                    </DropdownMenuItem>
+                    <DropdownMenuSeparator />
+                  </>
+                )}
                 <DropdownMenuSub>
                   <DropdownMenuSubTrigger className="text-xs gap-2 rounded-lg px-2.5 py-1.5 cursor-pointer focus:bg-foreground/5 data-[state=open]:bg-foreground/5">
                     <FolderOpen
@@ -159,18 +190,17 @@ export default function NoteListItem({
                   >
                     {folders.length > 5 && (
                       <>
-                        <div className="relative px-2 py-1.5">
+                        <div className="relative px-1.5 py-0.5">
                           <Search
                             size={9}
-                            className="absolute left-4 top-1/2 -translate-y-1/2 text-foreground/15 pointer-events-none"
+                            className="absolute left-3.5 top-1/2 -translate-y-1/2 text-foreground/15 pointer-events-none"
                           />
                           <input
                             value={folderSearch}
                             onChange={(e) => setFolderSearch(e.target.value)}
                             onKeyDown={(e) => e.stopPropagation()}
                             placeholder={t("notes.context.searchFolders")}
-                            style={{ background: "none" }}
-                            className="w-full pl-5 pr-1 py-0.5 text-xs text-foreground placeholder:text-foreground/15 outline-none border-none appearance-none"
+                            className="input-inline w-full pl-4.5 pr-1 py-0.5 text-xs text-foreground placeholder:text-foreground/15 outline-none border-none appearance-none"
                           />
                         </div>
                         <DropdownMenuSeparator />
@@ -202,7 +232,7 @@ export default function NoteListItem({
                     </div>
                     <DropdownMenuSeparator />
                     {isCreating ? (
-                      <div className="px-2 py-1">
+                      <div className="px-1">
                         <input
                           autoFocus
                           value={newFolderName}
@@ -220,7 +250,7 @@ export default function NoteListItem({
                             }
                           }}
                           placeholder={t("notes.folders.folderName")}
-                          className="w-full bg-transparent text-xs text-foreground placeholder:text-foreground/15 outline-none border-none appearance-none"
+                          className="input-inline w-full px-2 py-1.5 rounded-md bg-transparent text-xs text-foreground placeholder:text-foreground/20 outline-none border-none appearance-none"
                         />
                       </div>
                     ) : (
diff --git a/src/components/notes/PersonalNotesView.tsx b/src/components/notes/PersonalNotesView.tsx
index 96d1ffc3e..293a58725 100644
--- a/src/components/notes/PersonalNotesView.tsx
+++ b/src/components/notes/PersonalNotesView.tsx
@@ -1,6 +1,18 @@
 import { useState, useEffect, useRef, useCallback, useMemo } from "react";
 import { useTranslation } from "react-i18next";
-import { Plus, Loader2, FolderOpen, MoreHorizontal, Pencil, Trash2, Check } from "lucide-react";
+import {
+  Plus,
+  Loader2,
+  FolderOpen,
+  MoreHorizontal,
+  Pencil,
+  Trash2,
+  Check,
+  SquarePen,
+  Search,
+  Sparkles,
+  ExternalLink,
+} from "lucide-react";
 import { Button } from "../ui/button";
 import {
   DropdownMenu,
@@ -9,6 +21,16 @@ import {
   DropdownMenuItem,
   DropdownMenuSeparator,
 } from "../ui/dropdown-menu";
+import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter } from "../ui/dialog";
+import {
+  Select,
+  SelectTrigger,
+  SelectValue,
+  SelectContent,
+  SelectItem,
+  SelectSeparator,
+} from "../ui/select";
+import { Input } from "../ui/input";
 import { useToast } from "../ui/Toast";
 import NoteListItem from "./NoteListItem";
 import NoteEditor from "./NoteEditor";
@@ -20,7 +42,7 @@ import { useSettingsStore, selectIsCloudReasoningMode } from "../../stores/setti
 import { useFolderManagement } from "../../hooks/useFolderManagement";
 import { useNoteDragAndDrop } from "../../hooks/useNoteDragAndDrop";
 import { cn } from "../lib/utils";
-import { MEETINGS_FOLDER_NAME } from "./shared";
+import { MEETINGS_FOLDER_NAME, findDefaultFolder } from "./shared";
 import logger from "../../utils/logger";
 import { parseTranscriptSegments } from "../../utils/parseTranscriptSegments";
 import {
@@ -44,6 +66,7 @@ function makeContentHash(content: string): string {
 
 interface PersonalNotesViewProps {
   onOpenSettings?: (section: string) => void;
+  onOpenSearch?: () => void;
   meetingRecordingRequest?: { noteId: number; folderId: number; event: any } | null;
   onMeetingRecordingRequestHandled?: () => void;
   isMeetingMode?: boolean;
@@ -51,6 +74,7 @@ interface PersonalNotesViewProps {
 
 export default function PersonalNotesView({
   onOpenSettings,
+  onOpenSearch,
   meetingRecordingRequest,
   onMeetingRecordingRequestHandled,
   isMeetingMode,
@@ -64,6 +88,10 @@ export default function PersonalNotesView({
   const [localContent, setLocalContent] = useState("");
   const [localEnhancedContent, setLocalEnhancedContent] = useState<string | null>(null);
   const [showActionManager, setShowActionManager] = useState(false);
+  const [showNewNoteDialog, setShowNewNoteDialog] = useState(false);
+  const [newNoteFolderId, setNewNoteFolderId] = useState<string>("");
+  const [isCreatingNewNoteFolder, setIsCreatingNewNoteFolder] = useState(false);
+  const [newNoteFolderName, setNewNoteFolderName] = useState("");
   const saveTimeoutRef = useRef<NodeJS.Timeout | null>(null);
   const enhancedSaveTimeoutRef = useRef<NodeJS.Timeout | null>(null);
   const activeNoteRef = useRef<number | null>(null);
@@ -74,6 +102,12 @@ export default function PersonalNotesView({
   const { toast } = useToast();
   const isCloudMode = useSettingsStore(selectIsCloudReasoningMode);
   const effectiveModelId = useSettingsStore((s) => s.reasoningModel);
+  const noteFilesEnabled = useSettingsStore((s) => s.noteFilesEnabled);
+  const fileManagerName = navigator.platform.startsWith("Mac")
+    ? "Finder"
+    : navigator.platform.startsWith("Win")
+      ? "Explorer"
+      : "Files";
   const { isComplete: isOnboardingComplete, complete: completeOnboarding } = useNotesOnboarding();
 
   const {
@@ -112,6 +146,23 @@ export default function PersonalNotesView({
 
   const activeNote = notes.find((n) => n.id === activeNoteId) ?? null;
 
+  // Derive folder name and calendar event name for the metadata chips
+  const activeFolderName = useMemo(() => {
+    if (!activeNote?.folder_id) return null;
+    return folders.find((f) => f.id === activeNote.folder_id)?.name ?? null;
+  }, [activeNote?.folder_id, folders]);
+
+  const [calendarEventName, setCalendarEventName] = useState<string | null>(null);
+  useEffect(() => {
+    if (!activeNote?.calendar_event_id) {
+      setCalendarEventName(null);
+      return;
+    }
+    window.electronAPI.gcalGetEvent?.(activeNote.calendar_event_id).then((result) => {
+      setCalendarEventName(result?.success && result.event?.summary ? result.event.summary : null);
+    });
+  }, [activeNote?.calendar_event_id]);
+
   // Note recording uses the same meeting transcription pipeline.
   // The `isMeetingMode` ref distinguishes whether the recording was triggered
   // by the meeting hotkey (creates a separate note) or the note record button.
@@ -127,15 +178,43 @@ export default function PersonalNotesView({
   }, [stopTranscription]);
 
   useEffect(() => {
-    if (activeNote && activeNote.id !== activeNoteRef.current) {
-      activeNoteRef.current = activeNote.id;
-      setLocalTitle(activeNote.title);
-      setLocalContent(activeNote.content);
-      setLocalEnhancedContent(activeNote.enhanced_content ?? null);
-    }
-    if (!activeNote) {
-      activeNoteRef.current = null;
-    }
+    const syncNote = async () => {
+      if (activeNote && activeNote.id !== activeNoteRef.current) {
+        if (saveTimeoutRef.current) {
+          clearTimeout(saveTimeoutRef.current);
+          saveTimeoutRef.current = null;
+          if (activeNoteRef.current) {
+            await window.electronAPI.updateNote(activeNoteRef.current, {
+              title: localTitleRef.current,
+              content: localContentRef.current,
+            });
+          }
+        }
+        if (enhancedSaveTimeoutRef.current) {
+          clearTimeout(enhancedSaveTimeoutRef.current);
+          enhancedSaveTimeoutRef.current = null;
+        }
+        activeNoteRef.current = activeNote.id;
+        setLocalTitle(activeNote.title);
+        setLocalContent(activeNote.content);
+        setLocalEnhancedContent(activeNote.enhanced_content ?? null);
+      }
+      if (!activeNote) {
+        if (saveTimeoutRef.current) {
+          clearTimeout(saveTimeoutRef.current);
+          saveTimeoutRef.current = null;
+        }
+        if (enhancedSaveTimeoutRef.current) {
+          clearTimeout(enhancedSaveTimeoutRef.current);
+          enhancedSaveTimeoutRef.current = null;
+        }
+        activeNoteRef.current = null;
+        setLocalTitle("");
+        setLocalContent("");
+        setLocalEnhancedContent(null);
+      }
+    };
+    syncNote();
   }, [activeNote]);
 
   const debouncedSave = useCallback((noteId: number, title: string, content: string) => {
@@ -162,35 +241,35 @@ export default function PersonalNotesView({
   const handleTitleChange = useCallback(
     (title: string) => {
       setLocalTitle(title);
-      if (activeNoteId) debouncedSave(activeNoteId, title, localContent);
+      if (activeNoteRef.current)
+        debouncedSave(activeNoteRef.current, title, localContentRef.current);
     },
-    [activeNoteId, localContent, debouncedSave]
+    [debouncedSave]
   );
 
   const handleContentChange = useCallback(
     (content: string) => {
       setLocalContent(content);
-      if (activeNoteId) debouncedSave(activeNoteId, localTitle, content);
+      if (activeNoteRef.current)
+        debouncedSave(activeNoteRef.current, localTitleRef.current, content);
     },
-    [activeNoteId, localTitle, debouncedSave]
+    [debouncedSave]
   );
 
-  const handleEnhancedContentChange = useCallback(
-    (content: string) => {
-      setLocalEnhancedContent(content);
-      if (!activeNoteId) return;
-      if (enhancedSaveTimeoutRef.current) clearTimeout(enhancedSaveTimeoutRef.current);
-      enhancedSaveTimeoutRef.current = setTimeout(async () => {
-        setIsSaving(true);
-        try {
-          await window.electronAPI.updateNote(activeNoteId, { enhanced_content: content });
-        } finally {
-          setIsSaving(false);
-        }
-      }, 1000);
-    },
-    [activeNoteId]
-  );
+  const handleEnhancedContentChange = useCallback((content: string) => {
+    setLocalEnhancedContent(content);
+    if (!activeNoteRef.current) return;
+    const noteId = activeNoteRef.current;
+    if (enhancedSaveTimeoutRef.current) clearTimeout(enhancedSaveTimeoutRef.current);
+    enhancedSaveTimeoutRef.current = setTimeout(async () => {
+      setIsSaving(true);
+      try {
+        await window.electronAPI.updateNote(noteId, { enhanced_content: content });
+      } finally {
+        setIsSaving(false);
+      }
+    }, 1000);
+  }, []);
 
   const handleNewNote = useCallback(async () => {
     if (!activeFolderId) return;
@@ -208,6 +287,51 @@ export default function PersonalNotesView({
     }
   }, [activeFolderId, loadFolders]);
 
+  const handleOpenNewNoteDialog = useCallback(() => {
+    const personal = findDefaultFolder(folders);
+    setNewNoteFolderId(personal ? String(personal.id) : folders[0] ? String(folders[0].id) : "");
+    setShowNewNoteDialog(true);
+  }, [folders]);
+
+  const handleNewNoteFolderChange = useCallback((val: string) => {
+    if (val === "__create_new__") {
+      setIsCreatingNewNoteFolder(true);
+      return;
+    }
+    setNewNoteFolderId(val);
+  }, []);
+
+  const handleCreateNewNoteFolder = useCallback(async () => {
+    const trimmed = newNoteFolderName.trim();
+    if (!trimmed) return;
+    const res = await window.electronAPI.createFolder(trimmed);
+    if (res.success && res.folder) {
+      await loadFolders();
+      setNewNoteFolderId(String(res.folder.id));
+    }
+    setNewNoteFolderName("");
+    setIsCreatingNewNoteFolder(false);
+  }, [newNoteFolderName, loadFolders]);
+
+  const handleConfirmNewNote = useCallback(async () => {
+    const folderId = Number(newNoteFolderId);
+    if (!folderId) return;
+    const result = await window.electronAPI.saveNote(
+      t("notes.list.untitledNote"),
+      "",
+      "personal",
+      null,
+      null,
+      folderId
+    );
+    if (result.success && result.note) {
+      setActiveFolderId(folderId);
+      setActiveNoteId(result.note.id);
+      loadFolders();
+    }
+    setShowNewNoteDialog(false);
+  }, [newNoteFolderId, loadFolders]);
+
   const handleNotesAdded = useCallback(async () => {
     if (activeFolderId) {
       await initializeNotes(null, 50, activeFolderId);
@@ -217,23 +341,24 @@ export default function PersonalNotesView({
 
   const handleDelete = useCallback(
     async (id: number) => {
-      await window.electronAPI.deleteNote(id);
-      if (activeNoteId === id) {
-        const remaining = notes.filter((n) => n.id !== id);
-        setActiveNoteId(remaining.length > 0 ? remaining[0].id : null);
+      if (saveTimeoutRef.current) {
+        clearTimeout(saveTimeoutRef.current);
+        saveTimeoutRef.current = null;
       }
+      await window.electronAPI.deleteNote(id);
       loadFolders();
     },
-    [activeNoteId, notes, loadFolders]
+    [loadFolders]
   );
 
   const handleMoveToFolder = useCallback(
     async (noteId: number, folderId: number) => {
       await window.electronAPI.updateNote(noteId, { folder_id: folderId });
-      if (activeFolderId) await initializeNotes(null, 50, activeFolderId);
+      // During meeting mode, keep the note visible — don't re-filter by folder
+      if (activeFolderId && !isMeetingMode) await initializeNotes(null, 50, activeFolderId);
       loadFolders();
     },
-    [activeFolderId, loadFolders]
+    [activeFolderId, isMeetingMode, loadFolders]
   );
 
   const { dragState, noteDragHandlers, folderDropHandlers } = useNoteDragAndDrop({
@@ -246,7 +371,7 @@ export default function PersonalNotesView({
       const result = await window.electronAPI.createFolder(folderName);
       if (result.success && result.folder) {
         await window.electronAPI.updateNote(noteId, { folder_id: result.folder.id });
-        if (activeFolderId) await initializeNotes(null, 50, activeFolderId);
+        if (activeFolderId && !isMeetingMode) await initializeNotes(null, 50, activeFolderId);
         await loadFolders();
       } else if (result.error) {
         toast({
@@ -256,7 +381,7 @@ export default function PersonalNotesView({
         });
       }
     },
-    [activeFolderId, loadFolders, toast, t]
+    [activeFolderId, isMeetingMode, loadFolders, toast, t]
   );
 
   const handleApplyEnhancement = useCallback(
@@ -369,8 +494,13 @@ export default function PersonalNotesView({
     prevTranscribingRef.current = isTranscribing;
   }, [isTranscribing, realtimeTranscript, realtimeSegments]);
 
+  const isLocalSynced = activeNoteRef.current === activeNote?.id;
   const editorNote = activeNote
-    ? { ...activeNote, title: localTitle, content: localContent }
+    ? {
+        ...activeNote,
+        title: isLocalSynced ? localTitle : activeNote.title,
+        content: isLocalSynced ? localContent : activeNote.content,
+      }
     : null;
 
   if (!isOnboardingComplete) {
@@ -384,6 +514,47 @@ export default function PersonalNotesView({
         style={{ width: isMeetingMode ? 0 : "13rem" }}
       >
         <div className="w-52 shrink-0 border-r border-border/15 dark:border-white/4 flex flex-col h-full">
+          <div className="px-2 pt-2 pb-1 shrink-0 space-y-0.5">
+            <button
+              onClick={handleOpenNewNoteDialog}
+              className={cn(
+                "flex items-center gap-2 w-full px-2 py-1.5 rounded-md text-xs",
+                "text-muted-foreground/80 hover:text-foreground hover:bg-foreground/5",
+                "transition-colors duration-150",
+                "focus:outline-none focus-visible:ring-1 focus-visible:ring-ring/30"
+              )}
+            >
+              <SquarePen size={14} className="shrink-0" />
+              {t("notes.sidebar.newNote")}
+            </button>
+            {onOpenSearch && (
+              <button
+                onClick={onOpenSearch}
+                className={cn(
+                  "flex items-center gap-2 w-full px-2 py-1.5 rounded-md text-xs",
+                  "text-muted-foreground/80 hover:text-foreground hover:bg-foreground/5",
+                  "transition-colors duration-150",
+                  "focus:outline-none focus-visible:ring-1 focus-visible:ring-ring/30"
+                )}
+              >
+                <Search size={14} className="shrink-0" />
+                {t("notes.sidebar.searchNotes")}
+              </button>
+            )}
+            <button
+              onClick={() => setShowActionManager(true)}
+              className={cn(
+                "flex items-center gap-2 w-full px-2 py-1.5 rounded-md text-xs",
+                "text-muted-foreground/80 hover:text-foreground hover:bg-foreground/5",
+                "transition-colors duration-150",
+                "focus:outline-none focus-visible:ring-1 focus-visible:ring-ring/30"
+              )}
+            >
+              <Sparkles size={14} className="shrink-0" />
+              {t("notes.sidebar.actions")}
+            </button>
+          </div>
+
           {/* Folders */}
           <div className="flex items-center justify-between px-3 py-2">
             <span className="text-xs font-medium uppercase tracking-wider text-foreground/50 dark:text-foreground/25">
@@ -449,9 +620,6 @@ export default function PersonalNotesView({
                       "bg-emerald-500/10 dark:bg-emerald-400/10 ring-1 ring-emerald-500/20"
                   )}
                 >
-                  {isActive && !isDragOver && !isDropSuccess && (
-                    <div className="absolute left-0 top-1/2 -translate-y-1/2 w-0.5 h-3 rounded-r-full bg-primary" />
-                  )}
                   <FolderOpen
                     size={13}
                     className={cn(
@@ -489,7 +657,7 @@ export default function PersonalNotesView({
                       {count > 0 ? count : ""}
                     </span>
                   )}
-                  {!folder.is_default && (
+                  {(!folder.is_default || noteFilesEnabled) && (
                     <DropdownMenu>
                       <DropdownMenuTrigger asChild>
                         <span
@@ -502,28 +670,45 @@ export default function PersonalNotesView({
                         </span>
                       </DropdownMenuTrigger>
                       <DropdownMenuContent align="end" sideOffset={4} className="min-w-32">
-                        <DropdownMenuItem
-                          onClick={(e) => {
-                            e.stopPropagation();
-                            setRenamingFolderId(folder.id);
-                            setRenameValue(folder.name);
-                          }}
-                          className="text-xs gap-2 rounded-md px-2 py-1"
-                        >
-                          <Pencil size={11} className="text-muted-foreground/60" />
-                          {t("notes.context.rename")}
-                        </DropdownMenuItem>
-                        <DropdownMenuSeparator />
-                        <DropdownMenuItem
-                          onClick={(e) => {
-                            e.stopPropagation();
-                            handleDeleteFolder(folder.id);
-                          }}
-                          className="text-xs gap-2 rounded-md px-2 py-1 text-destructive focus:text-destructive focus:bg-destructive/10"
-                        >
-                          <Trash2 size={11} />
-                          {t("notes.context.delete")}
-                        </DropdownMenuItem>
+                        {noteFilesEnabled && (
+                          <DropdownMenuItem
+                            onClick={(e) => {
+                              e.stopPropagation();
+                              window.electronAPI?.showFolderInExplorer?.(folder.name);
+                            }}
+                            className="text-xs gap-2 rounded-md px-2 py-1"
+                          >
+                            <ExternalLink size={11} className="text-muted-foreground/60" />
+                            {t("notes.context.showInFileManager", { manager: fileManagerName })}
+                          </DropdownMenuItem>
+                        )}
+                        {!folder.is_default && (
+                          <>
+                            {noteFilesEnabled && <DropdownMenuSeparator />}
+                            <DropdownMenuItem
+                              onClick={(e) => {
+                                e.stopPropagation();
+                                setRenamingFolderId(folder.id);
+                                setRenameValue(folder.name);
+                              }}
+                              className="text-xs gap-2 rounded-md px-2 py-1"
+                            >
+                              <Pencil size={11} className="text-muted-foreground/60" />
+                              {t("notes.context.rename")}
+                            </DropdownMenuItem>
+                            <DropdownMenuSeparator />
+                            <DropdownMenuItem
+                              onClick={(e) => {
+                                e.stopPropagation();
+                                handleDeleteFolder(folder.id);
+                              }}
+                              className="text-xs gap-2 rounded-md px-2 py-1 text-destructive focus:text-destructive focus:bg-destructive/10"
+                            >
+                              <Trash2 size={11} />
+                              {t("notes.context.delete")}
+                            </DropdownMenuItem>
+                          </>
+                        )}
                       </DropdownMenuContent>
                     </DropdownMenu>
                   )}
@@ -668,6 +853,7 @@ export default function PersonalNotesView({
                   onCreateFolderAndMove={handleCreateFolderAndMove}
                   dragHandlers={noteDragHandlers(note.id, note.title)}
                   isDragging={dragState.draggingNoteId === note.id}
+                  noteFilesEnabled={noteFilesEnabled}
                 />
               ))
             )}
@@ -704,6 +890,11 @@ export default function PersonalNotesView({
               meetingSystemPartial={systemPartial}
               onStopMeetingRecording={stopTranscription}
               liveTranscript={isTranscribing ? realtimeTranscript : ""}
+              folderName={activeFolderName}
+              calendarEventName={calendarEventName}
+              folders={folders}
+              onMoveToFolder={handleMoveToFolder}
+              onCreateFolderAndMove={handleCreateFolderAndMove}
               actionProcessingState={actionProcessingState}
               actionName={actionName}
               actionPicker={
@@ -897,6 +1088,97 @@ export default function PersonalNotesView({
           onNotesAdded={handleNotesAdded}
         />
       )}
+
+      <Dialog
+        open={showNewNoteDialog}
+        onOpenChange={(open) => {
+          setShowNewNoteDialog(open);
+          if (!open) {
+            setIsCreatingNewNoteFolder(false);
+            setNewNoteFolderName("");
+          }
+        }}
+      >
+        <DialogContent className="sm:max-w-95 p-6 gap-5">
+          <DialogHeader>
+            <DialogTitle>
+              {isCreatingNewNoteFolder ? t("notes.upload.newFolder") : t("notes.sidebar.newNote")}
+            </DialogTitle>
+          </DialogHeader>
+
+          {isCreatingNewNoteFolder ? (
+            <div className="space-y-1.5">
+              <label className="text-xs font-medium text-foreground/50">
+                {t("notes.upload.folderName")}
+              </label>
+              <Input
+                value={newNoteFolderName}
+                onChange={(e) => setNewNoteFolderName(e.target.value)}
+                placeholder={t("notes.folders.folderName")}
+                autoFocus
+                onKeyDown={(e) => {
+                  if (e.key === "Enter") handleCreateNewNoteFolder();
+                }}
+              />
+            </div>
+          ) : (
+            folders.length > 0 && (
+              <div className="space-y-1.5">
+                <label className="text-xs font-medium text-foreground/50">
+                  {t("notes.folders.title")}
+                </label>
+                <Select value={newNoteFolderId} onValueChange={handleNewNoteFolderChange}>
+                  <SelectTrigger>
+                    <SelectValue placeholder={t("notes.upload.selectFolder")} />
+                  </SelectTrigger>
+                  <SelectContent>
+                    {folders.map((f) => (
+                      <SelectItem key={f.id} value={String(f.id)}>
+                        {f.name}
+                      </SelectItem>
+                    ))}
+                    <SelectSeparator />
+                    <SelectItem value="__create_new__">
+                      <span className="flex items-center gap-1.5 text-primary/60">
+                        <Plus size={13} />
+                        {t("notes.upload.newFolder")}
+                      </span>
+                    </SelectItem>
+                  </SelectContent>
+                </Select>
+              </div>
+            )
+          )}
+
+          <DialogFooter>
+            {isCreatingNewNoteFolder ? (
+              <>
+                <Button
+                  variant="ghost"
+                  onClick={() => {
+                    setIsCreatingNewNoteFolder(false);
+                    setNewNoteFolderName("");
+                  }}
+                >
+                  {t("common.back")}
+                </Button>
+                <Button onClick={handleCreateNewNoteFolder} disabled={!newNoteFolderName.trim()}>
+                  {t("notes.upload.create")}
+                </Button>
+              </>
+            ) : (
+              <>
+                <Button variant="ghost" onClick={() => setShowNewNoteDialog(false)}>
+                  {t("notes.upload.cancel")}
+                </Button>
+                <Button onClick={handleConfirmNewNote} disabled={!newNoteFolderId}>
+                  {t("notes.upload.create")}
+                </Button>
+              </>
+            )}
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
     </div>
   );
 }
diff --git a/src/components/notes/UploadAudioView.tsx b/src/components/notes/UploadAudioView.tsx
index 351dbc9d7..84531cbc7 100644
--- a/src/components/notes/UploadAudioView.tsx
+++ b/src/components/notes/UploadAudioView.tsx
@@ -667,39 +667,35 @@ export default function UploadAudioView({ onNoteCreated, onOpenSettings }: Uploa
       </div>
 
       <Dialog open={showNewFolderDialog} onOpenChange={setShowNewFolderDialog}>
-        <DialogContent className="sm:max-w-[320px] p-5 gap-3">
+        <DialogContent className="sm:max-w-95">
           <DialogHeader>
-            <DialogTitle className="text-sm">{t("notes.upload.newFolder")}</DialogTitle>
+            <DialogTitle>{t("notes.upload.newFolder")}</DialogTitle>
           </DialogHeader>
-          <Input
-            value={newFolderName}
-            onChange={(e) => setNewFolderName(e.target.value)}
-            placeholder={t("notes.upload.folderName")}
-            className="h-8 text-xs"
-            autoFocus
-            onKeyDown={(e) => {
-              if (e.key === "Enter") handleCreateFolder();
-            }}
-          />
-          <DialogFooter className="gap-1.5">
+          <div className="space-y-1.5">
+            <label className="text-xs font-medium text-foreground/50">
+              {t("notes.upload.folderName")}
+            </label>
+            <Input
+              value={newFolderName}
+              onChange={(e) => setNewFolderName(e.target.value)}
+              placeholder={t("notes.folders.folderName")}
+              autoFocus
+              onKeyDown={(e) => {
+                if (e.key === "Enter") handleCreateFolder();
+              }}
+            />
+          </div>
+          <DialogFooter>
             <Button
               variant="ghost"
-              size="sm"
               onClick={() => {
                 setShowNewFolderDialog(false);
                 setNewFolderName("");
               }}
-              className="h-7 text-xs"
             >
               {t("notes.upload.cancel")}
             </Button>
-            <Button
-              variant="default"
-              size="sm"
-              onClick={handleCreateFolder}
-              disabled={!newFolderName.trim()}
-              className="h-7 text-xs"
-            >
+            <Button onClick={handleCreateFolder} disabled={!newFolderName.trim()}>
               {t("notes.upload.create")}
             </Button>
           </DialogFooter>
diff --git a/src/components/ui/SettingsSection.tsx b/src/components/ui/SettingsSection.tsx
index ec176d7e5..daf4c9e9a 100644
--- a/src/components/ui/SettingsSection.tsx
+++ b/src/components/ui/SettingsSection.tsx
@@ -1,4 +1,5 @@
 import React from "react";
+import { useSettingsLayout } from "./SidebarModal";
 
 interface SettingsSectionProps {
   title: string;
@@ -66,15 +67,21 @@ export const SettingsRow: React.FC<SettingsRowProps> = ({
   children,
   className = "",
 }) => {
+  const { isCompact } = useSettingsLayout();
+
   return (
-    <div className={`flex items-center justify-between gap-4 ${className}`}>
+    <div
+      className={`flex ${
+        isCompact ? "flex-col items-start gap-2" : "items-center justify-between gap-4"
+      } ${className}`}
+    >
       <div className="min-w-0 flex-1">
         <p className="text-xs font-medium text-foreground">{label}</p>
         {description && (
           <p className="text-xs text-muted-foreground/80 mt-0.5 leading-relaxed">{description}</p>
         )}
       </div>
-      <div className="shrink-0">{children}</div>
+      <div className={isCompact ? "" : "shrink-0"}>{children}</div>
     </div>
   );
 };
@@ -102,7 +109,11 @@ export function SettingsPanelRow({
   children: React.ReactNode;
   className?: string;
 }) {
-  return <div className={`px-4 py-3 ${className}`}>{children}</div>;
+  const { isCompact } = useSettingsLayout();
+
+  return (
+    <div className={`${isCompact ? "px-3 py-2.5" : "px-4 py-3"} ${className}`}>{children}</div>
+  );
 }
 
 export function SectionHeader({ title, description }: { title: string; description?: string }) {
diff --git a/src/components/ui/SidebarModal.tsx b/src/components/ui/SidebarModal.tsx
index 62470acd3..229c9e6a9 100644
--- a/src/components/ui/SidebarModal.tsx
+++ b/src/components/ui/SidebarModal.tsx
@@ -3,6 +3,9 @@ import { useTranslation } from "react-i18next";
 import * as DialogPrimitive from "@radix-ui/react-dialog";
 import { X } from "lucide-react";
 
+const SettingsLayoutContext = React.createContext({ isCompact: false });
+export const useSettingsLayout = () => React.useContext(SettingsLayoutContext);
+
 export interface SidebarItem<T extends string> {
   id: T;
   label: string;
@@ -38,6 +41,24 @@ export default function SidebarModal<T extends string>({
   version,
 }: SidebarModalProps<T>) {
   const { t } = useTranslation();
+
+  const [isCompact, setIsCompact] = React.useState(false);
+  const observerRef = React.useRef<ResizeObserver | null>(null);
+
+  const containerRef = React.useCallback((el: HTMLDivElement | null) => {
+    if (observerRef.current) {
+      observerRef.current.disconnect();
+      observerRef.current = null;
+    }
+    if (!el) return;
+    const observer = new ResizeObserver((entries) => {
+      const width = entries[0]?.contentRect.width ?? 0;
+      setIsCompact(width > 0 && width < 800);
+    });
+    observer.observe(el);
+    observerRef.current = observer;
+  }, []);
+
   // Group items by their group property
   const groupedItems = React.useMemo(() => {
     const groups: { label: string | null; items: SidebarItem<T>[] }[] = [];
@@ -78,6 +99,8 @@ export default function SidebarModal<T extends string>({
     );
   };
 
+  const actualSidebarWidth = isCompact ? "w-12" : sidebarWidth;
+
   return (
     <DialogPrimitive.Root open={open} onOpenChange={onOpenChange}>
       <DialogPrimitive.Portal>
@@ -89,23 +112,29 @@ export default function SidebarModal<T extends string>({
               <span className="sr-only">{t("common.close")}</span>
             </DialogPrimitive.Close>
 
-            <div className="flex h-[85vh]">
+            <div ref={containerRef} className="flex h-[85vh]">
               {/* Sidebar */}
               <div
-                className={`${sidebarWidth} shrink-0 border-r border-border/40 dark:border-border-subtle flex flex-col bg-surface-1 dark:bg-surface-0`}
+                className={`${actualSidebarWidth} shrink-0 border-r border-border/40 dark:border-border-subtle flex flex-col bg-surface-1 dark:bg-surface-0 transition-[width] duration-200 ease-out`}
               >
                 {/* Title */}
-                <div className="px-4 pt-5 pb-0.5">
-                  <h2 className="text-xs font-semibold uppercase tracking-widest text-muted-foreground/70">
-                    {title}
-                  </h2>
-                </div>
+                {!isCompact && (
+                  <div className="px-4 pt-5 pb-0.5">
+                    <h2 className="text-xs font-semibold uppercase tracking-widest text-muted-foreground/70">
+                      {title}
+                    </h2>
+                  </div>
+                )}
 
                 {/* Navigation */}
-                <nav className="relative flex-1 px-2 pt-2.5 pb-2 overflow-y-auto">
+                <nav
+                  className={`relative flex-1 pb-2 overflow-y-auto ${
+                    isCompact ? "px-1.5 pt-4" : "px-2 pt-2.5"
+                  }`}
+                >
                   {groupedItems.map((group, groupIndex) => (
                     <div key={groupIndex} className={groupIndex > 0 ? "mt-3" : ""}>
-                      {group.label && (
+                      {!isCompact && group.label && (
                         <div className="px-2 pb-0.5 pt-1.5">
                           <span className="text-xs font-medium tracking-[0.08em] uppercase text-muted-foreground/60 dark:text-muted-foreground/65">
                             {group.label}
@@ -116,21 +145,21 @@ export default function SidebarModal<T extends string>({
                         {group.items.map((item) => {
                           const Icon = item.icon;
                           const isActive = activeSection === item.id;
+
                           return (
                             <button
                               key={item.id}
                               data-section-id={item.id}
                               onClick={() => onSectionChange(item.id)}
-                              className={`group relative w-full flex items-center gap-2.5 px-2.5 py-2 text-left text-xs rounded-lg transition-colors duration-100 outline-none ${
+                              title={isCompact ? item.label : undefined}
+                              className={`group relative w-full flex items-center text-left text-xs rounded-lg transition-colors duration-100 outline-none ${
+                                isCompact ? "justify-center px-0 py-2" : "gap-2.5 px-2.5 py-2"
+                              } ${
                                 isActive
                                   ? "text-foreground bg-muted dark:bg-surface-raised"
                                   : "text-muted-foreground dark:text-foreground/75 hover:text-foreground hover:bg-muted/50 dark:hover:bg-surface-2"
                               }`}
                             >
-                              {/* Active indicator bar */}
-                              {isActive && (
-                                <div className="absolute left-0 top-1/2 -translate-y-1/2 w-0.5 h-4 rounded-full bg-primary" />
-                              )}
                               <div
                                 className={`flex items-center justify-center h-6 w-6 rounded-md shrink-0 transition-colors duration-100 ${
                                   isActive ? "bg-primary/10 dark:bg-primary/15" : "bg-transparent"
@@ -144,16 +173,23 @@ export default function SidebarModal<T extends string>({
                                   }`}
                                 />
                               </div>
-                              <span
-                                className={`flex-1 truncate leading-tight ${isActive ? "font-medium" : "font-normal"}`}
-                              >
-                                {item.label}
-                              </span>
-                              {renderBadge(item)}
-                              {item.shortcut && !item.badge && (
-                                <kbd className="ml-auto text-xs text-muted-foreground/25 font-mono shrink-0">
-                                  {item.shortcut}
-                                </kbd>
+                              {!isCompact && (
+                                <>
+                                  <span
+                                    className={`flex-1 truncate leading-tight ${isActive ? "font-medium" : "font-normal"}`}
+                                  >
+                                    {item.label}
+                                  </span>
+                                  {renderBadge(item)}
+                                  {item.shortcut && !item.badge && (
+                                    <kbd className="ml-auto text-xs text-muted-foreground/25 font-mono shrink-0">
+                                      {item.shortcut}
+                                    </kbd>
+                                  )}
+                                </>
+                              )}
+                              {isCompact && item.badgeVariant === "dot" && (
+                                <span className="absolute top-1.5 right-1.5 h-1.5 w-1.5 rounded-full bg-primary" />
                               )}
                             </button>
                           );
@@ -165,12 +201,18 @@ export default function SidebarModal<T extends string>({
 
                 {/* Footer / version */}
                 {version && (
-                  <div className="px-3 py-2.5 border-t border-border/20 dark:border-border-subtle">
+                  <div
+                    className={`border-t border-border/20 dark:border-border-subtle ${
+                      isCompact ? "flex justify-center py-2.5" : "px-3 py-2.5"
+                    }`}
+                  >
                     <div className="flex items-center gap-1.5">
                       <div className="h-1 w-1 rounded-full bg-success/60" />
-                      <span className="text-xs text-muted-foreground/40 tabular-nums tracking-wide">
-                        v{version}
-                      </span>
+                      {!isCompact && (
+                        <span className="text-xs text-muted-foreground/40 tabular-nums tracking-wide">
+                          v{version}
+                        </span>
+                      )}
                     </div>
                   </div>
                 )}
@@ -178,7 +220,9 @@ export default function SidebarModal<T extends string>({
 
               {/* Main Content */}
               <div className="flex-1 overflow-y-auto bg-background dark:bg-surface-1">
-                <div className="p-6">{children}</div>
+                <SettingsLayoutContext.Provider value={{ isCompact }}>
+                  <div className={isCompact ? "p-4" : "p-6"}>{children}</div>
+                </SettingsLayoutContext.Provider>
               </div>
             </div>
           </div>
diff --git a/src/config/prompts.ts b/src/config/prompts.ts
index 7b6795ca1..6649fc58c 100644
--- a/src/config/prompts.ts
+++ b/src/config/prompts.ts
@@ -147,10 +147,43 @@ const DEFAULT_AGENT_SYSTEM_PROMPT =
   "Keep answers brief unless the user asks for detail. " +
   "You may be given a transcription of spoken input, so handle informal phrasing gracefully.";
 
-export function getAgentSystemPrompt(): string {
+const TOOL_INSTRUCTIONS: Record<string, string> = {
+  search_notes:
+    "Use search_notes to find information from the user's past meetings, discussions, or personal notes before answering from memory.",
+  get_note:
+    "Use get_note to fetch the full content of a specific note by ID. Use search_notes first to find the note ID.",
+  create_note: "Use create_note when the user asks you to create, write, or draft a new note.",
+  update_note:
+    "Use update_note to modify an existing note's title, content, or move it to a different folder. Use search_notes first to find the note ID.",
+  web_search:
+    "Use web_search for questions about current events, facts you're unsure about, or anything requiring up-to-date information.",
+  copy_to_clipboard:
+    "Use copy_to_clipboard when the user asks you to copy something to their clipboard.",
+  get_calendar_events:
+    "Use get_calendar_events to check the user's schedule, upcoming meetings, or calendar events.",
+};
+
+export function getAgentSystemPrompt(availableTools?: string[], noteContext?: string): string {
   if (typeof window !== "undefined" && window.localStorage) {
     const custom = window.localStorage.getItem("agentSystemPrompt");
     if (custom) return custom;
   }
-  return DEFAULT_AGENT_SYSTEM_PROMPT;
+
+  let prompt = DEFAULT_AGENT_SYSTEM_PROMPT;
+
+  if (availableTools && availableTools.length > 0) {
+    const toolLines = availableTools.map((name) => TOOL_INSTRUCTIONS[name]).filter(Boolean);
+    if (toolLines.length > 0) {
+      prompt += "\n\nYou have access to tools. " + toolLines.join(" ");
+    }
+  }
+
+  if (noteContext) {
+    prompt +=
+      "\n\nBelow are notes from the user's library that may be relevant. " +
+      "Reference them naturally if they help answer the question.\n\n" +
+      noteContext;
+  }
+
+  return prompt;
 }
diff --git a/src/helpers/audioActivityDetector.js b/src/helpers/audioActivityDetector.js
index d32bc954d..883adc000 100644
--- a/src/helpers/audioActivityDetector.js
+++ b/src/helpers/audioActivityDetector.js
@@ -354,14 +354,34 @@ class AudioActivityDetector extends EventEmitter {
   // ---------------------------------------------------------------------------
 
   _onMicStateChanged(active) {
-    if (this._userRecording) return;
-    if (this.lastDismissedAt && Date.now() - this.lastDismissedAt < COOLDOWN_MS) return;
+    if (this._userRecording) {
+      debugLogger.debug("Mic state changed but user recording, ignoring", { active }, "meeting");
+      return;
+    }
+    if (this.lastDismissedAt && Date.now() - this.lastDismissedAt < COOLDOWN_MS) {
+      debugLogger.debug(
+        "Mic state changed but in cooldown",
+        {
+          active,
+          remainingMs: COOLDOWN_MS - (Date.now() - this.lastDismissedAt),
+        },
+        "meeting"
+      );
+      return;
+    }
 
-    debugLogger.debug("Mic state changed (event-driven)", { active }, "meeting");
+    debugLogger.debug(
+      "Mic state changed (event-driven)",
+      { active, hasPrompted: this.hasPrompted },
+      "meeting"
+    );
 
     if (active) {
       this._clearResetTimer();
-      if (this.hasPrompted) return;
+      if (this.hasPrompted) {
+        debugLogger.debug("Mic active but already prompted, suppressing", {}, "meeting");
+        return;
+      }
       if (!this.audioActiveStart) this.audioActiveStart = Date.now();
 
       if (!this._sustainedTimer) {
diff --git a/src/helpers/audioManager.js b/src/helpers/audioManager.js
index cb6d72fa0..7bc141f78 100644
--- a/src/helpers/audioManager.js
+++ b/src/helpers/audioManager.js
@@ -930,6 +930,14 @@ registerProcessor("pcm-streaming-processor", PCMStreamingProcessor);
       return normalizedText;
     }
 
+    if (this.skipReasoning) {
+      logger.logReasoning("REASONING_SKIPPED_AGENT_MODE", {
+        source,
+        reason: "skipReasoning is set (agent mode) — returning raw transcription",
+      });
+      return normalizedText;
+    }
+
     logger.logReasoning("TRANSCRIPTION_RECEIVED", {
       source,
       textLength: normalizedText.length,
diff --git a/src/helpers/audioTapManager.js b/src/helpers/audioTapManager.js
index 29e797282..fbcfeac50 100644
--- a/src/helpers/audioTapManager.js
+++ b/src/helpers/audioTapManager.js
@@ -41,7 +41,7 @@ class AudioTapManager {
     this.onChunk = null;
     this.onError = null;
     this.isStopping = false;
-    this.permissionStatus = "unknown";
+    this.permissionStatus = this._loadPermissionStatus();
     this._requestPromise = null;
   }
 
@@ -69,12 +69,46 @@ class AudioTapManager {
     return this.permissionStatus;
   }
 
+  /** Cached status check — never spawns processes or triggers system dialogs. */
+  checkAccess() {
+    if (!this.isSupported()) {
+      return { granted: false, status: "unsupported" };
+    }
+    const status = this.getPermissionStatus();
+    return { granted: status === "granted", status };
+  }
+
+  _statusFilePath() {
+    const { app } = require("electron");
+    return path.join(app.getPath("userData"), ".system-audio-permission");
+  }
+
+  _loadPermissionStatus() {
+    try {
+      const status = fs.readFileSync(this._statusFilePath(), "utf8").trim();
+      if (status === "granted" || status === "denied") return status;
+    } catch {
+      // File doesn't exist yet — first launch or reset.
+    }
+    return "unknown";
+  }
+
+  _persistPermissionStatus(status) {
+    if (status !== "granted" && status !== "denied") return;
+    this.permissionStatus = status;
+    try {
+      fs.writeFileSync(this._statusFilePath(), status);
+    } catch {
+      // Non-critical — status is still cached in memory for this session.
+    }
+  }
+
   async requestAccess() {
     if (!this.isSupported()) {
       return { granted: false, status: "unsupported" };
     }
     if (this.process) {
-      this.permissionStatus = "granted";
+      this._persistPermissionStatus("granted");
       return { granted: true, status: "granted" };
     }
     if (this._requestPromise) {
@@ -84,7 +118,7 @@ class AudioTapManager {
     this._requestPromise = this._probeForAccess()
       .catch((error) => {
         const status = error.code === "permission_denied" ? "denied" : "unknown";
-        this.permissionStatus = status;
+        this._persistPermissionStatus(status);
         return { granted: false, status, error: error.message };
       })
       .finally(() => {
@@ -101,7 +135,6 @@ class AudioTapManager {
     if (this.process) {
       this.onChunk = onChunk || null;
       this.onError = onError || null;
-      this.permissionStatus = "granted";
       return;
     }
     if (this._requestPromise) {
@@ -156,7 +189,7 @@ class AudioTapManager {
         }
         this._consumeStderr(chunk, (message) => {
           if (message.type === "start") {
-            this.permissionStatus = "granted";
+            this._persistPermissionStatus("granted");
             finish(resolve);
             return;
           }
@@ -164,7 +197,7 @@ class AudioTapManager {
           if (message.type === "error") {
             const error = this._buildProcessError(message);
             if (error.code === "permission_denied") {
-              this.permissionStatus = "denied";
+              this._persistPermissionStatus("denied");
             }
             if (!settled) {
               finish(reject, error, true);
@@ -288,14 +321,14 @@ class AudioTapManager {
             try {
               const message = JSON.parse(line);
               if (message.type === "start") {
-                this.permissionStatus = "granted";
+                this._persistPermissionStatus("granted");
                 finish(resolve, { granted: true, status: "granted" }, true);
                 return;
               }
               if (message.type === "error") {
                 const error = this._buildProcessError(message);
                 if (error.code === "permission_denied") {
-                  this.permissionStatus = "denied";
+                  this._persistPermissionStatus("denied");
                 }
                 finish(reject, error, true);
                 return;
diff --git a/src/helpers/clipboard.js b/src/helpers/clipboard.js
index 93dec26ea..fb85b7330 100644
--- a/src/helpers/clipboard.js
+++ b/src/helpers/clipboard.js
@@ -57,6 +57,7 @@ const RESTORE_DELAYS = {
   win32_nircmd: 80,
   win32_pwsh: 80,
   linux: 200,
+  linux_kde_wayland: 600,
 };
 
 function writeClipboardInRenderer(webContents, text) {
@@ -134,8 +135,7 @@ class ClipboardManager {
 
     if (this.commandExists("wl-copy")) {
       try {
-        const isHyprland = !!process.env.HYPRLAND_INSTANCE_SIGNATURE;
-        const result = spawnSync("wl-copy", ["--", text], { timeout: isHyprland ? 50 : 1 });
+        const result = spawnSync("wl-copy", ["--", text], { timeout: 50 });
         if (result.status === 0) {
           clipboard.writeText(text);
           return;
@@ -1046,13 +1046,14 @@ class ClipboardManager {
 
     const restoreClipboard = () => {
       if (originalClipboard == null) return;
+      const delay = isKde && isWayland ? RESTORE_DELAYS.linux_kde_wayland : RESTORE_DELAYS.linux;
       setTimeout(() => {
         if (isWayland && originalClipboard.type === "text") {
           this._writeClipboardWayland(originalClipboard.data, webContents);
         } else {
           this._restoreClipboard(originalClipboard);
         }
-      }, RESTORE_DELAYS.linux);
+      }, delay);
     };
 
     const terminalClasses = [
@@ -1163,11 +1164,6 @@ class ClipboardManager {
         });
 
       if (isWayland) {
-        // On KDE with XWayland (ozone-platform-hint: x11), portal paste works
-        // because clipboard and input are both on X11. uinput causes a clipboard
-        // desync (X11 clipboard vs Wayland input) so portal is preferred.
-        // On GNOME, Mutter doesn't reliably route uinput to native Wayland
-        // windows (issue #292), so portal is tried first there too.
         const tryUinputPaste = async () => {
           const args = ["--uinput"];
           if (earlyIsTerminal) args.push("--terminal");
@@ -1181,7 +1177,7 @@ class ClipboardManager {
           restoreClipboard();
         };
 
-        if ((isGnome || isKde) && linuxFastPaste && !this.portalDenied) {
+        const tryPortalPaste = async () => {
           const MAX_PORTAL_RETRIES = 3;
           for (let attempt = 0; attempt < MAX_PORTAL_RETRIES; attempt++) {
             try {
@@ -1193,7 +1189,7 @@ class ClipboardManager {
                 "clipboard"
               );
               restoreClipboard();
-              return "portal";
+              return true;
             } catch (portalError) {
               if (portalError?.message === "portal-dismissed") {
                 debugLogger.warn(
@@ -1212,21 +1208,49 @@ class ClipboardManager {
                 );
               } else {
                 debugLogger.warn(
-                  "linux-fast-paste --portal failed, falling back to uinput",
+                  "linux-fast-paste --portal failed, falling back",
                   { error: portalError?.message },
                   "clipboard"
                 );
               }
-              break;
+              return false;
             }
           }
-        }
+          return false;
+        };
 
-        try {
-          await tryUinputPaste();
-          return "uinput";
-        } catch (uinputError) {
-          debugLogger.warn("uinput paste failed", { error: uinputError?.message }, "clipboard");
+        // KDE with XWayland: portal first because clipboard and input are both
+        // on X11. uinput causes clipboard desync (X11 clipboard vs Wayland input).
+        // GNOME: uinput first because the portal often times out or shows a
+        // confusing permission dialog, causing a 10s+ delay (issue #494).
+        if (isKde && linuxFastPaste && !this.portalDenied) {
+          if (await tryPortalPaste()) return "portal";
+          try {
+            await tryUinputPaste();
+            return "uinput";
+          } catch (uinputError) {
+            debugLogger.warn("uinput paste failed", { error: uinputError?.message }, "clipboard");
+          }
+        } else if (isGnome && linuxFastPaste) {
+          try {
+            await tryUinputPaste();
+            return "uinput";
+          } catch (uinputError) {
+            debugLogger.warn(
+              "uinput paste failed on GNOME, trying portal",
+              { error: uinputError?.message },
+              "clipboard"
+            );
+          }
+          if (!this.portalDenied && (await tryPortalPaste())) return "portal";
+        } else {
+          // Other compositors (wlroots, etc.): try uinput only
+          try {
+            await tryUinputPaste();
+            return "uinput";
+          } catch (uinputError) {
+            debugLogger.warn("uinput paste failed", { error: uinputError?.message }, "clipboard");
+          }
         }
 
         // XTest/XWayland fallback: works for XWayland apps on any Wayland compositor
diff --git a/src/helpers/conversationChunker.js b/src/helpers/conversationChunker.js
new file mode 100644
index 000000000..0ec4cb014
--- /dev/null
+++ b/src/helpers/conversationChunker.js
@@ -0,0 +1,26 @@
+const CHUNK_SIZE = 5;
+const CHUNK_OVERLAP = 2;
+
+function chunkConversation(title, messages) {
+  const relevant = messages.filter((m) => m.role !== "system");
+  if (relevant.length === 0) return [];
+
+  if (relevant.length <= CHUNK_SIZE) {
+    return [{ chunkIndex: 0, text: formatChunkText(title, relevant) }];
+  }
+
+  const chunks = [];
+  for (let i = 0; i < relevant.length; i += CHUNK_SIZE - CHUNK_OVERLAP) {
+    const window = relevant.slice(i, i + CHUNK_SIZE);
+    if (window.length < 2) break;
+    chunks.push({ chunkIndex: chunks.length, text: formatChunkText(title, window) });
+  }
+  return chunks;
+}
+
+function formatChunkText(title, messages) {
+  const body = messages.map((m) => `${m.role}: ${m.content}`).join("\n");
+  return `${title}\n${body}`.slice(0, 1500);
+}
+
+module.exports = { chunkConversation };
diff --git a/src/helpers/database.js b/src/helpers/database.js
index a977c4002..40523b485 100644
--- a/src/helpers/database.js
+++ b/src/helpers/database.js
@@ -230,6 +230,22 @@ class DatabaseManager {
         "CREATE INDEX IF NOT EXISTS idx_agent_messages_conversation ON agent_messages(conversation_id)"
       );
 
+      try {
+        this.db.exec("ALTER TABLE agent_messages ADD COLUMN metadata TEXT");
+      } catch (err) {
+        if (!err.message.includes("duplicate column")) throw err;
+      }
+      try {
+        this.db.exec("ALTER TABLE agent_conversations ADD COLUMN archived_at DATETIME");
+      } catch (err) {
+        if (!err.message.includes("duplicate column")) throw err;
+      }
+      try {
+        this.db.exec("ALTER TABLE agent_conversations ADD COLUMN cloud_id TEXT");
+      } catch (err) {
+        if (!err.message.includes("duplicate column")) throw err;
+      }
+
       const actionCount = this.db.prepare("SELECT COUNT(*) as count FROM actions").get();
       if (actionCount.count === 0) {
         this.db
@@ -931,12 +947,15 @@ class DatabaseManager {
     }
   }
 
-  addAgentMessage(conversationId, role, content) {
+  addAgentMessage(conversationId, role, content, metadata) {
     try {
       if (!this.db) throw new Error("Database not initialized");
+      const metadataStr = metadata ? JSON.stringify(metadata) : null;
       const result = this.db
-        .prepare("INSERT INTO agent_messages (conversation_id, role, content) VALUES (?, ?, ?)")
-        .run(conversationId, role, content);
+        .prepare(
+          "INSERT INTO agent_messages (conversation_id, role, content, metadata) VALUES (?, ?, ?, ?)"
+        )
+        .run(conversationId, role, content, metadataStr);
       this.db
         .prepare("UPDATE agent_conversations SET updated_at = CURRENT_TIMESTAMP WHERE id = ?")
         .run(conversationId);
@@ -1175,6 +1194,16 @@ class DatabaseManager {
     }
   }
 
+  getCalendarEventById(eventId) {
+    try {
+      if (!this.db) throw new Error("Database not initialized");
+      return this.db.prepare("SELECT * FROM calendar_events WHERE id = ?").get(eventId) || null;
+    } catch (error) {
+      debugLogger.error("Error getting calendar event by id", { error: error.message }, "gcal");
+      return null;
+    }
+  }
+
   clearCalendarData() {
     try {
       if (!this.db) throw new Error("Database not initialized");
@@ -1262,6 +1291,108 @@ class DatabaseManager {
       debugLogger.error("Error deleting database file", { error: error.message }, "database");
     }
   }
+  getAgentConversationsWithPreview(limit = 50, offset = 0, includeArchived = false) {
+    try {
+      if (!this.db) throw new Error("Database not initialized");
+      const archiveFilter = includeArchived
+        ? "WHERE c.archived_at IS NOT NULL"
+        : "WHERE c.archived_at IS NULL";
+      return this.db
+        .prepare(
+          `SELECT c.id, c.title, c.created_at, c.updated_at, c.archived_at, c.cloud_id,
+            COUNT(m.id) AS message_count,
+            (SELECT content FROM agent_messages WHERE conversation_id = c.id ORDER BY created_at DESC LIMIT 1) AS last_message,
+            (SELECT role FROM agent_messages WHERE conversation_id = c.id ORDER BY created_at DESC LIMIT 1) AS last_message_role
+          FROM agent_conversations c
+          LEFT JOIN agent_messages m ON m.conversation_id = c.id
+          ${archiveFilter}
+          GROUP BY c.id
+          ORDER BY c.updated_at DESC
+          LIMIT ? OFFSET ?`
+        )
+        .all(limit, offset);
+    } catch (error) {
+      debugLogger.error(
+        "Error getting agent conversations with preview",
+        { error: error.message },
+        "database"
+      );
+      throw error;
+    }
+  }
+
+  searchAgentConversations(query, limit = 20) {
+    try {
+      if (!this.db) throw new Error("Database not initialized");
+      const pattern = `%${query}%`;
+      return this.db
+        .prepare(
+          `SELECT DISTINCT c.id, c.title, c.created_at, c.updated_at, c.archived_at, c.cloud_id,
+            COUNT(m.id) AS message_count,
+            (SELECT content FROM agent_messages WHERE conversation_id = c.id ORDER BY created_at DESC LIMIT 1) AS last_message,
+            (SELECT role FROM agent_messages WHERE conversation_id = c.id ORDER BY created_at DESC LIMIT 1) AS last_message_role
+          FROM agent_conversations c
+          LEFT JOIN agent_messages m ON m.conversation_id = c.id
+          LEFT JOIN agent_messages ms ON ms.conversation_id = c.id
+          WHERE c.archived_at IS NULL
+            AND (c.title LIKE ? OR ms.content LIKE ?)
+          GROUP BY c.id
+          ORDER BY c.updated_at DESC
+          LIMIT ?`
+        )
+        .all(pattern, pattern, limit);
+    } catch (error) {
+      debugLogger.error(
+        "Error searching agent conversations",
+        { error: error.message },
+        "database"
+      );
+      throw error;
+    }
+  }
+
+  archiveAgentConversation(id) {
+    try {
+      if (!this.db) throw new Error("Database not initialized");
+      this.db
+        .prepare("UPDATE agent_conversations SET archived_at = CURRENT_TIMESTAMP WHERE id = ?")
+        .run(id);
+      return { success: true };
+    } catch (error) {
+      debugLogger.error("Error archiving agent conversation", { error: error.message }, "database");
+      throw error;
+    }
+  }
+
+  unarchiveAgentConversation(id) {
+    try {
+      if (!this.db) throw new Error("Database not initialized");
+      this.db.prepare("UPDATE agent_conversations SET archived_at = NULL WHERE id = ?").run(id);
+      return { success: true };
+    } catch (error) {
+      debugLogger.error(
+        "Error unarchiving agent conversation",
+        { error: error.message },
+        "database"
+      );
+      throw error;
+    }
+  }
+
+  updateAgentConversationCloudId(id, cloudId) {
+    try {
+      if (!this.db) throw new Error("Database not initialized");
+      this.db.prepare("UPDATE agent_conversations SET cloud_id = ? WHERE id = ?").run(cloudId, id);
+      return { success: true };
+    } catch (error) {
+      debugLogger.error(
+        "Error updating agent conversation cloud_id",
+        { error: error.message },
+        "database"
+      );
+      throw error;
+    }
+  }
 }
 
 module.exports = DatabaseManager;
diff --git a/src/helpers/hotkeyManager.js b/src/helpers/hotkeyManager.js
index 3409d600d..a2a8119ef 100644
--- a/src/helpers/hotkeyManager.js
+++ b/src/helpers/hotkeyManager.js
@@ -559,7 +559,9 @@ class HotkeyManager {
     this.mainWindow = mainWindow;
     this.hotkeyCallback = callback;
 
-    if (process.platform === "linux" && GnomeShortcutManager.isWayland()) {
+    // On XWayland, skip D-Bus shortcut managers — globalShortcut works via X11.
+    const isXWayland = process.argv.includes("--ozone-platform=x11");
+    if (process.platform === "linux" && GnomeShortcutManager.isWayland() && !isXWayland) {
       const gnomeOk = await this.initializeGnomeShortcuts(callback);
 
       if (gnomeOk) {
@@ -679,9 +681,24 @@ class HotkeyManager {
       globalShortcut.unregisterAll();
     }
 
-    setTimeout(() => {
-      this.loadSavedHotkeyOrDefault(mainWindow, callback);
-    }, HOTKEY_REGISTRATION_DELAY_MS);
+    // Register from env var immediately if available, otherwise wait for page load.
+    const envHotkey = process.env.DICTATION_KEY || "";
+    if (envHotkey) {
+      const result = this.setupShortcuts(envHotkey, callback);
+      if (result.success) {
+        debugLogger.log(`[HotkeyManager] Hotkey "${envHotkey}" registered from env`);
+      } else {
+        debugLogger.log(`[HotkeyManager] Env hotkey "${envHotkey}" failed, waiting for page`);
+        this.loadSavedHotkeyOrDefault(mainWindow, callback);
+      }
+    } else {
+      const loadHotkey = () => this.loadSavedHotkeyOrDefault(mainWindow, callback);
+      if (mainWindow.webContents.isLoading()) {
+        mainWindow.webContents.once("did-finish-load", loadHotkey);
+      } else {
+        loadHotkey();
+      }
+    }
 
     this.isInitialized = true;
   }
@@ -693,9 +710,14 @@ class HotkeyManager {
 
       // Fall back to localStorage if env var is empty
       if (!savedHotkey) {
-        savedHotkey = await mainWindow.webContents.executeJavaScript(`
-          localStorage.getItem("dictationKey") || ""
-        `);
+        try {
+          savedHotkey = await mainWindow.webContents.executeJavaScript(`
+            localStorage.getItem("dictationKey") || ""
+          `);
+        } catch (jsErr) {
+          debugLogger.log(`[HotkeyManager] executeJavaScript failed: ${jsErr.message}`);
+          savedHotkey = "";
+        }
 
         // If we found a hotkey in localStorage but not in env, migrate it to .env file
         if (savedHotkey && savedHotkey.trim() !== "") {
diff --git a/src/helpers/ipcHandlers.js b/src/helpers/ipcHandlers.js
index af78a080f..46e2a07d1 100644
--- a/src/helpers/ipcHandlers.js
+++ b/src/helpers/ipcHandlers.js
@@ -117,6 +117,7 @@ class IPCHandlers {
     this._activeRecordingPipeline = null;
     this.audioStorageManager = new AudioStorageManager();
     this._audioCleanupInterval = null;
+    this._noteFilesEnabled = false;
     this._setupTextEditMonitor();
     this._setupAudioCleanup();
     this._logDetectedGpus();
@@ -129,6 +130,64 @@ class IPCHandlers {
     }
   }
 
+  _asyncVectorUpsert(note) {
+    setImmediate(() => {
+      const vectorIndex = require("./vectorIndex");
+      if (!vectorIndex.isReady()) return;
+      const { LocalEmbeddings } = require("./localEmbeddings");
+      const text = LocalEmbeddings.noteEmbedText(note.title, note.content, note.enhanced_content);
+      vectorIndex.upsertNote(note.id, text).catch(() => {});
+    });
+  }
+
+  _asyncVectorDelete(noteId) {
+    setImmediate(() => {
+      const vectorIndex = require("./vectorIndex");
+      if (!vectorIndex.isReady()) return;
+      vectorIndex.deleteNote(noteId).catch(() => {});
+    });
+  }
+
+  _asyncMirrorWrite(note) {
+    if (!this._noteFilesEnabled) return;
+    setImmediate(() => {
+      const markdownMirror = require("./markdownMirror");
+      const folderName = this._getFolderName(note.folder_id);
+      markdownMirror.writeNote(note, folderName);
+    });
+  }
+
+  _asyncMirrorDelete(noteId) {
+    if (!this._noteFilesEnabled) return;
+    setImmediate(() => {
+      const markdownMirror = require("./markdownMirror");
+      markdownMirror.deleteNote(noteId);
+    });
+  }
+
+  _buildFolderMap() {
+    const folders = this.databaseManager.getFolders();
+    const map = {};
+    for (const f of folders) {
+      map[f.id] = f.name;
+    }
+    return map;
+  }
+
+  _rebuildMirror(basePath) {
+    const markdownMirror = require("./markdownMirror");
+    if (basePath) markdownMirror.init(basePath);
+    markdownMirror.rebuildAll(this.databaseManager.getNotes(null, 99999), this._buildFolderMap());
+  }
+
+  _getFolderName(folderId) {
+    if (!folderId) return "Personal";
+    const folder = this.databaseManager.db
+      .prepare("SELECT name FROM folders WHERE id = ?")
+      .get(folderId);
+    return folder?.name || "Personal";
+  }
+
   _getDictionarySafe() {
     try {
       return this.databaseManager.getDictionary();
@@ -169,7 +228,11 @@ class IPCHandlers {
     const { listNvidiaGpus } = require("../utils/gpuDetection");
     const gpus = await listNvidiaGpus();
     if (gpus.length > 0) {
-      debugLogger.info("NVIDIA GPUs detected", { count: gpus.length, devices: gpus.map(g => `${g.name} (${g.vramMb}MB)`) }, "gpu");
+      debugLogger.info(
+        "NVIDIA GPUs detected",
+        { count: gpus.length, devices: gpus.map((g) => `${g.name} (${g.vramMb}MB)`) },
+        "gpu"
+      );
     } else {
       debugLogger.debug("No NVIDIA GPUs detected", {}, "gpu");
     }
@@ -553,9 +616,9 @@ class IPCHandlers {
           folderId
         );
         if (result?.success && result?.note) {
-          setImmediate(() => {
-            this.broadcastToWindows("note-added", result.note);
-          });
+          setImmediate(() => this.broadcastToWindows("note-added", result.note));
+          this._asyncVectorUpsert(result.note);
+          this._asyncMirrorWrite(result.note);
         }
         return result;
       }
@@ -572,9 +635,9 @@ class IPCHandlers {
     ipcMain.handle("db-update-note", async (event, id, updates) => {
       const result = this.databaseManager.updateNote(id, updates);
       if (result?.success && result?.note) {
-        setImmediate(() => {
-          this.broadcastToWindows("note-updated", result.note);
-        });
+        setImmediate(() => this.broadcastToWindows("note-updated", result.note));
+        this._asyncVectorUpsert(result.note);
+        this._asyncMirrorWrite(result.note);
       }
       return result;
     });
@@ -582,9 +645,9 @@ class IPCHandlers {
     ipcMain.handle("db-delete-note", async (event, id) => {
       const result = this.databaseManager.deleteNote(id);
       if (result?.success) {
-        setImmediate(() => {
-          this.broadcastToWindows("note-deleted", { id });
-        });
+        setImmediate(() => this.broadcastToWindows("note-deleted", { id }));
+        this._asyncVectorDelete(id);
+        this._asyncMirrorDelete(id);
       }
       return result;
     });
@@ -593,6 +656,64 @@ class IPCHandlers {
       return this.databaseManager.searchNotes(query, limit);
     });
 
+    ipcMain.handle("db-semantic-search-notes", async (event, query, limit = 5) => {
+      const vectorIndex = require("./vectorIndex");
+      if (!vectorIndex.isReady()) {
+        return this.databaseManager.searchNotes(query, limit);
+      }
+
+      try {
+        const [ftsResults, vectorResults] = await Promise.all([
+          this.databaseManager.searchNotes(query, limit * 2),
+          vectorIndex.search(query, limit * 2),
+        ]);
+
+        // Filter low-confidence semantic matches before RRF
+        const filteredVectorResults = vectorResults.filter(({ score }) => score > 0.3);
+
+        // Reciprocal Rank Fusion (K=60, matching cloud implementation)
+        const scores = new Map();
+        ftsResults.forEach((note, i) => {
+          scores.set(note.id, (scores.get(note.id) || 0) + 1 / (60 + i));
+        });
+        filteredVectorResults.forEach(({ noteId }, i) => {
+          scores.set(noteId, (scores.get(noteId) || 0) + 1 / (60 + i));
+        });
+
+        const rankedIds = [...scores.entries()]
+          .sort((a, b) => b[1] - a[1])
+          .slice(0, limit)
+          .map(([id]) => id);
+
+        const noteMap = new Map();
+        ftsResults.forEach((n) => noteMap.set(n.id, n));
+        for (const id of rankedIds) {
+          if (!noteMap.has(id)) {
+            const note = this.databaseManager.getNote(id);
+            if (note) noteMap.set(id, note);
+          }
+        }
+
+        return rankedIds.map((id) => noteMap.get(id)).filter(Boolean);
+      } catch (error) {
+        debugLogger.error("Semantic search failed, falling back to FTS5", { error: error.message });
+        return this.databaseManager.searchNotes(query, limit);
+      }
+    });
+
+    ipcMain.handle("db-semantic-reindex-all", async () => {
+      const vectorIndex = require("./vectorIndex");
+      if (!vectorIndex.isReady()) return { success: false, error: "Vector index not ready" };
+
+      const notes = this.databaseManager.getNotes(null, 100000);
+      let done = 0;
+      await vectorIndex.reindexAll(notes, (completed, total) => {
+        done = completed;
+        this.broadcastToWindows("semantic-reindex-progress", { done: completed, total });
+      });
+      return { success: true, indexed: done };
+    });
+
     ipcMain.handle("db-update-note-cloud-id", async (event, id, cloudId) => {
       return this.databaseManager.updateNoteCloudId(id, cloudId);
     });
@@ -606,26 +727,40 @@ class IPCHandlers {
       if (result?.success && result?.folder) {
         setImmediate(() => {
           this.broadcastToWindows("folder-created", result.folder);
+          if (this._noteFilesEnabled) {
+            const markdownMirror = require("./markdownMirror");
+            markdownMirror.ensureFolder(result.folder.name);
+          }
         });
       }
       return result;
     });
 
     ipcMain.handle("db-delete-folder", async (event, id) => {
+      const folderName = this._noteFilesEnabled ? this._getFolderName(id) : null;
       const result = this.databaseManager.deleteFolder(id);
       if (result?.success) {
         setImmediate(() => {
           this.broadcastToWindows("folder-deleted", { id });
+          if (this._noteFilesEnabled && folderName) {
+            const markdownMirror = require("./markdownMirror");
+            markdownMirror.deleteFolder(folderName, "Personal");
+          }
         });
       }
       return result;
     });
 
     ipcMain.handle("db-rename-folder", async (event, id, name) => {
+      const oldName = this._noteFilesEnabled ? this._getFolderName(id) : null;
       const result = this.databaseManager.renameFolder(id, name);
       if (result?.success && result?.folder) {
         setImmediate(() => {
           this.broadcastToWindows("folder-renamed", result.folder);
+          if (this._noteFilesEnabled && oldName) {
+            const markdownMirror = require("./markdownMirror");
+            markdownMirror.renameFolder(oldName, name);
+          }
         });
       }
       return result;
@@ -687,21 +822,92 @@ class IPCHandlers {
     });
 
     ipcMain.handle("db-delete-agent-conversation", async (event, id) => {
-      return this.databaseManager.deleteAgentConversation(id);
+      const result = this.databaseManager.deleteAgentConversation(id);
+      if (this.vectorIndex?.isReady?.()) {
+        this.vectorIndex.deleteConversationChunks(id).catch(() => {});
+      }
+      return result;
     });
 
     ipcMain.handle("db-update-agent-conversation-title", async (event, id, title) => {
       return this.databaseManager.updateAgentConversationTitle(id, title);
     });
 
-    ipcMain.handle("db-add-agent-message", async (event, conversationId, role, content) => {
-      return this.databaseManager.addAgentMessage(conversationId, role, content);
-    });
+    ipcMain.handle(
+      "db-add-agent-message",
+      async (event, conversationId, role, content, metadata) => {
+        const result = this.databaseManager.addAgentMessage(
+          conversationId,
+          role,
+          content,
+          metadata
+        );
+        if (this.vectorIndex?.isReady?.()) {
+          const conv = this.databaseManager.getAgentConversation(conversationId);
+          if (conv && conv.messages?.length % 3 === 0) {
+            this.vectorIndex
+              .upsertConversationChunks(conversationId, conv.title, conv.messages)
+              .catch(() => {});
+          }
+        }
+        return result;
+      }
+    );
 
     ipcMain.handle("db-get-agent-messages", async (event, conversationId) => {
       return this.databaseManager.getAgentMessages(conversationId);
     });
 
+    ipcMain.handle(
+      "db-get-agent-conversations-with-preview",
+      async (event, limit, offset, includeArchived) => {
+        return this.databaseManager.getAgentConversationsWithPreview(
+          limit,
+          offset,
+          includeArchived
+        );
+      }
+    );
+
+    ipcMain.handle("db-search-agent-conversations", async (event, query, limit) => {
+      return this.databaseManager.searchAgentConversations(query, limit);
+    });
+
+    ipcMain.handle("db-archive-agent-conversation", async (event, id) => {
+      return this.databaseManager.archiveAgentConversation(id);
+    });
+
+    ipcMain.handle("db-unarchive-agent-conversation", async (event, id) => {
+      return this.databaseManager.unarchiveAgentConversation(id);
+    });
+
+    ipcMain.handle("db-update-agent-conversation-cloud-id", async (event, id, cloudId) => {
+      return this.databaseManager.updateAgentConversationCloudId(id, cloudId);
+    });
+
+    ipcMain.handle("db-semantic-search-conversations", async (event, query, limit) => {
+      if (this.vectorIndex?.isReady?.()) {
+        try {
+          const vectorResults = await this.vectorIndex.searchConversations(query, limit);
+          if (vectorResults?.length > 0) {
+            const ids = vectorResults.map((r) => r.conversationId);
+            const previews = ids
+              .map((id) => this.databaseManager.getAgentConversation(id))
+              .filter(Boolean)
+              .map((c) => ({
+                ...c,
+                message_count: c.messages?.length ?? 0,
+                last_message: c.messages?.[c.messages.length - 1]?.content,
+              }));
+            if (previews.length > 0) return previews;
+          }
+        } catch {
+          // fall through to keyword search
+        }
+      }
+      return this.databaseManager.searchAgentConversations(query, limit);
+    });
+
     ipcMain.handle("export-note", async (event, noteId, format) => {
       try {
         const note = this.databaseManager.getNote(noteId);
@@ -1020,17 +1226,27 @@ class IPCHandlers {
       if (oldIdx !== idx) {
         try {
           if (purpose === "transcription" && this.whisperManager?.serverManager?.process) {
-            debugLogger.info("Restarting whisper-server for GPU change", { from: oldIdx, to: idx }, "gpu");
+            debugLogger.info(
+              "Restarting whisper-server for GPU change",
+              { from: oldIdx, to: idx },
+              "gpu"
+            );
             const modelName = this.whisperManager.currentServerModel;
             await this.whisperManager.stopServer();
             if (modelName) {
-              await this.whisperManager.startServer(modelName, { useCuda: !!process.env.WHISPER_CUDA_ENABLED });
+              await this.whisperManager.startServer(modelName, {
+                useCuda: !!process.env.WHISPER_CUDA_ENABLED,
+              });
             }
           }
           if (purpose === "intelligence") {
             const modelManager = require("./modelManagerBridge").default;
             if (modelManager.serverManager?.process) {
-              debugLogger.info("Restarting llama-server for GPU change", { from: oldIdx, to: idx }, "gpu");
+              debugLogger.info(
+                "Restarting llama-server for GPU change",
+                { from: oldIdx, to: idx },
+                "gpu"
+              );
               const modelPath = modelManager.serverManager.modelPath;
               await modelManager.serverManager.stop();
               if (modelPath) {
@@ -1039,7 +1255,11 @@ class IPCHandlers {
             }
           }
         } catch (err) {
-          debugLogger.error("Failed to restart server after GPU change", { error: err.message, purpose }, "gpu");
+          debugLogger.error(
+            "Failed to restart server after GPU change",
+            { error: err.message, purpose },
+            "gpu"
+          );
         }
       }
 
@@ -2155,10 +2375,8 @@ class IPCHandlers {
         return { granted: false, status: "unsupported", mode: "unsupported" };
       }
 
-      const screenStatus = systemPreferences.getMediaAccessStatus("screen");
-      const tapStatus = this.audioTapManager.getPermissionStatus();
-      const granted = screenStatus === "granted" || tapStatus === "granted";
-      return { granted, status: granted ? "granted" : screenStatus, mode: "native" };
+      const result = this.audioTapManager.checkAccess();
+      return { granted: result.granted, status: result.status, mode: "native" };
     });
 
     ipcMain.handle("request-system-audio-access", async () => {
@@ -2170,12 +2388,7 @@ class IPCHandlers {
         return { granted: false, status: "unsupported", mode: "unsupported" };
       }
 
-      const screenStatus = systemPreferences.getMediaAccessStatus("screen");
-      if (screenStatus === "granted") {
-        return { granted: true, status: "granted", mode: "native" };
-      }
-
-      // Probe the binary — AudioHardwareCreateProcessTap triggers the native consent dialog
+      // Probe the binary — AudioHardwareCreateProcessTap triggers the native consent dialog.
       try {
         const result = await this.audioTapManager.requestAccess();
         if (result.granted) {
@@ -2187,7 +2400,8 @@ class IPCHandlers {
 
       // Fallback for older macOS or if the native prompt was denied
       await openSystemSettings("systemAudio");
-      return { granted: false, status: screenStatus, mode: "native" };
+      const status = this.audioTapManager.getPermissionStatus();
+      return { granted: false, status, mode: "native" };
     });
 
     // Auth: clear all session cookies for sign-out.
@@ -2654,6 +2868,134 @@ class IPCHandlers {
 
     let meetingSendCounts = { mic: 0, system: 0 };
 
+    // Meeting mic captures at 24kHz (for OpenAI Realtime), but local engines
+    // expect 16kHz. Downsample with linear interpolation (3:2 ratio).
+    const downsample24kTo16k = (pcmBuffer) => {
+      const input = new Int16Array(pcmBuffer.buffer, pcmBuffer.byteOffset, pcmBuffer.length / 2);
+      const ratio = 1.5; // 24000 / 16000
+      const outputLength = Math.floor(input.length / ratio);
+      const output = new Int16Array(outputLength);
+      for (let i = 0; i < outputLength; i++) {
+        const srcIdx = i * ratio;
+        const idx = Math.floor(srcIdx);
+        const frac = srcIdx - idx;
+        const s0 = input[idx];
+        const s1 = idx + 1 < input.length ? input[idx + 1] : s0;
+        output[i] = Math.round(s0 + frac * (s1 - s0));
+      }
+      return Buffer.from(output.buffer);
+    };
+
+    const pcm16ToWav = (pcmBuffer, sampleRate = 16000, channels = 1) => {
+      const dataSize = pcmBuffer.length;
+      const header = Buffer.alloc(44);
+      header.write("RIFF", 0);
+      header.writeUInt32LE(36 + dataSize, 4);
+      header.write("WAVE", 8);
+      header.write("fmt ", 12);
+      header.writeUInt32LE(16, 16);
+      header.writeUInt16LE(1, 20);
+      header.writeUInt16LE(channels, 22);
+      header.writeUInt32LE(sampleRate, 24);
+      header.writeUInt32LE(sampleRate * channels * 2, 28);
+      header.writeUInt16LE(channels * 2, 32);
+      header.writeUInt16LE(16, 34);
+      header.write("data", 36);
+      header.writeUInt32LE(dataSize, 40);
+      return Buffer.concat([header, pcmBuffer]);
+    };
+
+    let meetingLocalMode = false;
+    let meetingLocalBuffers = { mic: [], system: [] };
+    let meetingLocalTimer = null;
+    let meetingLocalWin = null;
+    let meetingLocalTranscript = "";
+    let meetingLocalProvider = null;
+    let meetingLocalModel = null;
+    let meetingLocalTranscribing = false;
+
+    const transcribeLocalMeetingChunk = async (source) => {
+      const chunks = meetingLocalBuffers[source];
+      if (!chunks.length) return;
+
+      const pcm24k = Buffer.concat(chunks);
+      meetingLocalBuffers[source] = [];
+
+      const pcm16k = downsample24kTo16k(pcm24k);
+
+      // Skip silent/near-silent chunks to prevent Whisper hallucinations
+      const samples = new Int16Array(pcm16k.buffer, pcm16k.byteOffset, pcm16k.length / 2);
+      let sumSq = 0;
+      for (let i = 0; i < samples.length; i++) {
+        const n = samples[i] / 0x7fff;
+        sumSq += n * n;
+      }
+      const rms = Math.sqrt(sumSq / samples.length);
+      if (rms < 0.005) return;
+
+      const wav = pcm16ToWav(pcm16k);
+
+      try {
+        let result;
+        if (meetingLocalProvider === "nvidia") {
+          result = await this.parakeetManager.transcribeLocalParakeet(wav, {
+            model: meetingLocalModel,
+          });
+        } else {
+          result = await this.whisperManager.transcribeLocalWhisper(wav, {
+            model: meetingLocalModel,
+          });
+        }
+
+        if (result?.success && result.text?.trim()) {
+          const text = result.text.trim();
+          meetingLocalTranscript += (meetingLocalTranscript ? " " : "") + text;
+
+          if (meetingLocalWin && !meetingLocalWin.isDestroyed()) {
+            meetingLocalWin.webContents.send("meeting-transcription-segment", {
+              text,
+              source,
+              type: "final",
+              timestamp: Date.now(),
+            });
+          }
+        }
+      } catch (error) {
+        debugLogger.error("Local meeting transcription chunk failed", {
+          source,
+          error: error.message,
+        });
+        if (meetingLocalWin && !meetingLocalWin.isDestroyed()) {
+          meetingLocalWin.webContents.send("meeting-transcription-error", error.message);
+        }
+      }
+    };
+
+    const transcribeAllLocalBuffers = async () => {
+      if (meetingLocalTranscribing) return;
+      meetingLocalTranscribing = true;
+      try {
+        await transcribeLocalMeetingChunk("mic");
+        await transcribeLocalMeetingChunk("system");
+      } finally {
+        meetingLocalTranscribing = false;
+      }
+    };
+
+    const resetMeetingLocalState = () => {
+      if (meetingLocalTimer) {
+        clearInterval(meetingLocalTimer);
+        meetingLocalTimer = null;
+      }
+      meetingLocalMode = false;
+      meetingLocalBuffers = { mic: [], system: [] };
+      meetingLocalWin = null;
+      meetingLocalTranscript = "";
+      meetingLocalProvider = null;
+      meetingLocalModel = null;
+      meetingLocalTranscribing = false;
+    };
+
     const resetMeetingStreamingState = () => {
       this._meetingMicStreaming = null;
       this._meetingSystemStreaming = null;
@@ -2678,6 +3020,7 @@ class IPCHandlers {
       if (this.audioTapManager) {
         await this.audioTapManager.stop().catch(() => {});
       }
+      resetMeetingLocalState();
       await disconnectMeetingStreaming().catch(() => {});
     };
 
@@ -2719,6 +3062,10 @@ class IPCHandlers {
         return { success: true, alreadyPrepared: true };
       }
 
+      if (options.provider === "local") {
+        return { success: true };
+      }
+
       if (options.provider !== "openai-realtime") {
         return { success: false, error: `Unsupported provider: ${options.provider}` };
       }
@@ -2758,7 +3105,7 @@ class IPCHandlers {
         const systemAudioMode = getMeetingSystemAudioMode();
 
         // If already prepared (warm connections from prepare), just re-attach handlers
-        if (isMeetingStreamingConnected()) {
+        if (!meetingLocalMode && isMeetingStreamingConnected()) {
           debugLogger.debug("Meeting transcription start: reusing warm connections");
           const win = BrowserWindow.fromWebContents(event.sender);
           attachMeetingStreamingHandlers(this._meetingMicStreaming, win, "mic");
@@ -2769,6 +3116,30 @@ class IPCHandlers {
           return { success: true, systemAudioMode };
         }
 
+        if (options.provider === "local") {
+          meetingLocalMode = true;
+          meetingLocalProvider = options.localProvider || "whisper";
+          meetingLocalModel = options.localModel || null;
+          meetingLocalWin = BrowserWindow.fromWebContents(event.sender);
+          meetingLocalBuffers = { mic: [], system: [] };
+          meetingLocalTranscript = "";
+
+          meetingLocalTimer = setInterval(() => {
+            transcribeAllLocalBuffers();
+          }, 5000);
+
+          if (systemAudioMode === "native") {
+            await startNativeMeetingSystemAudio(event);
+          }
+
+          debugLogger.debug("Meeting transcription started in local mode", {
+            provider: meetingLocalProvider,
+            systemAudioMode,
+          });
+
+          return { success: true, systemAudioMode };
+        }
+
         if (options.provider !== "openai-realtime") {
           return { success: false, error: `Unsupported provider: ${options.provider}` };
         }
@@ -2788,6 +3159,12 @@ class IPCHandlers {
     });
 
     const sendMeetingAudio = (audioBuffer, source) => {
+      if (meetingLocalMode) {
+        const buf = Buffer.isBuffer(audioBuffer) ? audioBuffer : Buffer.from(audioBuffer);
+        meetingLocalBuffers[source].push(buf);
+        return;
+      }
+
       const streaming = source === "mic" ? this._meetingMicStreaming : this._meetingSystemStreaming;
       if (!streaming) {
         if (meetingSendCounts[source] === 0) {
@@ -2834,6 +3211,21 @@ class IPCHandlers {
           await this.audioTapManager.stop();
         }
 
+        if (meetingLocalMode) {
+          if (meetingLocalTimer) {
+            clearInterval(meetingLocalTimer);
+            meetingLocalTimer = null;
+          }
+          try {
+            await transcribeAllLocalBuffers();
+          } catch (err) {
+            debugLogger.error("Local meeting final transcription failed", { error: err.message });
+          }
+          const transcript = meetingLocalTranscript;
+          resetMeetingLocalState();
+          return { success: true, transcript };
+        }
+
         const results = await disconnectMeetingStreaming();
 
         return {
@@ -2975,7 +3367,7 @@ class IPCHandlers {
       }
     });
 
-    ipcMain.handle("cloud-agent-stream", async (event, messages, opts = {}) => {
+    ipcMain.on("cloud-agent-stream-start", async (event, messages, opts = {}) => {
       try {
         const apiUrl = getApiUrl();
         if (!apiUrl) throw new Error("OpenWhispr API URL not configured");
@@ -2983,12 +3375,6 @@ class IPCHandlers {
         const cookieHeader = await getSessionCookies(event);
         if (!cookieHeader) throw new Error("No session cookies available");
 
-        debugLogger.debug(
-          "Cloud agent stream request",
-          { messageCount: messages?.length || 0 },
-          "cloud-api"
-        );
-
         const response = await fetch(`${apiUrl}/api/agent/stream`, {
           method: "POST",
           headers: {
@@ -2998,6 +3384,7 @@ class IPCHandlers {
           body: JSON.stringify({
             messages,
             systemPrompt: opts.systemPrompt,
+            tools: opts.tools,
             sessionId: this.sessionId,
             clientType: "desktop",
             appVersion: app.getVersion(),
@@ -3005,36 +3392,99 @@ class IPCHandlers {
         });
 
         if (!response.ok) {
-          if (response.status === 401) {
-            return { success: false, error: "Session expired", code: "AUTH_EXPIRED" };
-          }
           const errorData = await response.json().catch(() => ({}));
-          return {
-            success: false,
+          event.sender.send("cloud-agent-stream-error", {
             error: errorData.error || `API error: ${response.status}`,
-          };
+            code: response.status === 401 ? "AUTH_EXPIRED" : undefined,
+          });
+          return;
         }
 
         const reader = response.body.getReader();
         const decoder = new TextDecoder();
+        let buffer = "";
 
         try {
           while (true) {
             const { done, value } = await reader.read();
             if (done) break;
 
-            const text = decoder.decode(value, { stream: true });
-            if (text) event.sender.send("agent-stream-chunk", text);
+            buffer += decoder.decode(value, { stream: true });
+            const lines = buffer.split("\n");
+            buffer = lines.pop() || "";
+
+            for (const line of lines) {
+              if (!line.trim()) continue;
+              try {
+                event.sender.send("cloud-agent-stream-chunk", JSON.parse(line));
+              } catch {
+                // skip malformed NDJSON line
+              }
+            }
+          }
+          if (buffer.trim()) {
+            try {
+              event.sender.send("cloud-agent-stream-chunk", JSON.parse(buffer));
+            } catch {
+              // skip malformed remainder
+            }
           }
         } finally {
           reader.releaseLock();
         }
 
-        event.sender.send("agent-stream-done");
-        return { success: true };
+        event.sender.send("cloud-agent-stream-end");
       } catch (error) {
         debugLogger.error("Cloud agent stream error:", error);
-        event.sender.send("agent-stream-done");
+        event.sender.send("cloud-agent-stream-error", { error: error.message });
+      }
+    });
+
+    ipcMain.handle("agent-open-note", async (_event, noteId) => {
+      try {
+        await this.windowManager.createControlPanelWindow();
+        this.windowManager.sendToControlPanel("navigate-to-note", { noteId });
+        return { success: true };
+      } catch (error) {
+        debugLogger.error("Failed to open note from agent:", error);
+        return { success: false, error: error.message };
+      }
+    });
+
+    ipcMain.handle("agent-web-search", async (event, query, numResults = 5) => {
+      try {
+        const apiUrl = getApiUrl();
+        if (!apiUrl) throw new Error("OpenWhispr API URL not configured");
+
+        const cookieHeader = await getSessionCookies(event);
+        if (!cookieHeader) throw new Error("No session cookies available");
+
+        debugLogger.debug("Agent web search request", { query, numResults }, "cloud-api");
+
+        const response = await fetch(`${apiUrl}/api/agent/web-search`, {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+            Cookie: cookieHeader,
+          },
+          body: JSON.stringify({ query, numResults }),
+        });
+
+        if (!response.ok) {
+          if (response.status === 401) {
+            return { success: false, error: "Session expired", code: "AUTH_EXPIRED" };
+          }
+          const errorData = await response.json().catch(() => ({}));
+          return {
+            success: false,
+            error: errorData.error || `API error: ${response.status}`,
+          };
+        }
+
+        const data = await response.json();
+        return { success: true, ...data };
+      } catch (error) {
+        debugLogger.error("Agent web search error:", error);
         return { success: false, error: error.message };
       }
     });
@@ -4336,26 +4786,26 @@ class IPCHandlers {
       }
     });
 
-    ipcMain.handle("meeting-detection-get-preferences", async () => {
+    ipcMain.handle("gcal-get-event", async (_event, eventId) => {
       try {
-        return { success: true, preferences: this.meetingDetectionEngine.getPreferences() };
+        const event = this.databaseManager.getCalendarEventById(eventId);
+        return { success: true, event };
       } catch (error) {
-        return { success: false, error: error.message };
+        return { success: false, event: null };
       }
     });
 
-    ipcMain.handle("meeting-detection-set-preferences", async (_event, prefs) => {
+    ipcMain.handle("meeting-detection-get-preferences", async () => {
       try {
-        this.meetingDetectionEngine.setPreferences(prefs);
-        return { success: true };
+        return { success: true, preferences: this.meetingDetectionEngine.getPreferences() };
       } catch (error) {
         return { success: false, error: error.message };
       }
     });
 
-    ipcMain.handle("meeting-detection-respond", async (_event, detectionId, action) => {
+    ipcMain.handle("meeting-detection-set-preferences", async (_event, prefs) => {
       try {
-        this.meetingDetectionEngine.handleUserResponse(detectionId, action);
+        this.meetingDetectionEngine.setPreferences(prefs);
         return { success: true };
       } catch (error) {
         return { success: false, error: error.message };
@@ -4398,6 +4848,98 @@ class IPCHandlers {
       }
       return { success: true };
     });
+
+    // Note files (markdown mirror) handlers
+    ipcMain.handle("note-files-set-enabled", async (_event, enabled, customPath) => {
+      try {
+        this._noteFilesEnabled = !!enabled;
+        if (enabled) {
+          this._rebuildMirror(customPath || path.join(app.getPath("userData"), "notes"));
+        }
+        return { success: true };
+      } catch (error) {
+        debugLogger.error(
+          "Failed to set note-files enabled",
+          { error: error.message },
+          "note-files"
+        );
+        return { success: false, error: error.message };
+      }
+    });
+
+    ipcMain.handle("note-files-set-path", async (_event, newPath) => {
+      try {
+        if (!this._noteFilesEnabled) return { success: false, error: "Note files not enabled" };
+        this._rebuildMirror(newPath);
+        return { success: true };
+      } catch (error) {
+        debugLogger.error("Failed to set note-files path", { error: error.message }, "note-files");
+        return { success: false, error: error.message };
+      }
+    });
+
+    ipcMain.handle("note-files-rebuild", async () => {
+      try {
+        if (!this._noteFilesEnabled) return { success: false, error: "Note files not enabled" };
+        this._rebuildMirror();
+        return { success: true };
+      } catch (error) {
+        debugLogger.error("Failed to rebuild note files", { error: error.message }, "note-files");
+        return { success: false, error: error.message };
+      }
+    });
+
+    ipcMain.handle("note-files-get-default-path", async () => {
+      return path.join(app.getPath("userData"), "notes");
+    });
+
+    ipcMain.handle("show-note-file", async (_event, noteId) => {
+      try {
+        const markdownMirror = require("./markdownMirror");
+        const filePath = markdownMirror.getNotePath(noteId);
+        if (!filePath) return { success: false };
+        shell.showItemInFolder(filePath);
+        return { success: true };
+      } catch (error) {
+        debugLogger.error(
+          "Failed to show note file",
+          { noteId, error: error.message },
+          "note-files"
+        );
+        return { success: false };
+      }
+    });
+
+    ipcMain.handle("show-folder-in-explorer", async (_event, folderName) => {
+      try {
+        const markdownMirror = require("./markdownMirror");
+        const dirPath = markdownMirror.getFolderPath(folderName);
+        if (!dirPath) return { success: false };
+        await shell.openPath(dirPath);
+        return { success: true };
+      } catch (error) {
+        debugLogger.error(
+          "Failed to show folder",
+          { folderName, error: error.message },
+          "note-files"
+        );
+        return { success: false };
+      }
+    });
+
+    ipcMain.handle("note-files-pick-folder", async () => {
+      try {
+        const { dialog } = require("electron");
+        const result = await dialog.showOpenDialog({ properties: ["openDirectory"] });
+        if (result.canceled || !result.filePaths.length) {
+          return { canceled: true };
+        }
+        return { canceled: false, path: result.filePaths[0] };
+      } catch (error) {
+        debugLogger.error("Failed to pick folder", { error: error.message }, "note-files");
+        return { canceled: true };
+      }
+    });
   }
 
   broadcastToWindows(channel, payload) {
diff --git a/src/helpers/kdeShortcut.js b/src/helpers/kdeShortcut.js
index e1d511030..d8f8fb5dc 100644
--- a/src/helpers/kdeShortcut.js
+++ b/src/helpers/kdeShortcut.js
@@ -220,9 +220,10 @@ class KDEShortcutManager {
     const actionId = [COMPONENT_NAME, "OpenWhispr", slotName, `OpenWhispr ${slotName}`];
 
     try {
-      // Register action then set shortcut
+      // Flag 0: always overwrite. 0x02 keeps stale saved values that
+      // silently prevent the hotkey from firing on startup.
       await this.kglobalaccel.doRegister(actionId);
-      const result = await this.kglobalaccel.setShortcut(actionId, [qtKey], 0x02);
+      const result = await this.kglobalaccel.setShortcut(actionId, [qtKey], 0);
 
       if (callback) this.callbacks.set(slotName, callback);
       this.registeredSlots.add(slotName);
diff --git a/src/helpers/llamaServer.js b/src/helpers/llamaServer.js
index 511df30fd..a8751fc60 100644
--- a/src/helpers/llamaServer.js
+++ b/src/helpers/llamaServer.js
@@ -136,7 +136,6 @@ class LlamaServerManager {
     this.port = await this.findAvailablePort();
     this.modelPath = modelPath;
 
-    // Let llama.cpp's auto-fit system choose --ctx-size based on available GPU memory
     const baseArgs = [
       "--model",
       modelPath,
@@ -146,6 +145,7 @@ class LlamaServerManager {
       String(this.port),
       "--threads",
       String(options.threads || 4),
+      "--jinja",
     ];
 
     if (process.platform === "darwin") {
diff --git a/src/helpers/localEmbeddings.js b/src/helpers/localEmbeddings.js
new file mode 100644
index 000000000..5732fc556
--- /dev/null
+++ b/src/helpers/localEmbeddings.js
@@ -0,0 +1,234 @@
+const fs = require("fs");
+const os = require("os");
+const path = require("path");
+const debugLogger = require("./debugLogger");
+
+const MAX_TOKENS = 256;
+const EMBEDDING_DIM = 384;
+
+const MODEL_SUBDIR = "all-MiniLM-L6-v2";
+
+class LocalEmbeddings {
+  constructor() {
+    this.session = null;
+    this.tokenizer = null;
+    this.modelDir = this._resolveModelDir();
+  }
+
+  _resolveModelDir() {
+    const cacheDir = path.join(
+      os.homedir(),
+      ".cache",
+      "openwhispr",
+      "embedding-models",
+      MODEL_SUBDIR
+    );
+
+    if (process.resourcesPath) {
+      const bundled = path.join(process.resourcesPath, "bin", MODEL_SUBDIR);
+      if (
+        fs.existsSync(path.join(bundled, "model.onnx")) &&
+        fs.existsSync(path.join(bundled, "tokenizer.json"))
+      ) {
+        return bundled;
+      }
+    }
+
+    const projectBin = path.resolve(__dirname, "..", "..", "resources", "bin", MODEL_SUBDIR);
+    if (
+      fs.existsSync(path.join(projectBin, "model.onnx")) &&
+      fs.existsSync(path.join(projectBin, "tokenizer.json"))
+    ) {
+      return projectBin;
+    }
+
+    return cacheDir;
+  }
+
+  isAvailable() {
+    return (
+      fs.existsSync(path.join(this.modelDir, "model.onnx")) &&
+      fs.existsSync(path.join(this.modelDir, "tokenizer.json"))
+    );
+  }
+
+  async _ensureLoaded() {
+    if (this.session && this.tokenizer) return;
+
+    if (!this.isAvailable()) {
+      throw new Error("Embedding model not found. Run: node scripts/download-minilm.js");
+    }
+
+    debugLogger.debug("local-embeddings loading model", { modelDir: this.modelDir });
+
+    const tokenizerPath = path.join(this.modelDir, "tokenizer.json");
+    const tokenizerData = JSON.parse(fs.readFileSync(tokenizerPath, "utf-8"));
+    this.tokenizer = this._buildTokenizer(tokenizerData);
+
+    const ort = require("onnxruntime-node");
+    const modelPath = path.join(this.modelDir, "model.onnx");
+    this.session = await ort.InferenceSession.create(modelPath);
+
+    debugLogger.debug("local-embeddings model loaded");
+  }
+
+  _buildTokenizer(tokenizerData) {
+    const tokenToId = new Map();
+    for (const [token, id] of Object.entries(tokenizerData.model.vocab)) {
+      tokenToId.set(token, id);
+    }
+
+    return {
+      tokenToId,
+      clsId: tokenToId.get("[CLS]") ?? 101,
+      sepId: tokenToId.get("[SEP]") ?? 102,
+      unkId: tokenToId.get("[UNK]") ?? 100,
+    };
+  }
+
+  _tokenize(text) {
+    const { tokenToId, clsId, sepId, unkId } = this.tokenizer;
+    const words = text.toLowerCase().match(/[a-z0-9]+|[^\s\w]/g) || [];
+    const tokenIds = [clsId];
+
+    for (const word of words) {
+      if (tokenIds.length >= MAX_TOKENS - 1) break;
+
+      if (tokenToId.has(word)) {
+        tokenIds.push(tokenToId.get(word));
+        continue;
+      }
+
+      // WordPiece: greedily match longest subword
+      let start = 0;
+      while (start < word.length) {
+        if (tokenIds.length >= MAX_TOKENS - 1) break;
+
+        let end = word.length;
+        let matched = false;
+
+        while (end > start) {
+          const subword = start === 0 ? word.slice(start, end) : `##${word.slice(start, end)}`;
+          if (tokenToId.has(subword)) {
+            tokenIds.push(tokenToId.get(subword));
+            start = end;
+            matched = true;
+            break;
+          }
+          end--;
+        }
+
+        if (!matched) {
+          tokenIds.push(unkId);
+          start++;
+        }
+      }
+    }
+
+    tokenIds.push(sepId);
+
+    const length = tokenIds.length;
+    const inputIds = new BigInt64Array(length);
+    const attentionMask = new BigInt64Array(length);
+    const tokenTypeIds = new BigInt64Array(length);
+
+    for (let i = 0; i < length; i++) {
+      inputIds[i] = BigInt(tokenIds[i]);
+      attentionMask[i] = 1n;
+      tokenTypeIds[i] = 0n;
+    }
+
+    return { inputIds, attentionMask, tokenTypeIds, length };
+  }
+
+  async embedText(text) {
+    await this._ensureLoaded();
+
+    const { inputIds, attentionMask, tokenTypeIds, length } = this._tokenize(text);
+
+    const ort = require("onnxruntime-node");
+    const feeds = {
+      input_ids: new ort.Tensor("int64", inputIds, [1, length]),
+      attention_mask: new ort.Tensor("int64", attentionMask, [1, length]),
+      token_type_ids: new ort.Tensor("int64", tokenTypeIds, [1, length]),
+    };
+
+    const results = await this.session.run(feeds);
+    const output = results.last_hidden_state ?? results.output_0;
+
+    return this._meanPoolAndNormalize(output.data, length, EMBEDDING_DIM);
+  }
+
+  async embedTexts(texts) {
+    const results = [];
+    for (const text of texts) {
+      results.push(await this.embedText(text));
+    }
+    return results;
+  }
+
+  // Mean pooling over token embeddings, then L2 normalize to unit vector
+  _meanPoolAndNormalize(data, tokenCount, dim) {
+    const embedding = new Float32Array(dim);
+
+    for (let t = 0; t < tokenCount; t++) {
+      const offset = t * dim;
+      for (let d = 0; d < dim; d++) {
+        embedding[d] += data[offset + d];
+      }
+    }
+
+    for (let d = 0; d < dim; d++) {
+      embedding[d] /= tokenCount;
+    }
+
+    let norm = 0;
+    for (let d = 0; d < dim; d++) {
+      norm += embedding[d] * embedding[d];
+    }
+    norm = Math.sqrt(norm);
+
+    if (norm > 0) {
+      for (let d = 0; d < dim; d++) {
+        embedding[d] /= norm;
+      }
+    }
+
+    return embedding;
+  }
+
+  static noteEmbedText(title, content, enhancedContent) {
+    return `${title}\n${enhancedContent || content}`.slice(0, 1500);
+  }
+
+  async downloadModel() {
+    if (this.isAvailable()) return;
+
+    const { downloadFile } = require("./downloadUtils");
+    const files = [
+      {
+        name: "model.onnx",
+        url: "https://huggingface.co/sentence-transformers/all-MiniLM-L6-v2/resolve/main/onnx/model.onnx",
+      },
+      {
+        name: "tokenizer.json",
+        url: "https://huggingface.co/sentence-transformers/all-MiniLM-L6-v2/resolve/main/tokenizer.json",
+      },
+    ];
+
+    fs.mkdirSync(this.modelDir, { recursive: true });
+
+    for (const file of files) {
+      const dest = path.join(this.modelDir, file.name);
+      if (fs.existsSync(dest)) continue;
+      debugLogger.debug("local-embeddings downloading", { file: file.name });
+      await downloadFile(file.url, dest);
+    }
+
+    debugLogger.info("local-embeddings model downloaded", { modelDir: this.modelDir });
+  }
+}
+
+const instance = new LocalEmbeddings();
+module.exports = instance;
+module.exports.LocalEmbeddings = LocalEmbeddings;
diff --git a/src/helpers/markdownMirror.js b/src/helpers/markdownMirror.js
new file mode 100644
index 000000000..45aad3f12
--- /dev/null
+++ b/src/helpers/markdownMirror.js
@@ -0,0 +1,196 @@
+const fs = require("fs");
+const path = require("path");
+const debugLogger = require("./debugLogger");
+
+class MarkdownMirror {
+  constructor() {
+    this._basePath = null;
+  }
+
+  init(basePath) {
+    this._basePath = basePath;
+    try {
+      fs.mkdirSync(basePath, { recursive: true });
+      debugLogger.debug("Markdown mirror initialized", { basePath }, "note-files");
+    } catch (err) {
+      debugLogger.error("Failed to init markdown mirror", { error: err.message }, "note-files");
+    }
+  }
+
+  getBasePath() {
+    return this._basePath;
+  }
+
+  _slugify(title) {
+    return (title || "Untitled")
+      .replace(/[/\\?%*:|"<>]/g, "-")
+      .trim()
+      .replace(/\s+/g, "-")
+      .toLowerCase()
+      .slice(0, 60);
+  }
+
+  _buildFrontmatter(note, folderName) {
+    const escYaml = (str) => {
+      if (!str) return '""';
+      if (/[:#{}[\],&*?|>!%@`]/.test(str) || str.includes('"') || str.includes("'")) {
+        return `"${str.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
+      }
+      return str;
+    };
+    const lines = [
+      "---",
+      `id: ${note.id}`,
+      `title: ${escYaml(note.title)}`,
+      `type: ${note.note_type || "personal"}`,
+      `folder: ${escYaml(folderName || "Personal")}`,
+      `created: ${note.created_at || new Date().toISOString()}`,
+      `updated: ${note.updated_at || new Date().toISOString()}`,
+      "---",
+    ];
+    return lines.join("\n");
+  }
+
+  writeNote(note, folderName) {
+    if (!this._basePath) return;
+    try {
+      const dirName = folderName || "Personal";
+      const dirPath = path.join(this._basePath, dirName);
+      fs.mkdirSync(dirPath, { recursive: true });
+
+      // Remove stale files (title changed or note moved to different folder)
+      const glob = this._globNoteFiles(note.id);
+      const slug = this._slugify(note.title);
+      const newFileName = `${note.id}-${slug}.md`;
+      const newFilePath = path.join(dirPath, newFileName);
+      for (const existing of glob) {
+        if (existing !== newFilePath) {
+          try {
+            fs.unlinkSync(existing);
+          } catch {}
+        }
+      }
+
+      const frontmatter = this._buildFrontmatter(note, dirName);
+      const body = note.enhanced_content || note.content || "";
+      fs.writeFileSync(newFilePath, `${frontmatter}\n\n${body}`, "utf-8");
+    } catch (err) {
+      debugLogger.error(
+        "Failed to write note file",
+        { noteId: note.id, error: err.message },
+        "note-files"
+      );
+    }
+  }
+
+  deleteNote(noteId) {
+    if (!this._basePath) return;
+    try {
+      const files = this._globNoteFiles(noteId);
+      for (const f of files) {
+        fs.unlinkSync(f);
+      }
+    } catch (err) {
+      debugLogger.error("Failed to delete note file", { noteId, error: err.message }, "note-files");
+    }
+  }
+
+  ensureFolder(folderName) {
+    if (!this._basePath) return;
+    try {
+      fs.mkdirSync(path.join(this._basePath, folderName), { recursive: true });
+    } catch (err) {
+      debugLogger.error(
+        "Failed to ensure folder",
+        { folderName, error: err.message },
+        "note-files"
+      );
+    }
+  }
+
+  renameFolder(oldName, newName) {
+    if (!this._basePath) return;
+    try {
+      const oldPath = path.join(this._basePath, oldName);
+      const newPath = path.join(this._basePath, newName);
+      if (fs.existsSync(oldPath)) {
+        fs.renameSync(oldPath, newPath);
+      }
+    } catch (err) {
+      debugLogger.error(
+        "Failed to rename folder",
+        { oldName, newName, error: err.message },
+        "note-files"
+      );
+    }
+  }
+
+  deleteFolder(folderName, targetName) {
+    if (!this._basePath) return;
+    try {
+      const srcDir = path.join(this._basePath, folderName);
+      const destDir = path.join(this._basePath, targetName || "Personal");
+      fs.mkdirSync(destDir, { recursive: true });
+      if (fs.existsSync(srcDir)) {
+        const files = fs.readdirSync(srcDir);
+        for (const file of files) {
+          fs.renameSync(path.join(srcDir, file), path.join(destDir, file));
+        }
+        fs.rmdirSync(srcDir);
+      }
+    } catch (err) {
+      debugLogger.error(
+        "Failed to delete folder",
+        { folderName, error: err.message },
+        "note-files"
+      );
+    }
+  }
+
+  rebuildAll(notes, folderMap) {
+    if (!this._basePath) return;
+    try {
+      for (const note of notes) {
+        const folderName = folderMap[note.folder_id] || "Personal";
+        this.writeNote(note, folderName);
+      }
+      debugLogger.info("Markdown mirror rebuild complete", { count: notes.length }, "note-files");
+    } catch (err) {
+      debugLogger.error("Failed to rebuild all note files", { error: err.message }, "note-files");
+    }
+  }
+
+  getNotePath(noteId) {
+    if (!this._basePath) return null;
+    const files = this._globNoteFiles(noteId);
+    return files.length > 0 ? files[0] : null;
+  }
+
+  getFolderPath(folderName) {
+    if (!this._basePath) return null;
+    const dirPath = path.join(this._basePath, folderName);
+    return fs.existsSync(dirPath) ? dirPath : null;
+  }
+
+  _globNoteFiles(noteId) {
+    if (!this._basePath) return [];
+    const results = [];
+    try {
+      const prefix = `${noteId}-`;
+      const dirs = fs.readdirSync(this._basePath, { withFileTypes: true });
+      for (const dir of dirs) {
+        if (!dir.isDirectory()) continue;
+        const dirPath = path.join(this._basePath, dir.name);
+        const files = fs.readdirSync(dirPath);
+        for (const file of files) {
+          if (file.startsWith(prefix) && file.endsWith(".md")) {
+            results.push(path.join(dirPath, file));
+          }
+        }
+      }
+    } catch {}
+    return results;
+  }
+}
+
+module.exports = new MarkdownMirror();
diff --git a/src/helpers/meetingDetectionEngine.js b/src/helpers/meetingDetectionEngine.js
index 69bcdf806..b1199cbe0 100644
--- a/src/helpers/meetingDetectionEngine.js
+++ b/src/helpers/meetingDetectionEngine.js
@@ -158,47 +158,47 @@ class MeetingDetectionEngine {
     });
   }
 
-  handleUserResponse(detectionId, action) {
-    debugLogger.info("User response to detection", { detectionId, action }, "meeting");
-    if (action === "dismiss") {
-      const detection = this.activeDetections.get(detectionId);
-      if (detection) {
-        this._dismiss();
-        detection.dismissed = true;
-      }
-    }
-  }
-
   async handleNotificationResponse(detectionId, action) {
     debugLogger.info("Notification response", { detectionId, action }, "meeting");
     try {
       const detection = this.activeDetections.get(detectionId);
 
       if (action === "start" && detection) {
-        this._meetingModeActive = true;
         const eventSummary = detection.event?.summary || "New note";
 
         const noteResult = this.databaseManager.saveNote(eventSummary, "", "meeting");
         const meetingsFolder = this.databaseManager.getMeetingsFolder();
 
-        if (noteResult?.note?.id && meetingsFolder?.id) {
-          await this.windowManager.createControlPanelWindow();
-          this.windowManager.snapControlPanelToMeetingMode();
-          this.windowManager.sendToControlPanel("navigate-to-meeting-note", {
-            noteId: noteResult.note.id,
-            folderId: meetingsFolder.id,
-            event: detection.event,
-          });
+        if (!noteResult?.note?.id || !meetingsFolder?.id) {
+          debugLogger.error(
+            "Meeting note creation failed",
+            { noteId: noteResult?.note?.id, folderId: meetingsFolder?.id },
+            "meeting"
+          );
+          this.activeDetections.delete(detectionId);
+          return;
         }
 
+        this._meetingModeActive = true;
+
+        this.broadcastToWindows("note-added", noteResult.note);
+
+        await this.windowManager.createControlPanelWindow();
+        this.windowManager.snapControlPanelToMeetingMode();
+        this.windowManager.sendToControlPanel("navigate-to-meeting-note", {
+          noteId: noteResult.note.id,
+          folderId: meetingsFolder.id,
+          event: detection.event,
+        });
+
         this.audioActivityDetector.resetPrompt();
 
         this.activeDetections.delete(detectionId);
       } else if (action === "dismiss") {
         if (detection) {
           this._dismiss();
-          detection.dismissed = true;
         }
+        this.activeDetections.delete(detectionId);
       }
     } catch (error) {
       this._meetingModeActive = false;
@@ -308,6 +308,10 @@ class MeetingDetectionEngine {
   setMeetingModeActive(active) {
     this._meetingModeActive = active;
     debugLogger.info("Meeting mode active state changed", { active }, "meeting");
+    if (!active) {
+      // Own mic usage during meeting mode sets hasPrompted=true; reset so future detections work
+      this.audioActivityDetector.resetPrompt();
+    }
   }
 
   setUserRecording(active) {
diff --git a/src/helpers/menuManager.js b/src/helpers/menuManager.js
index c141ea4bc..a62af4eed 100644
--- a/src/helpers/menuManager.js
+++ b/src/helpers/menuManager.js
@@ -2,7 +2,7 @@ const { Menu } = require("electron");
 const { i18nMain } = require("./i18nMain");
 
 class MenuManager {
-  static setupMainMenu() {
+  static setupMainMenu(onOpenSettings) {
     if (process.platform === "darwin") {
       const template = [
         {
@@ -10,6 +10,12 @@ class MenuManager {
           submenu: [
             { role: "about" },
             { type: "separator" },
+            {
+              label: i18nMain.t("menu.settings"),
+              accelerator: "Command+,",
+              click: () => onOpenSettings?.(),
+            },
+            { type: "separator" },
             { role: "services" },
             { type: "separator" },
             { role: "hide" },
@@ -25,7 +31,7 @@ class MenuManager {
     }
   }
 
-  static setupControlPanelMenu(controlPanelWindow) {
+  static setupControlPanelMenu(controlPanelWindow, onOpenSettings) {
     if (process.platform === "darwin") {
       // On macOS, create a proper application menu
       const template = [
@@ -34,6 +40,12 @@ class MenuManager {
           submenu: [
             { role: "about" },
             { type: "separator" },
+            {
+              label: i18nMain.t("menu.settings"),
+              accelerator: "Command+,",
+              click: () => onOpenSettings?.(),
+            },
+            { type: "separator" },
             { role: "services" },
             { type: "separator" },
             { role: "hide" },
@@ -108,7 +120,15 @@ class MenuManager {
       const template = [
         {
           label: i18nMain.t("menu.file"),
-          submenu: [{ role: "close", label: i18nMain.t("menu.closeWindow") }],
+          submenu: [
+            {
+              label: i18nMain.t("menu.settings"),
+              accelerator: "Ctrl+,",
+              click: () => onOpenSettings?.(),
+            },
+            { type: "separator" },
+            { role: "close", label: i18nMain.t("menu.closeWindow") },
+          ],
         },
         {
           label: "Edit",
diff --git a/src/helpers/openaiRealtimeStreaming.js b/src/helpers/openaiRealtimeStreaming.js
index fc02fc59e..ee16ca68c 100644
--- a/src/helpers/openaiRealtimeStreaming.js
+++ b/src/helpers/openaiRealtimeStreaming.js
@@ -174,8 +174,11 @@ class OpenAIRealtimeStreaming {
         }
 
         case "conversation.item.input_audio_transcription.delta": {
-          this.currentPartial += event.delta || "";
-          this.onPartialTranscript?.(this.currentPartial);
+          const delta = event.delta || "";
+          if (delta) {
+            this.currentPartial += delta;
+            this.onPartialTranscript?.(this.currentPartial);
+          }
           break;
         }
 
@@ -185,15 +188,17 @@ class OpenAIRealtimeStreaming {
             this.completedSegments.push(transcript);
           }
           this.currentPartial = "";
-          const fullText = this.getFullTranscript();
           const speechTimestamp = this.speechStartedAt || Date.now();
           this.speechStartedAt = null;
-          this.onFinalTranscript?.(fullText, speechTimestamp);
-          debugLogger.debug("OpenAI Realtime turn completed", {
-            turnText: transcript.slice(0, 100),
-            totalLength: fullText.length,
-            segments: this.completedSegments.length,
-          });
+          if (transcript) {
+            const fullText = this.getFullTranscript();
+            this.onFinalTranscript?.(fullText, speechTimestamp);
+            debugLogger.debug("OpenAI Realtime turn completed", {
+              turnText: transcript.slice(0, 100),
+              totalLength: fullText.length,
+              segments: this.completedSegments.length,
+            });
+          }
           break;
         }
 
diff --git a/src/helpers/qdrantManager.js b/src/helpers/qdrantManager.js
new file mode 100644
index 000000000..e5e7f2ad1
--- /dev/null
+++ b/src/helpers/qdrantManager.js
@@ -0,0 +1,238 @@
+const { spawn } = require("child_process");
+const fs = require("fs");
+const path = require("path");
+const http = require("http");
+const os = require("os");
+const debugLogger = require("./debugLogger");
+const {
+  findAvailablePort,
+  resolveBinaryPath,
+  gracefulStopProcess,
+} = require("../utils/serverUtils");
+
+const PORT_RANGE_START = 6333;
+const PORT_RANGE_END = 6350;
+const STARTUP_TIMEOUT_MS = 30000;
+const STARTUP_POLL_INTERVAL_MS = 100;
+const HEALTH_CHECK_INTERVAL_MS = 5000;
+const HEALTH_CHECK_TIMEOUT_MS = 2000;
+
+const STORAGE_DIR = path.join(os.homedir(), ".cache", "openwhispr", "qdrant-data");
+
+class QdrantManager {
+  constructor() {
+    this.process = null;
+    this.port = null;
+    this.ready = false;
+    this.startupPromise = null;
+    this.healthCheckInterval = null;
+    this.cachedBinaryPath = null;
+  }
+
+  getBinaryPath() {
+    if (this.cachedBinaryPath) return this.cachedBinaryPath;
+
+    const platformArch = `${process.platform}-${process.arch}`;
+    const binaryName =
+      process.platform === "win32" ? `qdrant-${platformArch}.exe` : `qdrant-${platformArch}`;
+
+    const resolved = resolveBinaryPath(binaryName);
+    if (resolved) this.cachedBinaryPath = resolved;
+    return resolved;
+  }
+
+  isAvailable() {
+    return this.getBinaryPath() !== null;
+  }
+
+  async start() {
+    if (this.startupPromise) return this.startupPromise;
+    if (this.ready) return;
+    if (this.process) await this.stop();
+
+    this.startupPromise = this._doStart();
+    try {
+      await this.startupPromise;
+    } finally {
+      this.startupPromise = null;
+    }
+  }
+
+  async _doStart() {
+    const binaryPath = this.getBinaryPath();
+    if (!binaryPath) throw new Error("qdrant binary not found");
+
+    this.port = await findAvailablePort(PORT_RANGE_START, PORT_RANGE_END);
+
+    fs.mkdirSync(STORAGE_DIR, { recursive: true });
+
+    const configPath = path.join(STORAGE_DIR, "config.yaml");
+    const storagePath = path.join(STORAGE_DIR, "storage");
+    const configContent = [
+      "storage:",
+      `  storage_path: ${storagePath}`,
+      "service:",
+      "  host: 127.0.0.1",
+      `  http_port: ${this.port}`,
+      `  grpc_port: ${this.port + 1}`,
+      "",
+    ].join("\n");
+
+    fs.writeFileSync(configPath, configContent, "utf-8");
+
+    debugLogger.debug("Starting qdrant", {
+      port: this.port,
+      binaryPath,
+      configPath,
+      storagePath,
+    });
+
+    this.process = spawn(binaryPath, ["--config-path", configPath], {
+      stdio: ["ignore", "pipe", "pipe"],
+      windowsHide: true,
+    });
+
+    let stderrBuffer = "";
+    let exitCode = null;
+
+    this.process.stdout.on("data", (data) => {
+      debugLogger.debug("qdrant stdout", { data: data.toString().trim() });
+    });
+
+    this.process.stderr.on("data", (data) => {
+      stderrBuffer += data.toString();
+      debugLogger.debug("qdrant stderr", { data: data.toString().trim() });
+    });
+
+    this.process.on("error", (error) => {
+      debugLogger.error("qdrant process error", { error: error.message });
+      this.ready = false;
+    });
+
+    this.process.on("close", (code) => {
+      exitCode = code;
+      debugLogger.debug("qdrant process exited", { code });
+      this.ready = false;
+      this.process = null;
+      this._stopHealthCheck();
+    });
+
+    await this._waitForReady(() => ({ stderr: stderrBuffer, exitCode }));
+    this._startHealthCheck();
+
+    debugLogger.info("qdrant started successfully", { port: this.port });
+  }
+
+  async _waitForReady(getProcessInfo) {
+    const startTime = Date.now();
+    let pollCount = 0;
+
+    while (Date.now() - startTime < STARTUP_TIMEOUT_MS) {
+      if (!this.process || this.process.killed) {
+        const info = getProcessInfo ? getProcessInfo() : {};
+        const stderr = info.stderr ? info.stderr.trim().slice(0, 200) : "";
+        const details = stderr || (info.exitCode !== null ? `exit code: ${info.exitCode}` : "");
+        throw new Error(`qdrant process died during startup${details ? `: ${details}` : ""}`);
+      }
+
+      pollCount++;
+      if (await this._checkHealth()) {
+        this.ready = true;
+        debugLogger.debug("qdrant ready", {
+          startupTimeMs: Date.now() - startTime,
+          pollCount,
+        });
+        return;
+      }
+
+      await new Promise((resolve) => setTimeout(resolve, STARTUP_POLL_INTERVAL_MS));
+    }
+
+    throw new Error(`qdrant failed to start within ${STARTUP_TIMEOUT_MS}ms`);
+  }
+
+  _checkHealth() {
+    return new Promise((resolve) => {
+      const req = http.request(
+        {
+          hostname: "127.0.0.1",
+          port: this.port,
+          path: "/healthz",
+          method: "GET",
+          timeout: HEALTH_CHECK_TIMEOUT_MS,
+        },
+        (res) => {
+          resolve(true);
+          res.resume();
+        }
+      );
+
+      req.on("error", () => resolve(false));
+      req.on("timeout", () => {
+        req.destroy();
+        resolve(false);
+      });
+      req.end();
+    });
+  }
+
+  _startHealthCheck() {
+    this._stopHealthCheck();
+    this.healthCheckInterval = setInterval(async () => {
+      if (!this.process) {
+        this._stopHealthCheck();
+        return;
+      }
+      if (!(await this._checkHealth())) {
+        debugLogger.warn("qdrant health check failed");
+        this.ready = false;
+      }
+    }, HEALTH_CHECK_INTERVAL_MS);
+  }
+
+  _stopHealthCheck() {
+    if (this.healthCheckInterval) {
+      clearInterval(this.healthCheckInterval);
+      this.healthCheckInterval = null;
+    }
+  }
+
+  async stop() {
+    this._stopHealthCheck();
+
+    if (!this.process) {
+      this.ready = false;
+      return;
+    }
+
+    debugLogger.debug("Stopping qdrant");
+
+    try {
+      await gracefulStopProcess(this.process);
+    } catch (error) {
+      debugLogger.error("Error stopping qdrant", { error: error.message });
+    }
+
+    this.process = null;
+    this.ready = false;
+    this.port = null;
+  }
+
+  isReady() {
+    return this.ready;
+  }
+
+  getPort() {
+    return this.port;
+  }
+
+  getStatus() {
+    return {
+      available: this.isAvailable(),
+      running: this.ready && this.process !== null,
+      port: this.port,
+    };
+  }
+}
+
+module.exports = QdrantManager;
diff --git a/src/helpers/vectorIndex.js b/src/helpers/vectorIndex.js
new file mode 100644
index 000000000..5cc85eb0b
--- /dev/null
+++ b/src/helpers/vectorIndex.js
@@ -0,0 +1,209 @@
+const { QdrantClient } = require("@qdrant/js-client-rest");
+const localEmbeddings = require("./localEmbeddings");
+const { LocalEmbeddings } = localEmbeddings;
+const debugLogger = require("./debugLogger");
+const { chunkConversation } = require("./conversationChunker");
+
+class VectorIndex {
+  constructor() {
+    this.client = null;
+    this.collectionName = "notes";
+    this.conversationChunksCollection = "conversation_chunks";
+  }
+
+  init(port) {
+    this.client = new QdrantClient({ host: "127.0.0.1", port });
+  }
+
+  async ensureCollection() {
+    if (!this.client) return;
+    try {
+      await this.client.getCollection(this.collectionName);
+    } catch {
+      try {
+        await this.client.createCollection(this.collectionName, {
+          vectors: { size: 384, distance: "Cosine" },
+        });
+      } catch (err) {
+        debugLogger.error("Failed to create Qdrant collection", { error: err.message });
+      }
+    }
+  }
+
+  async upsertNote(noteId, text) {
+    if (!this.client) return;
+    try {
+      const vector = await localEmbeddings.embedText(text);
+      await this.client.upsert(this.collectionName, {
+        points: [{ id: noteId, vector: Array.from(vector), payload: {} }],
+      });
+    } catch (err) {
+      debugLogger.debug("Vector index upsert failed", { noteId, error: err.message });
+    }
+  }
+
+  async deleteNote(noteId) {
+    if (!this.client) return;
+    try {
+      await this.client.delete(this.collectionName, { points: [noteId] });
+    } catch (err) {
+      debugLogger.debug("Vector index delete failed", { noteId, error: err.message });
+    }
+  }
+
+  async search(queryText, limit = 5) {
+    if (!this.client) return [];
+    try {
+      const vector = await localEmbeddings.embedText(queryText);
+      const results = await this.client.search(this.collectionName, {
+        vector: Array.from(vector),
+        limit,
+      });
+      return results.map((r) => ({ noteId: r.id, score: r.score }));
+    } catch (err) {
+      debugLogger.debug("Vector search failed", { error: err.message });
+      return [];
+    }
+  }
+
+  async reindexAll(notes, onProgress) {
+    if (!this.client) return;
+    const BATCH_SIZE = 50;
+    for (let i = 0; i < notes.length; i += BATCH_SIZE) {
+      const batch = notes.slice(i, i + BATCH_SIZE);
+      const texts = batch.map((n) =>
+        LocalEmbeddings.noteEmbedText(n.title, n.content, n.enhanced_content)
+      );
+      try {
+        const vectors = await localEmbeddings.embedTexts(texts);
+        const points = batch.map((n, j) => ({
+          id: n.id,
+          vector: Array.from(vectors[j]),
+          payload: {},
+        }));
+        await this.client.upsert(this.collectionName, { points });
+      } catch (err) {
+        debugLogger.debug("Vector reindex batch failed", { offset: i, error: err.message });
+      }
+      if (onProgress) onProgress(Math.min(i + BATCH_SIZE, notes.length), notes.length);
+    }
+  }
+
+  async ensureConversationChunksCollection() {
+    if (!this.client) return;
+    try {
+      await this.client.getCollection(this.conversationChunksCollection);
+    } catch {
+      try {
+        await this.client.createCollection(this.conversationChunksCollection, {
+          vectors: { size: 384, distance: "Cosine" },
+        });
+      } catch (err) {
+        debugLogger.error("Failed to create conversation_chunks collection", {
+          error: err.message,
+        });
+      }
+    }
+  }
+
+  async upsertConversationChunks(conversationId, title, messages) {
+    if (!this.client) return;
+    try {
+      await this.deleteConversationChunks(conversationId);
+      const chunks = chunkConversation(title, messages);
+      if (chunks.length === 0) return;
+
+      const texts = chunks.map((c) => c.text);
+      const vectors = await localEmbeddings.embedTexts(texts);
+      const points = chunks.map((c, i) => ({
+        id: conversationId * 1000 + c.chunkIndex,
+        vector: Array.from(vectors[i]),
+        payload: { conversation_id: conversationId, chunk_index: c.chunkIndex },
+      }));
+      await this.client.upsert(this.conversationChunksCollection, { points });
+    } catch (err) {
+      debugLogger.debug("Conversation chunks upsert failed", {
+        conversationId,
+        error: err.message,
+      });
+    }
+  }
+
+  async deleteConversationChunks(conversationId) {
+    if (!this.client) return;
+    try {
+      await this.client.delete(this.conversationChunksCollection, {
+        filter: { must: [{ key: "conversation_id", match: { value: conversationId } }] },
+      });
+    } catch (err) {
+      debugLogger.debug("Conversation chunks delete failed", {
+        conversationId,
+        error: err.message,
+      });
+    }
+  }
+
+  async searchConversations(queryText, limit = 10) {
+    if (!this.client) return [];
+    try {
+      const vector = await localEmbeddings.embedText(queryText);
+      const results = await this.client.search(this.conversationChunksCollection, {
+        vector: Array.from(vector),
+        limit: limit * 3,
+      });
+
+      const bestByConversation = new Map();
+      for (const r of results) {
+        if (r.score < 0.3) continue;
+        const convId = r.payload.conversation_id;
+        if (!bestByConversation.has(convId) || r.score > bestByConversation.get(convId)) {
+          bestByConversation.set(convId, r.score);
+        }
+      }
+
+      return [...bestByConversation.entries()]
+        .sort((a, b) => b[1] - a[1])
+        .slice(0, limit)
+        .map(([conversationId, score]) => ({ conversationId, score }));
+    } catch (err) {
+      debugLogger.debug("Conversation search failed", { error: err.message });
+      return [];
+    }
+  }
+
+  async reindexAllConversations(conversations, onProgress) {
+    if (!this.client) return;
+    const BATCH_SIZE = 50;
+    for (let i = 0; i < conversations.length; i += BATCH_SIZE) {
+      const batch = conversations.slice(i, i + BATCH_SIZE);
+      for (const conv of batch) {
+        try {
+          const chunks = chunkConversation(conv.title, conv.messages);
+          if (chunks.length === 0) continue;
+
+          const texts = chunks.map((c) => c.text);
+          const vectors = await localEmbeddings.embedTexts(texts);
+          const points = chunks.map((c, j) => ({
+            id: conv.id * 1000 + c.chunkIndex,
+            vector: Array.from(vectors[j]),
+            payload: { conversation_id: conv.id, chunk_index: c.chunkIndex },
+          }));
+          await this.client.upsert(this.conversationChunksCollection, { points });
+        } catch (err) {
+          debugLogger.debug("Conversation reindex failed", {
+            conversationId: conv.id,
+            error: err.message,
+          });
+        }
+      }
+      if (onProgress)
+        onProgress(Math.min(i + BATCH_SIZE, conversations.length), conversations.length);
+    }
+  }
+
+  isReady() {
+    return this.client !== null;
+  }
+}
+
+module.exports = new VectorIndex();
diff --git a/src/helpers/windowManager.js b/src/helpers/windowManager.js
index 4803f0ef2..0d41c758f 100644
--- a/src/helpers/windowManager.js
+++ b/src/helpers/windowManager.js
@@ -92,7 +92,7 @@ class WindowManager {
     await this.loadMainWindow();
     await this.initializeHotkey();
     this.dragManager.setTargetWindow(this.mainWindow);
-    MenuManager.setupMainMenu();
+    MenuManager.setupMainMenu(() => this.openSettings());
   }
 
   setMainWindowInteractivity(shouldCapture) {
@@ -599,7 +599,7 @@ class WindowManager {
       this.controlPanelWindow = null;
     });
 
-    MenuManager.setupControlPanelMenu(this.controlPanelWindow);
+    MenuManager.setupControlPanelMenu(this.controlPanelWindow, () => this.openSettings());
 
     this.controlPanelWindow.webContents.on("did-finish-load", () => {
       clearVisibilityTimer();
@@ -989,6 +989,8 @@ class WindowManager {
 
     WindowPositionUtil.setupAlwaysOnTop(this.notificationWindow);
 
+    this._pendingNotificationData = promptData;
+
     if (process.env.NODE_ENV === "development") {
       await DevServerManager.waitForDevServer();
       await this.notificationWindow.loadURL(
@@ -1001,8 +1003,6 @@ class WindowManager {
       });
     }
 
-    this._pendingNotificationData = promptData;
-
     this._notificationReadyFallback = setTimeout(() => {
       this._notificationReadyFallback = null;
       if (this.notificationWindow && !this.notificationWindow.isDestroyed()) {
@@ -1173,10 +1173,10 @@ class WindowManager {
   }
 
   refreshLocalizedUi() {
-    MenuManager.setupMainMenu();
+    MenuManager.setupMainMenu(() => this.openSettings());
 
     if (this.controlPanelWindow && !this.controlPanelWindow.isDestroyed()) {
-      MenuManager.setupControlPanelMenu(this.controlPanelWindow);
+      MenuManager.setupControlPanelMenu(this.controlPanelWindow, () => this.openSettings());
       this.controlPanelWindow.setTitle(i18nMain.t("window.controlPanelTitle"));
     }
 
@@ -1189,6 +1189,13 @@ class WindowManager {
     }
   }
 
+  async openSettings() {
+    await this.createControlPanelWindow();
+    if (this.controlPanelWindow && !this.controlPanelWindow.isDestroyed()) {
+      this.controlPanelWindow.webContents.send("show-settings");
+    }
+  }
+
   showLoadFailureDialog(windowName, errorCode, errorDescription, validatedURL) {
     if (this.loadErrorShown) {
       return;
diff --git a/src/hooks/useEmbeddedChat.ts b/src/hooks/useEmbeddedChat.ts
new file mode 100644
index 000000000..065070e2b
--- /dev/null
+++ b/src/hooks/useEmbeddedChat.ts
@@ -0,0 +1,92 @@
+import { useState, useCallback, useEffect, useRef } from "react";
+import { useChatPersistence } from "../components/chat/useChatPersistence";
+import { useChatStreaming } from "../components/chat/useChatStreaming";
+import type { Message, AgentState } from "../components/chat/types";
+
+interface UseEmbeddedChatOptions {
+  noteId: number | null;
+  noteTitle: string;
+  noteContent: string;
+  noteTranscript?: string;
+}
+
+interface UseEmbeddedChatReturn {
+  messages: Message[];
+  agentState: AgentState;
+  sendMessage: (text: string) => Promise<void>;
+  cancelStream: () => void;
+}
+
+export function useEmbeddedChat({
+  noteId,
+  noteTitle,
+  noteContent,
+  noteTranscript,
+}: UseEmbeddedChatOptions): UseEmbeddedChatReturn {
+  const [conversationId, setConversationId] = useState<number | null>(null);
+  const noteIdRef = useRef(noteId);
+
+  const persistence = useChatPersistence({
+    conversationId,
+    onConversationCreated: (id) => {
+      setConversationId(id);
+    },
+  });
+
+  const noteContextRef = useRef("");
+  noteContextRef.current = [
+    `Title: ${noteTitle}`,
+    `Content:\n${noteContent}`,
+    noteTranscript ? `\nTranscript:\n${noteTranscript}` : "",
+  ]
+    .filter(Boolean)
+    .join("\n");
+
+  const streaming = useChatStreaming({
+    messages: persistence.messages,
+    setMessages: persistence.setMessages,
+    noteContext: noteContextRef.current,
+    onStreamComplete: (_id, content, toolCalls) => {
+      persistence.saveAssistantMessage(content, toolCalls);
+    },
+  });
+
+  // Reset chat when noteId changes
+  useEffect(() => {
+    if (noteId !== noteIdRef.current) {
+      noteIdRef.current = noteId;
+      persistence.handleNewChat();
+      setConversationId(null);
+    }
+  }, [noteId, persistence]);
+
+  const sendMessage = useCallback(
+    async (text: string) => {
+      let convId = conversationId;
+      if (!convId) {
+        const title = `Note: ${noteTitle || "Untitled"}`;
+        convId = await persistence.createConversation(title);
+      }
+
+      const userMsg: Message = {
+        id: crypto.randomUUID(),
+        role: "user",
+        content: text,
+        isStreaming: false,
+      };
+      persistence.setMessages((prev) => [...prev, userMsg]);
+      await persistence.saveUserMessage(text);
+
+      const allMessages = [...persistence.messages, userMsg];
+      await streaming.sendToAI(text, allMessages);
+    },
+    [conversationId, noteTitle, persistence, streaming]
+  );
+
+  return {
+    messages: persistence.messages,
+    agentState: streaming.agentState,
+    sendMessage,
+    cancelStream: streaming.cancelStream,
+  };
+}
diff --git a/src/hooks/useFolderManagement.ts b/src/hooks/useFolderManagement.ts
index b9bdf2a3f..fa3fe6858 100644
--- a/src/hooks/useFolderManagement.ts
+++ b/src/hooks/useFolderManagement.ts
@@ -116,14 +116,23 @@ export function useFolderManagement(): UseFolderManagementReturn {
   // Re-initialize notes when active folder changes
   useEffect(() => {
     if (!activeFolderId || isLoading) return;
-    // Skip if folder hasn't changed (e.g., initial load completing)
     if (prevFolderIdRef.current === activeFolderId) return;
     prevFolderIdRef.current = activeFolderId;
+    setActiveNoteId(null);
     const loadForFolder = async () => {
-      const notes = await initializeNotes(null, 50, activeFolderId);
-      const presetNoteId = getActiveNoteIdValue();
-      if (!presetNoteId || !notes.some((n) => n.id === presetNoteId)) {
-        setActiveNoteId(notes.length > 0 ? notes[0].id : null);
+      try {
+        const notes = await initializeNotes(null, 50, activeFolderId);
+        if (getActiveFolderIdValue() !== activeFolderId) return;
+        const presetNoteId = getActiveNoteIdValue();
+        if (!presetNoteId || !notes.some((n) => n.id === presetNoteId)) {
+          setActiveNoteId(notes.length > 0 ? notes[0].id : null);
+        }
+      } catch (err) {
+        logger.warn(
+          "Failed to load notes for folder",
+          { folderId: activeFolderId, error: (err as Error).message },
+          "notes"
+        );
       }
     };
     loadForFolder();
@@ -192,11 +201,11 @@ export function useFolderManagement(): UseFolderManagementReturn {
     async (folderId: number) => {
       const result = await window.electronAPI.deleteFolder(folderId);
       if (result.success) {
-        const personalFolder = findDefaultFolder(folders);
-        if (activeFolderId === folderId && personalFolder) {
-          setActiveFolderId(personalFolder.id);
+        const items = await loadFolders();
+        if (getActiveFolderIdValue() === folderId) {
+          const personalFolder = findDefaultFolder(items);
+          if (personalFolder) setActiveFolderId(personalFolder.id);
         }
-        await loadFolders();
       } else if (result.error) {
         toast({
           title: t("notes.folders.couldNotDelete"),
@@ -205,7 +214,7 @@ export function useFolderManagement(): UseFolderManagementReturn {
         });
       }
     },
-    [folders, activeFolderId, loadFolders, toast, t]
+    [loadFolders, toast, t]
   );
 
   return {
diff --git a/src/hooks/useMeetingTranscription.ts b/src/hooks/useMeetingTranscription.ts
index 36e7a0090..719e3466b 100644
--- a/src/hooks/useMeetingTranscription.ts
+++ b/src/hooks/useMeetingTranscription.ts
@@ -29,7 +29,27 @@ const MEETING_STOP_FLUSH_TIMEOUT_MS = 50;
 const REALTIME_MODELS = new Set(["gpt-4o-mini-transcribe", "gpt-4o-transcribe"]);
 
 const getMeetingTranscriptionOptions = () => {
-  const { cloudTranscriptionMode, cloudTranscriptionModel, openaiApiKey } = getSettings();
+  const {
+    useLocalWhisper,
+    localTranscriptionProvider,
+    whisperModel,
+    parakeetModel,
+    cloudTranscriptionMode,
+    cloudTranscriptionModel,
+    openaiApiKey,
+  } = getSettings();
+
+  if (useLocalWhisper) {
+    return {
+      provider: "local" as const,
+      localProvider: localTranscriptionProvider,
+      localModel:
+        localTranscriptionProvider === "nvidia"
+          ? parakeetModel || "parakeet-tdt-0.6b-v3"
+          : whisperModel || "base",
+    };
+  }
+
   const model = REALTIME_MODELS.has(cloudTranscriptionModel)
     ? cloudTranscriptionModel
     : "gpt-4o-mini-transcribe";
@@ -90,7 +110,7 @@ registerProcessor("meeting-pcm-processor", MeetingPCMProcessor);
 const getMeetingMicConstraints = async (): Promise<MediaStreamConstraints> => {
   const { preferBuiltInMic, selectedMicDeviceId } = getSettings();
   const micProcessing = {
-    echoCancellation: false,
+    echoCancellation: true,
     noiseSuppression: false,
     autoGainControl: false,
   };
diff --git a/src/hooks/useSettings.ts b/src/hooks/useSettings.ts
index 7c563be18..fe3968bdf 100644
--- a/src/hooks/useSettings.ts
+++ b/src/hooks/useSettings.ts
@@ -243,6 +243,10 @@ function useSettingsInternal() {
     setAutoLearnCorrections,
     keepTranscriptionInClipboard: store.keepTranscriptionInClipboard,
     setKeepTranscriptionInClipboard: store.setKeepTranscriptionInClipboard,
+    noteFilesEnabled: store.noteFilesEnabled,
+    setNoteFilesEnabled: store.setNoteFilesEnabled,
+    noteFilesPath: store.noteFilesPath,
+    setNoteFilesPath: store.setNoteFilesPath,
     cloudBackupEnabled: store.cloudBackupEnabled,
     setCloudBackupEnabled: store.setCloudBackupEnabled,
     telemetryEnabled: store.telemetryEnabled,
diff --git a/src/index.css b/src/index.css
index 64d5ca038..84a4c58a3 100644
--- a/src/index.css
+++ b/src/index.css
@@ -241,8 +241,8 @@ a svg:hover,
 }
 
 /* Premium input styling with subtle depth */
-input,
-textarea {
+input:not(.input-inline),
+textarea:not(.input-inline) {
   border-radius: var(--radius);
   transition:
     background-color 0.2s ease,
@@ -253,34 +253,32 @@ textarea {
   box-shadow: inset 0 1px 2px oklch(from var(--color-foreground) l c h / 0.06);
 }
 
-/* Light mode inputs - embossed parchment */
-:root input,
-:root textarea {
-  background-color: var(--color-parchment-bg);
-  border: 1px solid var(--color-parchment-border);
-  color: var(--color-parchment-text);
+/* Light mode inputs */
+:root input:not(.input-inline),
+:root textarea:not(.input-inline) {
+  background-color: var(--color-background);
+  border: 1px solid var(--color-border);
+  color: var(--color-foreground);
 }
 
-:root input:focus,
-:root textarea:focus {
-  border-color: var(--color-parchment-accent);
-  box-shadow:
-    0 0 0 2px oklch(from var(--color-parchment-accent) l c h / 0.2),
-    inset 0 1px 3px oklch(from var(--color-parchment-text) l c h / var(--opacity-subtle));
+:root input:not(.input-inline):focus,
+:root textarea:not(.input-inline):focus {
+  border-color: var(--color-border-active);
+  box-shadow: 0 0 0 2px oklch(from var(--color-ring) l c h / 0.15);
   background-color: var(--color-background);
 }
 
 /* Dark mode inputs — flat, no embossed shadow */
-.dark input,
-.dark textarea {
+.dark input:not(.input-inline),
+.dark textarea:not(.input-inline) {
   background-color: var(--color-input);
   border: 1px solid var(--color-border);
   color: var(--color-foreground);
   box-shadow: none;
 }
 
-.dark input:focus,
-.dark textarea:focus {
+.dark input:not(.input-inline):focus,
+.dark textarea:not(.input-inline):focus {
   border-color: var(--color-border-active);
   box-shadow: 0 0 0 2px oklch(from var(--color-ring) l c h / 0.15);
 }
@@ -819,12 +817,51 @@ body:has(.agent-overlay-window) #root {
 
 @keyframes agent-cursor-blink {
   0%,
+  100% {
+    opacity: 0.2;
+  }
   50% {
     opacity: 1;
   }
-  51%,
+}
+
+@keyframes tool-step-shimmer {
+  0% {
+    background: linear-gradient(
+      90deg,
+      transparent 0%,
+      oklch(0.65 0.2 260 / 0.04) 50%,
+      transparent 100%
+    );
+    background-position: -100% 0;
+    background-size: 200% 100%;
+  }
   100% {
+    background-position: 100% 0;
+    background-size: 200% 100%;
+  }
+}
+
+@keyframes tool-check-pop {
+  0% {
     opacity: 0;
+    transform: scale(0);
+  }
+  70% {
+    transform: scale(1.3);
+  }
+  100% {
+    opacity: 1;
+    transform: scale(1);
+  }
+}
+
+@keyframes tool-status-sweep {
+  0% {
+    background-position: -200% 0;
+  }
+  100% {
+    background-position: 200% 0;
   }
 }
 
@@ -840,6 +877,30 @@ body:has(.agent-overlay-window) #root {
   }
 }
 
+@keyframes thinking-shimmer {
+  0% {
+    background-position: 200% 0;
+  }
+  100% {
+    background-position: -200% 0;
+  }
+}
+
+.thinking-shimmer-text {
+  background: linear-gradient(
+    90deg,
+    oklch(0.65 0.01 260) 0%,
+    oklch(0.85 0.02 240) 40%,
+    oklch(0.65 0.01 260) 60%,
+    oklch(0.78 0.015 250) 100%
+  );
+  background-size: 200% 100%;
+  animation: thinking-shimmer 2s ease-in-out infinite;
+  -webkit-background-clip: text;
+  background-clip: text;
+  -webkit-text-fill-color: transparent;
+}
+
 @keyframes agent-loading-dot {
   0%,
   80%,
diff --git a/src/locales/de/translation.json b/src/locales/de/translation.json
index 2305555eb..424a26834 100644
--- a/src/locales/de/translation.json
+++ b/src/locales/de/translation.json
@@ -7,6 +7,14 @@
       "uiDescription": "Wählen Sie die Sprache für die OpenWhispr-Oberfläche",
       "transcriptionLabel": "Transkriptionssprache",
       "transcriptionDescription": "Wählen Sie die Sprache, die Sie sprechen, für genauere Transkription"
+    },
+    "noteFiles": {
+      "title": "Notizen als Dateien speichern",
+      "description": "Notizen automatisch als .md-Dateien auf der Festplatte speichern, nach Ordner sortiert",
+      "path": "Speicherort",
+      "changePath": "Speicherort ändern",
+      "rebuild": "Alle Dateien neu erstellen",
+      "rebuildDescription": "Alle Notizen erneut auf die Festplatte synchronisieren"
     }
   },
   "tray": {
@@ -22,6 +30,7 @@
     "appLabel": "OpenWhispr",
     "quit": "OpenWhispr beenden",
     "speech": "Sprache",
+    "settings": "Einstellungen …",
     "help": "Hilfe",
     "learnMore": "Mehr erfahren",
     "file": "Datei",
@@ -935,15 +944,15 @@
           "period": "für immer",
           "features": [
             "## OpenWhispr Cloud",
-            "2,000 words/week transcription",
-            "5 hours of meeting recordings/month",
-            "## Always free",
-            "Unlimited local AI models",
-            "Unlimited cloud transcription with your own API keys",
-            "100+ languages supported",
-            "Custom dictionary",
-            "Zero data retention",
-            "Community support"
+            "2.000 Wörter/Woche Transkription",
+            "5 Stunden Meeting-Aufnahmen/Monat",
+            "## Immer kostenlos",
+            "Unbegrenzte lokale KI-Modelle",
+            "Unbegrenzte Cloud-Transkription mit eigenen API-Schlüsseln",
+            "Über 100 Sprachen unterstützt",
+            "Benutzerdefiniertes Wörterbuch",
+            "Keine Datenspeicherung",
+            "Community-Support"
           ]
         },
         "pro": {
@@ -955,10 +964,10 @@
           "annualEquivalent": "$6.67",
           "includesPrefix": "Alle Free-Funktionen +",
           "features": [
-            "Unlimited cloud transcription",
-            "20 hours of meeting recordings/month",
-            "Mobile app (iOS Coming Soon)",
-            "Email support"
+            "Unbegrenzte Cloud-Transkription",
+            "20 Stunden Meeting-Aufnahmen/Monat",
+            "Mobile App (iOS demnächst verfügbar)",
+            "E-Mail-Support"
           ],
           "cta": "Jetzt starten",
           "switchToAnnual": "Zum Jahresabo wechseln"
@@ -973,10 +982,10 @@
           "includesPrefix": "Alle Pro-Funktionen +",
           "badge": "Beliebteste Wahl",
           "features": [
-            "Unlimited meeting recordings",
-            "Agent mode",
-            "Chat over your data (Coming Soon)",
-            "Priority support"
+            "Unbegrenzte Meeting-Aufnahmen",
+            "Agentenmodus",
+            "Chat über Ihre Daten (demnächst verfügbar)",
+            "Prioritäts-Support"
           ],
           "cta": "Jetzt starten",
           "switchToAnnual": "Zum Jahresabo wechseln"
@@ -984,16 +993,16 @@
         "enterprise": {
           "name": "Enterprise",
           "price": "Individuell",
-          "subtitle": "For advanced security & support",
+          "subtitle": "Für erweiterte Sicherheit & Support",
           "includesPrefix": "Alle Business-Funktionen +",
           "features": [
-            "Managed API credits",
-            "Cloud sync across devices",
-            "Team features & admin",
-            "SSO & compliance",
-            "Dedicated support"
+            "Verwaltete API-Guthaben",
+            "Cloud-Synchronisierung über Geräte hinweg",
+            "Team-Funktionen & Verwaltung",
+            "SSO & Compliance",
+            "Dedizierter Support"
           ],
-          "cta": "Contact Sales"
+          "cta": "Vertrieb kontaktieren"
         },
         "currentPlan": "Aktueller Tarif",
         "upgrade": "Upgrade",
@@ -1542,6 +1551,11 @@
     }
   },
   "notes": {
+    "sidebar": {
+      "newNote": "Neue Notiz",
+      "searchNotes": "Notizen suchen",
+      "actions": "Aktionen"
+    },
     "folders": {
       "title": "Ordner",
       "soon": "Demnächst",
@@ -1572,13 +1586,15 @@
       "raw": "Roh",
       "enhanced": "Verbessert",
       "saving": "Wird gespeichert",
-      "wordsCount": "{{count}} Wörter",
       "startWriting": "Schreibe los...",
       "staleIndicator": "Der Inhalt hat sich seit der Verbesserung geändert",
       "live": "Live",
       "transcript": "Transkript",
       "notes": "Notizen",
-      "conversationWillAppear": "Gespräch wird hier angezeigt..."
+      "conversationWillAppear": "Gespräch wird hier angezeigt...",
+      "linkedEvent": "Verknüpftes Ereignis",
+      "noFolder": "Kein Ordner",
+      "participants": "Teilnehmer"
     },
     "upload": {
       "title": "Audio hochladen",
@@ -1636,7 +1652,8 @@
       "rename": "Umbenennen",
       "searchFolders": "Ordner suchen...",
       "noResults": "Keine Ordner gefunden",
-      "newFolder": "Neuer Ordner"
+      "newFolder": "Neuer Ordner",
+      "showInFileManager": "Im {{manager}} anzeigen"
     },
     "actions": {
       "manage": "Aktionen verwalten...",
@@ -1651,6 +1668,9 @@
       "update": "Aktualisieren",
       "cancel": "Abbrechen",
       "noActions": "Noch keine benutzerdefinierten Aktionen",
+      "promptLabel": "Anweisung",
+      "emptyEditorTitle": "Aktion auswählen",
+      "emptyEditorDescription": "Wählen Sie eine Aktion aus der Liste oder erstellen Sie eine neue",
       "runAction": "{{name}} ausführen",
       "selectAction": "Aktion auswählen",
       "done": "Fertig",
@@ -1745,7 +1765,30 @@
     "learnMore": "Mehr erfahren",
     "integrations": "Integrationen",
     "defaultUser": "Benutzer",
-    "notSignedIn": "Nicht angemeldet"
+    "notSignedIn": "Nicht angemeldet",
+    "chat": "Chat"
+  },
+  "chat": {
+    "newChat": "Neuer Chat",
+    "search": "Unterhaltungen suchen...",
+    "archived": "Archiviert",
+    "noConversations": "Starten Sie Ihre erste Unterhaltung",
+    "selectChat": "Wählen Sie eine Unterhaltung oder starten Sie eine neue",
+    "noResults": "Keine passenden Unterhaltungen",
+    "today": "Heute",
+    "yesterday": "Gestern",
+    "previousWeek": "Letzte 7 Tage",
+    "older": "Älter",
+    "archive": "Archivieren",
+    "unarchive": "Dearchivieren",
+    "delete": "Löschen",
+    "deleteConfirm": "Diese Unterhaltung wird dauerhaft gelöscht. Dies kann nicht rückgängig gemacht werden.",
+    "editTitle": "Doppelklick zum Bearbeiten des Titels",
+    "untitled": "Ohne Titel",
+    "searchChats": "Chats suchen",
+    "searchTitle": "Unterhaltungen suchen",
+    "searchDescription": "In allen Unterhaltungen suchen",
+    "newChatEmpty": "Fragen Sie zu Ihren Notizen, Transkripten oder anderem"
   },
   "usage": {
     "approachingLimit": "Wochenlimit fast erreicht",
@@ -1858,6 +1901,7 @@
       "copyToClipboard": "In Zwischenablage kopieren",
       "copied": "Kopiert!",
       "emptyState": "{{hotkey}} gedrückt halten, um eine Unterhaltung zu starten",
+      "orType": "oder eine Nachricht eingeben",
       "errorPrefix": "Fehler"
     },
     "titleBar": {
@@ -1870,7 +1914,30 @@
       "toClose": "schließen",
       "listening": "Hört zu...",
       "transcribing": "Transkribiert...",
-      "thinking": "Denkt nach..."
+      "thinking": "Denkt nach...",
+      "typeMessage": "Nachricht eingeben...",
+      "send": "Senden"
+    },
+    "tools": {
+      "search_notesStatus": "Notizen werden durchsucht...",
+      "web_searchStatus": "Websuche...",
+      "copy_to_clipboardStatus": "In Zwischenablage kopieren...",
+      "get_calendar_eventsStatus": "Kalender wird geprüft...",
+      "get_noteStatus": "Notiz wird gelesen...",
+      "create_noteStatus": "Notiz wird erstellt...",
+      "update_noteStatus": "Notiz wird aktualisiert...",
+      "copiedToClipboard": "In die Zwischenablage kopiert",
+      "foundNotes": "{{count}} Notiz gefunden",
+      "foundNotes_plural": "{{count}} Notizen gefunden",
+      "searchResults": "{{count}} Ergebnis gefunden",
+      "searchResults_plural": "{{count}} Ergebnisse gefunden",
+      "openNote": "Notiz öffnen",
+      "calendarEvents": "{{count}} Termin gefunden",
+      "calendarEvents_plural": "{{count}} Termine gefunden",
+      "noResults": "Keine Ergebnisse",
+      "error": "Werkzeugfehler",
+      "unknownTool": "Unbekanntes Werkzeug: {{name}}",
+      "invalidArgs": "Ungültige Tool-Argumente für {{name}}"
     }
   },
   "integrations": {
@@ -2011,5 +2078,14 @@
     "title": "Berechtigungen erforderlich",
     "description": "OpenWhispr benötigt einige Berechtigungen, um auf diesem Computer zu funktionieren.",
     "continue": "Weiter"
+  },
+  "embeddedChat": {
+    "askPlaceholder": "Frag etwas...",
+    "send": "Senden",
+    "title": "Chat",
+    "emptyState": "Stelle eine Frage zu dieser Notiz",
+    "dock": "In Seitenleiste andocken",
+    "undock": "Von Seitenleiste abdocken",
+    "close": "Chat schließen"
   }
 }
diff --git a/src/locales/en/translation.json b/src/locales/en/translation.json
index 6ef06337e..17e436cf6 100644
--- a/src/locales/en/translation.json
+++ b/src/locales/en/translation.json
@@ -7,6 +7,14 @@
       "uiDescription": "Choose the language used throughout OpenWhispr's interface",
       "transcriptionLabel": "Transcription language",
       "transcriptionDescription": "Choose the language you speak for more accurate transcription"
+    },
+    "noteFiles": {
+      "title": "Save notes as files",
+      "description": "Automatically save notes as .md files on disk, organized by folder",
+      "path": "Save location",
+      "changePath": "Change location",
+      "rebuild": "Rebuild all files",
+      "rebuildDescription": "Re-sync all notes to disk"
     }
   },
   "tray": {
@@ -22,6 +30,7 @@
     "appLabel": "OpenWhispr",
     "quit": "Quit OpenWhispr",
     "speech": "Speech",
+    "settings": "Settings...",
     "help": "Help",
     "learnMore": "Learn More",
     "file": "File",
@@ -1533,7 +1542,30 @@
     "learnMore": "Learn more",
     "integrations": "Integrations",
     "defaultUser": "User",
-    "notSignedIn": "Not signed in"
+    "notSignedIn": "Not signed in",
+    "chat": "Chat"
+  },
+  "chat": {
+    "newChat": "New chat",
+    "search": "Search conversations...",
+    "archived": "Archived",
+    "noConversations": "Start your first conversation",
+    "selectChat": "Select a conversation or start a new one",
+    "noResults": "No matching conversations",
+    "today": "Today",
+    "yesterday": "Yesterday",
+    "previousWeek": "Previous 7 Days",
+    "older": "Older",
+    "archive": "Archive",
+    "unarchive": "Unarchive",
+    "delete": "Delete",
+    "deleteConfirm": "This conversation will be permanently deleted. This cannot be undone.",
+    "editTitle": "Double-click to edit title",
+    "untitled": "Untitled",
+    "searchChats": "Search chats",
+    "searchTitle": "Search conversations",
+    "searchDescription": "Search across all your conversations",
+    "newChatEmpty": "Ask about your notes, transcripts, or anything else"
   },
   "referral": {
     "title": "Refer and earn rewards",
@@ -1628,6 +1660,11 @@
     "upgradeUnlimited": "Upgrade to Pro — unlimited transcriptions"
   },
   "notes": {
+    "sidebar": {
+      "newNote": "New note",
+      "searchNotes": "Search notes",
+      "actions": "Actions"
+    },
     "folders": {
       "title": "Folders",
       "soon": "Soon",
@@ -1658,13 +1695,15 @@
       "raw": "Raw",
       "enhanced": "Enhanced",
       "saving": "Saving",
-      "wordsCount": "{{count}} words",
       "startWriting": "Start writing...",
       "staleIndicator": "Content has changed since enhancement",
       "live": "Live",
       "transcript": "Transcript",
       "notes": "Notes",
-      "conversationWillAppear": "Conversation will appear here..."
+      "conversationWillAppear": "Conversation will appear here...",
+      "linkedEvent": "Linked event",
+      "noFolder": "No folder",
+      "participants": "Participants"
     },
     "upload": {
       "title": "Upload Audio",
@@ -1738,7 +1777,8 @@
       "rename": "Rename",
       "searchFolders": "Search folders...",
       "noResults": "No folders found",
-      "newFolder": "New folder"
+      "newFolder": "New folder",
+      "showInFileManager": "Show in {{manager}}"
     },
     "actions": {
       "done": "Done",
@@ -1754,6 +1794,9 @@
       "update": "Update",
       "cancel": "Cancel",
       "noActions": "No custom actions yet",
+      "promptLabel": "Prompt",
+      "emptyEditorTitle": "Select an action",
+      "emptyEditorDescription": "Choose an action from the list or create a new one",
       "runAction": "Run {{name}}",
       "selectAction": "Select action",
       "builtin": {
@@ -1906,6 +1949,7 @@
       "copyToClipboard": "Copy to clipboard",
       "copied": "Copied!",
       "emptyState": "Hold {{hotkey}} to start a conversation",
+      "orType": "or type a message",
       "errorPrefix": "Error"
     },
     "titleBar": {
@@ -1918,7 +1962,30 @@
       "toClose": "close",
       "listening": "Listening...",
       "transcribing": "Transcribing...",
-      "thinking": "Thinking..."
+      "thinking": "Thinking...",
+      "typeMessage": "Type a message...",
+      "send": "Send"
+    },
+    "tools": {
+      "search_notesStatus": "Searching notes...",
+      "web_searchStatus": "Searching the web...",
+      "copy_to_clipboardStatus": "Copying to clipboard...",
+      "get_calendar_eventsStatus": "Checking calendar...",
+      "get_noteStatus": "Reading note...",
+      "create_noteStatus": "Creating note...",
+      "update_noteStatus": "Updating note...",
+      "copiedToClipboard": "Copied to your clipboard",
+      "foundNotes": "Found {{count}} note",
+      "foundNotes_plural": "Found {{count}} notes",
+      "searchResults": "Found {{count}} result",
+      "searchResults_plural": "Found {{count}} results",
+      "openNote": "Open note",
+      "calendarEvents": "Found {{count}} event",
+      "calendarEvents_plural": "Found {{count}} events",
+      "noResults": "No results found",
+      "error": "Tool error",
+      "unknownTool": "Unknown tool: {{name}}",
+      "invalidArgs": "Invalid tool arguments for {{name}}"
     }
   },
   "integrations": {
@@ -2011,5 +2078,14 @@
     "title": "Permissions Required",
     "description": "OpenWhispr needs a few permissions to work on this computer.",
     "continue": "Continue"
+  },
+  "embeddedChat": {
+    "askPlaceholder": "Ask anything...",
+    "send": "Send",
+    "title": "Chat",
+    "emptyState": "Ask a question about this note",
+    "dock": "Dock to sidebar",
+    "undock": "Undock from sidebar",
+    "close": "Close chat"
   }
 }
diff --git a/src/locales/es/translation.json b/src/locales/es/translation.json
index 6133e7e78..de34b7991 100644
--- a/src/locales/es/translation.json
+++ b/src/locales/es/translation.json
@@ -7,6 +7,14 @@
       "uiDescription": "Elige el idioma usado en la interfaz de OpenWhispr",
       "transcriptionLabel": "Idioma de transcripción",
       "transcriptionDescription": "Elige el idioma que hablas para mejorar la precisión"
+    },
+    "noteFiles": {
+      "title": "Guardar notas como archivos",
+      "description": "Guardar notas automáticamente como archivos .md en disco, organizadas por carpeta",
+      "path": "Ubicación de guardado",
+      "changePath": "Cambiar ubicación",
+      "rebuild": "Reconstruir todos los archivos",
+      "rebuildDescription": "Resincronizar todas las notas al disco"
     }
   },
   "tray": {
@@ -22,6 +30,7 @@
     "appLabel": "OpenWhispr",
     "quit": "Salir de OpenWhispr",
     "speech": "Voz",
+    "settings": "Configuración...",
     "help": "Ayuda",
     "learnMore": "Más información",
     "file": "Archivo",
@@ -935,15 +944,15 @@
           "period": "para siempre",
           "features": [
             "## OpenWhispr Cloud",
-            "2,000 words/week transcription",
-            "5 hours of meeting recordings/month",
-            "## Always free",
-            "Unlimited local AI models",
-            "Unlimited cloud transcription with your own API keys",
-            "100+ languages supported",
-            "Custom dictionary",
-            "Zero data retention",
-            "Community support"
+            "2.000 palabras/semana de transcripción",
+            "5 horas de grabaciones de reuniones/mes",
+            "## Siempre gratis",
+            "Modelos de IA locales ilimitados",
+            "Transcripción en la nube ilimitada con tus propias claves API",
+            "Más de 100 idiomas compatibles",
+            "Diccionario personalizado",
+            "Sin retención de datos",
+            "Soporte de la comunidad"
           ]
         },
         "pro": {
@@ -955,10 +964,10 @@
           "annualEquivalent": "$6.67",
           "includesPrefix": "Todas las funciones de Free +",
           "features": [
-            "Unlimited cloud transcription",
-            "20 hours of meeting recordings/month",
-            "Mobile app (iOS Coming Soon)",
-            "Email support"
+            "Transcripción en la nube ilimitada",
+            "20 horas de grabaciones de reuniones/mes",
+            "Aplicación móvil (iOS próximamente)",
+            "Soporte por correo electrónico"
           ],
           "cta": "Comenzar",
           "switchToAnnual": "Cambiar a Anual"
@@ -973,10 +982,10 @@
           "includesPrefix": "Todas las funciones de Pro +",
           "badge": "Más popular",
           "features": [
-            "Unlimited meeting recordings",
-            "Agent mode",
-            "Chat over your data (Coming Soon)",
-            "Priority support"
+            "Grabaciones de reuniones ilimitadas",
+            "Modo agente",
+            "Chatea sobre tus datos (próximamente)",
+            "Soporte prioritario"
           ],
           "cta": "Comenzar",
           "switchToAnnual": "Cambiar a Anual"
@@ -984,16 +993,16 @@
         "enterprise": {
           "name": "Enterprise",
           "price": "Personalizado",
-          "subtitle": "For advanced security & support",
+          "subtitle": "Para seguridad avanzada y soporte",
           "includesPrefix": "Todas las funciones de Business +",
           "features": [
-            "Managed API credits",
-            "Cloud sync across devices",
-            "Team features & admin",
-            "SSO & compliance",
-            "Dedicated support"
+            "Créditos API gestionados",
+            "Sincronización en la nube entre dispositivos",
+            "Funciones de equipo y administración",
+            "SSO y cumplimiento normativo",
+            "Soporte dedicado"
           ],
-          "cta": "Contact Sales"
+          "cta": "Contactar a ventas"
         },
         "currentPlan": "Plan actual",
         "upgrade": "Mejorar plan",
@@ -1542,6 +1551,11 @@
     }
   },
   "notes": {
+    "sidebar": {
+      "newNote": "Nueva nota",
+      "searchNotes": "Buscar notas",
+      "actions": "Acciones"
+    },
     "folders": {
       "title": "Carpetas",
       "soon": "Próximamente",
@@ -1572,13 +1586,15 @@
       "raw": "Sin procesar",
       "enhanced": "Mejorado",
       "saving": "Guardando",
-      "wordsCount": "{{count}} palabras",
       "startWriting": "Comienza a escribir...",
       "staleIndicator": "El contenido ha cambiado desde la mejora",
       "live": "En vivo",
       "transcript": "Transcripción",
       "notes": "Notas",
-      "conversationWillAppear": "La conversación aparecerá aquí..."
+      "conversationWillAppear": "La conversación aparecerá aquí...",
+      "linkedEvent": "Evento vinculado",
+      "noFolder": "Sin carpeta",
+      "participants": "Participantes"
     },
     "upload": {
       "title": "Subir audio",
@@ -1636,7 +1652,8 @@
       "rename": "Renombrar",
       "searchFolders": "Buscar carpetas...",
       "noResults": "No se encontraron carpetas",
-      "newFolder": "Nueva carpeta"
+      "newFolder": "Nueva carpeta",
+      "showInFileManager": "Mostrar en {{manager}}"
     },
     "actions": {
       "manage": "Gestionar acciones...",
@@ -1651,6 +1668,9 @@
       "update": "Actualizar",
       "cancel": "Cancelar",
       "noActions": "Aún no hay acciones personalizadas",
+      "promptLabel": "Instrucción",
+      "emptyEditorTitle": "Seleccionar acción",
+      "emptyEditorDescription": "Elige una acción de la lista o crea una nueva",
       "runAction": "Ejecutar {{name}}",
       "selectAction": "Seleccionar acción",
       "done": "Listo",
@@ -1745,7 +1765,30 @@
     "learnMore": "Más información",
     "integrations": "Integraciones",
     "defaultUser": "Usuario",
-    "notSignedIn": "Sin sesión iniciada"
+    "notSignedIn": "Sin sesión iniciada",
+    "chat": "Chat"
+  },
+  "chat": {
+    "newChat": "Nuevo chat",
+    "search": "Buscar conversaciones...",
+    "archived": "Archivadas",
+    "noConversations": "Inicia tu primera conversación",
+    "selectChat": "Selecciona una conversación o inicia una nueva",
+    "noResults": "Sin conversaciones coincidentes",
+    "today": "Hoy",
+    "yesterday": "Ayer",
+    "previousWeek": "Últimos 7 días",
+    "older": "Anteriores",
+    "archive": "Archivar",
+    "unarchive": "Desarchivar",
+    "delete": "Eliminar",
+    "deleteConfirm": "Esta conversación se eliminará permanentemente. No se puede deshacer.",
+    "editTitle": "Doble clic para editar el título",
+    "untitled": "Sin título",
+    "searchChats": "Buscar chats",
+    "searchTitle": "Buscar conversaciones",
+    "searchDescription": "Buscar en todas tus conversaciones",
+    "newChatEmpty": "Pregunta sobre tus notas, transcripciones o lo que quieras"
   },
   "usage": {
     "approachingLimit": "Cerca del límite semanal",
@@ -1858,6 +1901,7 @@
       "copyToClipboard": "Copiar al portapapeles",
       "copied": "¡Copiado!",
       "emptyState": "Mantén {{hotkey}} para iniciar una conversación",
+      "orType": "o escribe un mensaje",
       "errorPrefix": "Error"
     },
     "titleBar": {
@@ -1870,7 +1914,30 @@
       "toClose": "cerrar",
       "listening": "Escuchando...",
       "transcribing": "Transcribiendo...",
-      "thinking": "Pensando..."
+      "thinking": "Pensando...",
+      "typeMessage": "Escribe un mensaje...",
+      "send": "Enviar"
+    },
+    "tools": {
+      "search_notesStatus": "Buscando notas...",
+      "web_searchStatus": "Buscando en la web...",
+      "copy_to_clipboardStatus": "Copiando al portapapeles...",
+      "get_calendar_eventsStatus": "Consultando calendario...",
+      "get_noteStatus": "Leyendo nota...",
+      "create_noteStatus": "Creando nota...",
+      "update_noteStatus": "Actualizando nota...",
+      "copiedToClipboard": "Copiado al portapapeles",
+      "foundNotes": "{{count}} nota encontrada",
+      "foundNotes_plural": "{{count}} notas encontradas",
+      "searchResults": "{{count}} resultado encontrado",
+      "searchResults_plural": "{{count}} resultados encontrados",
+      "openNote": "Abrir nota",
+      "calendarEvents": "{{count}} evento encontrado",
+      "calendarEvents_plural": "{{count}} eventos encontrados",
+      "noResults": "Sin resultados",
+      "error": "Error de herramienta",
+      "unknownTool": "Herramienta desconocida: {{name}}",
+      "invalidArgs": "Argumentos de herramienta no válidos para {{name}}"
     }
   },
   "integrations": {
@@ -2011,5 +2078,14 @@
     "title": "Permisos necesarios",
     "description": "OpenWhispr necesita algunos permisos para funcionar en este ordenador.",
     "continue": "Continuar"
+  },
+  "embeddedChat": {
+    "askPlaceholder": "Pregunta algo...",
+    "send": "Enviar",
+    "title": "Chat",
+    "emptyState": "Haz una pregunta sobre esta nota",
+    "dock": "Anclar a la barra lateral",
+    "undock": "Desanclar de la barra lateral",
+    "close": "Cerrar chat"
   }
 }
diff --git a/src/locales/fr/translation.json b/src/locales/fr/translation.json
index cd4866457..4b7aea1fa 100644
--- a/src/locales/fr/translation.json
+++ b/src/locales/fr/translation.json
@@ -7,6 +7,14 @@
       "uiDescription": "Choisissez la langue utilisée dans l'interface OpenWhispr",
       "transcriptionLabel": "Langue de transcription",
       "transcriptionDescription": "Choisissez la langue que vous parlez pour une transcription plus précise"
+    },
+    "noteFiles": {
+      "title": "Enregistrer les notes en fichiers",
+      "description": "Enregistrer automatiquement les notes en fichiers .md sur le disque, organisées par dossier",
+      "path": "Emplacement de sauvegarde",
+      "changePath": "Changer l'emplacement",
+      "rebuild": "Reconstruire tous les fichiers",
+      "rebuildDescription": "Resynchroniser toutes les notes sur le disque"
     }
   },
   "tray": {
@@ -22,6 +30,7 @@
     "appLabel": "OpenWhispr",
     "quit": "Quitter OpenWhispr",
     "speech": "Parole",
+    "settings": "Réglages…",
     "help": "Aide",
     "learnMore": "En savoir plus",
     "file": "Fichier",
@@ -935,15 +944,15 @@
           "period": "pour toujours",
           "features": [
             "## OpenWhispr Cloud",
-            "2,000 words/week transcription",
-            "5 hours of meeting recordings/month",
-            "## Always free",
-            "Unlimited local AI models",
-            "Unlimited cloud transcription with your own API keys",
-            "100+ languages supported",
-            "Custom dictionary",
-            "Zero data retention",
-            "Community support"
+            "2 000 mots/semaine de transcription",
+            "5 heures d'enregistrements de réunions/mois",
+            "## Toujours gratuit",
+            "Modèles d'IA locaux illimités",
+            "Transcription cloud illimitée avec vos propres clés API",
+            "Plus de 100 langues prises en charge",
+            "Dictionnaire personnalisé",
+            "Aucune conservation de données",
+            "Support communautaire"
           ]
         },
         "pro": {
@@ -955,10 +964,10 @@
           "annualEquivalent": "$6.67",
           "includesPrefix": "Toutes les fonctionnalités Free +",
           "features": [
-            "Unlimited cloud transcription",
-            "20 hours of meeting recordings/month",
-            "Mobile app (iOS Coming Soon)",
-            "Email support"
+            "Transcription cloud illimitée",
+            "20 heures d'enregistrements de réunions/mois",
+            "Application mobile (iOS bientôt disponible)",
+            "Support par e-mail"
           ],
           "cta": "Commencer",
           "switchToAnnual": "Passer à l'annuel"
@@ -973,10 +982,10 @@
           "includesPrefix": "Toutes les fonctionnalités Pro +",
           "badge": "Le plus populaire",
           "features": [
-            "Unlimited meeting recordings",
-            "Agent mode",
-            "Chat over your data (Coming Soon)",
-            "Priority support"
+            "Enregistrements de réunions illimités",
+            "Mode agent",
+            "Discutez avec vos données (bientôt disponible)",
+            "Support prioritaire"
           ],
           "cta": "Commencer",
           "switchToAnnual": "Passer à l'annuel"
@@ -984,16 +993,16 @@
         "enterprise": {
           "name": "Enterprise",
           "price": "Sur devis",
-          "subtitle": "For advanced security & support",
+          "subtitle": "Pour une sécurité avancée et un support dédié",
           "includesPrefix": "Toutes les fonctionnalités Business +",
           "features": [
-            "Managed API credits",
-            "Cloud sync across devices",
-            "Team features & admin",
-            "SSO & compliance",
-            "Dedicated support"
+            "Crédits API gérés",
+            "Synchronisation cloud entre appareils",
+            "Fonctionnalités d'équipe et administration",
+            "SSO et conformité",
+            "Support dédié"
           ],
-          "cta": "Contact Sales"
+          "cta": "Contacter les ventes"
         },
         "currentPlan": "Forfait actuel",
         "upgrade": "Passer au supérieur",
@@ -1485,7 +1494,30 @@
     "learnMore": "En savoir plus",
     "integrations": "Intégrations",
     "defaultUser": "Utilisateur",
-    "notSignedIn": "Non connecté"
+    "notSignedIn": "Non connecté",
+    "chat": "Chat"
+  },
+  "chat": {
+    "newChat": "Nouveau chat",
+    "search": "Rechercher des conversations...",
+    "archived": "Archivées",
+    "noConversations": "Démarrez votre première conversation",
+    "selectChat": "Sélectionnez une conversation ou démarrez-en une nouvelle",
+    "noResults": "Aucune conversation correspondante",
+    "today": "Aujourd'hui",
+    "yesterday": "Hier",
+    "previousWeek": "7 derniers jours",
+    "older": "Plus anciennes",
+    "archive": "Archiver",
+    "unarchive": "Désarchiver",
+    "delete": "Supprimer",
+    "deleteConfirm": "Cette conversation sera définitivement supprimée. Cette action est irréversible.",
+    "editTitle": "Double-cliquez pour modifier le titre",
+    "untitled": "Sans titre",
+    "searchChats": "Rechercher",
+    "searchTitle": "Rechercher des conversations",
+    "searchDescription": "Rechercher dans toutes vos conversations",
+    "newChatEmpty": "Posez des questions sur vos notes, transcriptions ou autre"
   },
   "referral": {
     "title": "Parrainez et gagnez des récompenses",
@@ -1580,6 +1612,11 @@
     "upgradeUnlimited": "Passer à Pro — transcriptions illimitées"
   },
   "notes": {
+    "sidebar": {
+      "newNote": "Nouvelle note",
+      "searchNotes": "Rechercher des notes",
+      "actions": "Actions"
+    },
     "folders": {
       "title": "Dossiers",
       "soon": "Bientôt",
@@ -1610,13 +1647,15 @@
       "raw": "Brut",
       "enhanced": "Amélioré",
       "saving": "Enregistrement",
-      "wordsCount": "{{count}} mots",
       "startWriting": "Commencez à écrire...",
       "staleIndicator": "Le contenu a changé depuis l'amélioration",
       "live": "En direct",
       "transcript": "Transcription",
       "notes": "Notes",
-      "conversationWillAppear": "La conversation apparaîtra ici..."
+      "conversationWillAppear": "La conversation apparaîtra ici...",
+      "linkedEvent": "Événement lié",
+      "noFolder": "Aucun dossier",
+      "participants": "Participants"
     },
     "upload": {
       "title": "Téléverser un fichier audio",
@@ -1690,7 +1729,8 @@
       "rename": "Renommer",
       "searchFolders": "Rechercher des dossiers...",
       "noResults": "Aucun dossier trouvé",
-      "newFolder": "Nouveau dossier"
+      "newFolder": "Nouveau dossier",
+      "showInFileManager": "Afficher dans {{manager}}"
     },
     "actions": {
       "done": "Terminé",
@@ -1706,6 +1746,9 @@
       "update": "Mettre à jour",
       "cancel": "Annuler",
       "noActions": "Aucune action personnalisée pour l'instant",
+      "promptLabel": "Instruction",
+      "emptyEditorTitle": "Sélectionner une action",
+      "emptyEditorDescription": "Choisissez une action dans la liste ou créez-en une nouvelle",
       "runAction": "Exécuter {{name}}",
       "selectAction": "Sélectionner l'action",
       "builtin": {
@@ -1858,6 +1901,7 @@
       "copyToClipboard": "Copier dans le presse-papiers",
       "copied": "Copié !",
       "emptyState": "Maintenez {{hotkey}} pour démarrer une conversation",
+      "orType": "ou tapez un message",
       "errorPrefix": "Erreur"
     },
     "titleBar": {
@@ -1870,7 +1914,30 @@
       "toClose": "fermer",
       "listening": "Écoute...",
       "transcribing": "Transcription...",
-      "thinking": "Réflexion..."
+      "thinking": "Réflexion...",
+      "typeMessage": "Écrivez un message...",
+      "send": "Envoyer"
+    },
+    "tools": {
+      "search_notesStatus": "Recherche de notes...",
+      "web_searchStatus": "Recherche sur le web...",
+      "copy_to_clipboardStatus": "Copie dans le presse-papiers...",
+      "get_calendar_eventsStatus": "Vérification du calendrier...",
+      "get_noteStatus": "Lecture de la note...",
+      "create_noteStatus": "Création de la note...",
+      "update_noteStatus": "Mise à jour de la note...",
+      "copiedToClipboard": "Copié dans le presse-papiers",
+      "foundNotes": "{{count}} note trouvée",
+      "foundNotes_plural": "{{count}} notes trouvées",
+      "searchResults": "{{count}} résultat trouvé",
+      "searchResults_plural": "{{count}} résultats trouvés",
+      "openNote": "Ouvrir la note",
+      "calendarEvents": "{{count}} événement trouvé",
+      "calendarEvents_plural": "{{count}} événements trouvés",
+      "noResults": "Aucun résultat",
+      "error": "Erreur d'outil",
+      "unknownTool": "Outil inconnu : {{name}}",
+      "invalidArgs": "Arguments d'outil invalides pour {{name}}"
     }
   },
   "integrations": {
@@ -2011,5 +2078,14 @@
     "title": "Autorisations requises",
     "description": "OpenWhispr a besoin de quelques autorisations pour fonctionner sur cet ordinateur.",
     "continue": "Continuer"
+  },
+  "embeddedChat": {
+    "askPlaceholder": "Posez une question...",
+    "send": "Envoyer",
+    "title": "Chat",
+    "emptyState": "Posez une question sur cette note",
+    "dock": "Ancrer dans la barre latérale",
+    "undock": "Détacher de la barre latérale",
+    "close": "Fermer le chat"
   }
 }
diff --git a/src/locales/it/translation.json b/src/locales/it/translation.json
index 5c7418746..ff2ba81e7 100644
--- a/src/locales/it/translation.json
+++ b/src/locales/it/translation.json
@@ -7,6 +7,14 @@
       "uiDescription": "Scegli la lingua usata nell'interfaccia di OpenWhispr",
       "transcriptionLabel": "Lingua di trascrizione",
       "transcriptionDescription": "Scegli la lingua che parli per una trascrizione più accurata"
+    },
+    "noteFiles": {
+      "title": "Salva note come file",
+      "description": "Salva automaticamente le note come file .md su disco, organizzate per cartella",
+      "path": "Percorso di salvataggio",
+      "changePath": "Cambia percorso",
+      "rebuild": "Ricostruisci tutti i file",
+      "rebuildDescription": "Risincronizza tutte le note su disco"
     }
   },
   "tray": {
@@ -22,6 +30,7 @@
     "appLabel": "OpenWhispr",
     "quit": "Esci da OpenWhispr",
     "speech": "Voce",
+    "settings": "Impostazioni...",
     "help": "Aiuto",
     "learnMore": "Scopri di più",
     "file": "File",
@@ -955,15 +964,15 @@
           "period": "per sempre",
           "features": [
             "## OpenWhispr Cloud",
-            "2,000 words/week transcription",
-            "5 hours of meeting recordings/month",
-            "## Always free",
-            "Unlimited local AI models",
-            "Unlimited cloud transcription with your own API keys",
-            "100+ languages supported",
-            "Custom dictionary",
-            "Zero data retention",
-            "Community support"
+            "2.000 parole/settimana di trascrizione",
+            "5 ore di registrazioni riunioni/mese",
+            "## Sempre gratuito",
+            "Modelli IA locali illimitati",
+            "Trascrizione cloud illimitata con le tue chiavi API",
+            "Oltre 100 lingue supportate",
+            "Dizionario personalizzato",
+            "Nessuna conservazione dei dati",
+            "Supporto della comunità"
           ]
         },
         "pro": {
@@ -975,10 +984,10 @@
           "annualEquivalent": "$6.67",
           "includesPrefix": "Tutte le funzionalità Free +",
           "features": [
-            "Unlimited cloud transcription",
-            "20 hours of meeting recordings/month",
-            "Mobile app (iOS Coming Soon)",
-            "Email support"
+            "Trascrizione cloud illimitata",
+            "20 ore di registrazioni riunioni/mese",
+            "App mobile (iOS in arrivo)",
+            "Supporto via e-mail"
           ],
           "cta": "Inizia",
           "switchToAnnual": "Passa all'annuale"
@@ -993,10 +1002,10 @@
           "includesPrefix": "Tutte le funzionalità Pro +",
           "badge": "Più popolare",
           "features": [
-            "Unlimited meeting recordings",
-            "Agent mode",
-            "Chat over your data (Coming Soon)",
-            "Priority support"
+            "Registrazioni riunioni illimitate",
+            "Modalità agente",
+            "Chatta con i tuoi dati (in arrivo)",
+            "Supporto prioritario"
           ],
           "cta": "Inizia",
           "switchToAnnual": "Passa all'annuale"
@@ -1004,16 +1013,16 @@
         "enterprise": {
           "name": "Enterprise",
           "price": "Personalizzato",
-          "subtitle": "For advanced security & support",
+          "subtitle": "Per sicurezza avanzata e supporto dedicato",
           "includesPrefix": "Tutte le funzionalità Business +",
           "features": [
-            "Managed API credits",
-            "Cloud sync across devices",
-            "Team features & admin",
-            "SSO & compliance",
-            "Dedicated support"
+            "Crediti API gestiti",
+            "Sincronizzazione cloud tra dispositivi",
+            "Funzionalità di team e amministrazione",
+            "SSO e conformità",
+            "Supporto dedicato"
           ],
-          "cta": "Contact Sales"
+          "cta": "Contatta le vendite"
         },
         "currentPlan": "Piano attuale",
         "upgrade": "Upgrade",
@@ -1542,6 +1551,11 @@
     }
   },
   "notes": {
+    "sidebar": {
+      "newNote": "Nuova nota",
+      "searchNotes": "Cerca note",
+      "actions": "Azioni"
+    },
     "folders": {
       "title": "Cartelle",
       "soon": "Presto",
@@ -1572,13 +1586,15 @@
       "raw": "Originale",
       "enhanced": "Migliorato",
       "saving": "Salvataggio",
-      "wordsCount": "{{count}} parole",
       "startWriting": "Inizia a scrivere...",
       "staleIndicator": "Il contenuto è cambiato dall'ultimo miglioramento",
       "live": "Dal vivo",
       "transcript": "Trascrizione",
       "notes": "Note",
-      "conversationWillAppear": "La conversazione apparirà qui..."
+      "conversationWillAppear": "La conversazione apparirà qui...",
+      "linkedEvent": "Evento collegato",
+      "noFolder": "Nessuna cartella",
+      "participants": "Partecipanti"
     },
     "upload": {
       "title": "Carica audio",
@@ -1636,7 +1652,8 @@
       "rename": "Rinomina",
       "searchFolders": "Cerca cartelle...",
       "noResults": "Nessuna cartella trovata",
-      "newFolder": "Nuova cartella"
+      "newFolder": "Nuova cartella",
+      "showInFileManager": "Mostra in {{manager}}"
     },
     "actions": {
       "manage": "Gestisci azioni...",
@@ -1651,6 +1668,9 @@
       "update": "Aggiorna",
       "cancel": "Annulla",
       "noActions": "Nessuna azione personalizzata ancora",
+      "promptLabel": "Istruzione",
+      "emptyEditorTitle": "Seleziona un'azione",
+      "emptyEditorDescription": "Scegli un'azione dall'elenco o creane una nuova",
       "runAction": "Esegui {{name}}",
       "selectAction": "Seleziona azione",
       "done": "Fatto",
@@ -1745,7 +1765,30 @@
     "learnMore": "Scopri di più",
     "integrations": "Integrazioni",
     "defaultUser": "Utente",
-    "notSignedIn": "Non hai effettuato l'accesso"
+    "notSignedIn": "Non hai effettuato l'accesso",
+    "chat": "Chat"
+  },
+  "chat": {
+    "newChat": "Nuova chat",
+    "search": "Cerca conversazioni...",
+    "archived": "Archiviate",
+    "noConversations": "Inizia la tua prima conversazione",
+    "selectChat": "Seleziona una conversazione o avviane una nuova",
+    "noResults": "Nessuna conversazione corrispondente",
+    "today": "Oggi",
+    "yesterday": "Ieri",
+    "previousWeek": "Ultimi 7 giorni",
+    "older": "Precedenti",
+    "archive": "Archivia",
+    "unarchive": "Ripristina",
+    "delete": "Elimina",
+    "deleteConfirm": "Questa conversazione verrà eliminata permanentemente. Non è possibile annullare.",
+    "editTitle": "Doppio clic per modificare il titolo",
+    "untitled": "Senza titolo",
+    "searchChats": "Cerca chat",
+    "searchTitle": "Cerca conversazioni",
+    "searchDescription": "Cerca in tutte le conversazioni",
+    "newChatEmpty": "Chiedi delle tue note, trascrizioni o qualsiasi altra cosa"
   },
   "usage": {
     "approachingLimit": "Limite settimanale quasi raggiunto",
@@ -1858,6 +1901,7 @@
       "copyToClipboard": "Copia negli appunti",
       "copied": "Copiato!",
       "emptyState": "Tieni premuto {{hotkey}} per iniziare una conversazione",
+      "orType": "o scrivi un messaggio",
       "errorPrefix": "Errore"
     },
     "titleBar": {
@@ -1870,7 +1914,30 @@
       "toClose": "chiudi",
       "listening": "Ascolto...",
       "transcribing": "Trascrizione...",
-      "thinking": "Pensiero..."
+      "thinking": "Pensiero...",
+      "typeMessage": "Scrivi un messaggio...",
+      "send": "Invia"
+    },
+    "tools": {
+      "search_notesStatus": "Ricerca nelle note...",
+      "web_searchStatus": "Ricerca sul web...",
+      "copy_to_clipboardStatus": "Copia negli appunti...",
+      "get_calendar_eventsStatus": "Controllo del calendario...",
+      "get_noteStatus": "Lettura della nota...",
+      "create_noteStatus": "Creazione della nota...",
+      "update_noteStatus": "Aggiornamento della nota...",
+      "copiedToClipboard": "Copiato negli appunti",
+      "foundNotes": "{{count}} nota trovata",
+      "foundNotes_plural": "{{count}} note trovate",
+      "searchResults": "{{count}} risultato trovato",
+      "searchResults_plural": "{{count}} risultati trovati",
+      "openNote": "Apri nota",
+      "calendarEvents": "{{count}} evento trovato",
+      "calendarEvents_plural": "{{count}} eventi trovati",
+      "noResults": "Nessun risultato",
+      "error": "Errore dello strumento",
+      "unknownTool": "Strumento sconosciuto: {{name}}",
+      "invalidArgs": "Argomenti dello strumento non validi per {{name}}"
     }
   },
   "integrations": {
@@ -2011,5 +2078,14 @@
     "title": "Autorizzazioni necessarie",
     "description": "OpenWhispr ha bisogno di alcune autorizzazioni per funzionare su questo computer.",
     "continue": "Continua"
+  },
+  "embeddedChat": {
+    "askPlaceholder": "Chiedi qualcosa...",
+    "send": "Invia",
+    "title": "Chat",
+    "emptyState": "Fai una domanda su questa nota",
+    "dock": "Ancora nella barra laterale",
+    "undock": "Sgancia dalla barra laterale",
+    "close": "Chiudi chat"
   }
 }
diff --git a/src/locales/ja/translation.json b/src/locales/ja/translation.json
index e0b39acc0..e70819edd 100644
--- a/src/locales/ja/translation.json
+++ b/src/locales/ja/translation.json
@@ -7,6 +7,14 @@
       "uiDescription": "OpenWhispr のインターフェースで使用する言語を選択",
       "transcriptionLabel": "文字起こし言語",
       "transcriptionDescription": "より正確な文字起こしのために話す言語を選択"
+    },
+    "noteFiles": {
+      "title": "ノートをファイルとして保存",
+      "description": "ノートを .md ファイルとしてディスクに自動保存し、フォルダごとに整理",
+      "path": "保存先",
+      "changePath": "保存先を変更",
+      "rebuild": "すべてのファイルを再構築",
+      "rebuildDescription": "すべてのノートをディスクに再同期"
     }
   },
   "tray": {
@@ -22,6 +30,7 @@
     "appLabel": "OpenWhispr",
     "quit": "OpenWhispr を終了",
     "speech": "スピーチ",
+    "settings": "設定...",
     "help": "ヘルプ",
     "learnMore": "詳細を見る",
     "file": "ファイル",
@@ -935,15 +944,15 @@
           "period": "永久",
           "features": [
             "## OpenWhispr Cloud",
-            "2,000 words/week transcription",
-            "5 hours of meeting recordings/month",
-            "## Always free",
-            "Unlimited local AI models",
-            "Unlimited cloud transcription with your own API keys",
-            "100+ languages supported",
-            "Custom dictionary",
-            "Zero data retention",
-            "Community support"
+            "週2,000ワードの文字起こし",
+            "月5時間の会議録音",
+            "## 永久無料",
+            "無制限のローカルAIモデル",
+            "独自のAPIキーで無制限のクラウド文字起こし",
+            "100以上の言語に対応",
+            "カスタム辞書",
+            "データ保持なし",
+            "コミュニティサポート"
           ]
         },
         "pro": {
@@ -955,10 +964,10 @@
           "annualEquivalent": "$6.67",
           "includesPrefix": "Free の全機能 +",
           "features": [
-            "Unlimited cloud transcription",
-            "20 hours of meeting recordings/month",
-            "Mobile app (iOS Coming Soon)",
-            "Email support"
+            "無制限のクラウド文字起こし",
+            "月20時間の会議録音",
+            "モバイルアプリ（iOS 近日公開）",
+            "メールサポート"
           ],
           "cta": "始める",
           "switchToAnnual": "年払いに切り替え"
@@ -973,10 +982,10 @@
           "includesPrefix": "Pro の全機能 +",
           "badge": "一番人気",
           "features": [
-            "Unlimited meeting recordings",
-            "Agent mode",
-            "Chat over your data (Coming Soon)",
-            "Priority support"
+            "無制限の会議録音",
+            "エージェントモード",
+            "データとチャット（近日公開）",
+            "優先サポート"
           ],
           "cta": "始める",
           "switchToAnnual": "年払いに切り替え"
@@ -984,16 +993,16 @@
         "enterprise": {
           "name": "Enterprise",
           "price": "カスタム",
-          "subtitle": "For advanced security & support",
+          "subtitle": "高度なセキュリティとサポート向け",
           "includesPrefix": "Business の全機能 +",
           "features": [
-            "Managed API credits",
-            "Cloud sync across devices",
-            "Team features & admin",
-            "SSO & compliance",
-            "Dedicated support"
+            "管理されたAPIクレジット",
+            "デバイス間のクラウド同期",
+            "チーム機能と管理",
+            "SSO とコンプライアンス",
+            "専任サポート"
           ],
-          "cta": "Contact Sales"
+          "cta": "営業に問い合わせる"
         },
         "currentPlan": "現在のプラン",
         "upgrade": "アップグレード",
@@ -1470,6 +1479,11 @@
     }
   },
   "notes": {
+    "sidebar": {
+      "newNote": "新しいノート",
+      "searchNotes": "ノートを検索",
+      "actions": "アクション"
+    },
     "editor": {
       "transcribe": "文字起こし",
       "staleIndicator": "強化後にコンテンツが変更されました",
@@ -1477,6 +1491,9 @@
       "transcript": "文字起こし",
       "notes": "ノート",
       "conversationWillAppear": "会話がここに表示されます...",
+      "linkedEvent": "リンクされたイベント",
+      "noFolder": "フォルダなし",
+      "participants": "参加者",
       "untitled": "無題",
       "noteTitle": "ノートのタイトル",
       "stop": "停止",
@@ -1487,7 +1504,6 @@
       "raw": "元のテキスト",
       "enhanced": "強化済み",
       "saving": "保存中",
-      "wordsCount": "{{count}} 語",
       "startWriting": "書き始める..."
     },
     "context": {
@@ -1496,7 +1512,8 @@
       "rename": "名前を変更",
       "searchFolders": "フォルダを検索...",
       "noResults": "フォルダが見つかりません",
-      "newFolder": "新しいフォルダ"
+      "newFolder": "新しいフォルダ",
+      "showInFileManager": "{{manager}}で表示"
     },
     "actions": {
       "manage": "アクションを管理...",
@@ -1511,6 +1528,9 @@
       "update": "更新",
       "cancel": "キャンセル",
       "noActions": "カスタムアクションはまだありません",
+      "promptLabel": "プロンプト",
+      "emptyEditorTitle": "アクションを選択",
+      "emptyEditorDescription": "リストからアクションを選択するか、新しく作成してください",
       "runAction": "{{name}} を実行",
       "selectAction": "アクションを選択",
       "done": "完了",
@@ -1745,7 +1765,30 @@
     "learnMore": "詳しく見る",
     "integrations": "連携",
     "defaultUser": "ユーザー",
-    "notSignedIn": "未サインイン"
+    "notSignedIn": "未サインイン",
+    "chat": "チャット"
+  },
+  "chat": {
+    "newChat": "新しいチャット",
+    "search": "会話を検索...",
+    "archived": "アーカイブ済み",
+    "noConversations": "最初の会話を始めましょう",
+    "selectChat": "会話を選択するか、新しく始めてください",
+    "noResults": "該当する会話がありません",
+    "today": "今日",
+    "yesterday": "昨日",
+    "previousWeek": "過去7日間",
+    "older": "それ以前",
+    "archive": "アーカイブ",
+    "unarchive": "アーカイブ解除",
+    "delete": "削除",
+    "deleteConfirm": "この会話は完全に削除されます。元に戻すことはできません。",
+    "editTitle": "ダブルクリックでタイトルを編集",
+    "untitled": "無題",
+    "searchChats": "チャットを検索",
+    "searchTitle": "会話を検索",
+    "searchDescription": "すべての会話を検索",
+    "newChatEmpty": "ノートや文字起こし、その他なんでも聞いてください"
   },
   "usage": {
     "approachingLimit": "週間制限に近づいています",
@@ -1858,6 +1901,7 @@
       "copyToClipboard": "クリップボードにコピー",
       "copied": "コピーしました！",
       "emptyState": "{{hotkey}} を長押しして会話を開始",
+      "orType": "またはメッセージを入力",
       "errorPrefix": "エラー"
     },
     "titleBar": {
@@ -1870,7 +1914,30 @@
       "toClose": "閉じる",
       "listening": "聞いています...",
       "transcribing": "文字起こし中...",
-      "thinking": "考え中..."
+      "thinking": "考え中...",
+      "typeMessage": "メッセージを入力...",
+      "send": "送信"
+    },
+    "tools": {
+      "search_notesStatus": "ノートを検索中...",
+      "web_searchStatus": "ウェブを検索中...",
+      "copy_to_clipboardStatus": "クリップボードにコピー中...",
+      "get_calendar_eventsStatus": "カレンダーを確認中...",
+      "get_noteStatus": "ノートを読み込み中...",
+      "create_noteStatus": "ノートを作成中...",
+      "update_noteStatus": "ノートを更新中...",
+      "copiedToClipboard": "クリップボードにコピーしました",
+      "foundNotes": "{{count}}件のノートが見つかりました",
+      "foundNotes_plural": "{{count}}件のノートが見つかりました",
+      "searchResults": "{{count}}件の結果が見つかりました",
+      "searchResults_plural": "{{count}}件の結果が見つかりました",
+      "openNote": "ノートを開く",
+      "calendarEvents": "{{count}}件の予定が見つかりました",
+      "calendarEvents_plural": "{{count}}件の予定が見つかりました",
+      "noResults": "結果が見つかりません",
+      "error": "ツールエラー",
+      "unknownTool": "不明なツール: {{name}}",
+      "invalidArgs": "{{name}} のツール引数が無効です"
     }
   },
   "integrations": {
@@ -2011,5 +2078,14 @@
     "title": "権限が必要です",
     "description": "OpenWhispr がこのコンピュータで動作するために、いくつかの権限が必要です。",
     "continue": "続行"
+  },
+  "embeddedChat": {
+    "askPlaceholder": "何でも聞いてください...",
+    "send": "送信",
+    "title": "チャット",
+    "emptyState": "このノートについて質問してください",
+    "dock": "サイドバーに固定",
+    "undock": "サイドバーから外す",
+    "close": "チャットを閉じる"
   }
 }
diff --git a/src/locales/pt/translation.json b/src/locales/pt/translation.json
index 80580683b..c5bac4c42 100644
--- a/src/locales/pt/translation.json
+++ b/src/locales/pt/translation.json
@@ -7,6 +7,14 @@
       "uiDescription": "Escolha o idioma usado na interface do OpenWhispr",
       "transcriptionLabel": "Idioma de transcrição",
       "transcriptionDescription": "Escolha o idioma que você fala para maior precisão"
+    },
+    "noteFiles": {
+      "title": "Salvar notas como arquivos",
+      "description": "Salvar notas automaticamente como arquivos .md no disco, organizadas por pasta",
+      "path": "Local de salvamento",
+      "changePath": "Alterar local",
+      "rebuild": "Reconstruir todos os arquivos",
+      "rebuildDescription": "Ressincronizar todas as notas no disco"
     }
   },
   "tray": {
@@ -22,6 +30,7 @@
     "appLabel": "OpenWhispr",
     "quit": "Sair do OpenWhispr",
     "speech": "Fala",
+    "settings": "Configurações...",
     "help": "Ajuda",
     "learnMore": "Saiba mais",
     "file": "Arquivo",
@@ -927,15 +936,15 @@
           "period": "para sempre",
           "features": [
             "## OpenWhispr Cloud",
-            "2,000 words/week transcription",
-            "5 hours of meeting recordings/month",
-            "## Always free",
-            "Unlimited local AI models",
-            "Unlimited cloud transcription with your own API keys",
-            "100+ languages supported",
-            "Custom dictionary",
-            "Zero data retention",
-            "Community support"
+            "2.000 palavras/semana de transcrição",
+            "5 horas de gravação de reuniões/mês",
+            "## Sempre gratuito",
+            "Modelos de IA locais ilimitados",
+            "Transcrição na nuvem ilimitada com suas próprias chaves de API",
+            "Mais de 100 idiomas suportados",
+            "Dicionário personalizado",
+            "Zero retenção de dados",
+            "Suporte da comunidade"
           ]
         },
         "pro": {
@@ -947,10 +956,10 @@
           "annualEquivalent": "$6.67",
           "includesPrefix": "Todos os recursos do Free +",
           "features": [
-            "Unlimited cloud transcription",
-            "20 hours of meeting recordings/month",
-            "Mobile app (iOS Coming Soon)",
-            "Email support"
+            "Transcrição na nuvem ilimitada",
+            "20 horas de gravação de reuniões/mês",
+            "Aplicativo móvel (iOS em breve)",
+            "Suporte por e-mail"
           ],
           "cta": "Começar",
           "switchToAnnual": "Mudar para anual"
@@ -965,10 +974,10 @@
           "includesPrefix": "Todos os recursos do Pro +",
           "badge": "Mais popular",
           "features": [
-            "Unlimited meeting recordings",
-            "Agent mode",
-            "Chat over your data (Coming Soon)",
-            "Priority support"
+            "Gravações de reuniões ilimitadas",
+            "Modo agente",
+            "Converse com seus dados (em breve)",
+            "Suporte prioritário"
           ],
           "cta": "Começar",
           "switchToAnnual": "Mudar para anual"
@@ -976,16 +985,16 @@
         "enterprise": {
           "name": "Enterprise",
           "price": "Personalizado",
-          "subtitle": "For advanced security & support",
+          "subtitle": "Para segurança avançada e suporte",
           "includesPrefix": "Todos os recursos do Business +",
           "features": [
-            "Managed API credits",
-            "Cloud sync across devices",
-            "Team features & admin",
-            "SSO & compliance",
-            "Dedicated support"
+            "Créditos de API gerenciados",
+            "Sincronização na nuvem entre dispositivos",
+            "Recursos de equipe e administração",
+            "SSO e conformidade",
+            "Suporte dedicado"
           ],
-          "cta": "Contact Sales"
+          "cta": "Falar com Vendas"
         },
         "currentPlan": "Plano atual",
         "upgrade": "Fazer upgrade",
@@ -1542,6 +1551,11 @@
     }
   },
   "notes": {
+    "sidebar": {
+      "newNote": "Nova nota",
+      "searchNotes": "Pesquisar notas",
+      "actions": "Ações"
+    },
     "folders": {
       "title": "Pastas",
       "soon": "Em breve",
@@ -1572,13 +1586,15 @@
       "raw": "Original",
       "enhanced": "Aprimorado",
       "saving": "Salvando",
-      "wordsCount": "{{count}} palavras",
       "startWriting": "Comece a escrever...",
       "staleIndicator": "O conteúdo mudou desde o aprimoramento",
       "live": "Ao vivo",
       "transcript": "Transcrição",
       "notes": "Notas",
-      "conversationWillAppear": "A conversa aparecerá aqui..."
+      "conversationWillAppear": "A conversa aparecerá aqui...",
+      "linkedEvent": "Evento vinculado",
+      "noFolder": "Sem pasta",
+      "participants": "Participantes"
     },
     "upload": {
       "title": "Enviar áudio",
@@ -1636,7 +1652,8 @@
       "rename": "Renomear",
       "searchFolders": "Pesquisar pastas...",
       "noResults": "Nenhuma pasta encontrada",
-      "newFolder": "Nova pasta"
+      "newFolder": "Nova pasta",
+      "showInFileManager": "Mostrar no {{manager}}"
     },
     "actions": {
       "manage": "Gerenciar ações...",
@@ -1651,6 +1668,9 @@
       "update": "Atualizar",
       "cancel": "Cancelar",
       "noActions": "Nenhuma ação personalizada ainda",
+      "promptLabel": "Instrução",
+      "emptyEditorTitle": "Selecionar ação",
+      "emptyEditorDescription": "Escolha uma ação da lista ou crie uma nova",
       "runAction": "Executar {{name}}",
       "selectAction": "Selecionar ação",
       "done": "Concluído",
@@ -1745,7 +1765,30 @@
     "learnMore": "Saiba mais",
     "integrations": "Integrações",
     "defaultUser": "Usuário",
-    "notSignedIn": "Não conectado"
+    "notSignedIn": "Não conectado",
+    "chat": "Chat"
+  },
+  "chat": {
+    "newChat": "Novo chat",
+    "search": "Pesquisar conversas...",
+    "archived": "Arquivadas",
+    "noConversations": "Inicie sua primeira conversa",
+    "selectChat": "Selecione uma conversa ou inicie uma nova",
+    "noResults": "Nenhuma conversa encontrada",
+    "today": "Hoje",
+    "yesterday": "Ontem",
+    "previousWeek": "Últimos 7 dias",
+    "older": "Mais antigas",
+    "archive": "Arquivar",
+    "unarchive": "Desarquivar",
+    "delete": "Excluir",
+    "deleteConfirm": "Esta conversa será excluída permanentemente. Não é possível desfazer.",
+    "editTitle": "Clique duplo para editar o título",
+    "untitled": "Sem título",
+    "searchChats": "Pesquisar chats",
+    "searchTitle": "Pesquisar conversas",
+    "searchDescription": "Pesquisar em todas as conversas",
+    "newChatEmpty": "Pergunte sobre suas notas, transcrições ou qualquer coisa"
   },
   "usage": {
     "approachingLimit": "Próximo do limite semanal",
@@ -1858,6 +1901,7 @@
       "copyToClipboard": "Copiar para área de transferência",
       "copied": "Copiado!",
       "emptyState": "Segure {{hotkey}} para iniciar uma conversa",
+      "orType": "ou digite uma mensagem",
       "errorPrefix": "Erro"
     },
     "titleBar": {
@@ -1870,7 +1914,30 @@
       "toClose": "fechar",
       "listening": "Ouvindo...",
       "transcribing": "Transcrevendo...",
-      "thinking": "Pensando..."
+      "thinking": "Pensando...",
+      "typeMessage": "Digite uma mensagem...",
+      "send": "Enviar"
+    },
+    "tools": {
+      "search_notesStatus": "Pesquisando notas...",
+      "web_searchStatus": "Pesquisando na web...",
+      "copy_to_clipboardStatus": "Copiando para a área de transferência...",
+      "get_calendar_eventsStatus": "Verificando calendário...",
+      "get_noteStatus": "Lendo nota...",
+      "create_noteStatus": "Criando nota...",
+      "update_noteStatus": "Atualizando nota...",
+      "copiedToClipboard": "Copiado para a área de transferência",
+      "foundNotes": "{{count}} nota encontrada",
+      "foundNotes_plural": "{{count}} notas encontradas",
+      "searchResults": "{{count}} resultado encontrado",
+      "searchResults_plural": "{{count}} resultados encontrados",
+      "openNote": "Abrir nota",
+      "calendarEvents": "{{count}} evento encontrado",
+      "calendarEvents_plural": "{{count}} eventos encontrados",
+      "noResults": "Nenhum resultado",
+      "error": "Erro de ferramenta",
+      "unknownTool": "Ferramenta desconhecida: {{name}}",
+      "invalidArgs": "Argumentos de ferramenta inválidos para {{name}}"
     }
   },
   "integrations": {
@@ -2011,5 +2078,14 @@
     "title": "Permissões necessárias",
     "description": "O OpenWhispr precisa de algumas permissões para funcionar neste computador.",
     "continue": "Continuar"
+  },
+  "embeddedChat": {
+    "askPlaceholder": "Pergunte algo...",
+    "send": "Enviar",
+    "title": "Chat",
+    "emptyState": "Faça uma pergunta sobre esta nota",
+    "dock": "Fixar na barra lateral",
+    "undock": "Desafixar da barra lateral",
+    "close": "Fechar chat"
   }
 }
diff --git a/src/locales/ru/translation.json b/src/locales/ru/translation.json
index 83918db87..1b11b0d37 100644
--- a/src/locales/ru/translation.json
+++ b/src/locales/ru/translation.json
@@ -7,6 +7,14 @@
       "uiDescription": "Выберите язык интерфейса OpenWhispr",
       "transcriptionLabel": "Язык транскрипции",
       "transcriptionDescription": "Выберите язык, на котором вы говорите, для более точной транскрипции"
+    },
+    "noteFiles": {
+      "title": "Сохранять заметки как файлы",
+      "description": "Автоматически сохранять заметки как файлы .md на диск с группировкой по папкам",
+      "path": "Расположение",
+      "changePath": "Изменить расположение",
+      "rebuild": "Пересоздать все файлы",
+      "rebuildDescription": "Повторно синхронизировать все заметки на диск"
     }
   },
   "tray": {
@@ -22,6 +30,7 @@
     "appLabel": "OpenWhispr",
     "quit": "Закрыть OpenWhispr",
     "speech": "Речь",
+    "settings": "Настройки…",
     "help": "Справка",
     "learnMore": "Узнать больше",
     "file": "Файл",
@@ -955,15 +964,15 @@
           "period": "навсегда",
           "features": [
             "## OpenWhispr Cloud",
-            "2,000 words/week transcription",
-            "5 hours of meeting recordings/month",
-            "## Always free",
-            "Unlimited local AI models",
-            "Unlimited cloud transcription with your own API keys",
-            "100+ languages supported",
-            "Custom dictionary",
-            "Zero data retention",
-            "Community support"
+            "2 000 слов/неделю транскрипции",
+            "5 часов записи встреч/месяц",
+            "## Всегда бесплатно",
+            "Безлимитные локальные модели ИИ",
+            "Безлимитная облачная транскрипция с вашими ключами API",
+            "Поддержка более 100 языков",
+            "Пользовательский словарь",
+            "Нулевое хранение данных",
+            "Поддержка сообщества"
           ]
         },
         "pro": {
@@ -975,10 +984,10 @@
           "annualEquivalent": "$6.67",
           "includesPrefix": "Все функции Free +",
           "features": [
-            "Unlimited cloud transcription",
-            "20 hours of meeting recordings/month",
-            "Mobile app (iOS Coming Soon)",
-            "Email support"
+            "Безлимитная облачная транскрипция",
+            "20 часов записи встреч/месяц",
+            "Мобильное приложение (iOS скоро)",
+            "Поддержка по электронной почте"
           ],
           "cta": "Начать",
           "switchToAnnual": "Перейти на годовой"
@@ -993,10 +1002,10 @@
           "includesPrefix": "Все функции Pro +",
           "badge": "Самый популярный",
           "features": [
-            "Unlimited meeting recordings",
-            "Agent mode",
-            "Chat over your data (Coming Soon)",
-            "Priority support"
+            "Безлимитные записи встреч",
+            "Режим агента",
+            "Чат с вашими данными (скоро)",
+            "Приоритетная поддержка"
           ],
           "cta": "Начать",
           "switchToAnnual": "Перейти на годовой"
@@ -1004,16 +1013,16 @@
         "enterprise": {
           "name": "Enterprise",
           "price": "Индивидуально",
-          "subtitle": "For advanced security & support",
+          "subtitle": "Для расширенной безопасности и поддержки",
           "includesPrefix": "Все функции Business +",
           "features": [
-            "Managed API credits",
-            "Cloud sync across devices",
-            "Team features & admin",
-            "SSO & compliance",
-            "Dedicated support"
+            "Управляемые кредиты API",
+            "Облачная синхронизация между устройствами",
+            "Командные функции и администрирование",
+            "SSO и соответствие требованиям",
+            "Выделенная поддержка"
           ],
-          "cta": "Contact Sales"
+          "cta": "Связаться с отделом продаж"
         },
         "currentPlan": "Текущий тариф",
         "upgrade": "Улучшить план",
@@ -1542,6 +1551,11 @@
     }
   },
   "notes": {
+    "sidebar": {
+      "newNote": "Новая заметка",
+      "searchNotes": "Поиск заметок",
+      "actions": "Действия"
+    },
     "folders": {
       "title": "Папки",
       "soon": "Скоро",
@@ -1572,13 +1586,15 @@
       "raw": "Исходный",
       "enhanced": "Улучшенный",
       "saving": "Сохранение",
-      "wordsCount": "{{count}} слов",
       "startWriting": "Начните писать...",
       "staleIndicator": "Содержимое изменилось после улучшения",
       "live": "Живой",
       "transcript": "Транскрипция",
       "notes": "Заметки",
-      "conversationWillAppear": "Разговор появится здесь..."
+      "conversationWillAppear": "Разговор появится здесь...",
+      "linkedEvent": "Связанное событие",
+      "noFolder": "Без папки",
+      "participants": "Участники"
     },
     "upload": {
       "title": "Загрузить аудио",
@@ -1636,7 +1652,8 @@
       "rename": "Переименовать",
       "searchFolders": "Поиск папок...",
       "noResults": "Папки не найдены",
-      "newFolder": "Новая папка"
+      "newFolder": "Новая папка",
+      "showInFileManager": "Показать в {{manager}}"
     },
     "actions": {
       "manage": "Управление действиями...",
@@ -1651,6 +1668,9 @@
       "update": "Обновить",
       "cancel": "Отмена",
       "noActions": "Пользовательских действий пока нет",
+      "promptLabel": "Инструкция",
+      "emptyEditorTitle": "Выберите действие",
+      "emptyEditorDescription": "Выберите действие из списка или создайте новое",
       "runAction": "Запустить {{name}}",
       "selectAction": "Выбрать действие",
       "done": "Готово",
@@ -1745,7 +1765,30 @@
     "learnMore": "Узнать больше",
     "integrations": "Интеграции",
     "defaultUser": "Пользователь",
-    "notSignedIn": "Не авторизован"
+    "notSignedIn": "Не авторизован",
+    "chat": "Чат"
+  },
+  "chat": {
+    "newChat": "Новый чат",
+    "search": "Поиск бесед...",
+    "archived": "Архив",
+    "noConversations": "Начните свою первую беседу",
+    "selectChat": "Выберите беседу или начните новую",
+    "noResults": "Совпадений не найдено",
+    "today": "Сегодня",
+    "yesterday": "Вчера",
+    "previousWeek": "Последние 7 дней",
+    "older": "Ранее",
+    "archive": "В архив",
+    "unarchive": "Из архива",
+    "delete": "Удалить",
+    "deleteConfirm": "Эта беседа будет удалена навсегда. Отменить действие невозможно.",
+    "editTitle": "Двойной клик для редактирования названия",
+    "untitled": "Без названия",
+    "searchChats": "Поиск чатов",
+    "searchTitle": "Поиск бесед",
+    "searchDescription": "Поиск по всем беседам",
+    "newChatEmpty": "Спросите о заметках, транскрипциях или о чём угодно"
   },
   "usage": {
     "approachingLimit": "Приближается недельный лимит",
@@ -1858,6 +1901,7 @@
       "copyToClipboard": "Копировать в буфер обмена",
       "copied": "Скопировано!",
       "emptyState": "Удерживайте {{hotkey}}, чтобы начать разговор",
+      "orType": "или введите сообщение",
       "errorPrefix": "Ошибка"
     },
     "titleBar": {
@@ -1870,7 +1914,30 @@
       "toClose": "закрыть",
       "listening": "Слушаю...",
       "transcribing": "Транскрибирую...",
-      "thinking": "Думаю..."
+      "thinking": "Думаю...",
+      "typeMessage": "Введите сообщение...",
+      "send": "Отправить"
+    },
+    "tools": {
+      "search_notesStatus": "Поиск в заметках...",
+      "web_searchStatus": "Поиск в интернете...",
+      "copy_to_clipboardStatus": "Копирование в буфер обмена...",
+      "get_calendar_eventsStatus": "Проверка календаря...",
+      "get_noteStatus": "Чтение заметки...",
+      "create_noteStatus": "Создание заметки...",
+      "update_noteStatus": "Обновление заметки...",
+      "copiedToClipboard": "Скопировано в буфер обмена",
+      "foundNotes": "Найдена {{count}} заметка",
+      "foundNotes_plural": "Найдено {{count}} заметок",
+      "searchResults": "Найден {{count}} результат",
+      "searchResults_plural": "Найдено {{count}} результатов",
+      "openNote": "Открыть заметку",
+      "calendarEvents": "Найдено {{count}} событие",
+      "calendarEvents_plural": "Найдено {{count}} событий",
+      "noResults": "Ничего не найдено",
+      "error": "Ошибка инструмента",
+      "unknownTool": "Неизвестный инструмент: {{name}}",
+      "invalidArgs": "Недопустимые аргументы инструмента для {{name}}"
     }
   },
   "integrations": {
@@ -2011,5 +2078,14 @@
     "title": "Требуются разрешения",
     "description": "OpenWhispr нужны некоторые разрешения для работы на этом компьютере.",
     "continue": "Продолжить"
+  },
+  "embeddedChat": {
+    "askPlaceholder": "Спросите что-нибудь...",
+    "send": "Отправить",
+    "title": "Чат",
+    "emptyState": "Задайте вопрос об этой заметке",
+    "dock": "Закрепить на боковой панели",
+    "undock": "Открепить от боковой панели",
+    "close": "Закрыть чат"
   }
 }
diff --git a/src/locales/zh-CN/translation.json b/src/locales/zh-CN/translation.json
index 3da7e17cb..0c6f93f43 100644
--- a/src/locales/zh-CN/translation.json
+++ b/src/locales/zh-CN/translation.json
@@ -7,6 +7,14 @@
       "uiDescription": "选择 OpenWhispr 界面使用的语言",
       "transcriptionLabel": "转录语言",
       "transcriptionDescription": "选择你说话的语言，以提高转录准确率"
+    },
+    "noteFiles": {
+      "title": "将笔记保存为文件",
+      "description": "自动将笔记保存为 .md 文件到磁盘，按文件夹分类",
+      "path": "保存位置",
+      "changePath": "更改位置",
+      "rebuild": "重建所有文件",
+      "rebuildDescription": "将所有笔记重新同步到磁盘"
     }
   },
   "tray": {
@@ -22,6 +30,7 @@
     "appLabel": "OpenWhispr",
     "quit": "退出 OpenWhispr",
     "speech": "语音",
+    "settings": "设置...",
     "help": "帮助",
     "learnMore": "了解更多",
     "file": "文件",
@@ -955,15 +964,15 @@
           "period": "永久",
           "features": [
             "## OpenWhispr Cloud",
-            "2,000 words/week transcription",
-            "5 hours of meeting recordings/month",
-            "## Always free",
-            "Unlimited local AI models",
-            "Unlimited cloud transcription with your own API keys",
-            "100+ languages supported",
-            "Custom dictionary",
-            "Zero data retention",
-            "Community support"
+            "每周 2,000 字转录",
+            "每月 5 小时会议录制",
+            "## 永久免费",
+            "无限本地 AI 模型",
+            "使用自己的 API 密钥无限云端转录",
+            "支持 100+ 种语言",
+            "自定义词典",
+            "零数据留存",
+            "社区支持"
           ]
         },
         "pro": {
@@ -975,10 +984,10 @@
           "annualEquivalent": "$6.67",
           "includesPrefix": "所有 Free 功能 +",
           "features": [
-            "Unlimited cloud transcription",
-            "20 hours of meeting recordings/month",
-            "Mobile app (iOS Coming Soon)",
-            "Email support"
+            "无限云端转录",
+            "每月 20 小时会议录制",
+            "移动应用（iOS 即将推出）",
+            "邮件支持"
           ],
           "cta": "开始使用",
           "switchToAnnual": "切换为年付"
@@ -992,28 +1001,23 @@
           "annualEquivalent": "$16.67",
           "includesPrefix": "所有 Pro 功能 +",
           "badge": "最受欢迎",
-          "features": [
-            "Unlimited meeting recordings",
-            "Agent mode",
-            "Chat over your data (Coming Soon)",
-            "Priority support"
-          ],
+          "features": ["无限会议录制", "代理模式", "与您的数据对话（即将推出）", "优先支持"],
           "cta": "开始使用",
           "switchToAnnual": "切换为年付"
         },
         "enterprise": {
           "name": "Enterprise",
           "price": "自定义",
-          "subtitle": "For advanced security & support",
+          "subtitle": "提供高级安全保障与支持",
           "includesPrefix": "所有 Business 功能 +",
           "features": [
-            "Managed API credits",
-            "Cloud sync across devices",
-            "Team features & admin",
-            "SSO & compliance",
-            "Dedicated support"
+            "托管 API 额度",
+            "跨设备云端同步",
+            "团队功能与管理",
+            "SSO 与合规",
+            "专属支持"
           ],
-          "cta": "Contact Sales"
+          "cta": "联系销售"
         },
         "currentPlan": "当前套餐",
         "upgrade": "升级",
@@ -1542,6 +1546,11 @@
     }
   },
   "notes": {
+    "sidebar": {
+      "newNote": "新建笔记",
+      "searchNotes": "搜索笔记",
+      "actions": "操作"
+    },
     "folders": {
       "title": "文件夹",
       "soon": "即将推出",
@@ -1572,13 +1581,15 @@
       "raw": "原始内容",
       "enhanced": "增强内容",
       "saving": "保存中",
-      "wordsCount": "{{count}} 个词",
       "startWriting": "开始书写...",
       "staleIndicator": "内容在增强后已更改",
       "live": "实时",
       "transcript": "转录",
       "notes": "笔记",
-      "conversationWillAppear": "对话将显示在这里..."
+      "conversationWillAppear": "对话将显示在这里...",
+      "linkedEvent": "关联日程",
+      "noFolder": "无文件夹",
+      "participants": "参与者"
     },
     "upload": {
       "title": "上传音频",
@@ -1636,7 +1647,8 @@
       "rename": "重命名",
       "searchFolders": "搜索文件夹...",
       "noResults": "未找到文件夹",
-      "newFolder": "新建文件夹"
+      "newFolder": "新建文件夹",
+      "showInFileManager": "在{{manager}}中显示"
     },
     "actions": {
       "manage": "管理操作...",
@@ -1651,6 +1663,9 @@
       "update": "更新",
       "cancel": "取消",
       "noActions": "暂无自定义操作",
+      "promptLabel": "提示词",
+      "emptyEditorTitle": "选择操作",
+      "emptyEditorDescription": "从列表中选择一个操作或创建新操作",
       "runAction": "运行 {{name}}",
       "selectAction": "选择操作",
       "done": "完成",
@@ -1745,7 +1760,30 @@
     "learnMore": "了解更多",
     "integrations": "集成",
     "defaultUser": "用户",
-    "notSignedIn": "未登录"
+    "notSignedIn": "未登录",
+    "chat": "聊天"
+  },
+  "chat": {
+    "newChat": "新对话",
+    "search": "搜索对话...",
+    "archived": "已归档",
+    "noConversations": "开始你的第一个对话",
+    "selectChat": "选择一个对话或开始新的对话",
+    "noResults": "没有匹配的对话",
+    "today": "今天",
+    "yesterday": "昨天",
+    "previousWeek": "最近 7 天",
+    "older": "更早",
+    "archive": "归档",
+    "unarchive": "取消归档",
+    "delete": "删除",
+    "deleteConfirm": "此对话将被永久删除，无法撤消。",
+    "editTitle": "双击编辑标题",
+    "untitled": "无标题",
+    "searchChats": "搜索聊天",
+    "searchTitle": "搜索对话",
+    "searchDescription": "搜索所有对话",
+    "newChatEmpty": "询问关于笔记、转录或其他任何内容"
   },
   "usage": {
     "approachingLimit": "即将达到周限额",
@@ -1858,6 +1896,7 @@
       "copyToClipboard": "复制到剪贴板",
       "copied": "已复制！",
       "emptyState": "按住 {{hotkey}} 开始对话",
+      "orType": "或输入消息",
       "errorPrefix": "错误"
     },
     "titleBar": {
@@ -1870,7 +1909,30 @@
       "toClose": "关闭",
       "listening": "正在聆听...",
       "transcribing": "正在转录...",
-      "thinking": "正在思考..."
+      "thinking": "正在思考...",
+      "typeMessage": "输入消息...",
+      "send": "发送"
+    },
+    "tools": {
+      "search_notesStatus": "正在搜索笔记...",
+      "web_searchStatus": "正在搜索网页...",
+      "copy_to_clipboardStatus": "正在复制到剪贴板...",
+      "get_calendar_eventsStatus": "正在查看日历...",
+      "get_noteStatus": "正在读取笔记...",
+      "create_noteStatus": "正在创建笔记...",
+      "update_noteStatus": "正在更新笔记...",
+      "copiedToClipboard": "已复制到剪贴板",
+      "foundNotes": "找到 {{count}} 条笔记",
+      "foundNotes_plural": "找到 {{count}} 条笔记",
+      "searchResults": "找到 {{count}} 条结果",
+      "searchResults_plural": "找到 {{count}} 条结果",
+      "openNote": "打开笔记",
+      "calendarEvents": "找到 {{count}} 个日程",
+      "calendarEvents_plural": "找到 {{count}} 个日程",
+      "noResults": "未找到结果",
+      "error": "工具错误",
+      "unknownTool": "未知工具：{{name}}",
+      "invalidArgs": "{{name}} 的工具参数无效"
     }
   },
   "integrations": {
@@ -2011,5 +2073,14 @@
     "title": "需要权限",
     "description": "OpenWhispr 需要一些权限才能在此电脑上正常运行。",
     "continue": "继续"
+  },
+  "embeddedChat": {
+    "askPlaceholder": "随便问点什么...",
+    "send": "发送",
+    "title": "聊天",
+    "emptyState": "就这条笔记提个问题",
+    "dock": "固定到侧边栏",
+    "undock": "从侧边栏取消固定",
+    "close": "关闭聊天"
   }
 }
diff --git a/src/locales/zh-TW/translation.json b/src/locales/zh-TW/translation.json
index a16e29967..4dc5e884e 100644
--- a/src/locales/zh-TW/translation.json
+++ b/src/locales/zh-TW/translation.json
@@ -7,6 +7,14 @@
       "uiDescription": "選擇 OpenWhispr 介面使用的語言",
       "transcriptionLabel": "轉錄語言",
       "transcriptionDescription": "選擇你說話的語言，以提高轉錄準確度"
+    },
+    "noteFiles": {
+      "title": "將筆記儲存為檔案",
+      "description": "自動將筆記儲存為 .md 檔案到磁碟，按資料夾分類",
+      "path": "儲存位置",
+      "changePath": "變更位置",
+      "rebuild": "重建所有檔案",
+      "rebuildDescription": "將所有筆記重新同步到磁碟"
     }
   },
   "tray": {
@@ -22,6 +30,7 @@
     "appLabel": "OpenWhispr",
     "quit": "結束 OpenWhispr",
     "speech": "語音",
+    "settings": "設定...",
     "help": "說明",
     "learnMore": "瞭解更多",
     "file": "檔案",
@@ -955,15 +964,15 @@
           "period": "永久",
           "features": [
             "## OpenWhispr Cloud",
-            "2,000 words/week transcription",
-            "5 hours of meeting recordings/month",
-            "## Always free",
-            "Unlimited local AI models",
-            "Unlimited cloud transcription with your own API keys",
-            "100+ languages supported",
-            "Custom dictionary",
-            "Zero data retention",
-            "Community support"
+            "每週 2,000 字轉錄",
+            "每月 5 小時會議錄製",
+            "## 永久免費",
+            "無限本地 AI 模型",
+            "使用自己的 API 金鑰無限雲端轉錄",
+            "支援 100+ 種語言",
+            "自訂詞典",
+            "零資料留存",
+            "社群支援"
           ]
         },
         "pro": {
@@ -975,10 +984,10 @@
           "annualEquivalent": "$6.67",
           "includesPrefix": "所有 Free 功能 +",
           "features": [
-            "Unlimited cloud transcription",
-            "20 hours of meeting recordings/month",
-            "Mobile app (iOS Coming Soon)",
-            "Email support"
+            "無限雲端轉錄",
+            "每月 20 小時會議錄製",
+            "行動應用程式（iOS 即將推出）",
+            "電子郵件支援"
           ],
           "cta": "開始使用",
           "switchToAnnual": "切換為年付"
@@ -992,28 +1001,23 @@
           "annualEquivalent": "$16.67",
           "includesPrefix": "所有 Pro 功能 +",
           "badge": "最熱門",
-          "features": [
-            "Unlimited meeting recordings",
-            "Agent mode",
-            "Chat over your data (Coming Soon)",
-            "Priority support"
-          ],
+          "features": ["無限會議錄製", "代理模式", "與您的資料對話（即將推出）", "優先支援"],
           "cta": "開始使用",
           "switchToAnnual": "切換為年付"
         },
         "enterprise": {
           "name": "Enterprise",
           "price": "自訂",
-          "subtitle": "For advanced security & support",
+          "subtitle": "提供進階安全保障與支援",
           "includesPrefix": "所有 Business 功能 +",
           "features": [
-            "Managed API credits",
-            "Cloud sync across devices",
-            "Team features & admin",
-            "SSO & compliance",
-            "Dedicated support"
+            "託管 API 額度",
+            "跨裝置雲端同步",
+            "團隊功能與管理",
+            "SSO 與合規",
+            "專屬支援"
           ],
-          "cta": "Contact Sales"
+          "cta": "聯繫銷售"
         },
         "currentPlan": "目前方案",
         "upgrade": "升級",
@@ -1542,6 +1546,11 @@
     }
   },
   "notes": {
+    "sidebar": {
+      "newNote": "新增筆記",
+      "searchNotes": "搜尋筆記",
+      "actions": "動作"
+    },
     "folders": {
       "title": "資料夾",
       "soon": "即將推出",
@@ -1572,13 +1581,15 @@
       "raw": "原始",
       "enhanced": "已增強",
       "saving": "儲存中",
-      "wordsCount": "{{count}} 個字",
       "startWriting": "開始撰寫...",
       "staleIndicator": "內容在增強後已變更",
       "live": "即時",
       "transcript": "轉錄",
       "notes": "筆記",
-      "conversationWillAppear": "對話將顯示在這裡..."
+      "conversationWillAppear": "對話將顯示在這裡...",
+      "linkedEvent": "關聯行程",
+      "noFolder": "無資料夾",
+      "participants": "參與者"
     },
     "upload": {
       "title": "上傳音訊",
@@ -1636,7 +1647,8 @@
       "rename": "重新命名",
       "searchFolders": "搜尋資料夾...",
       "noResults": "找不到資料夾",
-      "newFolder": "新增資料夾"
+      "newFolder": "新增資料夾",
+      "showInFileManager": "在{{manager}}中顯示"
     },
     "actions": {
       "manage": "管理動作...",
@@ -1651,6 +1663,9 @@
       "update": "更新",
       "cancel": "取消",
       "noActions": "尚無自訂動作",
+      "promptLabel": "提示詞",
+      "emptyEditorTitle": "選擇動作",
+      "emptyEditorDescription": "從列表中選擇一個動作或建立新動作",
       "runAction": "執行 {{name}}",
       "selectAction": "選擇動作",
       "done": "完成",
@@ -1745,7 +1760,30 @@
     "learnMore": "瞭解更多",
     "integrations": "整合",
     "defaultUser": "使用者",
-    "notSignedIn": "尚未登入"
+    "notSignedIn": "尚未登入",
+    "chat": "聊天"
+  },
+  "chat": {
+    "newChat": "新對話",
+    "search": "搜尋對話...",
+    "archived": "已封存",
+    "noConversations": "開始你的第一個對話",
+    "selectChat": "選擇一個對話或開始新的對話",
+    "noResults": "沒有符合的對話",
+    "today": "今天",
+    "yesterday": "昨天",
+    "previousWeek": "最近 7 天",
+    "older": "更早",
+    "archive": "封存",
+    "unarchive": "取消封存",
+    "delete": "刪除",
+    "deleteConfirm": "此對話將被永久刪除，無法復原。",
+    "editTitle": "雙擊編輯標題",
+    "untitled": "無標題",
+    "searchChats": "搜尋聊天",
+    "searchTitle": "搜尋對話",
+    "searchDescription": "搜尋所有對話",
+    "newChatEmpty": "詢問關於筆記、轉錄或其他任何內容"
   },
   "usage": {
     "approachingLimit": "即將達到每週上限",
@@ -1858,6 +1896,7 @@
       "copyToClipboard": "複製到剪貼簿",
       "copied": "已複製！",
       "emptyState": "按住 {{hotkey}} 開始對話",
+      "orType": "或輸入訊息",
       "errorPrefix": "錯誤"
     },
     "titleBar": {
@@ -1870,7 +1909,30 @@
       "toClose": "關閉",
       "listening": "正在聆聽...",
       "transcribing": "正在轉錄...",
-      "thinking": "正在思考..."
+      "thinking": "正在思考...",
+      "typeMessage": "輸入訊息...",
+      "send": "傳送"
+    },
+    "tools": {
+      "search_notesStatus": "正在搜尋筆記...",
+      "web_searchStatus": "正在搜尋網頁...",
+      "copy_to_clipboardStatus": "正在複製到剪貼簿...",
+      "get_calendar_eventsStatus": "正在查看行事曆...",
+      "get_noteStatus": "正在讀取筆記...",
+      "create_noteStatus": "正在建立筆記...",
+      "update_noteStatus": "正在更新筆記...",
+      "copiedToClipboard": "已複製到剪貼簿",
+      "foundNotes": "找到 {{count}} 則筆記",
+      "foundNotes_plural": "找到 {{count}} 則筆記",
+      "searchResults": "找到 {{count}} 項結果",
+      "searchResults_plural": "找到 {{count}} 項結果",
+      "openNote": "開啟筆記",
+      "calendarEvents": "找到 {{count}} 個行程",
+      "calendarEvents_plural": "找到 {{count}} 個行程",
+      "noResults": "未找到結果",
+      "error": "工具錯誤",
+      "unknownTool": "未知工具：{{name}}",
+      "invalidArgs": "{{name}} 的工具參數無效"
     }
   },
   "integrations": {
@@ -2011,5 +2073,14 @@
     "title": "需要權限",
     "description": "OpenWhispr 需要一些權限才能在此電腦上正常運作。",
     "continue": "繼續"
+  },
+  "embeddedChat": {
+    "askPlaceholder": "隨便問點什麼...",
+    "send": "傳送",
+    "title": "聊天",
+    "emptyState": "就這條筆記提個問題",
+    "dock": "固定到側邊欄",
+    "undock": "從側邊欄取消固定",
+    "close": "關閉聊天"
   }
 }
diff --git a/src/main.jsx b/src/main.jsx
index f73406cee..4b6190dfa 100644
--- a/src/main.jsx
+++ b/src/main.jsx
@@ -10,18 +10,18 @@ import { ToastProvider } from "./components/ui/Toast.tsx";
 import { SettingsProvider } from "./hooks/useSettings";
 import { useTheme } from "./hooks/useTheme";
 import { useAuth } from "./hooks/useAuth";
-import { areRequiredPermissionsMet } from "./utils/permissions";
+
 import i18n from "./i18n";
 import "./index.css";
 
 const controlPanelImport = () => import("./components/ControlPanel.tsx");
 const onboardingFlowImport = () => import("./components/OnboardingFlow.tsx");
 const agentOverlayImport = () => import("./components/AgentOverlay.tsx");
-const permissionsGateImport = () => import("./components/PermissionsGate.tsx");
+
 const ControlPanel = React.lazy(controlPanelImport);
 const OnboardingFlow = React.lazy(onboardingFlowImport);
 const AgentOverlay = React.lazy(agentOverlayImport);
-const PermissionsGate = React.lazy(permissionsGateImport);
+
 import MeetingNotificationOverlay from "./components/MeetingNotificationOverlay.tsx";
 import UpdateNotificationOverlay from "./components/UpdateNotificationOverlay.tsx";
 
@@ -294,7 +294,7 @@ function MainApp() {
 
   const [showOnboarding, setShowOnboarding] = useState(false);
   const [needsReauth, setNeedsReauth] = useState(false);
-  const [needsPermissions, setNeedsPermissions] = useState(false);
+
   const [isLoading, setIsLoading] = useState(true);
 
   const isAgentPanel = window.location.search.includes("agent=true");
@@ -309,7 +309,7 @@ function MainApp() {
       agentOverlayImport().catch(() => {});
     } else if (isControlPanel) {
       controlPanelImport().catch(() => {});
-      permissionsGateImport().catch(() => {});
+
       if (!localStorage.getItem("onboardingCompleted")) {
         onboardingFlowImport().catch(() => {});
       }
@@ -340,13 +340,9 @@ function MainApp() {
         setShowOnboarding(true);
       } else if (!isSignedIn && !authSkipped) {
         setNeedsReauth(true);
-      } else {
-        // Check permissions from localStorage — PermissionsGate does the real async checks
-        const micOk = localStorage.getItem("micPermissionGranted") === "true";
-        if (!areRequiredPermissionsMet(micOk)) {
-          setNeedsPermissions(true);
-        }
       }
+      // Otherwise: returning user with auth — go straight to ControlPanel.
+      // Permissions are checked at point-of-use (recording, device enumeration).
     }
 
     if (isDictationPanel && !resolved) {
@@ -362,14 +358,9 @@ function MainApp() {
 
   const handleOnboardingComplete = () => {
     setShowOnboarding(false);
-    setNeedsPermissions(false); // onboarding already handled permissions
     localStorage.setItem("onboardingCompleted", "true");
   };
 
-  const handlePermissionsComplete = () => {
-    setNeedsPermissions(false);
-  };
-
   if (isAgentPanel) {
     return (
       <Suspense fallback={<LoadingFallback />}>
@@ -429,15 +420,6 @@ function MainApp() {
     );
   }
 
-  // Returning user missing permissions (new machine, re-auth, etc.)
-  if (isControlPanel && needsPermissions) {
-    return (
-      <Suspense fallback={<LoadingFallback />}>
-        <PermissionsGate onComplete={handlePermissionsComplete} />
-      </Suspense>
-    );
-  }
-
   return isControlPanel ? (
     <Suspense fallback={<LoadingFallback />}>
       <ControlPanel />
diff --git a/src/services/ConversationsService.ts b/src/services/ConversationsService.ts
new file mode 100644
index 000000000..c75f4d663
--- /dev/null
+++ b/src/services/ConversationsService.ts
@@ -0,0 +1,141 @@
+import { OPENWHISPR_API_URL } from "../config/constants.js";
+
+interface ConversationInput {
+  client_conversation_id?: string;
+  title?: string;
+  created_at?: string;
+  updated_at?: string;
+  messages?: Array<{
+    role: "user" | "assistant" | "system";
+    content: string;
+    metadata?: Record<string, unknown> | null;
+  }>;
+}
+
+interface CloudConversation {
+  id: string;
+  client_conversation_id: string | null;
+  title: string;
+  archived_at: string | null;
+  deleted_at: string | null;
+  created_at: string;
+  updated_at: string;
+}
+
+interface CloudMessage {
+  id: string;
+  conversation_id: string;
+  role: "user" | "assistant" | "system";
+  content: string;
+  metadata: Record<string, unknown> | null;
+  created_at: string;
+}
+
+async function create(input: ConversationInput): Promise<CloudConversation> {
+  const res = await fetch(`${OPENWHISPR_API_URL}/api/conversations/create`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    credentials: "include",
+    body: JSON.stringify(input),
+  });
+  if (!res.ok) throw new Error(await res.text());
+  return res.json() as Promise<CloudConversation>;
+}
+
+async function update(
+  id: string,
+  updates: { title?: string; archived_at?: string }
+): Promise<CloudConversation> {
+  const res = await fetch(`${OPENWHISPR_API_URL}/api/conversations/update`, {
+    method: "PATCH",
+    headers: { "Content-Type": "application/json" },
+    credentials: "include",
+    body: JSON.stringify({ id, ...updates }),
+  });
+  if (!res.ok) throw new Error(await res.text());
+  return res.json() as Promise<CloudConversation>;
+}
+
+async function deleteConversation(id: string): Promise<void> {
+  const res = await fetch(`${OPENWHISPR_API_URL}/api/conversations/delete`, {
+    method: "DELETE",
+    headers: { "Content-Type": "application/json" },
+    credentials: "include",
+    body: JSON.stringify({ id }),
+  });
+  if (!res.ok) throw new Error(await res.text());
+}
+
+async function list(
+  limit?: number,
+  before?: string,
+  archived?: boolean
+): Promise<{ conversations: CloudConversation[] }> {
+  const params = new URLSearchParams();
+  if (limit !== undefined) params.set("limit", String(limit));
+  if (before !== undefined) params.set("before", before);
+  if (archived) params.set("archived", "true");
+  const query = params.toString();
+  const res = await fetch(
+    `${OPENWHISPR_API_URL}/api/conversations/list${query ? `?${query}` : ""}`,
+    { credentials: "include" }
+  );
+  if (!res.ok) throw new Error(await res.text());
+  return res.json() as Promise<{ conversations: CloudConversation[] }>;
+}
+
+async function addMessage(
+  conversationId: string,
+  role: "user" | "assistant" | "system",
+  content: string,
+  metadata?: Record<string, unknown> | null
+): Promise<CloudMessage> {
+  const res = await fetch(`${OPENWHISPR_API_URL}/api/conversations/messages`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    credentials: "include",
+    body: JSON.stringify({
+      conversation_id: conversationId,
+      role,
+      content,
+      ...(metadata ? { metadata } : {}),
+    }),
+  });
+  if (!res.ok) throw new Error(await res.text());
+  return res.json() as Promise<CloudMessage>;
+}
+
+async function listMessages(conversationId: string): Promise<{ messages: CloudMessage[] }> {
+  const params = new URLSearchParams({ conversation_id: conversationId });
+  const res = await fetch(`${OPENWHISPR_API_URL}/api/conversations/messages?${params}`, {
+    credentials: "include",
+  });
+  if (!res.ok) throw new Error(await res.text());
+  return res.json() as Promise<{ messages: CloudMessage[] }>;
+}
+
+async function search(
+  query: string,
+  limit?: number
+): Promise<{ conversations: CloudConversation[] }> {
+  const res = await fetch(`${OPENWHISPR_API_URL}/api/conversations/search`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    credentials: "include",
+    body: JSON.stringify({ query, ...(limit !== undefined ? { limit } : {}) }),
+  });
+  if (!res.ok) throw new Error(await res.text());
+  return res.json() as Promise<{ conversations: CloudConversation[] }>;
+}
+
+export { create, update, deleteConversation, list, addMessage, listMessages, search };
+
+export const ConversationsService = {
+  create,
+  update,
+  delete: deleteConversation,
+  list,
+  addMessage,
+  listMessages,
+  search,
+};
diff --git a/src/services/ReasoningService.ts b/src/services/ReasoningService.ts
index a94787414..ba6f43a3c 100644
--- a/src/services/ReasoningService.ts
+++ b/src/services/ReasoningService.ts
@@ -7,12 +7,28 @@ import logger from "../utils/logger";
 import { isSecureEndpoint } from "../utils/urlUtils";
 import { withSessionRefresh } from "../lib/neonAuth";
 import { getSettings, isCloudReasoningMode } from "../stores/settingsStore";
+import { streamText, stepCountIs } from "ai";
+import { getAIModel } from "./ai/providers";
+
+export type AgentStreamChunk =
+  | { type: "content"; text: string }
+  | { type: "tool_calls"; calls: Array<{ id: string; name: string; arguments: string }> }
+  | {
+      type: "tool_result";
+      callId: string;
+      toolName: string;
+      displayText: string;
+      metadata?: Record<string, unknown>;
+    }
+  | { type: "done"; finishReason?: string };
 
 class ReasoningService extends BaseReasoningService {
   private apiKeyCache: SecureCache<string>;
   private openAiEndpointPreference = new Map<string, "responses" | "chat">();
   private static readonly OPENAI_ENDPOINT_PREF_STORAGE_KEY = "openAiEndpointPreference";
+  private static readonly MAX_TOOL_STEPS = 20;
   private cacheCleanupStop: (() => void) | undefined;
+  private streamAbortController: AbortController | null = null;
 
   constructor() {
     super();
@@ -716,48 +732,57 @@ class ReasoningService extends BaseReasoningService {
     agentName: string | null = null,
     config: ReasoningConfig = {}
   ): Promise<string> {
+    if (this.isProcessing) {
+      throw new Error("Already processing a request");
+    }
+
     logger.logReasoning("ANTHROPIC_START", {
       model,
       agentName,
       environment: typeof window !== "undefined" ? "browser" : "node",
     });
 
-    if (typeof window !== "undefined" && window.electronAPI) {
-      const startTime = Date.now();
+    this.isProcessing = true;
+    try {
+      if (typeof window !== "undefined" && window.electronAPI) {
+        const startTime = Date.now();
 
-      logger.logReasoning("ANTHROPIC_IPC_CALL", {
-        model,
-        textLength: text.length,
-      });
+        logger.logReasoning("ANTHROPIC_IPC_CALL", {
+          model,
+          textLength: text.length,
+        });
 
-      const systemPrompt = config.systemPrompt || this.getSystemPrompt(agentName, text);
-      const result = await window.electronAPI.processAnthropicReasoning(text, model, agentName, {
-        ...config,
-        systemPrompt,
-      });
+        const systemPrompt = config.systemPrompt || this.getSystemPrompt(agentName, text);
+        const result = await window.electronAPI.processAnthropicReasoning(text, model, agentName, {
+          ...config,
+          systemPrompt,
+        });
 
-      const processingTime = Date.now() - startTime;
+        const processingTime = Date.now() - startTime;
 
-      if (result.success) {
-        logger.logReasoning("ANTHROPIC_SUCCESS", {
-          model,
-          processingTimeMs: processingTime,
-          resultLength: result.text.length,
-        });
-        return result.text;
+        if (result.success) {
+          logger.logReasoning("ANTHROPIC_SUCCESS", {
+            model,
+            processingTimeMs: processingTime,
+            resultLength: result.text.length,
+          });
+          return result.text;
+        } else {
+          logger.logReasoning("ANTHROPIC_ERROR", {
+            model,
+            processingTimeMs: processingTime,
+            error: result.error,
+          });
+          throw new Error(result.error);
+        }
       } else {
-        logger.logReasoning("ANTHROPIC_ERROR", {
-          model,
-          processingTimeMs: processingTime,
-          error: result.error,
+        logger.logReasoning("ANTHROPIC_UNAVAILABLE", {
+          reason: "Not in Electron environment",
         });
-        throw new Error(result.error);
+        throw new Error("Anthropic reasoning is not available in this environment");
       }
-    } else {
-      logger.logReasoning("ANTHROPIC_UNAVAILABLE", {
-        reason: "Not in Electron environment",
-      });
-      throw new Error("Anthropic reasoning is not available in this environment");
+    } finally {
+      this.isProcessing = false;
     }
   }
 
@@ -767,48 +792,57 @@ class ReasoningService extends BaseReasoningService {
     agentName: string | null = null,
     config: ReasoningConfig = {}
   ): Promise<string> {
+    if (this.isProcessing) {
+      throw new Error("Already processing a request");
+    }
+
     logger.logReasoning("LOCAL_START", {
       model,
       agentName,
       environment: typeof window !== "undefined" ? "browser" : "node",
     });
 
-    if (typeof window !== "undefined" && window.electronAPI) {
-      const startTime = Date.now();
+    this.isProcessing = true;
+    try {
+      if (typeof window !== "undefined" && window.electronAPI) {
+        const startTime = Date.now();
 
-      logger.logReasoning("LOCAL_IPC_CALL", {
-        model,
-        textLength: text.length,
-      });
+        logger.logReasoning("LOCAL_IPC_CALL", {
+          model,
+          textLength: text.length,
+        });
 
-      const systemPrompt = config.systemPrompt || this.getSystemPrompt(agentName, text);
-      const result = await window.electronAPI.processLocalReasoning(text, model, agentName, {
-        ...config,
-        systemPrompt,
-      });
+        const systemPrompt = config.systemPrompt || this.getSystemPrompt(agentName, text);
+        const result = await window.electronAPI.processLocalReasoning(text, model, agentName, {
+          ...config,
+          systemPrompt,
+        });
 
-      const processingTime = Date.now() - startTime;
+        const processingTime = Date.now() - startTime;
 
-      if (result.success) {
-        logger.logReasoning("LOCAL_SUCCESS", {
-          model,
-          processingTimeMs: processingTime,
-          resultLength: result.text.length,
-        });
-        return result.text;
+        if (result.success) {
+          logger.logReasoning("LOCAL_SUCCESS", {
+            model,
+            processingTimeMs: processingTime,
+            resultLength: result.text.length,
+          });
+          return result.text;
+        } else {
+          logger.logReasoning("LOCAL_ERROR", {
+            model,
+            processingTimeMs: processingTime,
+            error: result.error,
+          });
+          throw new Error(result.error);
+        }
       } else {
-        logger.logReasoning("LOCAL_ERROR", {
-          model,
-          processingTimeMs: processingTime,
-          error: result.error,
+        logger.logReasoning("LOCAL_UNAVAILABLE", {
+          reason: "Not in Electron environment",
         });
-        throw new Error(result.error);
+        throw new Error("Local reasoning is not available in this environment");
       }
-    } else {
-      logger.logReasoning("LOCAL_UNAVAILABLE", {
-        reason: "Not in Electron environment",
-      });
-      throw new Error("Local reasoning is not available in this environment");
+    } finally {
+      this.isProcessing = false;
     }
   }
 
@@ -1177,11 +1211,25 @@ class ReasoningService extends BaseReasoningService {
       headers["Authorization"] = `Bearer ${apiKey}`;
     }
 
-    const response = await fetch(endpoint, {
-      method: "POST",
-      headers,
-      body: JSON.stringify(requestBody),
-    });
+    this.streamAbortController = new AbortController();
+    const controller = this.streamAbortController;
+    const timeoutId = setTimeout(() => controller.abort(), 60000);
+
+    let response: Response;
+    try {
+      response = await fetch(endpoint, {
+        method: "POST",
+        headers,
+        body: JSON.stringify(requestBody),
+        signal: controller.signal,
+      });
+    } catch (error) {
+      clearTimeout(timeoutId);
+      if ((error as Error).name === "AbortError") {
+        throw new Error("Streaming request timed out");
+      }
+      throw error;
+    }
 
     if (!response.ok) {
       const errorText = await response.text();
@@ -1261,50 +1309,272 @@ class ReasoningService extends BaseReasoningService {
         }
       }
     } finally {
+      clearTimeout(timeoutId);
+      this.streamAbortController = null;
       reader.releaseLock();
     }
   }
 
-  async *processTextStreamingCloud(
+  async *processTextStreamingAI(
     messages: Array<{ role: string; content: string }>,
-    config: { systemPrompt: string }
-  ): AsyncGenerator<string, void, unknown> {
-    const chunks: string[] = [];
-    let done = false;
-    let waiting: (() => void) | null = null;
+    model: string,
+    provider: string,
+    config: ReasoningConfig & { systemPrompt: string },
+    tools?: Record<string, import("ai").Tool>
+  ): AsyncGenerator<AgentStreamChunk, void, unknown> {
+    const cloudProviders = ["openai", "groq", "gemini", "anthropic", "custom"];
+    const isLocalProvider = !cloudProviders.includes(provider);
 
-    const unsubChunk = window.electronAPI?.onAgentStreamChunk?.((chunk: string) => {
-      chunks.push(chunk);
-      waiting?.();
+    if (isLocalProvider && !tools) {
+      const contentGen = this.processTextStreaming(messages, model, provider, config);
+      for await (const text of contentGen) {
+        yield { type: "content", text };
+      }
+      yield { type: "done", finishReason: "stop" };
+      return;
+    }
+
+    let apiKey = "";
+    let baseURL: string | undefined;
+
+    if (isLocalProvider) {
+      const serverResult = await window.electronAPI.llamaServerStart(model);
+      if (!serverResult.success || !serverResult.port) {
+        throw new Error(serverResult.error || "Failed to start local model server");
+      }
+      baseURL = `http://127.0.0.1:${serverResult.port}/v1`;
+    } else {
+      const providerKey = provider as "openai" | "groq" | "gemini" | "anthropic" | "custom";
+      apiKey = await this.getApiKey(providerKey);
+      baseURL = provider === "custom" ? this.getConfiguredOpenAIBase() : undefined;
+    }
+    const apiConfig = getOpenAiApiConfig(model);
+
+    const aiProvider = isLocalProvider ? "local" : provider;
+    const aiModel = getAIModel(aiProvider, model, apiKey, baseURL);
+
+    const modelDef = getCloudModel(model);
+    const needsDisableThinking = provider === "groq" && modelDef?.disableThinking;
+
+    logger.logReasoning("AGENT_AI_SDK_STREAM_REQUEST", {
+      model,
+      provider,
+      hasTools: !!tools,
+      toolCount: tools ? Object.keys(tools).length : 0,
+      messageCount: messages.length,
     });
-    const unsubDone = window.electronAPI?.onAgentStreamDone?.(() => {
-      done = true;
-      waiting?.();
+
+    const useTemperature = isLocalProvider || apiConfig.supportsTemperature;
+
+    const result = streamText({
+      model: aiModel,
+      messages: messages.map((m) => ({
+        role: m.role as "system" | "user" | "assistant",
+        content: m.content,
+      })),
+      tools: tools || undefined,
+      stopWhen: stepCountIs(tools ? ReasoningService.MAX_TOOL_STEPS : 1),
+      ...(useTemperature ? { temperature: config.temperature ?? 0.3 } : {}),
+      maxOutputTokens: config.maxTokens || 4096,
+      ...(needsDisableThinking ? { providerOptions: { groq: { reasoningEffort: "none" } } } : {}),
     });
 
-    try {
-      const result = await window.electronAPI?.cloudAgentStream?.(messages, {
+    for await (const chunk of result.fullStream) {
+      if (chunk.type === "text-delta") {
+        yield { type: "content", text: chunk.text };
+      } else if (chunk.type === "tool-call") {
+        yield {
+          type: "tool_calls",
+          calls: [
+            {
+              id: chunk.toolCallId,
+              name: chunk.toolName,
+              arguments: JSON.stringify(chunk.input),
+            },
+          ],
+        };
+      } else if (chunk.type === "tool-result") {
+        const output = chunk.output;
+        const displayText =
+          typeof output === "string" ? output : output?.error ? String(output.error) : "Done";
+        yield {
+          type: "tool_result",
+          callId: chunk.toolCallId,
+          toolName: chunk.toolName,
+          displayText,
+        };
+      } else if (chunk.type === "finish") {
+        yield { type: "done", finishReason: chunk.finishReason };
+      }
+    }
+  }
+
+  cancelActiveStream(): void {
+    this.streamAbortController?.abort();
+    this.streamAbortController = null;
+  }
+
+  private streamFromIPC(
+    messages: Array<{ role: string; content: string | Array<unknown> }>,
+    opts: {
+      systemPrompt?: string;
+      tools?: Array<{ name: string; description: string; parameters: Record<string, unknown> }>;
+    }
+  ): AsyncGenerator<
+    {
+      type: string;
+      text?: string;
+      id?: string;
+      name?: string;
+      arguments?: string;
+      finishReason?: string;
+    },
+    void,
+    unknown
+  > {
+    type StreamEvent = {
+      type: string;
+      text?: string;
+      id?: string;
+      name?: string;
+      arguments?: string;
+      finishReason?: string;
+    };
+    const queue: Array<StreamEvent | { type: "__error"; error: string } | { type: "__end" }> = [];
+    let resolve: (() => void) | null = null;
+
+    const cleanupChunk = window.electronAPI?.onAgentStreamChunk?.((chunk) => {
+      queue.push(chunk);
+      resolve?.();
+    });
+    const cleanupError = window.electronAPI?.onAgentStreamError?.((err) => {
+      queue.push({ type: "__error", error: err.error });
+      resolve?.();
+    });
+    const cleanupEnd = window.electronAPI?.onAgentStreamEnd?.(() => {
+      queue.push({ type: "__end" });
+      resolve?.();
+    });
+
+    const cleanup = () => {
+      cleanupChunk?.();
+      cleanupError?.();
+      cleanupEnd?.();
+    };
+
+    window.electronAPI?.startAgentStream?.(messages, opts);
+
+    const generator = async function* () {
+      try {
+        while (true) {
+          if (queue.length === 0) {
+            await new Promise<void>((r) => {
+              resolve = r;
+            });
+            resolve = null;
+          }
+
+          while (queue.length > 0) {
+            const item = queue.shift()!;
+            if (item.type === "__end") return;
+            if (item.type === "__error") throw new Error((item as { error: string }).error);
+            yield item as StreamEvent;
+          }
+        }
+      } finally {
+        cleanup();
+      }
+    };
+
+    return generator();
+  }
+
+  async *processTextStreamingCloud(
+    messages: Array<{ role: string; content: string | Array<unknown> }>,
+    config: {
+      systemPrompt: string;
+      tools?: Array<{ name: string; description: string; parameters: Record<string, unknown> }>;
+      executeToolCall?: (
+        name: string,
+        args: string
+      ) => Promise<{ data: string; displayText: string; metadata?: Record<string, unknown> }>;
+    }
+  ): AsyncGenerator<AgentStreamChunk, void, unknown> {
+    const maxSteps = config.tools?.length ? ReasoningService.MAX_TOOL_STEPS : 1;
+    let currentMessages = [...messages];
+
+    for (let step = 0; step < maxSteps; step++) {
+      const stream = this.streamFromIPC(currentMessages, {
         systemPrompt: config.systemPrompt,
+        tools: config.tools,
       });
 
-      if (result && !result.success) {
-        throw new Error(result.error || "Cloud agent streaming failed");
+      const pendingToolCalls: Array<{ id: string; name: string; arguments: string }> = [];
+
+      for await (const ev of stream) {
+        if (ev.type === "content") {
+          yield { type: "content", text: ev.text as string };
+        } else if (ev.type === "tool_call") {
+          const call = {
+            id: ev.id as string,
+            name: ev.name as string,
+            arguments: ev.arguments as string,
+          };
+          pendingToolCalls.push(call);
+          yield { type: "tool_calls", calls: [call] };
+        }
       }
 
-      while (!done || chunks.length > 0) {
-        if (chunks.length > 0) {
-          yield chunks.shift()!;
-        } else if (!done) {
-          await new Promise<void>((r) => {
-            waiting = r;
-          });
-          waiting = null;
+      if (pendingToolCalls.length === 0 || !config.executeToolCall) {
+        yield { type: "done", finishReason: "stop" };
+        return;
+      }
+
+      for (const call of pendingToolCalls) {
+        let toolResult: { data: string; displayText: string; metadata?: Record<string, unknown> };
+        try {
+          toolResult = await config.executeToolCall(call.name, call.arguments);
+        } catch (error) {
+          const errMsg = `Error: ${(error as Error).message}`;
+          toolResult = { data: errMsg, displayText: errMsg };
         }
+        yield {
+          type: "tool_result",
+          callId: call.id,
+          toolName: call.name,
+          displayText: toolResult.displayText,
+          ...(toolResult.metadata ? { metadata: toolResult.metadata } : {}),
+        };
+
+        currentMessages = [
+          ...currentMessages,
+          {
+            role: "assistant",
+            content: [
+              {
+                type: "tool-call",
+                toolCallId: call.id,
+                toolName: call.name,
+                input: JSON.parse(call.arguments),
+              },
+            ],
+          },
+          {
+            role: "tool",
+            content: [
+              {
+                type: "tool-result",
+                toolCallId: call.id,
+                toolName: call.name,
+                output: { type: "text", value: toolResult.data },
+              },
+            ],
+          },
+        ];
       }
-    } finally {
-      unsubChunk?.();
-      unsubDone?.();
     }
+
+    yield { type: "done", finishReason: "stop" };
   }
 
   async isAvailable(): Promise<boolean> {
@@ -1363,6 +1633,7 @@ class ReasoningService extends BaseReasoningService {
   }
 
   destroy(): void {
+    this.cancelActiveStream();
     if (this.cacheCleanupStop) {
       this.cacheCleanupStop();
     }
diff --git a/src/services/ai/providers.ts b/src/services/ai/providers.ts
new file mode 100644
index 000000000..e0b3c1461
--- /dev/null
+++ b/src/services/ai/providers.ts
@@ -0,0 +1,32 @@
+import { createOpenAI } from "@ai-sdk/openai";
+import { createGroq } from "@ai-sdk/groq";
+import { createAnthropic } from "@ai-sdk/anthropic";
+import { createGoogleGenerativeAI } from "@ai-sdk/google";
+import type { LanguageModel } from "ai";
+
+export function getAIModel(
+  provider: string,
+  model: string,
+  apiKey: string,
+  baseURL?: string
+): LanguageModel {
+  switch (provider) {
+    case "openai":
+      return createOpenAI({ apiKey })(model);
+    case "groq":
+      return createGroq({ apiKey })(model);
+    case "anthropic":
+      return createAnthropic({ apiKey })(model);
+    case "gemini":
+      return createGoogleGenerativeAI({ apiKey })(model);
+    case "custom":
+      return createOpenAI({ apiKey, baseURL })(model);
+    case "local":
+      return createOpenAI({
+        apiKey: "no-key",
+        baseURL,
+      }).chat(model);
+    default:
+      throw new Error(`Unsupported AI SDK provider: ${provider}`);
+  }
+}
diff --git a/src/services/tools/ToolRegistry.ts b/src/services/tools/ToolRegistry.ts
new file mode 100644
index 000000000..948fdb78a
--- /dev/null
+++ b/src/services/tools/ToolRegistry.ts
@@ -0,0 +1,51 @@
+import { jsonSchema } from "ai";
+import type { Tool } from "ai";
+
+export interface ToolResult {
+  success: boolean;
+  data: unknown;
+  displayText: string;
+}
+
+export interface ToolDefinition {
+  name: string;
+  description: string;
+  parameters: Record<string, unknown>;
+  readOnly: boolean;
+  execute: (args: Record<string, unknown>) => Promise<ToolResult>;
+}
+
+export class ToolRegistry {
+  private tools = new Map<string, ToolDefinition>();
+
+  register(tool: ToolDefinition): void {
+    this.tools.set(tool.name, tool);
+  }
+
+  get(name: string): ToolDefinition | undefined {
+    return this.tools.get(name);
+  }
+
+  getAll(): ToolDefinition[] {
+    return Array.from(this.tools.values());
+  }
+
+  toAISDKFormat(): Record<string, Tool> {
+    const result: Record<string, Tool> = {};
+    for (const def of this.getAll()) {
+      result[def.name] = {
+        description: def.description,
+        inputSchema: jsonSchema(def.parameters),
+        execute: async (args: unknown) => {
+          try {
+            const toolResult = await def.execute(args as Record<string, unknown>);
+            return toolResult.success ? toolResult.data : { error: toolResult.displayText };
+          } catch (error) {
+            return { error: (error as Error).message || "Tool execution failed" };
+          }
+        },
+      } as Tool;
+    }
+    return result;
+  }
+}
diff --git a/src/services/tools/calendarTool.ts b/src/services/tools/calendarTool.ts
new file mode 100644
index 000000000..ed45ed116
--- /dev/null
+++ b/src/services/tools/calendarTool.ts
@@ -0,0 +1,83 @@
+import type { ToolDefinition, ToolResult } from "./ToolRegistry";
+
+type TimeRange = "today" | "tomorrow" | "week";
+
+function getWindowMinutes(timeRange: TimeRange): number {
+  if (timeRange === "week") return 10080;
+
+  const now = new Date();
+  if (timeRange === "tomorrow") {
+    const endOfTomorrow = new Date(now);
+    endOfTomorrow.setDate(endOfTomorrow.getDate() + 1);
+    endOfTomorrow.setHours(23, 59, 59, 999);
+    return Math.ceil((endOfTomorrow.getTime() - now.getTime()) / 60000);
+  }
+
+  // "today": remaining minutes until midnight
+  const midnight = new Date(now);
+  midnight.setHours(23, 59, 59, 999);
+  return Math.max(1, Math.ceil((midnight.getTime() - now.getTime()) / 60000));
+}
+
+export const calendarTool: ToolDefinition = {
+  name: "get_calendar_events",
+  description:
+    "Get upcoming Google Calendar events for a given time range. Returns event summaries, times, and locations.",
+  parameters: {
+    type: "object",
+    properties: {
+      timeRange: {
+        type: "string",
+        enum: ["today", "tomorrow", "week"],
+        description: 'Time range to fetch events for (default "today")',
+      },
+    },
+    required: [],
+    additionalProperties: false,
+  },
+  readOnly: true,
+
+  async execute(args: Record<string, unknown>): Promise<ToolResult> {
+    const timeRange = (args.timeRange as TimeRange) || "today";
+    const windowMinutes = getWindowMinutes(timeRange);
+
+    try {
+      const response = await window.electronAPI.gcalGetUpcomingEvents!(windowMinutes);
+
+      if (!response.success) {
+        return {
+          success: false,
+          data: null,
+          displayText: "Failed to fetch calendar events",
+        };
+      }
+
+      const events = response.events.map((event: Record<string, unknown>) => ({
+        summary: event.summary || "(No title)",
+        start: event.start,
+        end: event.end,
+        location: event.location || null,
+      }));
+
+      if (events.length === 0) {
+        return {
+          success: true,
+          data: [],
+          displayText: `No events found for ${timeRange}`,
+        };
+      }
+
+      return {
+        success: true,
+        data: events,
+        displayText: `Found ${events.length} event${events.length === 1 ? "" : "s"} for ${timeRange}`,
+      };
+    } catch (error) {
+      return {
+        success: false,
+        data: null,
+        displayText: `Failed to fetch calendar events: ${(error as Error).message}`,
+      };
+    }
+  },
+};
diff --git a/src/services/tools/clipboardTool.ts b/src/services/tools/clipboardTool.ts
new file mode 100644
index 000000000..09328e096
--- /dev/null
+++ b/src/services/tools/clipboardTool.ts
@@ -0,0 +1,39 @@
+import type { ToolDefinition, ToolResult } from "./ToolRegistry";
+
+export const clipboardTool: ToolDefinition = {
+  name: "copy_to_clipboard",
+  description: "Copy text to the user's system clipboard.",
+  parameters: {
+    type: "object",
+    properties: {
+      text: {
+        type: "string",
+        description: "The text to copy to the clipboard",
+      },
+    },
+    required: ["text"],
+    additionalProperties: false,
+  },
+  readOnly: false,
+
+  async execute(args: Record<string, unknown>): Promise<ToolResult> {
+    const text = args.text as string;
+
+    try {
+      await window.electronAPI.writeClipboard(text);
+
+      const preview = text.length > 100 ? text.slice(0, 100) + "..." : text;
+      return {
+        success: true,
+        data: null,
+        displayText: `Copied to clipboard: "${preview}"`,
+      };
+    } catch (error) {
+      return {
+        success: false,
+        data: null,
+        displayText: `Failed to copy to clipboard: ${(error as Error).message}`,
+      };
+    }
+  },
+};
diff --git a/src/services/tools/createNoteTool.ts b/src/services/tools/createNoteTool.ts
new file mode 100644
index 000000000..003a594b9
--- /dev/null
+++ b/src/services/tools/createNoteTool.ts
@@ -0,0 +1,73 @@
+import type { ToolDefinition, ToolResult } from "./ToolRegistry";
+import { resolveFolderId } from "./utils";
+import { syncNoteToCloud } from "../../stores/noteStore";
+
+export const createNoteTool: ToolDefinition = {
+  name: "create_note",
+  description: "Create a new note with a title and content, optionally in a specific folder.",
+  parameters: {
+    type: "object",
+    properties: {
+      title: {
+        type: "string",
+        description: "The title of the note",
+      },
+      content: {
+        type: "string",
+        description: "The content of the note",
+      },
+      folder: {
+        type: "string",
+        description: "The folder name to create the note in (optional)",
+      },
+    },
+    required: ["title", "content"],
+    additionalProperties: false,
+  },
+  readOnly: false,
+
+  async execute(args: Record<string, unknown>): Promise<ToolResult> {
+    const title = args.title as string;
+    const content = args.content as string;
+    const folderName = args.folder as string | undefined;
+
+    try {
+      let folderId: number | null = null;
+
+      if (folderName) {
+        const resolved = await resolveFolderId(folderName);
+        if (resolved.error) {
+          return { success: false, data: null, displayText: resolved.error };
+        }
+        folderId = resolved.folderId;
+      }
+
+      const result = await window.electronAPI.saveNote(
+        title,
+        content,
+        "personal",
+        null,
+        null,
+        folderId
+      );
+
+      if (!result.success || !result.note) {
+        return { success: false, data: null, displayText: "Failed to create note" };
+      }
+
+      syncNoteToCloud(result.note).catch(() => {});
+
+      return {
+        success: true,
+        data: { id: result.note.id, title: result.note.title },
+        displayText: `Created note: "${title}"`,
+      };
+    } catch (error) {
+      return {
+        success: false,
+        data: null,
+        displayText: `Failed to create note: ${(error as Error).message}`,
+      };
+    }
+  },
+};
diff --git a/src/services/tools/getNoteTool.ts b/src/services/tools/getNoteTool.ts
new file mode 100644
index 000000000..1219759fc
--- /dev/null
+++ b/src/services/tools/getNoteTool.ts
@@ -0,0 +1,55 @@
+import type { ToolDefinition, ToolResult } from "./ToolRegistry";
+
+export const getNoteTool: ToolDefinition = {
+  name: "get_note",
+  description:
+    "Get the full content of a specific note by ID. Use search_notes first to find the note ID.",
+  parameters: {
+    type: "object",
+    properties: {
+      id: {
+        type: "number",
+        description: "The note ID to retrieve",
+      },
+    },
+    required: ["id"],
+    additionalProperties: false,
+  },
+  readOnly: true,
+
+  async execute(args: Record<string, unknown>): Promise<ToolResult> {
+    const id = args.id as number;
+
+    try {
+      const note = await window.electronAPI.getNote(id);
+
+      if (!note) {
+        return {
+          success: false,
+          data: null,
+          displayText: `Note with ID ${id} not found`,
+        };
+      }
+
+      return {
+        success: true,
+        data: {
+          id: note.id,
+          title: note.title,
+          content: note.enhanced_content || note.content,
+          type: note.note_type,
+          folder_id: note.folder_id,
+          created_at: note.created_at,
+          updated_at: note.updated_at,
+        },
+        displayText: `Retrieved note: "${note.title}"`,
+      };
+    } catch (error) {
+      return {
+        success: false,
+        data: null,
+        displayText: `Failed to get note: ${(error as Error).message}`,
+      };
+    }
+  },
+};
diff --git a/src/services/tools/index.ts b/src/services/tools/index.ts
new file mode 100644
index 000000000..35552f94a
--- /dev/null
+++ b/src/services/tools/index.ts
@@ -0,0 +1,38 @@
+import { ToolRegistry } from "./ToolRegistry";
+import { createSearchNotesTool } from "./searchNotesTool";
+import { getNoteTool } from "./getNoteTool";
+import { createNoteTool } from "./createNoteTool";
+import { updateNoteTool } from "./updateNoteTool";
+import { clipboardTool } from "./clipboardTool";
+import { webSearchTool } from "./webSearchTool";
+import { calendarTool } from "./calendarTool";
+
+export { ToolRegistry } from "./ToolRegistry";
+export type { ToolDefinition, ToolResult } from "./ToolRegistry";
+
+interface ToolRegistrySettings {
+  isSignedIn: boolean;
+  gcalConnected: boolean;
+  cloudBackupEnabled: boolean;
+}
+
+export function createToolRegistry(settings: ToolRegistrySettings): ToolRegistry {
+  const registry = new ToolRegistry();
+
+  const useCloudSearch = settings.isSignedIn && settings.cloudBackupEnabled;
+  registry.register(createSearchNotesTool({ useCloudSearch }));
+  registry.register(getNoteTool);
+  registry.register(createNoteTool);
+  registry.register(updateNoteTool);
+  registry.register(clipboardTool);
+
+  if (settings.isSignedIn) {
+    registry.register(webSearchTool);
+  }
+
+  if (settings.gcalConnected) {
+    registry.register(calendarTool);
+  }
+
+  return registry;
+}
diff --git a/src/services/tools/searchNotesTool.ts b/src/services/tools/searchNotesTool.ts
new file mode 100644
index 000000000..d01b9adf3
--- /dev/null
+++ b/src/services/tools/searchNotesTool.ts
@@ -0,0 +1,120 @@
+import type { ToolDefinition, ToolResult } from "./ToolRegistry";
+
+const MAX_CONTENT_LENGTH = 500;
+
+interface SearchToolOptions {
+  useCloudSearch: boolean;
+}
+
+export function createSearchNotesTool(options: SearchToolOptions): ToolDefinition {
+  const { useCloudSearch } = options;
+
+  return {
+    name: "search_notes",
+    description:
+      "Search the user's notes using semantic search. Understands meaning and context, not just keywords. Returns matching notes with title, date, relevance score, and a preview of content.",
+    parameters: {
+      type: "object",
+      properties: {
+        query: {
+          type: "string",
+          description: "The search query to find relevant notes",
+        },
+        limit: {
+          type: "number",
+          description: "Maximum number of results to return (default 5)",
+        },
+      },
+      required: ["query"],
+      additionalProperties: false,
+    },
+    readOnly: true,
+
+    async execute(args: Record<string, unknown>): Promise<ToolResult> {
+      const query = args.query as string;
+      const limit = typeof args.limit === "number" ? args.limit : 5;
+
+      // Fallback chain: cloud → local semantic (hybrid RRF) → FTS5 keyword
+      const strategies: Array<() => Promise<ToolResult>> = [];
+      if (useCloudSearch) strategies.push(() => executeCloudSearch(query, limit));
+      strategies.push(() => executeLocalSearch(query, limit, true));
+      strategies.push(() => executeLocalSearch(query, limit, false));
+
+      for (let i = 0; i < strategies.length; i++) {
+        try {
+          return await strategies[i]();
+        } catch (error) {
+          if (i === strategies.length - 1) {
+            return {
+              success: false,
+              data: null,
+              displayText: `Failed to search notes: ${(error as Error).message}`,
+            };
+          }
+        }
+      }
+
+      return { success: false, data: null, displayText: "No search strategies available" };
+    },
+  };
+}
+
+async function executeLocalSearch(
+  query: string,
+  limit: number,
+  semantic: boolean
+): Promise<ToolResult> {
+  const notes = semantic
+    ? await window.electronAPI.semanticSearchNotes(query, limit)
+    : await window.electronAPI.searchNotes(query, limit);
+
+  if (notes.length === 0) {
+    return {
+      success: true,
+      data: [],
+      displayText: `No notes found for "${query}"`,
+    };
+  }
+
+  const results = notes.map((note) => ({
+    id: note.id,
+    title: note.title,
+    date: note.created_at,
+    type: note.note_type,
+    content: (note.enhanced_content || note.content).slice(0, MAX_CONTENT_LENGTH),
+  }));
+
+  return {
+    success: true,
+    data: results,
+    displayText: `Found ${results.length} note${results.length === 1 ? "" : "s"} for "${query}"${semantic ? " (semantic search)" : ""}`,
+  };
+}
+
+async function executeCloudSearch(query: string, limit: number): Promise<ToolResult> {
+  const { NotesService } = await import("../../services/NotesService.js");
+  const { notes: cloudNotes } = await NotesService.search(query, limit);
+
+  if (cloudNotes.length === 0) {
+    return {
+      success: true,
+      data: [],
+      displayText: `No notes found for "${query}"`,
+    };
+  }
+
+  const results = cloudNotes.map((cn) => ({
+    id: cn.client_note_id ? parseInt(cn.client_note_id, 10) : null,
+    title: cn.title,
+    date: cn.created_at,
+    type: cn.note_type,
+    score: cn.score,
+    content: (cn.enhanced_content || cn.content).slice(0, MAX_CONTENT_LENGTH),
+  }));
+
+  return {
+    success: true,
+    data: results,
+    displayText: `Found ${results.length} note${results.length === 1 ? "" : "s"} for "${query}" (semantic search)`,
+  };
+}
diff --git a/src/services/tools/updateNoteTool.ts b/src/services/tools/updateNoteTool.ts
new file mode 100644
index 000000000..e41b8a266
--- /dev/null
+++ b/src/services/tools/updateNoteTool.ts
@@ -0,0 +1,87 @@
+import type { ToolDefinition, ToolResult } from "./ToolRegistry";
+import { resolveFolderId } from "./utils";
+import { syncNoteUpdateToCloud } from "../../stores/noteStore";
+
+export const updateNoteTool: ToolDefinition = {
+  name: "update_note",
+  description:
+    "Update an existing note's title, content, or move it to a different folder. Use search_notes first to find the note ID.",
+  parameters: {
+    type: "object",
+    properties: {
+      id: {
+        type: "number",
+        description: "The note ID to update",
+      },
+      title: {
+        type: "string",
+        description: "New title for the note (optional)",
+      },
+      content: {
+        type: "string",
+        description: "New content for the note (optional)",
+      },
+      folder: {
+        type: "string",
+        description: "Folder name to move the note to (optional)",
+      },
+    },
+    required: ["id"],
+    additionalProperties: false,
+  },
+  readOnly: false,
+
+  async execute(args: Record<string, unknown>): Promise<ToolResult> {
+    const id = args.id as number;
+    const title = args.title as string | undefined;
+    const content = args.content as string | undefined;
+    const folderName = args.folder as string | undefined;
+
+    if (!title && !content && !folderName) {
+      return {
+        success: false,
+        data: null,
+        displayText: "At least one of title, content, or folder must be provided",
+      };
+    }
+
+    try {
+      const note = await window.electronAPI.getNote(id);
+      if (!note) {
+        return { success: false, data: null, displayText: `Note with ID ${id} not found` };
+      }
+
+      const updates: Record<string, string | number | null> = {};
+      if (title) updates.title = title;
+      if (content) updates.content = content;
+
+      if (folderName) {
+        const resolved = await resolveFolderId(folderName);
+        if (resolved.error) {
+          return { success: false, data: null, displayText: resolved.error };
+        }
+        updates.folder_id = resolved.folderId;
+      }
+
+      const result = await window.electronAPI.updateNote(id, updates);
+
+      if (!result.success) {
+        return { success: false, data: null, displayText: "Failed to update note" };
+      }
+
+      syncNoteUpdateToCloud(note, updates).catch(() => {});
+
+      return {
+        success: true,
+        data: { id, title: title || note.title },
+        displayText: `Updated note: "${title || note.title}"`,
+      };
+    } catch (error) {
+      return {
+        success: false,
+        data: null,
+        displayText: `Failed to update note: ${(error as Error).message}`,
+      };
+    }
+  },
+};
diff --git a/src/services/tools/utils.ts b/src/services/tools/utils.ts
new file mode 100644
index 000000000..ea4917971
--- /dev/null
+++ b/src/services/tools/utils.ts
@@ -0,0 +1,11 @@
+export async function resolveFolderId(
+  folderName: string
+): Promise<{ folderId: number; error?: undefined } | { folderId?: undefined; error: string }> {
+  const folders = await window.electronAPI.getFolders();
+
+  const match = folders.find((f) => f.name.toLowerCase() === folderName.toLowerCase());
+  if (match) return { folderId: match.id };
+
+  const available = folders.map((f) => f.name).join(", ");
+  return { error: `Folder "${folderName}" not found. Available folders: ${available}` };
+}
diff --git a/src/services/tools/webSearchTool.ts b/src/services/tools/webSearchTool.ts
new file mode 100644
index 000000000..a6454367b
--- /dev/null
+++ b/src/services/tools/webSearchTool.ts
@@ -0,0 +1,55 @@
+import type { ToolDefinition, ToolResult } from "./ToolRegistry";
+
+export const webSearchTool: ToolDefinition = {
+  name: "web_search",
+  description:
+    "Search the web for current information. Returns relevant web results with titles, URLs, and article text.",
+  parameters: {
+    type: "object",
+    properties: {
+      query: {
+        type: "string",
+        description: "The search query",
+      },
+      numResults: {
+        type: "number",
+        description: "Number of results to return (default 5)",
+      },
+    },
+    required: ["query"],
+    additionalProperties: false,
+  },
+  readOnly: true,
+
+  async execute(args: Record<string, unknown>): Promise<ToolResult> {
+    const query = args.query as string;
+    const numResults = typeof args.numResults === "number" ? args.numResults : 5;
+
+    try {
+      const raw = await window.electronAPI.agentWebSearch!(query, numResults);
+
+      const results = Array.isArray(raw?.results)
+        ? raw.results.map(
+            (r: { title?: string; url?: string; text?: string; publishedDate?: string }) => ({
+              title: r.title || "",
+              url: r.url || "",
+              text: r.text ? r.text.slice(0, 500) : "",
+              publishedDate: r.publishedDate || null,
+            })
+          )
+        : raw;
+
+      return {
+        success: true,
+        data: results,
+        displayText: `Found web results for "${query}"`,
+      };
+    } catch (error) {
+      return {
+        success: false,
+        data: null,
+        displayText: `Web search failed: ${(error as Error).message}`,
+      };
+    }
+  },
+};
diff --git a/src/stores/chatStore.ts b/src/stores/chatStore.ts
new file mode 100644
index 000000000..0b118e518
--- /dev/null
+++ b/src/stores/chatStore.ts
@@ -0,0 +1,161 @@
+import { create } from "zustand";
+
+interface ConversationItem {
+  id: number;
+  title: string;
+  cloud_id?: string | null;
+  archived_at?: string | null;
+  created_at: string;
+  updated_at: string;
+}
+
+interface ChatState {
+  conversations: ConversationItem[];
+  activeConversationId: number | null;
+  migration: { total: number; done: number } | null;
+}
+
+const useChatStore = create<ChatState>()(() => ({
+  conversations: [],
+  activeConversationId: null,
+  migration: null,
+}));
+
+export async function initializeConversations(limit = 50): Promise<ConversationItem[]> {
+  const items = (await window.electronAPI?.getAgentConversations?.(limit)) ?? [];
+  useChatStore.setState({ conversations: items });
+  return items;
+}
+
+export function addConversation(conversation: ConversationItem): void {
+  if (!conversation) return;
+  const { conversations } = useChatStore.getState();
+  const withoutDuplicate = conversations.filter((c) => c.id !== conversation.id);
+  useChatStore.setState({ conversations: [conversation, ...withoutDuplicate] });
+}
+
+export function updateConversation(conversation: ConversationItem): void {
+  if (!conversation) return;
+  const { conversations } = useChatStore.getState();
+  useChatStore.setState({
+    conversations: conversations.map((c) => (c.id === conversation.id ? conversation : c)),
+  });
+}
+
+export function removeConversation(id: number): void {
+  if (id == null) return;
+  const { conversations, activeConversationId } = useChatStore.getState();
+  const next = conversations.filter((c) => c.id !== id);
+  if (next.length === conversations.length) return;
+  const update: Partial<ChatState> = { conversations: next };
+  if (activeConversationId === id) {
+    const idx = conversations.findIndex((c) => c.id === id);
+    const neighbor = next[Math.min(idx, next.length - 1)] ?? null;
+    update.activeConversationId = neighbor?.id ?? null;
+  }
+  useChatStore.setState(update);
+}
+
+export function setActiveConversationId(id: number | null): void {
+  if (useChatStore.getState().activeConversationId === id) return;
+  useChatStore.setState({ activeConversationId: id });
+}
+
+export function getActiveConversationIdValue(): number | null {
+  return useChatStore.getState().activeConversationId;
+}
+
+export function useConversations(): ConversationItem[] {
+  return useChatStore((state) => state.conversations);
+}
+
+export function useActiveConversationId(): number | null {
+  return useChatStore((state) => state.activeConversationId);
+}
+
+export function useActiveConversation(): ConversationItem | null {
+  return useChatStore((state) => {
+    if (state.activeConversationId == null) return null;
+    return state.conversations.find((c) => c.id === state.activeConversationId) ?? null;
+  });
+}
+
+export function useChatMigration(): { total: number; done: number } | null {
+  return useChatStore((state) => state.migration);
+}
+
+export async function syncConversationToCloud(conversation: ConversationItem): Promise<void> {
+  const { ConversationsService } = await import("../services/ConversationsService.js");
+
+  const messages = (await window.electronAPI?.getAgentMessages?.(conversation.id)) ?? [];
+
+  const cloudConv = await ConversationsService.create({
+    client_conversation_id: String(conversation.id),
+    title: conversation.title,
+    created_at: conversation.created_at,
+    updated_at: conversation.updated_at,
+    messages: messages.map((m) => ({
+      role: m.role,
+      content: m.content,
+    })),
+  });
+
+  updateConversation({ ...conversation, cloud_id: cloudConv.id });
+}
+
+export async function syncMessageToCloud(
+  conversation: ConversationItem,
+  role: "user" | "assistant" | "system",
+  content: string,
+  metadata?: Record<string, unknown> | null
+): Promise<void> {
+  const { ConversationsService } = await import("../services/ConversationsService.js");
+  if (conversation.cloud_id) {
+    await ConversationsService.addMessage(conversation.cloud_id, role, content, metadata);
+  } else {
+    await syncConversationToCloud(conversation);
+  }
+}
+
+export async function syncConversationUpdateToCloud(
+  conversation: ConversationItem,
+  updates: { title?: string; archived_at?: string }
+): Promise<void> {
+  const { ConversationsService } = await import("../services/ConversationsService.js");
+  if (conversation.cloud_id) {
+    await ConversationsService.update(conversation.cloud_id, updates);
+  } else {
+    await syncConversationToCloud(conversation);
+  }
+}
+
+export async function syncConversationDeleteToCloud(cloudId: string): Promise<void> {
+  const { ConversationsService } = await import("../services/ConversationsService.js");
+  await ConversationsService.delete(cloudId);
+}
+
+export async function startConversationMigration(): Promise<void> {
+  const allConversations = (await window.electronAPI?.getAgentConversations?.(9999)) ?? [];
+  const unsynced = allConversations.filter((c) => !c.cloud_id);
+  if (unsynced.length === 0) return;
+
+  useChatStore.setState({ migration: { total: unsynced.length, done: 0 } });
+
+  for (const conv of unsynced) {
+    try {
+      await syncConversationToCloud(conv);
+      useChatStore.setState((s) => ({
+        migration: s.migration
+          ? {
+              total: s.migration.total,
+              done: Math.min(s.migration.done + 1, s.migration.total),
+            }
+          : null,
+      }));
+    } catch (err) {
+      console.error("Conversation migration failed:", err);
+    }
+  }
+
+  useChatStore.setState({ migration: null });
+}
diff --git a/src/stores/noteStore.ts b/src/stores/noteStore.ts
index 10eb2a641..6e5a2ff6b 100644
--- a/src/stores/noteStore.ts
+++ b/src/stores/noteStore.ts
@@ -18,6 +18,7 @@ const useNoteStore = create<NoteState>()(() => ({
 let hasBoundIpcListeners = false;
 const DEFAULT_LIMIT = 50;
 let currentLimit = DEFAULT_LIMIT;
+let loadGeneration = 0;
 
 function ensureIpcListeners() {
   if (hasBoundIpcListeners || typeof window === "undefined") {
@@ -69,9 +70,11 @@ export async function initializeNotes(
   limit = DEFAULT_LIMIT,
   folderId?: number | null
 ): Promise<NoteItem[]> {
+  const gen = ++loadGeneration;
   currentLimit = limit;
   ensureIpcListeners();
   const items = (await window.electronAPI?.getNotes(noteType, limit, folderId)) ?? [];
+  if (gen !== loadGeneration) return items;
   useNoteStore.setState({ notes: items });
   return items;
 }
@@ -94,10 +97,16 @@ export function updateNoteInStore(note: NoteItem): void {
 
 export function removeNote(id: number): void {
   if (id == null) return;
-  const { notes } = useNoteStore.getState();
+  const { notes, activeNoteId } = useNoteStore.getState();
   const next = notes.filter((item) => item.id !== id);
   if (next.length === notes.length) return;
-  useNoteStore.setState({ notes: next });
+  const update: Partial<NoteState> = { notes: next };
+  if (activeNoteId === id) {
+    const idx = notes.findIndex((item) => item.id === id);
+    const neighbor = next[Math.min(idx, next.length - 1)] ?? null;
+    update.activeNoteId = neighbor?.id ?? null;
+  }
+  useNoteStore.setState(update);
 }
 
 export function setActiveNoteId(id: number | null): void {
diff --git a/src/stores/settingsStore.ts b/src/stores/settingsStore.ts
index 85321b4cc..bf0b3b457 100644
--- a/src/stores/settingsStore.ts
+++ b/src/stores/settingsStore.ts
@@ -65,6 +65,7 @@ const BOOLEAN_SETTINGS = new Set([
   "agentEnabled",
   "keepTranscriptionInClipboard",
   "dataRetentionEnabled",
+  "noteFilesEnabled",
 ]);
 
 const ARRAY_SETTINGS = new Set(["customDictionary", "gcalAccounts"]);
@@ -105,6 +106,8 @@ export interface SettingsState
   meetingAudioDetection: boolean;
   panelStartPosition: "bottom-right" | "center" | "bottom-left";
   keepTranscriptionInClipboard: boolean;
+  noteFilesEnabled: boolean;
+  noteFilesPath: string;
 
   setUseLocalWhisper: (value: boolean) => void;
   setWhisperModel: (value: string) => void;
@@ -156,6 +159,8 @@ export interface SettingsState
   setMeetingAudioDetection: (value: boolean) => void;
   setPanelStartPosition: (position: "bottom-right" | "center" | "bottom-left") => void;
   setKeepTranscriptionInClipboard: (value: boolean) => void;
+  setNoteFilesEnabled: (value: boolean) => void;
+  setNoteFilesPath: (value: string) => void;
   setIsSignedIn: (value: boolean) => void;
 
   setAgentModel: (value: string) => void;
@@ -308,6 +313,8 @@ export const useSettingsStore = create<SettingsState>()((set, get) => ({
     return "bottom-right" as const;
   })(),
   keepTranscriptionInClipboard: readBoolean("keepTranscriptionInClipboard", false),
+  noteFilesEnabled: readBoolean("noteFilesEnabled", false),
+  noteFilesPath: readString("noteFilesPath", ""),
   isSignedIn: readBoolean("isSignedIn", false),
 
   agentModel: readString("agentModel", "openai/gpt-oss-120b"),
@@ -499,6 +506,8 @@ export const useSettingsStore = create<SettingsState>()((set, get) => ({
   },
 
   setKeepTranscriptionInClipboard: createBooleanSetter("keepTranscriptionInClipboard"),
+  setNoteFilesEnabled: createBooleanSetter("noteFilesEnabled"),
+  setNoteFilesPath: createStringSetter("noteFilesPath"),
 
   setIsSignedIn: (value: boolean) => {
     if (isBrowser) localStorage.setItem("isSignedIn", String(value));
diff --git a/src/types/electron.ts b/src/types/electron.ts
index f2904914a..c783003d9 100644
--- a/src/types/electron.ts
+++ b/src/types/electron.ts
@@ -275,6 +275,18 @@ export interface LlamaVulkanDownloadProgress {
   percentage: number;
 }
 
+export interface ConversationPreview {
+  id: number;
+  title: string;
+  created_at: string;
+  updated_at: string;
+  archived_at?: string | null;
+  cloud_id?: string | null;
+  message_count: number;
+  last_message?: string | null;
+  last_message_role?: "user" | "assistant" | "system" | null;
+}
+
 export interface ReferralItem {
   id: string;
   email: string;
@@ -387,6 +399,11 @@ declare global {
         format: "txt" | "md"
       ) => Promise<{ success: boolean; error?: string }>;
       searchNotes: (query: string, limit?: number) => Promise<NoteItem[]>;
+      semanticSearchNotes: (query: string, limit?: number) => Promise<NoteItem[]>;
+      semanticReindexAll: () => Promise<{ success: boolean; indexed?: number; error?: string }>;
+      onSemanticReindexProgress: (
+        callback: (data: { done: number; total: number }) => void
+      ) => () => void;
       updateNoteCloudId: (id: number, cloudId: string) => Promise<NoteItem>;
 
       // Folder operations
@@ -401,6 +418,18 @@ declare global {
       ) => Promise<{ success: boolean; folder?: FolderItem; error?: string }>;
       getFolderNoteCounts: () => Promise<Array<{ folder_id: number; count: number }>>;
 
+      // Note files (markdown mirror)
+      noteFilesSetEnabled?: (
+        enabled: boolean,
+        customPath?: string
+      ) => Promise<{ success: boolean; error?: string }>;
+      noteFilesSetPath?: (path: string) => Promise<{ success: boolean; error?: string }>;
+      noteFilesRebuild?: () => Promise<{ success: boolean; error?: string }>;
+      noteFilesGetDefaultPath?: () => Promise<string>;
+      noteFilesPickFolder?: () => Promise<{ canceled: boolean; path?: string }>;
+      showNoteFile?: (noteId: number) => Promise<{ success: boolean }>;
+      showFolderInExplorer?: (folderName: string) => Promise<{ success: boolean }>;
+
       // Action operations
       getActions: () => Promise<ActionItem[]>;
       getAction: (id: number) => Promise<ActionItem | null>;
@@ -503,7 +532,10 @@ declare global {
 
       // CUDA GPU acceleration
       listGpus?: () => Promise<GpuDevice[]>;
-      setGpuDeviceIndex?: (purpose: "transcription" | "intelligence", index: number) => Promise<{ success: boolean }>;
+      setGpuDeviceIndex?: (
+        purpose: "transcription" | "intelligence",
+        index: number
+      ) => Promise<{ success: boolean }>;
       getGpuDeviceIndex?: (purpose: "transcription" | "intelligence") => Promise<string>;
       detectGpu: () => Promise<GpuInfo>;
       getCudaWhisperStatus: () => Promise<CudaWhisperStatus>;
@@ -694,6 +726,9 @@ declare global {
       ) => () => void;
       onSettingUpdated?: (callback: (data: { key: string; value: unknown }) => void) => () => void;
 
+      // Settings shortcut (Cmd+, / Ctrl+,)
+      onShowSettings?: (callback: () => void) => () => void;
+
       // Accessibility permission events (macOS)
       onAccessibilityMissing?: (callback: () => void) => () => void;
       checkAccessibilityTrusted?: () => Promise<boolean>;
@@ -1014,6 +1049,8 @@ declare global {
         Array<{
           id: number;
           title: string;
+          archived_at?: string;
+          cloud_id?: string;
           created_at: string;
           updated_at: string;
         }>
@@ -1021,6 +1058,8 @@ declare global {
       getAgentConversation?: (id: number) => Promise<{
         id: number;
         title: string;
+        archived_at?: string;
+        cloud_id?: string;
         created_at: string;
         updated_at: string;
         messages: Array<{
@@ -1028,6 +1067,7 @@ declare global {
           conversation_id: number;
           role: "user" | "assistant" | "system";
           content: string;
+          metadata?: string;
           created_at: string;
         }>;
       } | null>;
@@ -1036,12 +1076,14 @@ declare global {
       addAgentMessage?: (
         conversationId: number,
         role: "user" | "assistant" | "system",
-        content: string
+        content: string,
+        metadata?: Record<string, unknown>
       ) => Promise<{
         id: number;
         conversation_id: number;
         role: string;
         content: string;
+        metadata?: string;
         created_at: string;
       }>;
       getAgentMessages?: (conversationId: number) => Promise<
@@ -1050,9 +1092,26 @@ declare global {
           conversation_id: number;
           role: "user" | "assistant" | "system";
           content: string;
+          metadata?: string;
           created_at: string;
         }>
       >;
+      getAgentConversationsWithPreview?: (
+        limit?: number,
+        offset?: number,
+        includeArchived?: boolean
+      ) => Promise<ConversationPreview[]>;
+      searchAgentConversations?: (query: string, limit?: number) => Promise<ConversationPreview[]>;
+      archiveAgentConversation?: (id: number) => Promise<{ success: boolean }>;
+      unarchiveAgentConversation?: (id: number) => Promise<{ success: boolean }>;
+      updateAgentConversationCloudId?: (
+        id: number,
+        cloudId: string
+      ) => Promise<{ success: boolean }>;
+      semanticSearchConversations?: (
+        query: string,
+        limit?: number
+      ) => Promise<ConversationPreview[]>;
 
       // Deepgram Streaming
       deepgramStreamingWarmup?: (options?: { sampleRate?: number; language?: string }) => Promise<{
@@ -1103,13 +1162,44 @@ declare global {
       onAgentStopRecording?: (callback: () => void) => () => void;
       onAgentToggleRecording?: (callback: () => void) => () => void;
 
-      // Agent cloud streaming
-      cloudAgentStream?: (
-        messages: Array<{ role: string; content: string }>,
-        opts?: { systemPrompt?: string }
-      ) => Promise<{ success: boolean; error?: string; code?: string }>;
-      onAgentStreamChunk?: (callback: (chunk: string) => void) => () => void;
-      onAgentStreamDone?: (callback: () => void) => () => void;
+      // Agent cloud streaming (event-based)
+      startAgentStream?: (
+        messages: Array<{ role: string; content: string | Array<unknown> }>,
+        opts?: {
+          systemPrompt?: string;
+          tools?: Array<{ name: string; description: string; parameters: Record<string, unknown> }>;
+        }
+      ) => void;
+      onAgentStreamChunk?: (
+        callback: (chunk: {
+          type: "content" | "tool_call" | "done";
+          text?: string;
+          id?: string;
+          name?: string;
+          arguments?: string;
+          finishReason?: string;
+        }) => void
+      ) => () => void;
+      onAgentStreamError?: (
+        callback: (error: { error: string; code?: string }) => void
+      ) => () => void;
+      onAgentStreamEnd?: (callback: () => void) => () => void;
+
+      // Agent cloud tools
+      agentOpenNote?: (noteId: number) => Promise<{ success: boolean; error?: string }>;
+      agentWebSearch?: (
+        query: string,
+        numResults?: number
+      ) => Promise<{
+        success: boolean;
+        results?: Array<{
+          title: string;
+          url: string;
+          text: string;
+          publishedDate?: string;
+        }>;
+        error?: string;
+      }>;
 
       // Google Calendar
       gcalStartOAuth?: () => Promise<{ success: boolean; email?: string; error?: string }>;
@@ -1128,6 +1218,16 @@ declare global {
       gcalGetUpcomingEvents?: (
         windowMinutes?: number
       ) => Promise<{ success: boolean; events: any[] }>;
+      gcalGetEvent?: (eventId: string) => Promise<{
+        success: boolean;
+        event: {
+          id: string;
+          summary: string | null;
+          start_time: string;
+          end_time: string;
+          attendees_count: number;
+        } | null;
+      }>;
 
       // Meeting chain transcription (BaseTen)
       meetingTranscribeChain?: (
@@ -1204,10 +1304,6 @@ declare global {
       meetingDetectionSetPreferences?: (
         prefs: Record<string, boolean>
       ) => Promise<{ success: boolean }>;
-      meetingDetectionRespond?: (
-        detectionId: string,
-        action: string
-      ) => Promise<{ success: boolean }>;
       onMeetingDetected?: (callback: (data: any) => void) => () => void;
       onMeetingDetectedStartRecording?: (callback: (data: any) => void) => () => void;
       onMeetingNotificationData?: (callback: (data: any) => void) => () => void;
@@ -1220,6 +1316,7 @@ declare global {
       onNavigateToMeetingNote?: (
         callback: (data: { noteId: number; folderId: number; event: any }) => void
       ) => () => void;
+      onNavigateToNote?: (callback: (data: { noteId: number }) => void) => () => void;
       onUpdateNotificationData?: (
         callback: (data: { version: string; releaseDate?: string }) => void
       ) => () => void;