Merge pull request 'Release v0.7.1' (!10) from dev into main

Docker compatibility:
- Discovery endpoints now read from OLLAMA_URL, LLAMACPP_URL, LMSTUDIO_URL env vars
- docker-compose.yml sets backends to host.docker.internal for container access
- justfile updated with --host 0.0.0.0 for llama-server

Vision support:
- OpenAI adapter now converts images to content parts array format
- Enables vision models with llama.cpp and LM Studio

Bumps version to 0.7.1

.env.example

@@ -0,0 +1,40 @@
+# ===========================================
+# Vessel Configuration
+# ===========================================
+# Copy this file to .env and adjust values as needed.
+# All variables have sensible defaults - only set what you need to change.
+
+# ----- Backend -----
+# Server port (default: 9090 for local dev, matches vite proxy)
+PORT=9090
+
+# SQLite database path (relative to backend working directory)
+DB_PATH=./data/vessel.db
+
+# Ollama API endpoint
+OLLAMA_URL=http://localhost:11434
+
+# GitHub repo for version checking (format: owner/repo)
+GITHUB_REPO=VikingOwl91/vessel
+
+# ----- Frontend -----
+# Ollama API endpoint (for frontend proxy)
+OLLAMA_API_URL=http://localhost:11434
+
+# Backend API endpoint
+BACKEND_URL=http://localhost:9090
+
+# Development server port
+DEV_PORT=7842
+
+# ----- llama.cpp -----
+# llama.cpp server port (used by `just llama-server`)
+LLAMA_PORT=8081
+
+# ----- Additional Ports (for health checks) -----
+# Ollama port (extracted from OLLAMA_URL for health checks)
+OLLAMA_PORT=11434
+
+# ----- Models -----
+# Directory for GGUF model files
+VESSEL_MODELS_DIR=~/.vessel/models

.github/workflows/release.yml

@@ -17,11 +17,30 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Wait for Gitea release
+        run: sleep 60
+
+      - name: Fetch release notes from Gitea
+        id: gitea_notes
+        env:
+          TAG_NAME: ${{ github.ref_name }}
+        run: |
+          NOTES=$(curl -s "https://somegit.dev/api/v1/repos/vikingowl/vessel/releases/tags/${TAG_NAME}" | jq -r '.body // empty')
+          if [ -n "$NOTES" ]; then
+            echo "found=true" >> $GITHUB_OUTPUT
+            {
+              echo "notes<<EOF"
+              echo "$NOTES"
+              echo "EOF"
+            } >> $GITHUB_OUTPUT
+          else
+            echo "found=false" >> $GITHUB_OUTPUT
+            echo "notes=See the [full release notes on Gitea](https://somegit.dev/vikingowl/vessel/releases/tag/${TAG_NAME}) for detailed information." >> $GITHUB_OUTPUT
+          fi
+
       - name: Create GitHub Release
         uses: softprops/action-gh-release@v2
         with:
-          generate_release_notes: true
-          body: |
-            See the [full release notes on Gitea](https://somegit.dev/vikingowl/vessel/releases) for detailed information.
+          body: ${{ steps.gitea_notes.outputs.notes }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -42,3 +42,10 @@ dev.env
 backend/vessel-backend
 data/
 backend/data-dev/
+
+# Generated files
+frontend/static/pdf.worker.min.mjs
+
+# Test artifacts
+frontend/playwright-report/
+frontend/test-results/

CONTRIBUTING.md

@@ -2,11 +2,63 @@
 
 Thanks for your interest in Vessel.
 
-- Issues and pull requests are handled on GitHub:
-  https://github.com/VikingOwl91/vessel
+### Where to Contribute
 
-- Keep changes focused and small.
-- UI and UX improvements are welcome.
-- Vessel intentionally avoids becoming a platform.
+- **Issues**: Open on GitHub at https://github.com/VikingOwl91/vessel
+- **Pull Requests**: Submit via GitHub (for external contributors) or Gitea (for maintainers)
 
-If you’re unsure whether something fits, open an issue first.
+### Branching Strategy
+
+```
+main          (protected - releases only)
+  └── dev     (default development branch)
+       └── feature/your-feature
+       └── fix/bug-description
+```
+
+- **main**: Production releases only. No direct pushes allowed.
+- **dev**: Active development. All changes merge here first.
+- **feature/***: New features, branch from `dev`
+- **fix/***: Bug fixes, branch from `dev`
+
+### Workflow
+
+1. **Fork** the repository (external contributors)
+2. **Clone** and switch to dev:
+   ```bash
+   git clone https://github.com/VikingOwl91/vessel.git
+   cd vessel
+   git checkout dev
+   ```
+3. **Create a feature branch**:
+   ```bash
+   git checkout -b feature/your-feature
+   ```
+4. **Make changes** with clear, focused commits
+5. **Test** your changes
+6. **Push** and create a PR targeting `dev`:
+   ```bash
+   git push -u origin feature/your-feature
+   ```
+7. Open a PR from your branch to `dev`
+
+### Commit Messages
+
+Follow conventional commits:
+- `feat:` New features
+- `fix:` Bug fixes
+- `docs:` Documentation changes
+- `refactor:` Code refactoring
+- `test:` Adding tests
+- `chore:` Maintenance tasks
+
+### Guidelines
+
+- Keep changes focused and small
+- UI and UX improvements are welcome
+- Vessel intentionally avoids becoming a platform
+- If unsure whether something fits, open an issue first
+
+### Development Setup
+
+See the [Development Wiki](https://github.com/VikingOwl91/vessel/wiki/Development) for detailed setup instructions.

README.md

@@ -5,91 +5,85 @@
 <h1 align="center">Vessel</h1>
 
 <p align="center">
-  <strong>A modern, feature-rich web interface for Ollama</strong>
+  <strong>A modern, feature-rich web interface for local LLMs</strong>
 </p>
 
 <p align="center">
-  <a href="#why-vessel">Why Vessel</a> •
   <a href="#features">Features</a> •
-  <a href="#screenshots">Screenshots</a> •
   <a href="#quick-start">Quick Start</a> •
-  <a href="#installation">Installation</a> •
-  <a href="#roadmap">Roadmap</a>
+  <a href="https://github.com/VikingOwl91/vessel/wiki">Documentation</a> •
+  <a href="#contributing">Contributing</a>
 </p>
 
 <p align="center">
   <img src="https://img.shields.io/badge/SvelteKit-5.0-FF3E00?style=flat-square&logo=svelte&logoColor=white" alt="SvelteKit 5">
-  <img src="https://img.shields.io/badge/Svelte-5.16-FF3E00?style=flat-square&logo=svelte&logoColor=white" alt="Svelte 5">
   <img src="https://img.shields.io/badge/Go-1.24-00ADD8?style=flat-square&logo=go&logoColor=white" alt="Go 1.24">
-  <img src="https://img.shields.io/badge/TypeScript-5.7-3178C6?style=flat-square&logo=typescript&logoColor=white" alt="TypeScript">
-  <img src="https://img.shields.io/badge/Tailwind-3.4-06B6D4?style=flat-square&logo=tailwindcss&logoColor=white" alt="Tailwind CSS">
   <img src="https://img.shields.io/badge/Docker-Ready-2496ED?style=flat-square&logo=docker&logoColor=white" alt="Docker">
-</p>
-
-<p align="center">
   <img src="https://img.shields.io/badge/license-GPL--3.0-blue?style=flat-square" alt="License GPL-3.0">
-  <img src="https://img.shields.io/badge/PRs-welcome-brightgreen?style=flat-square" alt="PRs Welcome">
 </p>
 
 ---
 
 ## Why Vessel
 
-Vessel and [open-webui](https://github.com/open-webui/open-webui) solve different problems.
-
 **Vessel** is intentionally focused on:
 
-- A clean, local-first UI for **Ollama**
+- A clean, local-first UI for **local LLMs**
+- **Multiple backends**: Ollama, llama.cpp, LM Studio
 - Minimal configuration
 - Low visual and cognitive overhead
 - Doing a small set of things well
 
-It exists for users who want a UI that is fast and uncluttered, makes browsing and managing Ollama models simple, and stays out of the way once set up.
-
-**open-webui** aims to be a feature-rich, extensible frontend supporting many runtimes, integrations, and workflows. That flexibility is powerful — but it comes with more complexity in setup, UI, and maintenance.
-
-### In short
-
-- If you want a **universal, highly configurable platform** → open-webui is a great choice
-- If you want a **small, focused UI for local Ollama usage** → Vessel is built for that
-
-Vessel deliberately avoids becoming a platform. Its scope is narrow by design.
+If you want a **universal, highly configurable platform** → [open-webui](https://github.com/open-webui/open-webui) is a great choice.
+If you want a **small, focused UI for local LLM usage** → Vessel is built for that.
 
 ---
 
 ## Features
 
-### Core Chat Experience
-- **Real-time streaming** — Watch responses appear token by token
-- **Conversation history** — All chats stored locally in IndexedDB
-- **Message editing** — Edit any message and regenerate responses with branching
-- **Branch navigation** — Explore different response paths from edited messages
-- **Markdown rendering** — Full GFM support with tables, lists, and formatting
-- **Syntax highlighting** — Beautiful code blocks powered by Shiki with 100+ languages
-- **Dark/Light mode** — Seamless theme switching with system preference detection
+### Chat
+- Real-time streaming responses with token metrics
+- **Message branching** — edit any message to create alternative conversation paths
+- Markdown rendering with syntax highlighting
+- **Thinking mode** — native support for reasoning models (DeepSeek-R1, etc.)
+- Dark/Light themes
 
-### Built-in Tools (Function Calling)
-Vessel includes five powerful tools that models can invoke automatically:
+### Projects & Organization
+- **Projects** — group related conversations together
+- Pin and archive conversations
+- Smart title generation from conversation content
+- **Global search** — semantic, title, and content search across all chats
 
-| Tool | Description |
-|------|-------------|
-| **Web Search** | Search the internet for current information, news, weather, prices |
-| **Fetch URL** | Read and extract content from any webpage |
-| **Calculator** | Safe math expression parser with functions (sqrt, sin, cos, log, etc.) |
-| **Get Location** | Detect user location via GPS or IP for local queries |
-| **Get Time** | Current date/time with timezone support |
+### Knowledge Base (RAG)
+- Upload documents (text, markdown, PDF) to build a knowledge base
+- **Semantic search** using embeddings for context-aware retrieval
+- Project-specific or global knowledge bases
+- Automatic context injection into conversations
 
-### Model Management
-- **Model browser** — Browse, search, and pull models from Ollama registry
-- **Live status** — See which models are currently loaded in memory
-- **Quick switch** — Change models mid-conversation
-- **Model metadata** — View parameters, quantization, and capabilities
+### Tools
+- **5 built-in tools**: web search, URL fetching, calculator, location, time
+- **Custom tools**: Create your own in JavaScript, Python, or HTTP
+- Agentic tool calling with chain-of-thought reasoning
+- Test tools before saving with the built-in testing panel
 
-### Developer Experience
-- **Beautiful code generation** — Syntax-highlighted output for any language
-- **Copy code blocks** — One-click copy with visual feedback
-- **Scroll to bottom** — Smart auto-scroll with manual override
-- **Keyboard shortcuts** — Navigate efficiently with hotkeys
+### LLM Backends
+- **Ollama** — Full model management, pull/delete/create custom models
+- **llama.cpp** — High-performance inference with GGUF models
+- **LM Studio** — Desktop app integration
+- Switch backends without restart, auto-detection of available backends
+
+### Models (Ollama)
+- Browse and pull models from ollama.com
+- Create custom models with embedded system prompts
+- **Per-model parameters** — customize temperature, context size, top_k/top_p
+- Track model updates and capability detection (vision, tools, code)
+
+### Prompts
+- Save and organize system prompts
+- Assign default prompts to specific models
+- Capability-based auto-selection (vision, code, tools, thinking)
+
+📖 **[Full documentation on the Wiki →](https://github.com/VikingOwl91/vessel/wiki)**
 
 ---
 
@@ -98,33 +92,22 @@ Vessel includes five powerful tools that models can invoke automatically:
 <table>
   <tr>
     <td align="center" width="50%">
-      <img src="screenshots/hero-dark.png" alt="Chat Interface - Dark Mode">
-      <br>
-      <em>Clean, modern chat interface</em>
+      <img src="screenshots/hero-dark.png" alt="Chat Interface">
+      <br><em>Clean chat interface</em>
     </td>
     <td align="center" width="50%">
       <img src="screenshots/code-generation.png" alt="Code Generation">
-      <br>
-      <em>Syntax-highlighted code output</em>
+      <br><em>Syntax-highlighted code</em>
     </td>
   </tr>
   <tr>
     <td align="center" width="50%">
-      <img src="screenshots/web-search.png" alt="Web Search Results">
-      <br>
-      <em>Integrated web search with styled results</em>
+      <img src="screenshots/web-search.png" alt="Web Search">
+      <br><em>Integrated web search</em>
     </td>
     <td align="center" width="50%">
-      <img src="screenshots/light-mode.png" alt="Light Mode">
-      <br>
-      <em>Light theme for daytime use</em>
-    </td>
-  </tr>
-  <tr>
-    <td align="center" colspan="2">
-      <img src="screenshots/model-browser.png" alt="Model Browser" width="50%">
-      <br>
-      <em>Browse and manage Ollama models</em>
+      <img src="screenshots/model-browser.png" alt="Model Browser">
+      <br><em>Model browser</em>
     </td>
   </tr>
 </table>
@@ -136,331 +119,121 @@ Vessel includes five powerful tools that models can invoke automatically:
 ### Prerequisites
 
 - [Docker](https://docs.docker.com/get-docker/) and Docker Compose
-- [Ollama](https://ollama.com/download) installed and running locally
+- An LLM backend (at least one):
+  - [Ollama](https://ollama.com/download) (recommended)
+  - [llama.cpp](https://github.com/ggerganov/llama.cpp)
+  - [LM Studio](https://lmstudio.ai/)
 
-#### Ollama Configuration
+### Configure Ollama
 
-Ollama must listen on all interfaces for Docker containers to connect. Configure it by setting `OLLAMA_HOST=0.0.0.0`:
+Ollama must listen on all interfaces for Docker to connect:
 
-**Option A: Using systemd (Linux, recommended)**
 ```bash
+# Option A: systemd (Linux)
 sudo systemctl edit ollama
-```
-
-Add these lines:
-```ini
-[Service]
-Environment="OLLAMA_HOST=0.0.0.0"
-```
-
-Then restart:
-```bash
-sudo systemctl daemon-reload
+# Add: Environment="OLLAMA_HOST=0.0.0.0"
 sudo systemctl restart ollama
-```
 
-**Option B: Manual start**
-```bash
+# Option B: Manual
 OLLAMA_HOST=0.0.0.0 ollama serve
 ```
 
-### One-Line Install
+### Install
 
 ```bash
+# One-line install
 curl -fsSL https://somegit.dev/vikingowl/vessel/raw/main/install.sh | bash
-```
 
-### Or Clone and Run
-
-```bash
-git clone https://somegit.dev/vikingowl/vessel.git
+# Or clone and run
+git clone https://github.com/VikingOwl91/vessel.git
 cd vessel
 ./install.sh
 ```
 
-The installer will:
-- Check for Docker, Docker Compose, and Ollama
-- Start the frontend and backend services
-- Optionally pull a starter model (llama3.2)
+Open **http://localhost:7842** in your browser.
 
-Once running, open **http://localhost:7842** in your browser.
+### Update / Uninstall
+
+```bash
+./install.sh --update     # Update to latest
+./install.sh --uninstall  # Remove
+```
+
+📖 **[Detailed installation guide →](https://github.com/VikingOwl91/vessel/wiki/Getting-Started)**
 
 ---
 
-## Installation
+## Documentation
 
-### Option 1: Install Script (Recommended)
+Full documentation is available on the **[GitHub Wiki](https://github.com/VikingOwl91/vessel/wiki)**:
 
-The install script handles everything automatically:
-
-```bash
-./install.sh              # Install and start
-./install.sh --update     # Update to latest version
-./install.sh --uninstall  # Remove installation
-```
-
-**Requirements:**
-- Ollama must be installed and running locally
-- Docker and Docker Compose
-- Linux or macOS
-
-### Option 2: Docker Compose (Manual)
-
-```bash
-# Make sure Ollama is running first
-ollama serve
-
-# Start Vessel
-docker compose up -d
-```
-
-### Option 3: Manual Setup (Development)
-
-#### Prerequisites
-- [Node.js](https://nodejs.org/) 20+
-- [Go](https://go.dev/) 1.24+
-- [Ollama](https://ollama.com/) running locally
-
-#### Frontend
-
-```bash
-cd frontend
-npm install
-npm run dev
-```
-
-Frontend runs on `http://localhost:5173`
-
-#### Backend
-
-```bash
-cd backend
-go mod tidy
-go run cmd/server/main.go -port 9090
-```
-
-Backend API runs on `http://localhost:9090`
-
----
-
-## Configuration
-
-### Environment Variables
-
-#### Frontend
-| Variable | Default | Description |
-|----------|---------|-------------|
-| `OLLAMA_API_URL` | `http://localhost:11434` | Ollama API endpoint |
-| `BACKEND_URL` | `http://localhost:9090` | Vessel backend API |
-
-#### Backend
-| Variable | Default | Description |
-|----------|---------|-------------|
-| `OLLAMA_URL` | `http://localhost:11434` | Ollama API endpoint |
-| `PORT` | `8080` | Backend server port |
-| `GIN_MODE` | `debug` | Gin mode (`debug`, `release`) |
-
-### Docker Compose Override
-
-Create `docker-compose.override.yml` for local customizations:
-
-```yaml
-services:
-  frontend:
-    environment:
-      - CUSTOM_VAR=value
-    ports:
-      - "3000:3000"  # Different port
-```
-
----
-
-## Architecture
-
-```
-vessel/
-├── frontend/               # SvelteKit 5 application
-│   ├── src/
-│   │   ├── lib/
-│   │   │   ├── components/ # UI components
-│   │   │   ├── stores/     # Svelte 5 runes state
-│   │   │   ├── tools/      # Built-in tool definitions
-│   │   │   ├── storage/    # IndexedDB (Dexie)
-│   │   │   └── api/        # API clients
-│   │   └── routes/         # SvelteKit routes
-│   └── Dockerfile
-│
-├── backend/                # Go API server
-│   ├── cmd/server/         # Entry point
-│   └── internal/
-│       ├── api/            # HTTP handlers
-│       │   ├── fetcher.go  # URL fetching with wget/curl/chromedp
-│       │   ├── search.go   # Web search via DuckDuckGo
-│       │   └── routes.go   # Route definitions
-│       ├── database/       # SQLite storage
-│       └── models/         # Data models
-│
-├── docker-compose.yml      # Production setup
-└── docker-compose.dev.yml  # Development with hot reload
-```
-
----
-
-## Tech Stack
-
-### Frontend
-- **[SvelteKit 5](https://kit.svelte.dev/)** — Full-stack framework
-- **[Svelte 5](https://svelte.dev/)** — Runes-based reactivity
-- **[TypeScript](https://www.typescriptlang.org/)** — Type safety
-- **[Tailwind CSS](https://tailwindcss.com/)** — Utility-first styling
-- **[Skeleton UI](https://skeleton.dev/)** — Component library
-- **[Shiki](https://shiki.matsu.io/)** — Syntax highlighting
-- **[Dexie](https://dexie.org/)** — IndexedDB wrapper
-- **[Marked](https://marked.js.org/)** — Markdown parser
-- **[DOMPurify](https://github.com/cure53/DOMPurify)** — XSS sanitization
-
-### Backend
-- **[Go 1.24](https://go.dev/)** — Fast, compiled backend
-- **[Gin](https://gin-gonic.com/)** — HTTP framework
-- **[SQLite](https://sqlite.org/)** — Embedded database
-- **[chromedp](https://github.com/chromedp/chromedp)** — Headless browser
-
----
-
-## Development
-
-### Running Tests
-
-```bash
-# Frontend unit tests
-cd frontend
-npm run test
-
-# With coverage
-npm run test:coverage
-
-# Watch mode
-npm run test:watch
-```
-
-### Type Checking
-
-```bash
-cd frontend
-npm run check
-```
-
-### Development Mode
-
-Use the dev compose file for hot reloading:
-
-```bash
-docker compose -f docker-compose.dev.yml up
-```
-
----
-
-## API Reference
-
-### Backend Endpoints
-
-| Method | Endpoint | Description |
-|--------|----------|-------------|
-| `POST` | `/api/v1/proxy/search` | Web search via DuckDuckGo |
-| `POST` | `/api/v1/proxy/fetch` | Fetch URL content |
-| `GET` | `/api/v1/location` | Get user location from IP |
-| `GET` | `/api/v1/models/registry` | Browse Ollama model registry |
-| `GET` | `/api/v1/models/search` | Search models |
-| `POST` | `/api/v1/chats/sync` | Sync conversations |
-
-### Ollama Proxy
-
-All requests to `/ollama/*` are proxied to the Ollama API, enabling CORS.
+| Guide | Description |
+|-------|-------------|
+| [Getting Started](https://github.com/VikingOwl91/vessel/wiki/Getting-Started) | Installation and configuration |
+| [LLM Backends](https://github.com/VikingOwl91/vessel/wiki/LLM-Backends) | Configure Ollama, llama.cpp, or LM Studio |
+| [Projects](https://github.com/VikingOwl91/vessel/wiki/Projects) | Organize conversations into projects |
+| [Knowledge Base](https://github.com/VikingOwl91/vessel/wiki/Knowledge-Base) | RAG with document upload and semantic search |
+| [Search](https://github.com/VikingOwl91/vessel/wiki/Search) | Semantic and content search across chats |
+| [Custom Tools](https://github.com/VikingOwl91/vessel/wiki/Custom-Tools) | Create JavaScript, Python, or HTTP tools |
+| [System Prompts](https://github.com/VikingOwl91/vessel/wiki/System-Prompts) | Manage prompts with model defaults |
+| [Custom Models](https://github.com/VikingOwl91/vessel/wiki/Custom-Models) | Create models with embedded prompts |
+| [Built-in Tools](https://github.com/VikingOwl91/vessel/wiki/Built-in-Tools) | Reference for web search, calculator, etc. |
+| [API Reference](https://github.com/VikingOwl91/vessel/wiki/API-Reference) | Backend endpoints |
+| [Development](https://github.com/VikingOwl91/vessel/wiki/Development) | Contributing and architecture |
+| [Troubleshooting](https://github.com/VikingOwl91/vessel/wiki/Troubleshooting) | Common issues and solutions |
 
 ---
 
 ## Roadmap
 
-Vessel is intentionally focused on being a **clean, local-first UI for Ollama**.
-The roadmap prioritizes **usability, clarity, and low friction** over feature breadth.
+Vessel prioritizes **usability and simplicity** over feature breadth.
 
-### Core UX Improvements (Near-term)
+**Completed:**
+- [x] Multi-backend support (Ollama, llama.cpp, LM Studio)
+- [x] Model browser with filtering and update detection
+- [x] Custom tools (JavaScript, Python, HTTP)
+- [x] System prompt library with model-specific defaults
+- [x] Custom model creation with embedded prompts
+- [x] Projects for conversation organization
+- [x] Knowledge base with RAG (semantic retrieval)
+- [x] Global search (semantic, title, content)
+- [x] Thinking mode for reasoning models
+- [x] Message branching and conversation trees
 
-These improve the existing experience without expanding scope.
-
-- [ ] Improve model browser & search
-  - better filtering (size, tags, quantization)
-  - clearer metadata presentation
+**Planned:**
 - [ ] Keyboard-first workflows
-  - model switching
-  - prompt navigation
-- [ ] UX polish & stability
-  - error handling
-  - loading / offline states
-  - small performance improvements
-
-### Local Ecosystem Quality-of-Life (Opt-in)
-
-Still local-first, still focused — but easing onboarding and workflows.
-
-- [ ] Docker-based Ollama support
-  *(for systems without native Ollama installs)*
+- [ ] UX polish and stability improvements
 - [ ] Optional voice input/output
-  *(accessibility & convenience, not a core requirement)*
-- [ ] Presets for common workflows
-  *(model + tool combinations, kept simple)*
 
-### Experimental / Explicitly Optional
+**Non-Goals:**
+- Multi-user systems
+- Cloud sync
+- Plugin ecosystems
+- Cloud/API-based LLM providers (OpenAI, Anthropic, etc.)
 
-These are **explorations**, not promises. They are intentionally separated to avoid scope creep.
-
-- [ ] Image generation support
-  *(only if it can be cleanly isolated from the core UI)*
-- [ ] Hugging Face integration
-  *(evaluated carefully to avoid bloating the local-first experience)*
-
-### Non-Goals (By Design)
-
-Vessel intentionally avoids becoming a platform.
-
-- Multi-user / account-based systems
-- Cloud sync or hosted services
-- Large plugin ecosystems
-- "Universal" support for every LLM runtime
-
-If a feature meaningfully compromises simplicity, it likely doesn't belong in core Vessel.
-
-### Philosophy
-
-> Do one thing well.
-> Keep the UI out of the way.
-> Prefer clarity over configurability.
+> *Do one thing well. Keep the UI out of the way.*
 
 ---
 
 ## Contributing
 
-Contributions are welcome! Please feel free to submit a Pull Request.
-
-> Issues and feature requests are tracked on GitHub:
-> https://github.com/VikingOwl91/vessel/issues
+Contributions are welcome!
 
 1. Fork the repository
 2. Create your feature branch (`git checkout -b feature/amazing-feature`)
-3. Commit your changes (`git commit -m 'Add some amazing feature'`)
-4. Push to the branch (`git push origin feature/amazing-feature`)
-5. Open a Pull Request
+3. Commit your changes
+4. Push and open a Pull Request
+
+📖 **[Development guide →](https://github.com/VikingOwl91/vessel/wiki/Development)**
+
+**Issues:** [github.com/VikingOwl91/vessel/issues](https://github.com/VikingOwl91/vessel/issues)
 
 ---
 
 ## License
 
-Copyright (C) 2026 VikingOwl
-
-This project is licensed under the GNU General Public License v3.0 - see the [LICENSE](LICENSE) file for details.
-
----
+GPL-3.0 — See [LICENSE](LICENSE) for details.
 
 <p align="center">
-  Made with <a href="https://ollama.com">Ollama</a> and <a href="https://svelte.dev">Svelte</a>
+  Made with <a href="https://svelte.dev">Svelte</a> • Supports <a href="https://ollama.com">Ollama</a>, <a href="https://github.com/ggerganov/llama.cpp">llama.cpp</a>, and <a href="https://lmstudio.ai/">LM Studio</a>
 </p>

backend/cmd/server/main.go

@@ -14,11 +14,14 @@ import (
 	"github.com/gin-gonic/gin"
 
 	"vessel-backend/internal/api"
+	"vessel-backend/internal/backends"
+	"vessel-backend/internal/backends/ollama"
+	"vessel-backend/internal/backends/openai"
 	"vessel-backend/internal/database"
 )
 
 // Version is set at build time via -ldflags, or defaults to dev
-var Version = "0.4.8"
+var Version = "0.7.1"
 
 func getEnvOrDefault(key, defaultValue string) string {
 	if value := os.Getenv(key); value != "" {
@@ -29,9 +32,11 @@ func getEnvOrDefault(key, defaultValue string) string {
 
 func main() {
 	var (
-		port      = flag.String("port", getEnvOrDefault("PORT", "8080"), "Server port")
-		dbPath    = flag.String("db", getEnvOrDefault("DB_PATH", "./data/vessel.db"), "Database file path")
-		ollamaURL = flag.String("ollama-url", getEnvOrDefault("OLLAMA_URL", "http://localhost:11434"), "Ollama API URL")
+		port        = flag.String("port", getEnvOrDefault("PORT", "8080"), "Server port")
+		dbPath      = flag.String("db", getEnvOrDefault("DB_PATH", "./data/vessel.db"), "Database file path")
+		ollamaURL   = flag.String("ollama-url", getEnvOrDefault("OLLAMA_URL", "http://localhost:11434"), "Ollama API URL")
+		llamacppURL = flag.String("llamacpp-url", getEnvOrDefault("LLAMACPP_URL", "http://localhost:8081"), "llama.cpp server URL")
+		lmstudioURL = flag.String("lmstudio-url", getEnvOrDefault("LMSTUDIO_URL", "http://localhost:1234"), "LM Studio server URL")
 	)
 	flag.Parse()
 
@@ -47,6 +52,52 @@ func main() {
 		log.Fatalf("Failed to run migrations: %v", err)
 	}
 
+	// Initialize backend registry
+	registry := backends.NewRegistry()
+
+	// Register Ollama backend
+	ollamaAdapter, err := ollama.NewAdapter(backends.BackendConfig{
+		Type:    backends.BackendTypeOllama,
+		BaseURL: *ollamaURL,
+	})
+	if err != nil {
+		log.Printf("Warning: Failed to create Ollama adapter: %v", err)
+	} else {
+		if err := registry.Register(ollamaAdapter); err != nil {
+			log.Printf("Warning: Failed to register Ollama backend: %v", err)
+		}
+	}
+
+	// Register llama.cpp backend (if URL is configured)
+	if *llamacppURL != "" {
+		llamacppAdapter, err := openai.NewAdapter(backends.BackendConfig{
+			Type:    backends.BackendTypeLlamaCpp,
+			BaseURL: *llamacppURL,
+		})
+		if err != nil {
+			log.Printf("Warning: Failed to create llama.cpp adapter: %v", err)
+		} else {
+			if err := registry.Register(llamacppAdapter); err != nil {
+				log.Printf("Warning: Failed to register llama.cpp backend: %v", err)
+			}
+		}
+	}
+
+	// Register LM Studio backend (if URL is configured)
+	if *lmstudioURL != "" {
+		lmstudioAdapter, err := openai.NewAdapter(backends.BackendConfig{
+			Type:    backends.BackendTypeLMStudio,
+			BaseURL: *lmstudioURL,
+		})
+		if err != nil {
+			log.Printf("Warning: Failed to create LM Studio adapter: %v", err)
+		} else {
+			if err := registry.Register(lmstudioAdapter); err != nil {
+				log.Printf("Warning: Failed to register LM Studio backend: %v", err)
+			}
+		}
+	}
+
 	// Setup Gin router
 	gin.SetMode(gin.ReleaseMode)
 	r := gin.New()
@@ -64,7 +115,7 @@ func main() {
 	}))
 
 	// Register routes
-	api.SetupRoutes(r, db, *ollamaURL, Version)
+	api.SetupRoutes(r, db, *ollamaURL, Version, registry)
 
 	// Create server
 	srv := &http.Server{
@@ -79,8 +130,12 @@ func main() {
 	// Graceful shutdown handling
 	go func() {
 		log.Printf("Server starting on port %s", *port)
-		log.Printf("Ollama URL: %s (using official Go client)", *ollamaURL)
 		log.Printf("Database: %s", *dbPath)
+		log.Printf("Backends configured:")
+		log.Printf("  - Ollama: %s", *ollamaURL)
+		log.Printf("  - llama.cpp: %s", *llamacppURL)
+		log.Printf("  - LM Studio: %s", *lmstudioURL)
+		log.Printf("Active backend: %s", registry.ActiveType().String())
 		if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
 			log.Fatalf("Failed to start server: %v", err)
 		}

backend/internal/api/ai_handlers.go

@@ -0,0 +1,275 @@
+package api
+
+import (
+	"encoding/json"
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+
+	"vessel-backend/internal/backends"
+)
+
+// AIHandlers provides HTTP handlers for the unified AI API
+type AIHandlers struct {
+	registry *backends.Registry
+}
+
+// NewAIHandlers creates a new AIHandlers instance
+func NewAIHandlers(registry *backends.Registry) *AIHandlers {
+	return &AIHandlers{
+		registry: registry,
+	}
+}
+
+// ListBackendsHandler returns information about all configured backends
+func (h *AIHandlers) ListBackendsHandler() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		infos := h.registry.AllInfo(c.Request.Context())
+
+		c.JSON(http.StatusOK, gin.H{
+			"backends": infos,
+			"active":   h.registry.ActiveType().String(),
+		})
+	}
+}
+
+// DiscoverBackendsHandler probes for available backends
+func (h *AIHandlers) DiscoverBackendsHandler() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		var req struct {
+			Endpoints []backends.DiscoveryEndpoint `json:"endpoints"`
+		}
+
+		if err := c.ShouldBindJSON(&req); err != nil {
+			// Use default endpoints if none provided
+			req.Endpoints = backends.DefaultDiscoveryEndpoints()
+		}
+
+		if len(req.Endpoints) == 0 {
+			req.Endpoints = backends.DefaultDiscoveryEndpoints()
+		}
+
+		results := h.registry.Discover(c.Request.Context(), req.Endpoints)
+
+		c.JSON(http.StatusOK, gin.H{
+			"results": results,
+		})
+	}
+}
+
+// SetActiveHandler sets the active backend
+func (h *AIHandlers) SetActiveHandler() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		var req struct {
+			Type string `json:"type" binding:"required"`
+		}
+
+		if err := c.ShouldBindJSON(&req); err != nil {
+			c.JSON(http.StatusBadRequest, gin.H{"error": "type is required"})
+			return
+		}
+
+		backendType, err := backends.ParseBackendType(req.Type)
+		if err != nil {
+			c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+			return
+		}
+
+		if err := h.registry.SetActive(backendType); err != nil {
+			c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+			return
+		}
+
+		c.JSON(http.StatusOK, gin.H{
+			"active": backendType.String(),
+		})
+	}
+}
+
+// HealthCheckHandler checks the health of a specific backend
+func (h *AIHandlers) HealthCheckHandler() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		typeParam := c.Param("type")
+
+		backendType, err := backends.ParseBackendType(typeParam)
+		if err != nil {
+			c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+			return
+		}
+
+		backend, ok := h.registry.Get(backendType)
+		if !ok {
+			c.JSON(http.StatusNotFound, gin.H{"error": "backend not registered"})
+			return
+		}
+
+		if err := backend.HealthCheck(c.Request.Context()); err != nil {
+			c.JSON(http.StatusServiceUnavailable, gin.H{
+				"status": "unhealthy",
+				"error":  err.Error(),
+			})
+			return
+		}
+
+		c.JSON(http.StatusOK, gin.H{
+			"status": "healthy",
+		})
+	}
+}
+
+// ListModelsHandler returns models from the active backend
+func (h *AIHandlers) ListModelsHandler() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		active := h.registry.Active()
+		if active == nil {
+			c.JSON(http.StatusServiceUnavailable, gin.H{"error": "no active backend"})
+			return
+		}
+
+		models, err := active.ListModels(c.Request.Context())
+		if err != nil {
+			c.JSON(http.StatusBadGateway, gin.H{"error": err.Error()})
+			return
+		}
+
+		c.JSON(http.StatusOK, gin.H{
+			"models":  models,
+			"backend": active.Type().String(),
+		})
+	}
+}
+
+// ChatHandler handles chat requests through the active backend
+func (h *AIHandlers) ChatHandler() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		active := h.registry.Active()
+		if active == nil {
+			c.JSON(http.StatusServiceUnavailable, gin.H{"error": "no active backend"})
+			return
+		}
+
+		var req backends.ChatRequest
+		if err := c.ShouldBindJSON(&req); err != nil {
+			c.JSON(http.StatusBadRequest, gin.H{"error": "invalid request: " + err.Error()})
+			return
+		}
+
+		if err := req.Validate(); err != nil {
+			c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+			return
+		}
+
+		// Check if streaming is requested
+		streaming := req.Stream != nil && *req.Stream
+
+		if streaming {
+			h.handleStreamingChat(c, active, &req)
+		} else {
+			h.handleNonStreamingChat(c, active, &req)
+		}
+	}
+}
+
+// handleNonStreamingChat handles non-streaming chat requests
+func (h *AIHandlers) handleNonStreamingChat(c *gin.Context, backend backends.LLMBackend, req *backends.ChatRequest) {
+	resp, err := backend.Chat(c.Request.Context(), req)
+	if err != nil {
+		c.JSON(http.StatusBadGateway, gin.H{"error": err.Error()})
+		return
+	}
+
+	c.JSON(http.StatusOK, resp)
+}
+
+// handleStreamingChat handles streaming chat requests
+func (h *AIHandlers) handleStreamingChat(c *gin.Context, backend backends.LLMBackend, req *backends.ChatRequest) {
+	// Set headers for NDJSON streaming
+	c.Header("Content-Type", "application/x-ndjson")
+	c.Header("Cache-Control", "no-cache")
+	c.Header("Connection", "keep-alive")
+	c.Header("Transfer-Encoding", "chunked")
+
+	ctx := c.Request.Context()
+	flusher, ok := c.Writer.(http.Flusher)
+	if !ok {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "streaming not supported"})
+		return
+	}
+
+	chunkCh, err := backend.StreamChat(ctx, req)
+	if err != nil {
+		errResp := gin.H{"error": err.Error()}
+		data, _ := json.Marshal(errResp)
+		c.Writer.Write(append(data, '\n'))
+		flusher.Flush()
+		return
+	}
+
+	for chunk := range chunkCh {
+		select {
+		case <-ctx.Done():
+			return
+		default:
+		}
+
+		data, err := json.Marshal(chunk)
+		if err != nil {
+			continue
+		}
+
+		_, err = c.Writer.Write(append(data, '\n'))
+		if err != nil {
+			return
+		}
+		flusher.Flush()
+	}
+}
+
+// RegisterBackendHandler registers a new backend
+func (h *AIHandlers) RegisterBackendHandler() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		var req backends.BackendConfig
+		if err := c.ShouldBindJSON(&req); err != nil {
+			c.JSON(http.StatusBadRequest, gin.H{"error": "invalid request: " + err.Error()})
+			return
+		}
+
+		if err := req.Validate(); err != nil {
+			c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+			return
+		}
+
+		// Create adapter based on type
+		var backend backends.LLMBackend
+		var err error
+
+		switch req.Type {
+		case backends.BackendTypeOllama:
+			// Would import ollama adapter
+			c.JSON(http.StatusNotImplemented, gin.H{"error": "use /api/v1/ai/backends/discover to register backends"})
+			return
+		case backends.BackendTypeLlamaCpp, backends.BackendTypeLMStudio:
+			// Would import openai adapter
+			c.JSON(http.StatusNotImplemented, gin.H{"error": "use /api/v1/ai/backends/discover to register backends"})
+			return
+		default:
+			c.JSON(http.StatusBadRequest, gin.H{"error": "unknown backend type"})
+			return
+		}
+
+		if err != nil {
+			c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+			return
+		}
+
+		if err := h.registry.Register(backend); err != nil {
+			c.JSON(http.StatusConflict, gin.H{"error": err.Error()})
+			return
+		}
+
+		c.JSON(http.StatusCreated, gin.H{
+			"type":    req.Type.String(),
+			"baseUrl": req.BaseURL,
+		})
+	}
+}

backend/internal/api/ai_handlers_test.go

@@ -0,0 +1,354 @@
+package api
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/gin-gonic/gin"
+
+	"vessel-backend/internal/backends"
+)
+
+func setupAITestRouter(registry *backends.Registry) *gin.Engine {
+	gin.SetMode(gin.TestMode)
+	r := gin.New()
+
+	handlers := NewAIHandlers(registry)
+
+	ai := r.Group("/api/v1/ai")
+	{
+		ai.GET("/backends", handlers.ListBackendsHandler())
+		ai.POST("/backends/discover", handlers.DiscoverBackendsHandler())
+		ai.POST("/backends/active", handlers.SetActiveHandler())
+		ai.GET("/backends/:type/health", handlers.HealthCheckHandler())
+		ai.POST("/chat", handlers.ChatHandler())
+		ai.GET("/models", handlers.ListModelsHandler())
+	}
+
+	return r
+}
+
+func TestAIHandlers_ListBackends(t *testing.T) {
+	registry := backends.NewRegistry()
+
+	mock := &mockAIBackend{
+		backendType: backends.BackendTypeOllama,
+		config: backends.BackendConfig{
+			Type:    backends.BackendTypeOllama,
+			BaseURL: "http://localhost:11434",
+		},
+		info: backends.BackendInfo{
+			Type:         backends.BackendTypeOllama,
+			BaseURL:      "http://localhost:11434",
+			Status:       backends.BackendStatusConnected,
+			Capabilities: backends.OllamaCapabilities(),
+			Version:      "0.3.0",
+		},
+	}
+	registry.Register(mock)
+	registry.SetActive(backends.BackendTypeOllama)
+
+	router := setupAITestRouter(registry)
+
+	w := httptest.NewRecorder()
+	req, _ := http.NewRequest("GET", "/api/v1/ai/backends", nil)
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Errorf("ListBackends() status = %d, want %d", w.Code, http.StatusOK)
+	}
+
+	var resp struct {
+		Backends []backends.BackendInfo `json:"backends"`
+		Active   string                 `json:"active"`
+	}
+	if err := json.Unmarshal(w.Body.Bytes(), &resp); err != nil {
+		t.Fatalf("Failed to unmarshal response: %v", err)
+	}
+
+	if len(resp.Backends) != 1 {
+		t.Errorf("ListBackends() returned %d backends, want 1", len(resp.Backends))
+	}
+
+	if resp.Active != "ollama" {
+		t.Errorf("ListBackends() active = %q, want %q", resp.Active, "ollama")
+	}
+}
+
+func TestAIHandlers_SetActive(t *testing.T) {
+	registry := backends.NewRegistry()
+
+	mock := &mockAIBackend{
+		backendType: backends.BackendTypeOllama,
+		config: backends.BackendConfig{
+			Type:    backends.BackendTypeOllama,
+			BaseURL: "http://localhost:11434",
+		},
+	}
+	registry.Register(mock)
+
+	router := setupAITestRouter(registry)
+
+	t.Run("set valid backend active", func(t *testing.T) {
+		body, _ := json.Marshal(map[string]string{"type": "ollama"})
+		w := httptest.NewRecorder()
+		req, _ := http.NewRequest("POST", "/api/v1/ai/backends/active", bytes.NewReader(body))
+		req.Header.Set("Content-Type", "application/json")
+		router.ServeHTTP(w, req)
+
+		if w.Code != http.StatusOK {
+			t.Errorf("SetActive() status = %d, want %d", w.Code, http.StatusOK)
+		}
+
+		if registry.ActiveType() != backends.BackendTypeOllama {
+			t.Errorf("Active backend = %v, want %v", registry.ActiveType(), backends.BackendTypeOllama)
+		}
+	})
+
+	t.Run("set invalid backend active", func(t *testing.T) {
+		body, _ := json.Marshal(map[string]string{"type": "llamacpp"})
+		w := httptest.NewRecorder()
+		req, _ := http.NewRequest("POST", "/api/v1/ai/backends/active", bytes.NewReader(body))
+		req.Header.Set("Content-Type", "application/json")
+		router.ServeHTTP(w, req)
+
+		if w.Code != http.StatusBadRequest {
+			t.Errorf("SetActive() status = %d, want %d", w.Code, http.StatusBadRequest)
+		}
+	})
+}
+
+func TestAIHandlers_HealthCheck(t *testing.T) {
+	registry := backends.NewRegistry()
+
+	mock := &mockAIBackend{
+		backendType: backends.BackendTypeOllama,
+		config: backends.BackendConfig{
+			Type:    backends.BackendTypeOllama,
+			BaseURL: "http://localhost:11434",
+		},
+		healthErr: nil,
+	}
+	registry.Register(mock)
+
+	router := setupAITestRouter(registry)
+
+	t.Run("healthy backend", func(t *testing.T) {
+		w := httptest.NewRecorder()
+		req, _ := http.NewRequest("GET", "/api/v1/ai/backends/ollama/health", nil)
+		router.ServeHTTP(w, req)
+
+		if w.Code != http.StatusOK {
+			t.Errorf("HealthCheck() status = %d, want %d", w.Code, http.StatusOK)
+		}
+	})
+
+	t.Run("non-existent backend", func(t *testing.T) {
+		w := httptest.NewRecorder()
+		req, _ := http.NewRequest("GET", "/api/v1/ai/backends/llamacpp/health", nil)
+		router.ServeHTTP(w, req)
+
+		if w.Code != http.StatusNotFound {
+			t.Errorf("HealthCheck() status = %d, want %d", w.Code, http.StatusNotFound)
+		}
+	})
+}
+
+func TestAIHandlers_ListModels(t *testing.T) {
+	registry := backends.NewRegistry()
+
+	mock := &mockAIBackend{
+		backendType: backends.BackendTypeOllama,
+		config: backends.BackendConfig{
+			Type:    backends.BackendTypeOllama,
+			BaseURL: "http://localhost:11434",
+		},
+		models: []backends.Model{
+			{ID: "llama3.2:8b", Name: "llama3.2:8b", Family: "llama"},
+			{ID: "mistral:7b", Name: "mistral:7b", Family: "mistral"},
+		},
+	}
+	registry.Register(mock)
+	registry.SetActive(backends.BackendTypeOllama)
+
+	router := setupAITestRouter(registry)
+
+	w := httptest.NewRecorder()
+	req, _ := http.NewRequest("GET", "/api/v1/ai/models", nil)
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Errorf("ListModels() status = %d, want %d", w.Code, http.StatusOK)
+	}
+
+	var resp struct {
+		Models []backends.Model `json:"models"`
+	}
+	if err := json.Unmarshal(w.Body.Bytes(), &resp); err != nil {
+		t.Fatalf("Failed to unmarshal response: %v", err)
+	}
+
+	if len(resp.Models) != 2 {
+		t.Errorf("ListModels() returned %d models, want 2", len(resp.Models))
+	}
+}
+
+func TestAIHandlers_ListModels_NoActiveBackend(t *testing.T) {
+	registry := backends.NewRegistry()
+	router := setupAITestRouter(registry)
+
+	w := httptest.NewRecorder()
+	req, _ := http.NewRequest("GET", "/api/v1/ai/models", nil)
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusServiceUnavailable {
+		t.Errorf("ListModels() status = %d, want %d", w.Code, http.StatusServiceUnavailable)
+	}
+}
+
+func TestAIHandlers_Chat(t *testing.T) {
+	registry := backends.NewRegistry()
+
+	mock := &mockAIBackend{
+		backendType: backends.BackendTypeOllama,
+		config: backends.BackendConfig{
+			Type:    backends.BackendTypeOllama,
+			BaseURL: "http://localhost:11434",
+		},
+		chatResponse: &backends.ChatChunk{
+			Model: "llama3.2:8b",
+			Message: &backends.ChatMessage{
+				Role:    "assistant",
+				Content: "Hello! How can I help?",
+			},
+			Done: true,
+		},
+	}
+	registry.Register(mock)
+	registry.SetActive(backends.BackendTypeOllama)
+
+	router := setupAITestRouter(registry)
+
+	t.Run("non-streaming chat", func(t *testing.T) {
+		chatReq := backends.ChatRequest{
+			Model: "llama3.2:8b",
+			Messages: []backends.ChatMessage{
+				{Role: "user", Content: "Hello"},
+			},
+		}
+		body, _ := json.Marshal(chatReq)
+
+		w := httptest.NewRecorder()
+		req, _ := http.NewRequest("POST", "/api/v1/ai/chat", bytes.NewReader(body))
+		req.Header.Set("Content-Type", "application/json")
+		router.ServeHTTP(w, req)
+
+		if w.Code != http.StatusOK {
+			t.Errorf("Chat() status = %d, want %d, body: %s", w.Code, http.StatusOK, w.Body.String())
+		}
+
+		var resp backends.ChatChunk
+		if err := json.Unmarshal(w.Body.Bytes(), &resp); err != nil {
+			t.Fatalf("Failed to unmarshal response: %v", err)
+		}
+
+		if !resp.Done {
+			t.Error("Chat() response.Done = false, want true")
+		}
+
+		if resp.Message == nil || resp.Message.Content != "Hello! How can I help?" {
+			t.Errorf("Chat() unexpected response: %+v", resp)
+		}
+	})
+}
+
+func TestAIHandlers_Chat_InvalidRequest(t *testing.T) {
+	registry := backends.NewRegistry()
+
+	mock := &mockAIBackend{
+		backendType: backends.BackendTypeOllama,
+	}
+	registry.Register(mock)
+	registry.SetActive(backends.BackendTypeOllama)
+
+	router := setupAITestRouter(registry)
+
+	// Missing model
+	chatReq := map[string]interface{}{
+		"messages": []map[string]string{
+			{"role": "user", "content": "Hello"},
+		},
+	}
+	body, _ := json.Marshal(chatReq)
+
+	w := httptest.NewRecorder()
+	req, _ := http.NewRequest("POST", "/api/v1/ai/chat", bytes.NewReader(body))
+	req.Header.Set("Content-Type", "application/json")
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusBadRequest {
+		t.Errorf("Chat() status = %d, want %d", w.Code, http.StatusBadRequest)
+	}
+}
+
+// mockAIBackend implements backends.LLMBackend for testing
+type mockAIBackend struct {
+	backendType  backends.BackendType
+	config       backends.BackendConfig
+	info         backends.BackendInfo
+	healthErr    error
+	models       []backends.Model
+	chatResponse *backends.ChatChunk
+}
+
+func (m *mockAIBackend) Type() backends.BackendType {
+	return m.backendType
+}
+
+func (m *mockAIBackend) Config() backends.BackendConfig {
+	return m.config
+}
+
+func (m *mockAIBackend) HealthCheck(ctx context.Context) error {
+	return m.healthErr
+}
+
+func (m *mockAIBackend) ListModels(ctx context.Context) ([]backends.Model, error) {
+	return m.models, nil
+}
+
+func (m *mockAIBackend) StreamChat(ctx context.Context, req *backends.ChatRequest) (<-chan backends.ChatChunk, error) {
+	ch := make(chan backends.ChatChunk, 1)
+	if m.chatResponse != nil {
+		ch <- *m.chatResponse
+	}
+	close(ch)
+	return ch, nil
+}
+
+func (m *mockAIBackend) Chat(ctx context.Context, req *backends.ChatRequest) (*backends.ChatChunk, error) {
+	if m.chatResponse != nil {
+		return m.chatResponse, nil
+	}
+	return &backends.ChatChunk{Done: true}, nil
+}
+
+func (m *mockAIBackend) Capabilities() backends.BackendCapabilities {
+	return backends.OllamaCapabilities()
+}
+
+func (m *mockAIBackend) Info(ctx context.Context) backends.BackendInfo {
+	if m.info.Type != "" {
+		return m.info
+	}
+	return backends.BackendInfo{
+		Type:         m.backendType,
+		BaseURL:      m.config.BaseURL,
+		Status:       backends.BackendStatusConnected,
+		Capabilities: m.Capabilities(),
+	}
+}

backend/internal/api/chats_test.go

@@ -0,0 +1,277 @@
+package api
+
+import (
+	"bytes"
+	"database/sql"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+	"vessel-backend/internal/database"
+	"vessel-backend/internal/models"
+
+	"github.com/gin-gonic/gin"
+	_ "modernc.org/sqlite"
+)
+
+func setupTestDB(t *testing.T) *sql.DB {
+	db, err := sql.Open("sqlite", ":memory:")
+	if err != nil {
+		t.Fatalf("failed to open test db: %v", err)
+	}
+
+	if err := database.RunMigrations(db); err != nil {
+		t.Fatalf("failed to run migrations: %v", err)
+	}
+
+	return db
+}
+
+func setupRouter(db *sql.DB) *gin.Engine {
+	gin.SetMode(gin.TestMode)
+	r := gin.New()
+	r.Use(gin.Recovery())
+
+	r.GET("/chats", ListChatsHandler(db))
+	r.GET("/chats/grouped", ListGroupedChatsHandler(db))
+	r.GET("/chats/:id", GetChatHandler(db))
+	r.POST("/chats", CreateChatHandler(db))
+	r.PATCH("/chats/:id", UpdateChatHandler(db))
+	r.DELETE("/chats/:id", DeleteChatHandler(db))
+	r.POST("/chats/:id/messages", CreateMessageHandler(db))
+
+	return r
+}
+
+func TestListChatsHandler(t *testing.T) {
+	db := setupTestDB(t)
+	defer db.Close()
+	router := setupRouter(db)
+
+	// Seed some data
+	chat1 := &models.Chat{ID: "chat1", Title: "Chat 1", Model: "gpt-4", Archived: false}
+	chat2 := &models.Chat{ID: "chat2", Title: "Chat 2", Model: "gpt-4", Archived: true}
+	models.CreateChat(db, chat1)
+	models.CreateChat(db, chat2)
+
+	t.Run("List non-archived chats", func(t *testing.T) {
+		w := httptest.NewRecorder()
+		req, _ := http.NewRequest("GET", "/chats", nil)
+		router.ServeHTTP(w, req)
+
+		if w.Code != http.StatusOK {
+			t.Errorf("expected status 200, got %d", w.Code)
+		}
+
+		var response map[string][]models.Chat
+		json.Unmarshal(w.Body.Bytes(), &response)
+		if len(response["chats"]) != 1 {
+			t.Errorf("expected 1 chat, got %d", len(response["chats"]))
+		}
+	})
+
+	t.Run("List including archived chats", func(t *testing.T) {
+		w := httptest.NewRecorder()
+		req, _ := http.NewRequest("GET", "/chats?include_archived=true", nil)
+		router.ServeHTTP(w, req)
+
+		if w.Code != http.StatusOK {
+			t.Errorf("expected status 200, got %d", w.Code)
+		}
+
+		var response map[string][]models.Chat
+		json.Unmarshal(w.Body.Bytes(), &response)
+		if len(response["chats"]) != 2 {
+			t.Errorf("expected 2 chats, got %d", len(response["chats"]))
+		}
+	})
+}
+
+func TestListGroupedChatsHandler(t *testing.T) {
+	db := setupTestDB(t)
+	defer db.Close()
+	router := setupRouter(db)
+
+	// Seed some data
+	models.CreateChat(db, &models.Chat{ID: "chat1", Title: "Apple Chat", Model: "gpt-4"})
+	models.CreateChat(db, &models.Chat{ID: "chat2", Title: "Banana Chat", Model: "gpt-4"})
+
+	t.Run("Search chats", func(t *testing.T) {
+		w := httptest.NewRecorder()
+		req, _ := http.NewRequest("GET", "/chats/grouped?search=Apple", nil)
+		router.ServeHTTP(w, req)
+
+		var resp models.GroupedChatsResponse
+		json.Unmarshal(w.Body.Bytes(), &resp)
+		if resp.Total != 1 {
+			t.Errorf("expected 1 chat, got %d", resp.Total)
+		}
+	})
+
+	t.Run("Pagination", func(t *testing.T) {
+		w := httptest.NewRecorder()
+		req, _ := http.NewRequest("GET", "/chats/grouped?limit=1&offset=0", nil)
+		router.ServeHTTP(w, req)
+
+		var resp models.GroupedChatsResponse
+		json.Unmarshal(w.Body.Bytes(), &resp)
+		if len(resp.Groups) != 1 || len(resp.Groups[0].Chats) != 1 {
+			t.Errorf("expected 1 chat in response, got %d", len(resp.Groups[0].Chats))
+		}
+	})
+}
+
+func TestGetChatHandler(t *testing.T) {
+	db := setupTestDB(t)
+	defer db.Close()
+	router := setupRouter(db)
+
+	chat := &models.Chat{ID: "test-chat", Title: "Test Chat", Model: "gpt-4"}
+	models.CreateChat(db, chat)
+
+	t.Run("Get existing chat", func(t *testing.T) {
+		w := httptest.NewRecorder()
+		req, _ := http.NewRequest("GET", "/chats/test-chat", nil)
+		router.ServeHTTP(w, req)
+
+		if w.Code != http.StatusOK {
+			t.Errorf("expected status 200, got %d", w.Code)
+		}
+	})
+
+	t.Run("Get non-existent chat", func(t *testing.T) {
+		w := httptest.NewRecorder()
+		req, _ := http.NewRequest("GET", "/chats/invalid", nil)
+		router.ServeHTTP(w, req)
+
+		if w.Code != http.StatusNotFound {
+			t.Errorf("expected status 404, got %d", w.Code)
+		}
+	})
+}
+
+func TestCreateChatHandler(t *testing.T) {
+	db := setupTestDB(t)
+	defer db.Close()
+	router := setupRouter(db)
+
+	body := CreateChatRequest{Title: "New Chat Title", Model: "gpt-4"}
+	jsonBody, _ := json.Marshal(body)
+
+	w := httptest.NewRecorder()
+	req, _ := http.NewRequest("POST", "/chats", bytes.NewBuffer(jsonBody))
+	req.Header.Set("Content-Type", "application/json")
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusCreated {
+		t.Errorf("expected status 201, got %d", w.Code)
+	}
+
+	var chat models.Chat
+	json.Unmarshal(w.Body.Bytes(), &chat)
+	if chat.Title != "New Chat Title" {
+		t.Errorf("expected title 'New Chat Title', got '%s'", chat.Title)
+	}
+}
+
+func TestUpdateChatHandler(t *testing.T) {
+	db := setupTestDB(t)
+	defer db.Close()
+	router := setupRouter(db)
+
+	chat := &models.Chat{ID: "test-chat", Title: "Old Title", Model: "gpt-4"}
+	models.CreateChat(db, chat)
+
+	newTitle := "Updated Title"
+	body := UpdateChatRequest{Title: &newTitle}
+	jsonBody, _ := json.Marshal(body)
+
+	w := httptest.NewRecorder()
+	req, _ := http.NewRequest("PATCH", "/chats/test-chat", bytes.NewBuffer(jsonBody))
+	req.Header.Set("Content-Type", "application/json")
+	router.ServeHTTP(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Errorf("expected status 200, got %d", w.Code)
+	}
+
+	var updatedChat models.Chat
+	json.Unmarshal(w.Body.Bytes(), &updatedChat)
+	if updatedChat.Title != "Updated Title" {
+		t.Errorf("expected title 'Updated Title', got '%s'", updatedChat.Title)
+	}
+}
+
+func TestDeleteChatHandler(t *testing.T) {
+	db := setupTestDB(t)
+	defer db.Close()
+	router := setupRouter(db)
+
+	chat := &models.Chat{ID: "test-chat", Title: "To Delete", Model: "gpt-4"}
+	models.CreateChat(db, chat)
+
+	t.Run("Delete existing chat", func(t *testing.T) {
+		w := httptest.NewRecorder()
+		req, _ := http.NewRequest("DELETE", "/chats/test-chat", nil)
+		router.ServeHTTP(w, req)
+
+		if w.Code != http.StatusOK {
+			t.Errorf("expected status 200, got %d", w.Code)
+		}
+	})
+
+	t.Run("Delete non-existent chat", func(t *testing.T) {
+		w := httptest.NewRecorder()
+		req, _ := http.NewRequest("DELETE", "/chats/invalid", nil)
+		router.ServeHTTP(w, req)
+
+		if w.Code != http.StatusNotFound {
+			t.Errorf("expected status 404, got %d", w.Code)
+		}
+	})
+}
+
+func TestCreateMessageHandler(t *testing.T) {
+	db := setupTestDB(t)
+	defer db.Close()
+	router := setupRouter(db)
+
+	chat := &models.Chat{ID: "test-chat", Title: "Message Test", Model: "gpt-4"}
+	models.CreateChat(db, chat)
+
+	t.Run("Create valid message", func(t *testing.T) {
+		body := CreateMessageRequest{
+			Role:    "user",
+			Content: "Hello world",
+		}
+		jsonBody, _ := json.Marshal(body)
+
+		w := httptest.NewRecorder()
+		req, _ := http.NewRequest("POST", "/chats/test-chat/messages", bytes.NewBuffer(jsonBody))
+		req.Header.Set("Content-Type", "application/json")
+		router.ServeHTTP(w, req)
+
+		if w.Code != http.StatusCreated {
+			t.Errorf("expected status 201, got %d", w.Code)
+			fmt.Println(w.Body.String())
+		}
+	})
+
+	t.Run("Create message with invalid role", func(t *testing.T) {
+		body := CreateMessageRequest{
+			Role:    "invalid",
+			Content: "Hello world",
+		}
+		jsonBody, _ := json.Marshal(body)
+
+		w := httptest.NewRecorder()
+		req, _ := http.NewRequest("POST", "/chats/test-chat/messages", bytes.NewBuffer(jsonBody))
+		req.Header.Set("Content-Type", "application/json")
+		router.ServeHTTP(w, req)
+
+		if w.Code != http.StatusBadRequest {
+			t.Errorf("expected status 400, got %d", w.Code)
+		}
+	})
+}

backend/internal/api/fetcher.go

@@ -430,7 +430,7 @@ func (f *Fetcher) fetchWithCurl(ctx context.Context, url string, curlPath string
 		"--max-time", fmt.Sprintf("%d", int(opts.Timeout.Seconds())),
 		"-A", opts.UserAgent,           // User agent
 		"-w", "\n---CURL_INFO---\n%{content_type}\n%{url_effective}\n%{http_code}", // Output metadata
-		"--compressed",                 // Accept compressed responses
+		"--compressed",                 // Automatically decompress responses
 	}
 
 	// Add custom headers
@@ -439,9 +439,12 @@ func (f *Fetcher) fetchWithCurl(ctx context.Context, url string, curlPath string
 	}
 
 	// Add common headers for better compatibility
+	// Override Accept-Encoding to only include widely-supported formats
+	// This prevents errors when servers return zstd/br that curl may not support
 	args = append(args,
 		"-H", "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8",
 		"-H", "Accept-Language: en-US,en;q=0.5",
+		"-H", "Accept-Encoding: gzip, deflate, identity",
 		"-H", "DNT: 1",
 		"-H", "Connection: keep-alive",
 		"-H", "Upgrade-Insecure-Requests: 1",

backend/internal/api/fetcher_test.go

@@ -0,0 +1,196 @@
+package api
+
+import (
+	"testing"
+)
+
+func TestDefaultFetchOptions(t *testing.T) {
+	opts := DefaultFetchOptions()
+
+	if opts.MaxLength != 500000 {
+		t.Errorf("expected MaxLength 500000, got %d", opts.MaxLength)
+	}
+	if opts.Timeout.Seconds() != 30 {
+		t.Errorf("expected Timeout 30s, got %v", opts.Timeout)
+	}
+	if opts.UserAgent == "" {
+		t.Error("expected non-empty UserAgent")
+	}
+	if opts.Headers == nil {
+		t.Error("expected Headers to be initialized")
+	}
+	if !opts.FollowRedirects {
+		t.Error("expected FollowRedirects to be true")
+	}
+	if opts.WaitTime.Seconds() != 2 {
+		t.Errorf("expected WaitTime 2s, got %v", opts.WaitTime)
+	}
+}
+
+func TestStripHTMLTags(t *testing.T) {
+	tests := []struct {
+		name     string
+		input    string
+		expected string
+	}{
+		{
+			name:     "removes simple tags",
+			input:    "<p>Hello World</p>",
+			expected: "Hello World",
+		},
+		{
+			name:     "removes nested tags",
+			input:    "<div><span>Nested</span> content</div>",
+			expected: "Nested content",
+		},
+		{
+			name:     "removes script tags with content",
+			input:    "<p>Before</p><script>alert('xss')</script><p>After</p>",
+			expected: "Before After",
+		},
+		{
+			name:     "removes style tags with content",
+			input:    "<p>Text</p><style>.foo{color:red}</style><p>More</p>",
+			expected: "Text More",
+		},
+		{
+			name:     "collapses whitespace",
+			input:    "<p>Lots    of   spaces</p>",
+			expected: "Lots of spaces",
+		},
+		{
+			name:     "handles empty input",
+			input:    "",
+			expected: "",
+		},
+		{
+			name:     "handles plain text",
+			input:    "No HTML here",
+			expected: "No HTML here",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := stripHTMLTags(tt.input)
+			if result != tt.expected {
+				t.Errorf("expected %q, got %q", tt.expected, result)
+			}
+		})
+	}
+}
+
+func TestIsJSRenderedPage(t *testing.T) {
+	f := &Fetcher{}
+
+	tests := []struct {
+		name     string
+		content  string
+		expected bool
+	}{
+		{
+			name:     "short content indicates JS rendering",
+			content:  "<html><body><div id=\"app\"></div></body></html>",
+			expected: true,
+		},
+		{
+			name:     "React root div with minimal content",
+			content:  "<html><body><div id=\"root\"></div><script>window.__INITIAL_STATE__={}</script></body></html>",
+			expected: true,
+		},
+		{
+			name:     "Next.js pattern",
+			content:  "<html><body><div id=\"__next\"></div></body></html>",
+			expected: true,
+		},
+		{
+			name:     "Nuxt.js pattern",
+			content:  "<html><body><div id=\"__nuxt\"></div></body></html>",
+			expected: true,
+		},
+		{
+			name:     "noscript indicator",
+			content:  "<html><body><noscript>Enable JS</noscript><div></div></body></html>",
+			expected: true,
+		},
+		{
+			name:     "substantial content is not JS-rendered",
+			content:  generateLongContent(2000),
+			expected: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := f.isJSRenderedPage(tt.content)
+			if result != tt.expected {
+				t.Errorf("expected %v, got %v", tt.expected, result)
+			}
+		})
+	}
+}
+
+// generateLongContent creates content of specified length
+func generateLongContent(length int) string {
+	base := "<html><body><article>"
+	content := ""
+	word := "word "
+	for len(content) < length {
+		content += word
+	}
+	return base + content + "</article></body></html>"
+}
+
+func TestFetchMethod_String(t *testing.T) {
+	tests := []struct {
+		method   FetchMethod
+		expected string
+	}{
+		{FetchMethodCurl, "curl"},
+		{FetchMethodWget, "wget"},
+		{FetchMethodChrome, "chrome"},
+		{FetchMethodNative, "native"},
+	}
+
+	for _, tt := range tests {
+		t.Run(string(tt.method), func(t *testing.T) {
+			if string(tt.method) != tt.expected {
+				t.Errorf("expected %q, got %q", tt.expected, string(tt.method))
+			}
+		})
+	}
+}
+
+func TestFetchResult_Fields(t *testing.T) {
+	result := FetchResult{
+		Content:      "test content",
+		ContentType:  "text/html",
+		FinalURL:     "https://example.com",
+		StatusCode:   200,
+		Method:       FetchMethodNative,
+		Truncated:    true,
+		OriginalSize: 1000000,
+	}
+
+	if result.Content != "test content" {
+		t.Errorf("Content mismatch")
+	}
+	if result.ContentType != "text/html" {
+		t.Errorf("ContentType mismatch")
+	}
+	if result.FinalURL != "https://example.com" {
+		t.Errorf("FinalURL mismatch")
+	}
+	if result.StatusCode != 200 {
+		t.Errorf("StatusCode mismatch")
+	}
+	if result.Method != FetchMethodNative {
+		t.Errorf("Method mismatch")
+	}
+	if !result.Truncated {
+		t.Errorf("Truncated should be true")
+	}
+	if result.OriginalSize != 1000000 {
+		t.Errorf("OriginalSize mismatch")
+	}
+}

backend/internal/api/geolocation_test.go

@@ -0,0 +1,133 @@
+package api
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/gin-gonic/gin"
+)
+
+func TestIsPrivateIP(t *testing.T) {
+	tests := []struct {
+		name     string
+		ip       string
+		expected bool
+	}{
+		// Loopback addresses
+		{"IPv4 loopback", "127.0.0.1", true},
+		{"IPv6 loopback", "::1", true},
+
+		// Private IPv4 ranges (RFC 1918)
+		{"10.x.x.x range", "10.0.0.1", true},
+		{"10.x.x.x high", "10.255.255.255", true},
+		{"172.16.x.x range", "172.16.0.1", true},
+		{"172.31.x.x range", "172.31.255.255", true},
+		{"192.168.x.x range", "192.168.0.1", true},
+		{"192.168.x.x high", "192.168.255.255", true},
+
+		// Public IPv4 addresses
+		{"Google DNS", "8.8.8.8", false},
+		{"Cloudflare DNS", "1.1.1.1", false},
+		{"Random public IP", "203.0.113.50", false},
+
+		// Edge cases - not in private ranges
+		{"172.15.x.x not private", "172.15.0.1", false},
+		{"172.32.x.x not private", "172.32.0.1", false},
+		{"192.167.x.x not private", "192.167.0.1", false},
+
+		// IPv6 private (fc00::/7)
+		{"IPv6 private fc", "fc00::1", true},
+		{"IPv6 private fd", "fd00::1", true},
+
+		// IPv6 public
+		{"IPv6 public", "2001:4860:4860::8888", false},
+
+		// Invalid inputs
+		{"invalid IP", "not-an-ip", false},
+		{"empty string", "", false},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := isPrivateIP(tt.ip)
+			if result != tt.expected {
+				t.Errorf("isPrivateIP(%q) = %v, want %v", tt.ip, result, tt.expected)
+			}
+		})
+	}
+}
+
+func TestGetClientIP(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+
+	tests := []struct {
+		name       string
+		headers    map[string]string
+		remoteAddr string
+		expected   string
+	}{
+		{
+			name:       "X-Forwarded-For single IP",
+			headers:    map[string]string{"X-Forwarded-For": "203.0.113.50"},
+			remoteAddr: "127.0.0.1:8080",
+			expected:   "203.0.113.50",
+		},
+		{
+			name:       "X-Forwarded-For multiple IPs",
+			headers:    map[string]string{"X-Forwarded-For": "203.0.113.50, 70.41.3.18, 150.172.238.178"},
+			remoteAddr: "127.0.0.1:8080",
+			expected:   "203.0.113.50",
+		},
+		{
+			name:       "X-Real-IP header",
+			headers:    map[string]string{"X-Real-IP": "198.51.100.178"},
+			remoteAddr: "127.0.0.1:8080",
+			expected:   "198.51.100.178",
+		},
+		{
+			name:       "X-Forwarded-For takes precedence over X-Real-IP",
+			headers:    map[string]string{"X-Forwarded-For": "203.0.113.50", "X-Real-IP": "198.51.100.178"},
+			remoteAddr: "127.0.0.1:8080",
+			expected:   "203.0.113.50",
+		},
+		{
+			name:       "fallback to RemoteAddr",
+			headers:    map[string]string{},
+			remoteAddr: "192.168.1.100:54321",
+			expected:   "192.168.1.100",
+		},
+		{
+			name:       "X-Forwarded-For with whitespace",
+			headers:    map[string]string{"X-Forwarded-For": "  203.0.113.50  "},
+			remoteAddr: "127.0.0.1:8080",
+			expected:   "203.0.113.50",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			router := gin.New()
+
+			var capturedIP string
+			router.GET("/test", func(c *gin.Context) {
+				capturedIP = getClientIP(c)
+				c.Status(http.StatusOK)
+			})
+
+			w := httptest.NewRecorder()
+			req, _ := http.NewRequest("GET", "/test", nil)
+			req.RemoteAddr = tt.remoteAddr
+
+			for key, value := range tt.headers {
+				req.Header.Set(key, value)
+			}
+
+			router.ServeHTTP(w, req)
+
+			if capturedIP != tt.expected {
+				t.Errorf("getClientIP() = %q, want %q", capturedIP, tt.expected)
+			}
+		})
+	}
+}

backend/internal/api/model_registry_test.go

@@ -0,0 +1,528 @@
+package api
+
+import (
+	"strings"
+	"testing"
+	"time"
+)
+
+func TestParsePullCount(t *testing.T) {
+	tests := []struct {
+		name     string
+		input    string
+		expected int64
+	}{
+		{"plain number", "1000", 1000},
+		{"thousands K", "1.5K", 1500},
+		{"millions M", "2.3M", 2300000},
+		{"billions B", "1B", 1000000000},
+		{"whole K", "500K", 500000},
+		{"decimal M", "60.3M", 60300000},
+		{"with whitespace", " 100K ", 100000},
+		{"empty string", "", 0},
+		{"invalid", "abc", 0},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := parsePullCount(tt.input)
+			if result != tt.expected {
+				t.Errorf("parsePullCount(%q) = %d, want %d", tt.input, result, tt.expected)
+			}
+		})
+	}
+}
+
+func TestDecodeHTMLEntities(t *testing.T) {
+	tests := []struct {
+		name     string
+		input    string
+		expected string
+	}{
+		{"apostrophe numeric", "It's", "It's"},
+		{"quote numeric", ""Hello"", "\"Hello\""},
+		{"quote named", ""World"", "\"World\""},
+		{"ampersand", "A & B", "A & B"},
+		{"less than", "1 &lt; 2", "1 < 2"},
+		{"greater than", "2 &gt; 1", "2 > 1"},
+		{"nbsp", "Hello&nbsp;World", "Hello World"},
+		{"multiple entities", "&lt;div&gt;&amp;&lt;/div&gt;", "<div>&</div>"},
+		{"no entities", "Plain text", "Plain text"},
+		{"empty", "", ""},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := decodeHTMLEntities(tt.input)
+			if result != tt.expected {
+				t.Errorf("decodeHTMLEntities(%q) = %q, want %q", tt.input, result, tt.expected)
+			}
+		})
+	}
+}
+
+func TestParseRelativeTime(t *testing.T) {
+	now := time.Now()
+
+	tests := []struct {
+		name       string
+		input      string
+		wantEmpty  bool
+		checkDelta time.Duration
+	}{
+		{"2 weeks ago", "2 weeks ago", false, 14 * 24 * time.Hour},
+		{"1 month ago", "1 month ago", false, 30 * 24 * time.Hour},
+		{"3 days ago", "3 days ago", false, 3 * 24 * time.Hour},
+		{"5 hours ago", "5 hours ago", false, 5 * time.Hour},
+		{"30 minutes ago", "30 minutes ago", false, 30 * time.Minute},
+		{"1 year ago", "1 year ago", false, 365 * 24 * time.Hour},
+		{"empty string", "", true, 0},
+		{"invalid format", "recently", true, 0},
+		{"uppercase", "2 WEEKS AGO", false, 14 * 24 * time.Hour},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := parseRelativeTime(tt.input)
+
+			if tt.wantEmpty {
+				if result != "" {
+					t.Errorf("parseRelativeTime(%q) = %q, want empty string", tt.input, result)
+				}
+				return
+			}
+
+			// Parse the result as RFC3339
+			parsed, err := time.Parse(time.RFC3339, result)
+			if err != nil {
+				t.Fatalf("failed to parse result %q: %v", result, err)
+			}
+
+			// Check that the delta is approximately correct (within 1 minute tolerance)
+			expectedTime := now.Add(-tt.checkDelta)
+			diff := parsed.Sub(expectedTime)
+			if diff < -time.Minute || diff > time.Minute {
+				t.Errorf("parseRelativeTime(%q) = %v, expected around %v", tt.input, parsed, expectedTime)
+			}
+		})
+	}
+}
+
+func TestParseSizeToBytes(t *testing.T) {
+	tests := []struct {
+		name     string
+		input    string
+		expected int64
+	}{
+		{"gigabytes", "2.0GB", 2 * 1024 * 1024 * 1024},
+		{"megabytes", "500MB", 500 * 1024 * 1024},
+		{"kilobytes", "100KB", 100 * 1024},
+		{"decimal GB", "1.5GB", int64(1.5 * 1024 * 1024 * 1024)},
+		{"plain number", "1024", 1024},
+		{"with whitespace", " 1GB ", 1 * 1024 * 1024 * 1024},
+		{"empty", "", 0},
+		{"invalid", "abc", 0},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := parseSizeToBytes(tt.input)
+			if result != tt.expected {
+				t.Errorf("parseSizeToBytes(%q) = %d, want %d", tt.input, result, tt.expected)
+			}
+		})
+	}
+}
+
+func TestFormatParamCount(t *testing.T) {
+	tests := []struct {
+		name     string
+		input    int64
+		expected string
+	}{
+		{"billions", 13900000000, "13.9B"},
+		{"single billion", 1000000000, "1.0B"},
+		{"millions", 500000000, "500.0M"},
+		{"single million", 1000000, "1.0M"},
+		{"thousands", 500000, "500.0K"},
+		{"single thousand", 1000, "1.0K"},
+		{"small number", 500, "500"},
+		{"zero", 0, "0"},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := formatParamCount(tt.input)
+			if result != tt.expected {
+				t.Errorf("formatParamCount(%d) = %q, want %q", tt.input, result, tt.expected)
+			}
+		})
+	}
+}
+
+func TestParseParamSizeToFloat(t *testing.T) {
+	tests := []struct {
+		name     string
+		input    string
+		expected float64
+	}{
+		{"8b", "8b", 8.0},
+		{"70b", "70b", 70.0},
+		{"1.5b", "1.5b", 1.5},
+		{"500m to billions", "500m", 0.5},
+		{"uppercase B", "8B", 8.0},
+		{"uppercase M", "500M", 0.5},
+		{"with whitespace", " 8b ", 8.0},
+		{"empty", "", 0},
+		{"invalid", "abc", 0},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := parseParamSizeToFloat(tt.input)
+			if result != tt.expected {
+				t.Errorf("parseParamSizeToFloat(%q) = %f, want %f", tt.input, result, tt.expected)
+			}
+		})
+	}
+}
+
+func TestGetSizeRange(t *testing.T) {
+	tests := []struct {
+		name     string
+		input    string
+		expected string
+	}{
+		{"small 1b", "1b", "small"},
+		{"small 3b", "3b", "small"},
+		{"medium 4b", "4b", "medium"},
+		{"medium 8b", "8b", "medium"},
+		{"medium 13b", "13b", "medium"},
+		{"large 14b", "14b", "large"},
+		{"large 70b", "70b", "large"},
+		{"xlarge 405b", "405b", "xlarge"},
+		{"empty", "", ""},
+		{"invalid", "abc", ""},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := getSizeRange(tt.input)
+			if result != tt.expected {
+				t.Errorf("getSizeRange(%q) = %q, want %q", tt.input, result, tt.expected)
+			}
+		})
+	}
+}
+
+func TestGetContextRange(t *testing.T) {
+	tests := []struct {
+		name     string
+		input    int64
+		expected string
+	}{
+		{"standard 4K", 4096, "standard"},
+		{"standard 8K", 8192, "standard"},
+		{"extended 16K", 16384, "extended"},
+		{"extended 32K", 32768, "extended"},
+		{"large 64K", 65536, "large"},
+		{"large 128K", 131072, "large"},
+		{"unlimited 256K", 262144, "unlimited"},
+		{"unlimited 1M", 1048576, "unlimited"},
+		{"zero", 0, ""},
+		{"negative", -1, ""},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := getContextRange(tt.input)
+			if result != tt.expected {
+				t.Errorf("getContextRange(%d) = %q, want %q", tt.input, result, tt.expected)
+			}
+		})
+	}
+}
+
+func TestExtractFamily(t *testing.T) {
+	tests := []struct {
+		name     string
+		input    string
+		expected string
+	}{
+		{"llama3.2", "llama3.2", "llama"},
+		{"qwen2.5", "qwen2.5", "qwen"},
+		{"mistral", "mistral", "mistral"},
+		{"deepseek-r1", "deepseek-r1", "deepseek"},
+		{"phi_3", "phi_3", "phi"},
+		{"community model", "username/custom-llama", "custom"},
+		{"with version", "llama3.2:8b", "llama"},
+		{"numbers only", "123model", ""},
+		{"empty", "", ""},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := extractFamily(tt.input)
+			if result != tt.expected {
+				t.Errorf("extractFamily(%q) = %q, want %q", tt.input, result, tt.expected)
+			}
+		})
+	}
+}
+
+func TestInferModelType(t *testing.T) {
+	tests := []struct {
+		name     string
+		input    string
+		expected string
+	}{
+		{"official llama", "llama3.2", "official"},
+		{"official mistral", "mistral", "official"},
+		{"community model", "username/model", "community"},
+		{"nested community", "org/subdir/model", "community"},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := inferModelType(tt.input)
+			if result != tt.expected {
+				t.Errorf("inferModelType(%q) = %q, want %q", tt.input, result, tt.expected)
+			}
+		})
+	}
+}
+
+func TestModelMatchesSizeRanges(t *testing.T) {
+	tests := []struct {
+		name       string
+		tags       []string
+		sizeRanges []string
+		expected   bool
+	}{
+		{
+			name:       "matches small",
+			tags:       []string{"1b", "3b"},
+			sizeRanges: []string{"small"},
+			expected:   true,
+		},
+		{
+			name:       "matches medium",
+			tags:       []string{"8b", "14b"},
+			sizeRanges: []string{"medium"},
+			expected:   true,
+		},
+		{
+			name:       "matches large",
+			tags:       []string{"70b"},
+			sizeRanges: []string{"large"},
+			expected:   true,
+		},
+		{
+			name:       "matches multiple ranges",
+			tags:       []string{"8b", "70b"},
+			sizeRanges: []string{"medium", "large"},
+			expected:   true,
+		},
+		{
+			name:       "no match",
+			tags:       []string{"8b"},
+			sizeRanges: []string{"large", "xlarge"},
+			expected:   false,
+		},
+		{
+			name:       "empty tags",
+			tags:       []string{},
+			sizeRanges: []string{"medium"},
+			expected:   false,
+		},
+		{
+			name:       "empty ranges",
+			tags:       []string{"8b"},
+			sizeRanges: []string{},
+			expected:   false,
+		},
+		{
+			name:       "non-size tags",
+			tags:       []string{"latest", "fp16"},
+			sizeRanges: []string{"medium"},
+			expected:   false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := modelMatchesSizeRanges(tt.tags, tt.sizeRanges)
+			if result != tt.expected {
+				t.Errorf("modelMatchesSizeRanges(%v, %v) = %v, want %v", tt.tags, tt.sizeRanges, result, tt.expected)
+			}
+		})
+	}
+}
+
+func TestParseOllamaParams(t *testing.T) {
+	tests := []struct {
+		name     string
+		input    string
+		expected map[string]any
+	}{
+		{
+			name:  "temperature",
+			input: "temperature 0.8",
+			expected: map[string]any{
+				"temperature": 0.8,
+			},
+		},
+		{
+			name:  "multiple params",
+			input: "temperature 0.8\nnum_ctx 4096\nstop <|im_end|>",
+			expected: map[string]any{
+				"temperature": 0.8,
+				"num_ctx":     float64(4096),
+				"stop":        "<|im_end|>",
+			},
+		},
+		{
+			name:     "empty input",
+			input:    "",
+			expected: map[string]any{},
+		},
+		{
+			name:     "whitespace only",
+			input:    "   \n   \n   ",
+			expected: map[string]any{},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := parseOllamaParams(tt.input)
+			if len(result) != len(tt.expected) {
+				t.Errorf("parseOllamaParams result length = %d, want %d", len(result), len(tt.expected))
+				return
+			}
+			for k, v := range tt.expected {
+				if result[k] != v {
+					t.Errorf("parseOllamaParams[%q] = %v, want %v", k, result[k], v)
+				}
+			}
+		})
+	}
+}
+
+func TestParseLibraryHTML(t *testing.T) {
+	// Test with minimal valid HTML structure
+	html := `
+		<a href="/library/llama3.2" class="group flex">
+			<p class="text-neutral-800">A foundation model</p>
+			<span x-test-pull-count>1.5M</span>
+			<span x-test-size>8b</span>
+			<span x-test-size>70b</span>
+			<span x-test-capability>vision</span>
+			<span x-test-updated>2 weeks ago</span>
+		</a>
+		<a href="/library/mistral" class="group flex">
+			<p class="text-neutral-800">Fast model</p>
+			<span x-test-pull-count>500K</span>
+			<span x-test-size>7b</span>
+		</a>
+	`
+
+	models, err := parseLibraryHTML(html)
+	if err != nil {
+		t.Fatalf("parseLibraryHTML failed: %v", err)
+	}
+
+	if len(models) != 2 {
+		t.Fatalf("expected 2 models, got %d", len(models))
+	}
+
+	// Find llama3.2 model
+	var llama *ScrapedModel
+	for i := range models {
+		if models[i].Slug == "llama3.2" {
+			llama = &models[i]
+			break
+		}
+	}
+
+	if llama == nil {
+		t.Fatal("llama3.2 model not found")
+	}
+
+	if llama.Description != "A foundation model" {
+		t.Errorf("description = %q, want %q", llama.Description, "A foundation model")
+	}
+
+	if llama.PullCount != 1500000 {
+		t.Errorf("pull count = %d, want 1500000", llama.PullCount)
+	}
+
+	if len(llama.Tags) != 2 || llama.Tags[0] != "8b" || llama.Tags[1] != "70b" {
+		t.Errorf("tags = %v, want [8b, 70b]", llama.Tags)
+	}
+
+	if len(llama.Capabilities) != 1 || llama.Capabilities[0] != "vision" {
+		t.Errorf("capabilities = %v, want [vision]", llama.Capabilities)
+	}
+
+	if !strings.HasPrefix(llama.URL, "https://ollama.com/library/") {
+		t.Errorf("URL = %q, want prefix https://ollama.com/library/", llama.URL)
+	}
+}
+
+func TestParseModelPageForSizes(t *testing.T) {
+	html := `
+		<a href="/library/llama3.2:8b">
+			<span>8b</span>
+			<span>2.0GB</span>
+		</a>
+		<a href="/library/llama3.2:70b">
+			<span>70b</span>
+			<span>40.5GB</span>
+		</a>
+		<a href="/library/llama3.2:1b">
+			<span>1b</span>
+			<span>500MB</span>
+		</a>
+	`
+
+	sizes, err := parseModelPageForSizes(html)
+	if err != nil {
+		t.Fatalf("parseModelPageForSizes failed: %v", err)
+	}
+
+	expected := map[string]int64{
+		"8b":  int64(2.0 * 1024 * 1024 * 1024),
+		"70b": int64(40.5 * 1024 * 1024 * 1024),
+		"1b":  int64(500 * 1024 * 1024),
+	}
+
+	for tag, expectedSize := range expected {
+		if sizes[tag] != expectedSize {
+			t.Errorf("sizes[%q] = %d, want %d", tag, sizes[tag], expectedSize)
+		}
+	}
+}
+
+func TestStripHTML(t *testing.T) {
+	tests := []struct {
+		name     string
+		input    string
+		expected string
+	}{
+		{"simple tags", "<p>Hello</p>", " Hello "},
+		{"nested tags", "<div><span>Text</span></div>", "  Text  "},
+		{"self-closing", "<br/>Line<br/>", " Line "},
+		{"no tags", "Plain text", "Plain text"},
+		{"empty", "", ""},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := stripHTML(tt.input)
+			if result != tt.expected {
+				t.Errorf("stripHTML(%q) = %q, want %q", tt.input, result, tt.expected)
+			}
+		})
+	}
+}

backend/internal/api/ollama_client.go

@@ -336,6 +336,56 @@ func (s *OllamaService) CopyModelHandler() gin.HandlerFunc {
 	}
 }
 
+// CreateModelHandler handles custom model creation with progress streaming
+// Creates a new model derived from an existing one with a custom system prompt
+func (s *OllamaService) CreateModelHandler() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		var req api.CreateRequest
+		if err := c.ShouldBindJSON(&req); err != nil {
+			c.JSON(http.StatusBadRequest, gin.H{"error": "invalid request: " + err.Error()})
+			return
+		}
+
+		c.Header("Content-Type", "application/x-ndjson")
+		c.Header("Cache-Control", "no-cache")
+		c.Header("Connection", "keep-alive")
+
+		ctx := c.Request.Context()
+		flusher, ok := c.Writer.(http.Flusher)
+		if !ok {
+			c.JSON(http.StatusInternalServerError, gin.H{"error": "streaming not supported"})
+			return
+		}
+
+		err := s.client.Create(ctx, &req, func(resp api.ProgressResponse) error {
+			select {
+			case <-ctx.Done():
+				return ctx.Err()
+			default:
+			}
+
+			data, err := json.Marshal(resp)
+			if err != nil {
+				return err
+			}
+
+			_, err = c.Writer.Write(append(data, '\n'))
+			if err != nil {
+				return err
+			}
+			flusher.Flush()
+			return nil
+		})
+
+		if err != nil && err != context.Canceled {
+			errResp := gin.H{"error": err.Error()}
+			data, _ := json.Marshal(errResp)
+			c.Writer.Write(append(data, '\n'))
+			flusher.Flush()
+		}
+	}
+}
+
 // VersionHandler returns Ollama version
 func (s *OllamaService) VersionHandler() gin.HandlerFunc {
 	return func(c *gin.Context) {

backend/internal/api/routes.go

@@ -5,10 +5,12 @@ import (
 	"log"
 
 	"github.com/gin-gonic/gin"
+
+	"vessel-backend/internal/backends"
 )
 
 // SetupRoutes configures all API routes
-func SetupRoutes(r *gin.Engine, db *sql.DB, ollamaURL string, appVersion string) {
+func SetupRoutes(r *gin.Engine, db *sql.DB, ollamaURL string, appVersion string, registry *backends.Registry) {
 	// Initialize Ollama service with official client
 	ollamaService, err := NewOllamaService(ollamaURL)
 	if err != nil {
@@ -97,6 +99,24 @@ func SetupRoutes(r *gin.Engine, db *sql.DB, ollamaURL string, appVersion string)
 			models.GET("/remote/status", modelRegistry.SyncStatusHandler())
 		}
 
+		// Unified AI routes (multi-backend support)
+		if registry != nil {
+			aiHandlers := NewAIHandlers(registry)
+			ai := v1.Group("/ai")
+			{
+				// Backend management
+				ai.GET("/backends", aiHandlers.ListBackendsHandler())
+				ai.POST("/backends/discover", aiHandlers.DiscoverBackendsHandler())
+				ai.POST("/backends/active", aiHandlers.SetActiveHandler())
+				ai.GET("/backends/:type/health", aiHandlers.HealthCheckHandler())
+				ai.POST("/backends/register", aiHandlers.RegisterBackendHandler())
+
+				// Unified model and chat endpoints (route to active backend)
+				ai.GET("/models", aiHandlers.ListModelsHandler())
+				ai.POST("/chat", aiHandlers.ChatHandler())
+			}
+		}
+
 		// Ollama API routes (using official client)
 		if ollamaService != nil {
 			ollama := v1.Group("/ollama")
@@ -105,6 +125,7 @@ func SetupRoutes(r *gin.Engine, db *sql.DB, ollamaURL string, appVersion string)
 				ollama.GET("/api/tags", ollamaService.ListModelsHandler())
 				ollama.POST("/api/show", ollamaService.ShowModelHandler())
 				ollama.POST("/api/pull", ollamaService.PullModelHandler())
+				ollama.POST("/api/create", ollamaService.CreateModelHandler())
 				ollama.DELETE("/api/delete", ollamaService.DeleteModelHandler())
 				ollama.POST("/api/copy", ollamaService.CopyModelHandler())
 

backend/internal/api/search_test.go

@@ -0,0 +1,186 @@
+package api
+
+import (
+	"testing"
+)
+
+func TestCleanHTML(t *testing.T) {
+	tests := []struct {
+		name     string
+		input    string
+		expected string
+	}{
+		{
+			name:     "removes simple tags",
+			input:    "<b>bold</b> text",
+			expected: "bold text",
+		},
+		{
+			name:     "removes nested tags",
+			input:    "<div><span>nested</span></div>",
+			expected: "nested",
+		},
+		{
+			name:     "decodes html entities",
+			input:    "&amp; &lt; &gt; &quot;",
+			expected: "& < > \"",
+		},
+		{
+			name:     "decodes apostrophe",
+			input:    "it&#39;s working",
+			expected: "it's working",
+		},
+		{
+			name:     "replaces nbsp with space",
+			input:    "word&nbsp;word",
+			expected: "word word",
+		},
+		{
+			name:     "normalizes whitespace",
+			input:    "  multiple   spaces  ",
+			expected: "multiple spaces",
+		},
+		{
+			name:     "handles empty string",
+			input:    "",
+			expected: "",
+		},
+		{
+			name:     "handles plain text",
+			input:    "no html here",
+			expected: "no html here",
+		},
+		{
+			name:     "handles complex html",
+			input:    "<a href=\"https://example.com\">Link &amp; Text</a>",
+			expected: "Link & Text",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := cleanHTML(tt.input)
+			if result != tt.expected {
+				t.Errorf("cleanHTML(%q) = %q, want %q", tt.input, result, tt.expected)
+			}
+		})
+	}
+}
+
+func TestDecodeURL(t *testing.T) {
+	tests := []struct {
+		name     string
+		input    string
+		expected string
+	}{
+		{
+			name:     "extracts url from uddg parameter",
+			input:    "//duckduckgo.com/l/?uddg=https%3A%2F%2Fexample.com%2Fpath&rut=abc",
+			expected: "https://example.com/path",
+		},
+		{
+			name:     "adds https to protocol-relative urls",
+			input:    "//example.com/path",
+			expected: "https://example.com/path",
+		},
+		{
+			name:     "returns normal urls unchanged",
+			input:    "https://example.com/page",
+			expected: "https://example.com/page",
+		},
+		{
+			name:     "handles http urls",
+			input:    "http://example.com",
+			expected: "http://example.com",
+		},
+		{
+			name:     "handles empty string",
+			input:    "",
+			expected: "",
+		},
+		{
+			name:     "handles uddg with special chars",
+			input:    "//duckduckgo.com/l/?uddg=https%3A%2F%2Fexample.com%2Fsearch%3Fq%3Dtest",
+			expected: "https://example.com/search?q=test",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := decodeURL(tt.input)
+			if result != tt.expected {
+				t.Errorf("decodeURL(%q) = %q, want %q", tt.input, result, tt.expected)
+			}
+		})
+	}
+}
+
+func TestParseDuckDuckGoResults(t *testing.T) {
+	// Test with realistic DuckDuckGo HTML structure
+	html := `
+	<div class="result results_links results_links_deep web-result">
+		<a class="result__a" href="//duckduckgo.com/l/?uddg=https%3A%2F%2Fexample.com%2Fpage1">Example Page 1</a>
+		<a class="result__snippet">This is the first result snippet.</a>
+	</div>
+	</div>
+	<div class="result results_links results_links_deep web-result">
+		<a class="result__a" href="https://example.org/page2">Example Page 2</a>
+		<a class="result__snippet">Second result snippet here.</a>
+	</div>
+	</div>
+	`
+
+	results := parseDuckDuckGoResults(html, 10)
+
+	if len(results) < 1 {
+		t.Fatalf("expected at least 1 result, got %d", len(results))
+	}
+
+	// Check first result
+	if results[0].Title != "Example Page 1" {
+		t.Errorf("first result title = %q, want %q", results[0].Title, "Example Page 1")
+	}
+	if results[0].URL != "https://example.com/page1" {
+		t.Errorf("first result URL = %q, want %q", results[0].URL, "https://example.com/page1")
+	}
+}
+
+func TestParseDuckDuckGoResultsMaxResults(t *testing.T) {
+	// Create HTML with many results
+	html := ""
+	for i := 0; i < 20; i++ {
+		html += `<div class="result results_links results_links_deep web-result">
+			<a class="result__a" href="https://example.com/page">Title</a>
+			<a class="result__snippet">Snippet</a>
+		</div></div>`
+	}
+
+	results := parseDuckDuckGoResults(html, 5)
+
+	if len(results) > 5 {
+		t.Errorf("expected max 5 results, got %d", len(results))
+	}
+}
+
+func TestParseDuckDuckGoResultsSkipsDuckDuckGoLinks(t *testing.T) {
+	html := `
+	<div class="result results_links results_links_deep web-result">
+		<a class="result__a" href="https://duckduckgo.com/something">DDG Internal</a>
+		<a class="result__snippet">Internal link</a>
+	</div>
+	</div>
+	<div class="result results_links results_links_deep web-result">
+		<a class="result__a" href="https://example.com/page">External Page</a>
+		<a class="result__snippet">External snippet</a>
+	</div>
+	</div>
+	`
+
+	results := parseDuckDuckGoResults(html, 10)
+
+	for _, r := range results {
+		if r.URL == "https://duckduckgo.com/something" {
+			t.Error("should have filtered out duckduckgo.com link")
+		}
+	}
+}

backend/internal/api/tools_test.go

@@ -0,0 +1,210 @@
+package api
+
+import (
+	"bytes"
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+
+	"github.com/gin-gonic/gin"
+)
+
+func TestTruncateOutput(t *testing.T) {
+	tests := []struct {
+		name     string
+		input    string
+		expected string
+	}{
+		{
+			name:     "short string unchanged",
+			input:    "hello world",
+			expected: "hello world",
+		},
+		{
+			name:     "empty string",
+			input:    "",
+			expected: "",
+		},
+		{
+			name:     "exactly at limit",
+			input:    strings.Repeat("a", MaxOutputSize),
+			expected: strings.Repeat("a", MaxOutputSize),
+		},
+		{
+			name:     "over limit truncated",
+			input:    strings.Repeat("a", MaxOutputSize+100),
+			expected: strings.Repeat("a", MaxOutputSize) + "\n... (output truncated)",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := truncateOutput(tt.input)
+			if result != tt.expected {
+				// For long strings, just check length and suffix
+				if len(tt.input) > MaxOutputSize {
+					if !strings.HasSuffix(result, "(output truncated)") {
+						t.Error("truncated output should have truncation message")
+					}
+					if len(result) > MaxOutputSize+50 {
+						t.Errorf("truncated output too long: %d", len(result))
+					}
+				} else {
+					t.Errorf("truncateOutput() = %q, want %q", result, tt.expected)
+				}
+			}
+		})
+	}
+}
+
+func TestExecuteToolHandler(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+
+	t.Run("rejects invalid request", func(t *testing.T) {
+		router := gin.New()
+		router.POST("/tools/execute", ExecuteToolHandler())
+
+		body := `{"language": "invalid", "code": "print(1)"}`
+		w := httptest.NewRecorder()
+		req, _ := http.NewRequest("POST", "/tools/execute", strings.NewReader(body))
+		req.Header.Set("Content-Type", "application/json")
+		router.ServeHTTP(w, req)
+
+		if w.Code != http.StatusBadRequest {
+			t.Errorf("expected status 400, got %d", w.Code)
+		}
+	})
+
+	t.Run("rejects javascript on backend", func(t *testing.T) {
+		router := gin.New()
+		router.POST("/tools/execute", ExecuteToolHandler())
+
+		reqBody := ExecuteToolRequest{
+			Language: "javascript",
+			Code:     "return 1 + 1",
+		}
+		body, _ := json.Marshal(reqBody)
+
+		w := httptest.NewRecorder()
+		req, _ := http.NewRequest("POST", "/tools/execute", bytes.NewBuffer(body))
+		req.Header.Set("Content-Type", "application/json")
+		router.ServeHTTP(w, req)
+
+		var resp ExecuteToolResponse
+		json.Unmarshal(w.Body.Bytes(), &resp)
+
+		if resp.Success {
+			t.Error("javascript should not be supported on backend")
+		}
+		if !strings.Contains(resp.Error, "browser") {
+			t.Errorf("error should mention browser, got: %s", resp.Error)
+		}
+	})
+
+	t.Run("executes simple python", func(t *testing.T) {
+		router := gin.New()
+		router.POST("/tools/execute", ExecuteToolHandler())
+
+		reqBody := ExecuteToolRequest{
+			Language: "python",
+			Code:     "print('{\"result\": 42}')",
+			Args:     map[string]interface{}{},
+			Timeout:  5,
+		}
+		body, _ := json.Marshal(reqBody)
+
+		w := httptest.NewRecorder()
+		req, _ := http.NewRequest("POST", "/tools/execute", bytes.NewBuffer(body))
+		req.Header.Set("Content-Type", "application/json")
+		router.ServeHTTP(w, req)
+
+		var resp ExecuteToolResponse
+		json.Unmarshal(w.Body.Bytes(), &resp)
+
+		// This test depends on python3 being available
+		// If python isn't available, the test should still pass (checking error handling)
+		if w.Code != http.StatusOK {
+			t.Errorf("expected status 200, got %d", w.Code)
+		}
+	})
+
+	t.Run("passes args to python", func(t *testing.T) {
+		router := gin.New()
+		router.POST("/tools/execute", ExecuteToolHandler())
+
+		reqBody := ExecuteToolRequest{
+			Language: "python",
+			Code:     "import json; print(json.dumps({'doubled': args['value'] * 2}))",
+			Args:     map[string]interface{}{"value": 21},
+			Timeout:  5,
+		}
+		body, _ := json.Marshal(reqBody)
+
+		w := httptest.NewRecorder()
+		req, _ := http.NewRequest("POST", "/tools/execute", bytes.NewBuffer(body))
+		req.Header.Set("Content-Type", "application/json")
+		router.ServeHTTP(w, req)
+
+		var resp ExecuteToolResponse
+		json.Unmarshal(w.Body.Bytes(), &resp)
+
+		if resp.Success {
+			// Check result contains the doubled value
+			if result, ok := resp.Result.(map[string]interface{}); ok {
+				if doubled, ok := result["doubled"].(float64); ok {
+					if doubled != 42 {
+						t.Errorf("expected doubled=42, got %v", doubled)
+					}
+				}
+			}
+		}
+		// If python isn't available, test passes anyway
+	})
+
+	t.Run("uses default timeout", func(t *testing.T) {
+		router := gin.New()
+		router.POST("/tools/execute", ExecuteToolHandler())
+
+		// Request without timeout should use default (30s)
+		reqBody := ExecuteToolRequest{
+			Language: "python",
+			Code:     "print('ok')",
+		}
+		body, _ := json.Marshal(reqBody)
+
+		w := httptest.NewRecorder()
+		req, _ := http.NewRequest("POST", "/tools/execute", bytes.NewBuffer(body))
+		req.Header.Set("Content-Type", "application/json")
+		router.ServeHTTP(w, req)
+
+		// Should complete successfully (not timeout)
+		if w.Code != http.StatusOK {
+			t.Errorf("expected status 200, got %d", w.Code)
+		}
+	})
+
+	t.Run("caps timeout at 60s", func(t *testing.T) {
+		router := gin.New()
+		router.POST("/tools/execute", ExecuteToolHandler())
+
+		// Request with excessive timeout
+		reqBody := ExecuteToolRequest{
+			Language: "python",
+			Code:     "print('ok')",
+			Timeout:  999, // Should be capped to 30 (default)
+		}
+		body, _ := json.Marshal(reqBody)
+
+		w := httptest.NewRecorder()
+		req, _ := http.NewRequest("POST", "/tools/execute", bytes.NewBuffer(body))
+		req.Header.Set("Content-Type", "application/json")
+		router.ServeHTTP(w, req)
+
+		// Should complete (timeout was capped, not honored)
+		if w.Code != http.StatusOK {
+			t.Errorf("expected status 200, got %d", w.Code)
+		}
+	})
+}

backend/internal/api/version_test.go

@@ -0,0 +1,85 @@
+package api
+
+import (
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/gin-gonic/gin"
+)
+
+func TestCompareVersions(t *testing.T) {
+	tests := []struct {
+		name     string
+		current  string
+		latest   string
+		expected bool
+	}{
+		// Basic comparisons
+		{"newer major version", "1.0.0", "2.0.0", true},
+		{"newer minor version", "1.0.0", "1.1.0", true},
+		{"newer patch version", "1.0.0", "1.0.1", true},
+		{"same version", "1.0.0", "1.0.0", false},
+		{"older version", "2.0.0", "1.0.0", false},
+
+		// With v prefix
+		{"v prefix on both", "v1.0.0", "v1.1.0", true},
+		{"v prefix on current only", "v1.0.0", "1.1.0", true},
+		{"v prefix on latest only", "1.0.0", "v1.1.0", true},
+
+		// Different segment counts
+		{"more segments in latest", "1.0", "1.0.1", true},
+		{"more segments in current", "1.0.1", "1.1", true},
+		{"single segment", "1", "2", true},
+
+		// Pre-release versions (strips suffix after -)
+		{"pre-release current", "1.0.0-beta", "1.0.0", false},
+		{"pre-release latest", "1.0.0", "1.0.1-beta", true},
+
+		// Edge cases
+		{"empty latest", "1.0.0", "", false},
+		{"empty current", "", "1.0.0", false},
+		{"both empty", "", "", false},
+
+		// Real-world scenarios
+		{"typical update", "0.5.1", "0.5.2", true},
+		{"major bump", "0.9.9", "1.0.0", true},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := compareVersions(tt.current, tt.latest)
+			if result != tt.expected {
+				t.Errorf("compareVersions(%q, %q) = %v, want %v",
+					tt.current, tt.latest, result, tt.expected)
+			}
+		})
+	}
+}
+
+func TestVersionHandler(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+
+	t.Run("returns current version", func(t *testing.T) {
+		router := gin.New()
+		router.GET("/version", VersionHandler("1.2.3"))
+
+		w := httptest.NewRecorder()
+		req, _ := http.NewRequest("GET", "/version", nil)
+		router.ServeHTTP(w, req)
+
+		if w.Code != http.StatusOK {
+			t.Errorf("expected status 200, got %d", w.Code)
+		}
+
+		var info VersionInfo
+		if err := json.Unmarshal(w.Body.Bytes(), &info); err != nil {
+			t.Fatalf("failed to unmarshal response: %v", err)
+		}
+
+		if info.Current != "1.2.3" {
+			t.Errorf("expected current version '1.2.3', got '%s'", info.Current)
+		}
+	})
+}

backend/internal/backends/interface.go

@@ -0,0 +1,98 @@
+package backends
+
+import (
+	"context"
+)
+
+// LLMBackend defines the interface for LLM backend implementations.
+// All backends (Ollama, llama.cpp, LM Studio) must implement this interface.
+type LLMBackend interface {
+	// Type returns the backend type identifier
+	Type() BackendType
+
+	// Config returns the backend configuration
+	Config() BackendConfig
+
+	// HealthCheck verifies the backend is reachable and operational
+	HealthCheck(ctx context.Context) error
+
+	// ListModels returns all models available from this backend
+	ListModels(ctx context.Context) ([]Model, error)
+
+	// StreamChat sends a chat request and returns a channel for streaming responses.
+	// The channel is closed when the stream completes or an error occurs.
+	// Callers should check ChatChunk.Error for stream errors.
+	StreamChat(ctx context.Context, req *ChatRequest) (<-chan ChatChunk, error)
+
+	// Chat sends a non-streaming chat request and returns the final response
+	Chat(ctx context.Context, req *ChatRequest) (*ChatChunk, error)
+
+	// Capabilities returns what features this backend supports
+	Capabilities() BackendCapabilities
+
+	// Info returns detailed information about the backend including status
+	Info(ctx context.Context) BackendInfo
+}
+
+// ModelManager extends LLMBackend with model management capabilities.
+// Only Ollama implements this interface.
+type ModelManager interface {
+	LLMBackend
+
+	// PullModel downloads a model from the registry.
+	// Returns a channel for progress updates.
+	PullModel(ctx context.Context, name string) (<-chan PullProgress, error)
+
+	// DeleteModel removes a model from local storage
+	DeleteModel(ctx context.Context, name string) error
+
+	// CreateModel creates a custom model with the given Modelfile content
+	CreateModel(ctx context.Context, name string, modelfile string) (<-chan CreateProgress, error)
+
+	// CopyModel creates a copy of an existing model
+	CopyModel(ctx context.Context, source, destination string) error
+
+	// ShowModel returns detailed information about a specific model
+	ShowModel(ctx context.Context, name string) (*ModelDetails, error)
+}
+
+// EmbeddingProvider extends LLMBackend with embedding capabilities.
+type EmbeddingProvider interface {
+	LLMBackend
+
+	// Embed generates embeddings for the given input
+	Embed(ctx context.Context, model string, input []string) ([][]float64, error)
+}
+
+// PullProgress represents progress during model download
+type PullProgress struct {
+	Status    string `json:"status"`
+	Digest    string `json:"digest,omitempty"`
+	Total     int64  `json:"total,omitempty"`
+	Completed int64  `json:"completed,omitempty"`
+	Error     string `json:"error,omitempty"`
+}
+
+// CreateProgress represents progress during model creation
+type CreateProgress struct {
+	Status string `json:"status"`
+	Error  string `json:"error,omitempty"`
+}
+
+// ModelDetails contains detailed information about a model
+type ModelDetails struct {
+	Name       string            `json:"name"`
+	ModifiedAt string            `json:"modified_at"`
+	Size       int64             `json:"size"`
+	Digest     string            `json:"digest"`
+	Format     string            `json:"format"`
+	Family     string            `json:"family"`
+	Families   []string          `json:"families"`
+	ParamSize  string            `json:"parameter_size"`
+	QuantLevel string            `json:"quantization_level"`
+	Template   string            `json:"template"`
+	System     string            `json:"system"`
+	License    string            `json:"license"`
+	Modelfile  string            `json:"modelfile"`
+	Parameters map[string]string `json:"parameters"`
+}

backend/internal/backends/ollama/adapter.go

@@ -0,0 +1,624 @@
+package ollama
+
+import (
+	"bufio"
+	"bytes"
+	"context"
+	"encoding/json"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"time"
+
+	"vessel-backend/internal/backends"
+)
+
+// Adapter implements the LLMBackend interface for Ollama.
+// It also implements ModelManager and EmbeddingProvider.
+type Adapter struct {
+	config     backends.BackendConfig
+	httpClient *http.Client
+	baseURL    *url.URL
+}
+
+// Ensure Adapter implements all required interfaces
+var (
+	_ backends.LLMBackend         = (*Adapter)(nil)
+	_ backends.ModelManager       = (*Adapter)(nil)
+	_ backends.EmbeddingProvider  = (*Adapter)(nil)
+)
+
+// NewAdapter creates a new Ollama backend adapter
+func NewAdapter(config backends.BackendConfig) (*Adapter, error) {
+	if config.Type != backends.BackendTypeOllama {
+		return nil, fmt.Errorf("invalid backend type: expected %s, got %s", backends.BackendTypeOllama, config.Type)
+	}
+
+	if err := config.Validate(); err != nil {
+		return nil, fmt.Errorf("invalid config: %w", err)
+	}
+
+	baseURL, err := url.Parse(config.BaseURL)
+	if err != nil {
+		return nil, fmt.Errorf("invalid base URL: %w", err)
+	}
+
+	return &Adapter{
+		config:  config,
+		baseURL: baseURL,
+		httpClient: &http.Client{
+			Timeout: 30 * time.Second,
+		},
+	}, nil
+}
+
+// Type returns the backend type
+func (a *Adapter) Type() backends.BackendType {
+	return backends.BackendTypeOllama
+}
+
+// Config returns the backend configuration
+func (a *Adapter) Config() backends.BackendConfig {
+	return a.config
+}
+
+// Capabilities returns what features this backend supports
+func (a *Adapter) Capabilities() backends.BackendCapabilities {
+	return backends.OllamaCapabilities()
+}
+
+// HealthCheck verifies the backend is reachable
+func (a *Adapter) HealthCheck(ctx context.Context) error {
+	req, err := http.NewRequestWithContext(ctx, "GET", a.baseURL.String()+"/api/version", nil)
+	if err != nil {
+		return fmt.Errorf("failed to create request: %w", err)
+	}
+
+	resp, err := a.httpClient.Do(req)
+	if err != nil {
+		return fmt.Errorf("failed to reach Ollama: %w", err)
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		return fmt.Errorf("Ollama returned status %d", resp.StatusCode)
+	}
+
+	return nil
+}
+
+// ollamaListResponse represents the response from /api/tags
+type ollamaListResponse struct {
+	Models []ollamaModel `json:"models"`
+}
+
+type ollamaModel struct {
+	Name       string            `json:"name"`
+	Size       int64             `json:"size"`
+	ModifiedAt string            `json:"modified_at"`
+	Details    ollamaModelDetails `json:"details"`
+}
+
+type ollamaModelDetails struct {
+	Family     string `json:"family"`
+	QuantLevel string `json:"quantization_level"`
+	ParamSize  string `json:"parameter_size"`
+}
+
+// ListModels returns all models available from Ollama
+func (a *Adapter) ListModels(ctx context.Context) ([]backends.Model, error) {
+	req, err := http.NewRequestWithContext(ctx, "GET", a.baseURL.String()+"/api/tags", nil)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create request: %w", err)
+	}
+
+	resp, err := a.httpClient.Do(req)
+	if err != nil {
+		return nil, fmt.Errorf("failed to list models: %w", err)
+	}
+	defer resp.Body.Close()
+
+	var listResp ollamaListResponse
+	if err := json.NewDecoder(resp.Body).Decode(&listResp); err != nil {
+		return nil, fmt.Errorf("failed to decode response: %w", err)
+	}
+
+	models := make([]backends.Model, len(listResp.Models))
+	for i, m := range listResp.Models {
+		models[i] = backends.Model{
+			ID:         m.Name,
+			Name:       m.Name,
+			Size:       m.Size,
+			ModifiedAt: m.ModifiedAt,
+			Family:     m.Details.Family,
+			QuantLevel: m.Details.QuantLevel,
+		}
+	}
+
+	return models, nil
+}
+
+// Chat sends a non-streaming chat request
+func (a *Adapter) Chat(ctx context.Context, req *backends.ChatRequest) (*backends.ChatChunk, error) {
+	if err := req.Validate(); err != nil {
+		return nil, fmt.Errorf("invalid request: %w", err)
+	}
+
+	// Convert to Ollama format
+	ollamaReq := a.convertChatRequest(req)
+	ollamaReq["stream"] = false
+
+	body, err := json.Marshal(ollamaReq)
+	if err != nil {
+		return nil, fmt.Errorf("failed to marshal request: %w", err)
+	}
+
+	httpReq, err := http.NewRequestWithContext(ctx, "POST", a.baseURL.String()+"/api/chat", bytes.NewReader(body))
+	if err != nil {
+		return nil, fmt.Errorf("failed to create request: %w", err)
+	}
+	httpReq.Header.Set("Content-Type", "application/json")
+
+	resp, err := a.httpClient.Do(httpReq)
+	if err != nil {
+		return nil, fmt.Errorf("chat request failed: %w", err)
+	}
+	defer resp.Body.Close()
+
+	var ollamaResp ollamaChatResponse
+	if err := json.NewDecoder(resp.Body).Decode(&ollamaResp); err != nil {
+		return nil, fmt.Errorf("failed to decode response: %w", err)
+	}
+
+	return a.convertChatResponse(&ollamaResp), nil
+}
+
+// StreamChat sends a streaming chat request
+func (a *Adapter) StreamChat(ctx context.Context, req *backends.ChatRequest) (<-chan backends.ChatChunk, error) {
+	if err := req.Validate(); err != nil {
+		return nil, fmt.Errorf("invalid request: %w", err)
+	}
+
+	// Convert to Ollama format
+	ollamaReq := a.convertChatRequest(req)
+	ollamaReq["stream"] = true
+
+	body, err := json.Marshal(ollamaReq)
+	if err != nil {
+		return nil, fmt.Errorf("failed to marshal request: %w", err)
+	}
+
+	// Create HTTP request without timeout for streaming
+	httpReq, err := http.NewRequestWithContext(ctx, "POST", a.baseURL.String()+"/api/chat", bytes.NewReader(body))
+	if err != nil {
+		return nil, fmt.Errorf("failed to create request: %w", err)
+	}
+	httpReq.Header.Set("Content-Type", "application/json")
+
+	// Use a client without timeout for streaming
+	client := &http.Client{}
+	resp, err := client.Do(httpReq)
+	if err != nil {
+		return nil, fmt.Errorf("chat request failed: %w", err)
+	}
+
+	chunkCh := make(chan backends.ChatChunk)
+
+	go func() {
+		defer close(chunkCh)
+		defer resp.Body.Close()
+
+		scanner := bufio.NewScanner(resp.Body)
+		for scanner.Scan() {
+			select {
+			case <-ctx.Done():
+				return
+			default:
+			}
+
+			line := scanner.Bytes()
+			if len(line) == 0 {
+				continue
+			}
+
+			var ollamaResp ollamaChatResponse
+			if err := json.Unmarshal(line, &ollamaResp); err != nil {
+				chunkCh <- backends.ChatChunk{Error: fmt.Sprintf("failed to parse response: %v", err)}
+				return
+			}
+
+			chunkCh <- *a.convertChatResponse(&ollamaResp)
+
+			if ollamaResp.Done {
+				return
+			}
+		}
+
+		if err := scanner.Err(); err != nil && ctx.Err() == nil {
+			chunkCh <- backends.ChatChunk{Error: fmt.Sprintf("stream error: %v", err)}
+		}
+	}()
+
+	return chunkCh, nil
+}
+
+// Info returns detailed information about the backend
+func (a *Adapter) Info(ctx context.Context) backends.BackendInfo {
+	info := backends.BackendInfo{
+		Type:         backends.BackendTypeOllama,
+		BaseURL:      a.config.BaseURL,
+		Capabilities: a.Capabilities(),
+	}
+
+	// Try to get version
+	req, err := http.NewRequestWithContext(ctx, "GET", a.baseURL.String()+"/api/version", nil)
+	if err != nil {
+		info.Status = backends.BackendStatusDisconnected
+		info.Error = err.Error()
+		return info
+	}
+
+	resp, err := a.httpClient.Do(req)
+	if err != nil {
+		info.Status = backends.BackendStatusDisconnected
+		info.Error = err.Error()
+		return info
+	}
+	defer resp.Body.Close()
+
+	var versionResp struct {
+		Version string `json:"version"`
+	}
+	if err := json.NewDecoder(resp.Body).Decode(&versionResp); err != nil {
+		info.Status = backends.BackendStatusDisconnected
+		info.Error = err.Error()
+		return info
+	}
+
+	info.Status = backends.BackendStatusConnected
+	info.Version = versionResp.Version
+	return info
+}
+
+// ShowModel returns detailed information about a specific model
+func (a *Adapter) ShowModel(ctx context.Context, name string) (*backends.ModelDetails, error) {
+	body, err := json.Marshal(map[string]string{"name": name})
+	if err != nil {
+		return nil, fmt.Errorf("failed to marshal request: %w", err)
+	}
+
+	req, err := http.NewRequestWithContext(ctx, "POST", a.baseURL.String()+"/api/show", bytes.NewReader(body))
+	if err != nil {
+		return nil, fmt.Errorf("failed to create request: %w", err)
+	}
+	req.Header.Set("Content-Type", "application/json")
+
+	resp, err := a.httpClient.Do(req)
+	if err != nil {
+		return nil, fmt.Errorf("failed to show model: %w", err)
+	}
+	defer resp.Body.Close()
+
+	var showResp struct {
+		Modelfile string `json:"modelfile"`
+		Template  string `json:"template"`
+		System    string `json:"system"`
+		Details   struct {
+			Family     string `json:"family"`
+			ParamSize  string `json:"parameter_size"`
+			QuantLevel string `json:"quantization_level"`
+		} `json:"details"`
+	}
+	if err := json.NewDecoder(resp.Body).Decode(&showResp); err != nil {
+		return nil, fmt.Errorf("failed to decode response: %w", err)
+	}
+
+	return &backends.ModelDetails{
+		Name:       name,
+		Family:     showResp.Details.Family,
+		ParamSize:  showResp.Details.ParamSize,
+		QuantLevel: showResp.Details.QuantLevel,
+		Template:   showResp.Template,
+		System:     showResp.System,
+		Modelfile:  showResp.Modelfile,
+	}, nil
+}
+
+// PullModel downloads a model from the registry
+func (a *Adapter) PullModel(ctx context.Context, name string) (<-chan backends.PullProgress, error) {
+	body, err := json.Marshal(map[string]interface{}{"name": name, "stream": true})
+	if err != nil {
+		return nil, fmt.Errorf("failed to marshal request: %w", err)
+	}
+
+	req, err := http.NewRequestWithContext(ctx, "POST", a.baseURL.String()+"/api/pull", bytes.NewReader(body))
+	if err != nil {
+		return nil, fmt.Errorf("failed to create request: %w", err)
+	}
+	req.Header.Set("Content-Type", "application/json")
+
+	client := &http.Client{}
+	resp, err := client.Do(req)
+	if err != nil {
+		return nil, fmt.Errorf("failed to pull model: %w", err)
+	}
+
+	progressCh := make(chan backends.PullProgress)
+
+	go func() {
+		defer close(progressCh)
+		defer resp.Body.Close()
+
+		scanner := bufio.NewScanner(resp.Body)
+		for scanner.Scan() {
+			select {
+			case <-ctx.Done():
+				return
+			default:
+			}
+
+			var progress struct {
+				Status    string `json:"status"`
+				Digest    string `json:"digest"`
+				Total     int64  `json:"total"`
+				Completed int64  `json:"completed"`
+			}
+			if err := json.Unmarshal(scanner.Bytes(), &progress); err != nil {
+				progressCh <- backends.PullProgress{Error: err.Error()}
+				return
+			}
+
+			progressCh <- backends.PullProgress{
+				Status:    progress.Status,
+				Digest:    progress.Digest,
+				Total:     progress.Total,
+				Completed: progress.Completed,
+			}
+		}
+
+		if err := scanner.Err(); err != nil && ctx.Err() == nil {
+			progressCh <- backends.PullProgress{Error: err.Error()}
+		}
+	}()
+
+	return progressCh, nil
+}
+
+// DeleteModel removes a model from local storage
+func (a *Adapter) DeleteModel(ctx context.Context, name string) error {
+	body, err := json.Marshal(map[string]string{"name": name})
+	if err != nil {
+		return fmt.Errorf("failed to marshal request: %w", err)
+	}
+
+	req, err := http.NewRequestWithContext(ctx, "DELETE", a.baseURL.String()+"/api/delete", bytes.NewReader(body))
+	if err != nil {
+		return fmt.Errorf("failed to create request: %w", err)
+	}
+	req.Header.Set("Content-Type", "application/json")
+
+	resp, err := a.httpClient.Do(req)
+	if err != nil {
+		return fmt.Errorf("failed to delete model: %w", err)
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		bodyBytes, _ := io.ReadAll(resp.Body)
+		return fmt.Errorf("delete failed: %s", string(bodyBytes))
+	}
+
+	return nil
+}
+
+// CreateModel creates a custom model with the given Modelfile content
+func (a *Adapter) CreateModel(ctx context.Context, name string, modelfile string) (<-chan backends.CreateProgress, error) {
+	body, err := json.Marshal(map[string]interface{}{
+		"name":      name,
+		"modelfile": modelfile,
+		"stream":    true,
+	})
+	if err != nil {
+		return nil, fmt.Errorf("failed to marshal request: %w", err)
+	}
+
+	req, err := http.NewRequestWithContext(ctx, "POST", a.baseURL.String()+"/api/create", bytes.NewReader(body))
+	if err != nil {
+		return nil, fmt.Errorf("failed to create request: %w", err)
+	}
+	req.Header.Set("Content-Type", "application/json")
+
+	client := &http.Client{}
+	resp, err := client.Do(req)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create model: %w", err)
+	}
+
+	progressCh := make(chan backends.CreateProgress)
+
+	go func() {
+		defer close(progressCh)
+		defer resp.Body.Close()
+
+		scanner := bufio.NewScanner(resp.Body)
+		for scanner.Scan() {
+			select {
+			case <-ctx.Done():
+				return
+			default:
+			}
+
+			var progress struct {
+				Status string `json:"status"`
+			}
+			if err := json.Unmarshal(scanner.Bytes(), &progress); err != nil {
+				progressCh <- backends.CreateProgress{Error: err.Error()}
+				return
+			}
+
+			progressCh <- backends.CreateProgress{Status: progress.Status}
+		}
+
+		if err := scanner.Err(); err != nil && ctx.Err() == nil {
+			progressCh <- backends.CreateProgress{Error: err.Error()}
+		}
+	}()
+
+	return progressCh, nil
+}
+
+// CopyModel creates a copy of an existing model
+func (a *Adapter) CopyModel(ctx context.Context, source, destination string) error {
+	body, err := json.Marshal(map[string]string{
+		"source":      source,
+		"destination": destination,
+	})
+	if err != nil {
+		return fmt.Errorf("failed to marshal request: %w", err)
+	}
+
+	req, err := http.NewRequestWithContext(ctx, "POST", a.baseURL.String()+"/api/copy", bytes.NewReader(body))
+	if err != nil {
+		return fmt.Errorf("failed to create request: %w", err)
+	}
+	req.Header.Set("Content-Type", "application/json")
+
+	resp, err := a.httpClient.Do(req)
+	if err != nil {
+		return fmt.Errorf("failed to copy model: %w", err)
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		bodyBytes, _ := io.ReadAll(resp.Body)
+		return fmt.Errorf("copy failed: %s", string(bodyBytes))
+	}
+
+	return nil
+}
+
+// Embed generates embeddings for the given input
+func (a *Adapter) Embed(ctx context.Context, model string, input []string) ([][]float64, error) {
+	body, err := json.Marshal(map[string]interface{}{
+		"model": model,
+		"input": input,
+	})
+	if err != nil {
+		return nil, fmt.Errorf("failed to marshal request: %w", err)
+	}
+
+	req, err := http.NewRequestWithContext(ctx, "POST", a.baseURL.String()+"/api/embed", bytes.NewReader(body))
+	if err != nil {
+		return nil, fmt.Errorf("failed to create request: %w", err)
+	}
+	req.Header.Set("Content-Type", "application/json")
+
+	resp, err := a.httpClient.Do(req)
+	if err != nil {
+		return nil, fmt.Errorf("embed request failed: %w", err)
+	}
+	defer resp.Body.Close()
+
+	var embedResp struct {
+		Embeddings [][]float64 `json:"embeddings"`
+	}
+	if err := json.NewDecoder(resp.Body).Decode(&embedResp); err != nil {
+		return nil, fmt.Errorf("failed to decode response: %w", err)
+	}
+
+	return embedResp.Embeddings, nil
+}
+
+// ollamaChatResponse represents the response from /api/chat
+type ollamaChatResponse struct {
+	Model     string             `json:"model"`
+	CreatedAt string             `json:"created_at"`
+	Message   ollamaChatMessage  `json:"message"`
+	Done      bool               `json:"done"`
+	DoneReason string            `json:"done_reason,omitempty"`
+	PromptEvalCount int          `json:"prompt_eval_count,omitempty"`
+	EvalCount       int          `json:"eval_count,omitempty"`
+}
+
+type ollamaChatMessage struct {
+	Role      string            `json:"role"`
+	Content   string            `json:"content"`
+	Images    []string          `json:"images,omitempty"`
+	ToolCalls []ollamaToolCall  `json:"tool_calls,omitempty"`
+}
+
+type ollamaToolCall struct {
+	Function struct {
+		Name      string          `json:"name"`
+		Arguments json.RawMessage `json:"arguments"`
+	} `json:"function"`
+}
+
+// convertChatRequest converts a backends.ChatRequest to Ollama format
+func (a *Adapter) convertChatRequest(req *backends.ChatRequest) map[string]interface{} {
+	messages := make([]map[string]interface{}, len(req.Messages))
+	for i, msg := range req.Messages {
+		m := map[string]interface{}{
+			"role":    msg.Role,
+			"content": msg.Content,
+		}
+		if len(msg.Images) > 0 {
+			m["images"] = msg.Images
+		}
+		messages[i] = m
+	}
+
+	ollamaReq := map[string]interface{}{
+		"model":    req.Model,
+		"messages": messages,
+	}
+
+	// Add optional parameters
+	if req.Options != nil {
+		ollamaReq["options"] = req.Options
+	}
+	if len(req.Tools) > 0 {
+		ollamaReq["tools"] = req.Tools
+	}
+
+	return ollamaReq
+}
+
+// convertChatResponse converts an Ollama response to backends.ChatChunk
+func (a *Adapter) convertChatResponse(resp *ollamaChatResponse) *backends.ChatChunk {
+	chunk := &backends.ChatChunk{
+		Model:           resp.Model,
+		CreatedAt:       resp.CreatedAt,
+		Done:            resp.Done,
+		DoneReason:      resp.DoneReason,
+		PromptEvalCount: resp.PromptEvalCount,
+		EvalCount:       resp.EvalCount,
+	}
+
+	if resp.Message.Role != "" || resp.Message.Content != "" {
+		msg := &backends.ChatMessage{
+			Role:    resp.Message.Role,
+			Content: resp.Message.Content,
+			Images:  resp.Message.Images,
+		}
+
+		// Convert tool calls
+		for _, tc := range resp.Message.ToolCalls {
+			msg.ToolCalls = append(msg.ToolCalls, backends.ToolCall{
+				Type: "function",
+				Function: struct {
+					Name      string `json:"name"`
+					Arguments string `json:"arguments"`
+				}{
+					Name:      tc.Function.Name,
+					Arguments: string(tc.Function.Arguments),
+				},
+			})
+		}
+
+		chunk.Message = msg
+	}
+
+	return chunk
+}

backend/internal/backends/ollama/adapter_test.go

@@ -0,0 +1,574 @@
+package ollama
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+	"time"
+
+	"vessel-backend/internal/backends"
+)
+
+func TestAdapter_Type(t *testing.T) {
+	adapter, _ := NewAdapter(backends.BackendConfig{
+		Type:    backends.BackendTypeOllama,
+		BaseURL: "http://localhost:11434",
+	})
+
+	if adapter.Type() != backends.BackendTypeOllama {
+		t.Errorf("Type() = %v, want %v", adapter.Type(), backends.BackendTypeOllama)
+	}
+}
+
+func TestAdapter_Config(t *testing.T) {
+	cfg := backends.BackendConfig{
+		Type:    backends.BackendTypeOllama,
+		BaseURL: "http://localhost:11434",
+		Enabled: true,
+	}
+
+	adapter, _ := NewAdapter(cfg)
+	got := adapter.Config()
+
+	if got.Type != cfg.Type {
+		t.Errorf("Config().Type = %v, want %v", got.Type, cfg.Type)
+	}
+	if got.BaseURL != cfg.BaseURL {
+		t.Errorf("Config().BaseURL = %v, want %v", got.BaseURL, cfg.BaseURL)
+	}
+}
+
+func TestAdapter_Capabilities(t *testing.T) {
+	adapter, _ := NewAdapter(backends.BackendConfig{
+		Type:    backends.BackendTypeOllama,
+		BaseURL: "http://localhost:11434",
+	})
+
+	caps := adapter.Capabilities()
+
+	if !caps.CanListModels {
+		t.Error("Ollama adapter should support listing models")
+	}
+	if !caps.CanPullModels {
+		t.Error("Ollama adapter should support pulling models")
+	}
+	if !caps.CanDeleteModels {
+		t.Error("Ollama adapter should support deleting models")
+	}
+	if !caps.CanCreateModels {
+		t.Error("Ollama adapter should support creating models")
+	}
+	if !caps.CanStreamChat {
+		t.Error("Ollama adapter should support streaming chat")
+	}
+	if !caps.CanEmbed {
+		t.Error("Ollama adapter should support embeddings")
+	}
+}
+
+func TestAdapter_HealthCheck(t *testing.T) {
+	t.Run("healthy server", func(t *testing.T) {
+		server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			if r.URL.Path == "/" || r.URL.Path == "/api/version" {
+				w.WriteHeader(http.StatusOK)
+				json.NewEncoder(w).Encode(map[string]string{"version": "0.1.0"})
+			}
+		}))
+		defer server.Close()
+
+		adapter, err := NewAdapter(backends.BackendConfig{
+			Type:    backends.BackendTypeOllama,
+			BaseURL: server.URL,
+		})
+		if err != nil {
+			t.Fatalf("Failed to create adapter: %v", err)
+		}
+
+		ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+		defer cancel()
+
+		if err := adapter.HealthCheck(ctx); err != nil {
+			t.Errorf("HealthCheck() error = %v, want nil", err)
+		}
+	})
+
+	t.Run("unreachable server", func(t *testing.T) {
+		adapter, err := NewAdapter(backends.BackendConfig{
+			Type:    backends.BackendTypeOllama,
+			BaseURL: "http://localhost:19999", // unlikely to be running
+		})
+		if err != nil {
+			t.Fatalf("Failed to create adapter: %v", err)
+		}
+
+		ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
+		defer cancel()
+
+		if err := adapter.HealthCheck(ctx); err == nil {
+			t.Error("HealthCheck() expected error for unreachable server")
+		}
+	})
+}
+
+func TestAdapter_ListModels(t *testing.T) {
+	t.Run("returns model list", func(t *testing.T) {
+		server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			if r.URL.Path == "/api/tags" {
+				resp := map[string]interface{}{
+					"models": []map[string]interface{}{
+						{
+							"name":        "llama3.2:8b",
+							"size":        int64(4700000000),
+							"modified_at": "2024-01-15T10:30:00Z",
+							"details": map[string]interface{}{
+								"family":             "llama",
+								"quantization_level": "Q4_K_M",
+							},
+						},
+						{
+							"name":        "mistral:7b",
+							"size":        int64(4100000000),
+							"modified_at": "2024-01-14T08:00:00Z",
+							"details": map[string]interface{}{
+								"family":             "mistral",
+								"quantization_level": "Q4_0",
+							},
+						},
+					},
+				}
+				json.NewEncoder(w).Encode(resp)
+			}
+		}))
+		defer server.Close()
+
+		adapter, _ := NewAdapter(backends.BackendConfig{
+			Type:    backends.BackendTypeOllama,
+			BaseURL: server.URL,
+		})
+
+		ctx := context.Background()
+		models, err := adapter.ListModels(ctx)
+		if err != nil {
+			t.Fatalf("ListModels() error = %v", err)
+		}
+
+		if len(models) != 2 {
+			t.Errorf("ListModels() returned %d models, want 2", len(models))
+		}
+
+		if models[0].Name != "llama3.2:8b" {
+			t.Errorf("First model name = %q, want %q", models[0].Name, "llama3.2:8b")
+		}
+
+		if models[0].Family != "llama" {
+			t.Errorf("First model family = %q, want %q", models[0].Family, "llama")
+		}
+	})
+
+	t.Run("handles empty model list", func(t *testing.T) {
+		server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			if r.URL.Path == "/api/tags" {
+				resp := map[string]interface{}{
+					"models": []map[string]interface{}{},
+				}
+				json.NewEncoder(w).Encode(resp)
+			}
+		}))
+		defer server.Close()
+
+		adapter, _ := NewAdapter(backends.BackendConfig{
+			Type:    backends.BackendTypeOllama,
+			BaseURL: server.URL,
+		})
+
+		models, err := adapter.ListModels(context.Background())
+		if err != nil {
+			t.Fatalf("ListModels() error = %v", err)
+		}
+
+		if len(models) != 0 {
+			t.Errorf("ListModels() returned %d models, want 0", len(models))
+		}
+	})
+}
+
+func TestAdapter_Chat(t *testing.T) {
+	t.Run("non-streaming chat", func(t *testing.T) {
+		server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			if r.URL.Path == "/api/chat" && r.Method == "POST" {
+				var req map[string]interface{}
+				json.NewDecoder(r.Body).Decode(&req)
+
+				// Check stream is false
+				if stream, ok := req["stream"].(bool); !ok || stream {
+					t.Error("Expected stream=false for non-streaming chat")
+				}
+
+				resp := map[string]interface{}{
+					"model":   "llama3.2:8b",
+					"message": map[string]interface{}{"role": "assistant", "content": "Hello! How can I help you?"},
+					"done":    true,
+				}
+				json.NewEncoder(w).Encode(resp)
+			}
+		}))
+		defer server.Close()
+
+		adapter, _ := NewAdapter(backends.BackendConfig{
+			Type:    backends.BackendTypeOllama,
+			BaseURL: server.URL,
+		})
+
+		req := &backends.ChatRequest{
+			Model: "llama3.2:8b",
+			Messages: []backends.ChatMessage{
+				{Role: "user", Content: "Hello"},
+			},
+		}
+
+		resp, err := adapter.Chat(context.Background(), req)
+		if err != nil {
+			t.Fatalf("Chat() error = %v", err)
+		}
+
+		if !resp.Done {
+			t.Error("Chat() response.Done = false, want true")
+		}
+
+		if resp.Message == nil || resp.Message.Content != "Hello! How can I help you?" {
+			t.Errorf("Chat() response content unexpected: %+v", resp.Message)
+		}
+	})
+}
+
+func TestAdapter_StreamChat(t *testing.T) {
+	t.Run("streaming chat", func(t *testing.T) {
+		server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			if r.URL.Path == "/api/chat" && r.Method == "POST" {
+				var req map[string]interface{}
+				json.NewDecoder(r.Body).Decode(&req)
+
+				// Check stream is true
+				if stream, ok := req["stream"].(bool); ok && !stream {
+					t.Error("Expected stream=true for streaming chat")
+				}
+
+				w.Header().Set("Content-Type", "application/x-ndjson")
+				flusher := w.(http.Flusher)
+
+				// Send streaming chunks
+				chunks := []map[string]interface{}{
+					{"model": "llama3.2:8b", "message": map[string]interface{}{"role": "assistant", "content": "Hello"}, "done": false},
+					{"model": "llama3.2:8b", "message": map[string]interface{}{"role": "assistant", "content": "!"}, "done": false},
+					{"model": "llama3.2:8b", "message": map[string]interface{}{"role": "assistant", "content": ""}, "done": true},
+				}
+
+				for _, chunk := range chunks {
+					data, _ := json.Marshal(chunk)
+					w.Write(append(data, '\n'))
+					flusher.Flush()
+				}
+			}
+		}))
+		defer server.Close()
+
+		adapter, _ := NewAdapter(backends.BackendConfig{
+			Type:    backends.BackendTypeOllama,
+			BaseURL: server.URL,
+		})
+
+		streaming := true
+		req := &backends.ChatRequest{
+			Model: "llama3.2:8b",
+			Messages: []backends.ChatMessage{
+				{Role: "user", Content: "Hello"},
+			},
+			Stream: &streaming,
+		}
+
+		chunkCh, err := adapter.StreamChat(context.Background(), req)
+		if err != nil {
+			t.Fatalf("StreamChat() error = %v", err)
+		}
+
+		var chunks []backends.ChatChunk
+		for chunk := range chunkCh {
+			chunks = append(chunks, chunk)
+		}
+
+		if len(chunks) != 3 {
+			t.Errorf("StreamChat() received %d chunks, want 3", len(chunks))
+		}
+
+		// Last chunk should be done
+		if !chunks[len(chunks)-1].Done {
+			t.Error("Last chunk should have Done=true")
+		}
+	})
+
+	t.Run("handles context cancellation", func(t *testing.T) {
+		server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			if r.URL.Path == "/api/chat" {
+				w.Header().Set("Content-Type", "application/x-ndjson")
+				flusher := w.(http.Flusher)
+
+				// Send first chunk then wait
+				chunk := map[string]interface{}{"model": "llama3.2:8b", "message": map[string]interface{}{"role": "assistant", "content": "Starting..."}, "done": false}
+				data, _ := json.Marshal(chunk)
+				w.Write(append(data, '\n'))
+				flusher.Flush()
+
+				// Wait long enough for context to be cancelled
+				time.Sleep(2 * time.Second)
+			}
+		}))
+		defer server.Close()
+
+		adapter, _ := NewAdapter(backends.BackendConfig{
+			Type:    backends.BackendTypeOllama,
+			BaseURL: server.URL,
+		})
+
+		ctx, cancel := context.WithTimeout(context.Background(), 100*time.Millisecond)
+		defer cancel()
+
+		streaming := true
+		req := &backends.ChatRequest{
+			Model: "llama3.2:8b",
+			Messages: []backends.ChatMessage{
+				{Role: "user", Content: "Hello"},
+			},
+			Stream: &streaming,
+		}
+
+		chunkCh, err := adapter.StreamChat(ctx, req)
+		if err != nil {
+			t.Fatalf("StreamChat() error = %v", err)
+		}
+
+		// Should receive at least one chunk before timeout
+		receivedChunks := 0
+		for range chunkCh {
+			receivedChunks++
+		}
+
+		if receivedChunks == 0 {
+			t.Error("Expected to receive at least one chunk before cancellation")
+		}
+	})
+}
+
+func TestAdapter_Info(t *testing.T) {
+	t.Run("connected server", func(t *testing.T) {
+		server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			if r.URL.Path == "/" || r.URL.Path == "/api/version" {
+				json.NewEncoder(w).Encode(map[string]string{"version": "0.3.0"})
+			}
+		}))
+		defer server.Close()
+
+		adapter, _ := NewAdapter(backends.BackendConfig{
+			Type:    backends.BackendTypeOllama,
+			BaseURL: server.URL,
+		})
+
+		info := adapter.Info(context.Background())
+
+		if info.Type != backends.BackendTypeOllama {
+			t.Errorf("Info().Type = %v, want %v", info.Type, backends.BackendTypeOllama)
+		}
+
+		if info.Status != backends.BackendStatusConnected {
+			t.Errorf("Info().Status = %v, want %v", info.Status, backends.BackendStatusConnected)
+		}
+
+		if info.Version != "0.3.0" {
+			t.Errorf("Info().Version = %v, want %v", info.Version, "0.3.0")
+		}
+	})
+
+	t.Run("disconnected server", func(t *testing.T) {
+		adapter, _ := NewAdapter(backends.BackendConfig{
+			Type:    backends.BackendTypeOllama,
+			BaseURL: "http://localhost:19999",
+		})
+
+		ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
+		defer cancel()
+
+		info := adapter.Info(ctx)
+
+		if info.Status != backends.BackendStatusDisconnected {
+			t.Errorf("Info().Status = %v, want %v", info.Status, backends.BackendStatusDisconnected)
+		}
+
+		if info.Error == "" {
+			t.Error("Info().Error should be set for disconnected server")
+		}
+	})
+}
+
+func TestAdapter_ShowModel(t *testing.T) {
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.URL.Path == "/api/show" && r.Method == "POST" {
+			var req map[string]string
+			json.NewDecoder(r.Body).Decode(&req)
+
+			resp := map[string]interface{}{
+				"modelfile": "FROM llama3.2:8b\nSYSTEM You are helpful.",
+				"template":  "{{ .Prompt }}",
+				"system":    "You are helpful.",
+				"details": map[string]interface{}{
+					"family":             "llama",
+					"parameter_size":     "8B",
+					"quantization_level": "Q4_K_M",
+				},
+			}
+			json.NewEncoder(w).Encode(resp)
+		}
+	}))
+	defer server.Close()
+
+	adapter, _ := NewAdapter(backends.BackendConfig{
+		Type:    backends.BackendTypeOllama,
+		BaseURL: server.URL,
+	})
+
+	details, err := adapter.ShowModel(context.Background(), "llama3.2:8b")
+	if err != nil {
+		t.Fatalf("ShowModel() error = %v", err)
+	}
+
+	if details.Family != "llama" {
+		t.Errorf("ShowModel().Family = %q, want %q", details.Family, "llama")
+	}
+
+	if details.System != "You are helpful." {
+		t.Errorf("ShowModel().System = %q, want %q", details.System, "You are helpful.")
+	}
+}
+
+func TestAdapter_DeleteModel(t *testing.T) {
+	deleted := false
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.URL.Path == "/api/delete" && r.Method == "DELETE" {
+			deleted = true
+			w.WriteHeader(http.StatusOK)
+		}
+	}))
+	defer server.Close()
+
+	adapter, _ := NewAdapter(backends.BackendConfig{
+		Type:    backends.BackendTypeOllama,
+		BaseURL: server.URL,
+	})
+
+	err := adapter.DeleteModel(context.Background(), "test-model")
+	if err != nil {
+		t.Fatalf("DeleteModel() error = %v", err)
+	}
+
+	if !deleted {
+		t.Error("DeleteModel() did not call the delete endpoint")
+	}
+}
+
+func TestAdapter_CopyModel(t *testing.T) {
+	copied := false
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.URL.Path == "/api/copy" && r.Method == "POST" {
+			var req map[string]string
+			json.NewDecoder(r.Body).Decode(&req)
+
+			if req["source"] == "source-model" && req["destination"] == "dest-model" {
+				copied = true
+			}
+			w.WriteHeader(http.StatusOK)
+		}
+	}))
+	defer server.Close()
+
+	adapter, _ := NewAdapter(backends.BackendConfig{
+		Type:    backends.BackendTypeOllama,
+		BaseURL: server.URL,
+	})
+
+	err := adapter.CopyModel(context.Background(), "source-model", "dest-model")
+	if err != nil {
+		t.Fatalf("CopyModel() error = %v", err)
+	}
+
+	if !copied {
+		t.Error("CopyModel() did not call the copy endpoint with correct params")
+	}
+}
+
+func TestAdapter_Embed(t *testing.T) {
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.URL.Path == "/api/embed" && r.Method == "POST" {
+			resp := map[string]interface{}{
+				"embeddings": [][]float64{
+					{0.1, 0.2, 0.3},
+					{0.4, 0.5, 0.6},
+				},
+			}
+			json.NewEncoder(w).Encode(resp)
+		}
+	}))
+	defer server.Close()
+
+	adapter, _ := NewAdapter(backends.BackendConfig{
+		Type:    backends.BackendTypeOllama,
+		BaseURL: server.URL,
+	})
+
+	embeddings, err := adapter.Embed(context.Background(), "nomic-embed-text", []string{"hello", "world"})
+	if err != nil {
+		t.Fatalf("Embed() error = %v", err)
+	}
+
+	if len(embeddings) != 2 {
+		t.Errorf("Embed() returned %d embeddings, want 2", len(embeddings))
+	}
+
+	if len(embeddings[0]) != 3 {
+		t.Errorf("First embedding has %d dimensions, want 3", len(embeddings[0]))
+	}
+}
+
+func TestNewAdapter_Validation(t *testing.T) {
+	t.Run("invalid URL", func(t *testing.T) {
+		_, err := NewAdapter(backends.BackendConfig{
+			Type:    backends.BackendTypeOllama,
+			BaseURL: "not-a-url",
+		})
+		if err == nil {
+			t.Error("NewAdapter() should fail with invalid URL")
+		}
+	})
+
+	t.Run("wrong backend type", func(t *testing.T) {
+		_, err := NewAdapter(backends.BackendConfig{
+			Type:    backends.BackendTypeLlamaCpp,
+			BaseURL: "http://localhost:11434",
+		})
+		if err == nil {
+			t.Error("NewAdapter() should fail with wrong backend type")
+		}
+	})
+
+	t.Run("valid config", func(t *testing.T) {
+		adapter, err := NewAdapter(backends.BackendConfig{
+			Type:    backends.BackendTypeOllama,
+			BaseURL: "http://localhost:11434",
+		})
+		if err != nil {
+			t.Errorf("NewAdapter() error = %v", err)
+		}
+		if adapter == nil {
+			t.Error("NewAdapter() returned nil adapter")
+		}
+	})
+}

backend/internal/backends/openai/adapter.go

@@ -0,0 +1,538 @@
+package openai
+
+import (
+	"bufio"
+	"bytes"
+	"context"
+	"encoding/json"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"strings"
+	"time"
+
+	"vessel-backend/internal/backends"
+)
+
+// Adapter implements the LLMBackend interface for OpenAI-compatible APIs.
+// This includes llama.cpp server and LM Studio.
+type Adapter struct {
+	config     backends.BackendConfig
+	httpClient *http.Client
+	baseURL    *url.URL
+}
+
+// Ensure Adapter implements required interfaces
+var (
+	_ backends.LLMBackend        = (*Adapter)(nil)
+	_ backends.EmbeddingProvider = (*Adapter)(nil)
+)
+
+// NewAdapter creates a new OpenAI-compatible backend adapter
+func NewAdapter(config backends.BackendConfig) (*Adapter, error) {
+	if config.Type != backends.BackendTypeLlamaCpp && config.Type != backends.BackendTypeLMStudio {
+		return nil, fmt.Errorf("invalid backend type: expected %s or %s, got %s",
+			backends.BackendTypeLlamaCpp, backends.BackendTypeLMStudio, config.Type)
+	}
+
+	if err := config.Validate(); err != nil {
+		return nil, fmt.Errorf("invalid config: %w", err)
+	}
+
+	baseURL, err := url.Parse(config.BaseURL)
+	if err != nil {
+		return nil, fmt.Errorf("invalid base URL: %w", err)
+	}
+
+	return &Adapter{
+		config:  config,
+		baseURL: baseURL,
+		httpClient: &http.Client{
+			Timeout: 30 * time.Second,
+		},
+	}, nil
+}
+
+// Type returns the backend type
+func (a *Adapter) Type() backends.BackendType {
+	return a.config.Type
+}
+
+// Config returns the backend configuration
+func (a *Adapter) Config() backends.BackendConfig {
+	return a.config
+}
+
+// Capabilities returns what features this backend supports
+func (a *Adapter) Capabilities() backends.BackendCapabilities {
+	if a.config.Type == backends.BackendTypeLlamaCpp {
+		return backends.LlamaCppCapabilities()
+	}
+	return backends.LMStudioCapabilities()
+}
+
+// HealthCheck verifies the backend is reachable
+func (a *Adapter) HealthCheck(ctx context.Context) error {
+	req, err := http.NewRequestWithContext(ctx, "GET", a.baseURL.String()+"/v1/models", nil)
+	if err != nil {
+		return fmt.Errorf("failed to create request: %w", err)
+	}
+
+	resp, err := a.httpClient.Do(req)
+	if err != nil {
+		return fmt.Errorf("failed to reach backend: %w", err)
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		return fmt.Errorf("backend returned status %d", resp.StatusCode)
+	}
+
+	return nil
+}
+
+// openaiModelsResponse represents the response from /v1/models
+type openaiModelsResponse struct {
+	Data []openaiModel `json:"data"`
+}
+
+type openaiModel struct {
+	ID      string `json:"id"`
+	Object  string `json:"object"`
+	OwnedBy string `json:"owned_by"`
+	Created int64  `json:"created"`
+}
+
+// ListModels returns all models available from this backend
+func (a *Adapter) ListModels(ctx context.Context) ([]backends.Model, error) {
+	req, err := http.NewRequestWithContext(ctx, "GET", a.baseURL.String()+"/v1/models", nil)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create request: %w", err)
+	}
+
+	resp, err := a.httpClient.Do(req)
+	if err != nil {
+		return nil, fmt.Errorf("failed to list models: %w", err)
+	}
+	defer resp.Body.Close()
+
+	var listResp openaiModelsResponse
+	if err := json.NewDecoder(resp.Body).Decode(&listResp); err != nil {
+		return nil, fmt.Errorf("failed to decode response: %w", err)
+	}
+
+	models := make([]backends.Model, len(listResp.Data))
+	for i, m := range listResp.Data {
+		models[i] = backends.Model{
+			ID:   m.ID,
+			Name: m.ID,
+		}
+	}
+
+	return models, nil
+}
+
+// Chat sends a non-streaming chat request
+func (a *Adapter) Chat(ctx context.Context, req *backends.ChatRequest) (*backends.ChatChunk, error) {
+	if err := req.Validate(); err != nil {
+		return nil, fmt.Errorf("invalid request: %w", err)
+	}
+
+	openaiReq := a.convertChatRequest(req)
+	openaiReq["stream"] = false
+
+	body, err := json.Marshal(openaiReq)
+	if err != nil {
+		return nil, fmt.Errorf("failed to marshal request: %w", err)
+	}
+
+	httpReq, err := http.NewRequestWithContext(ctx, "POST", a.baseURL.String()+"/v1/chat/completions", bytes.NewReader(body))
+	if err != nil {
+		return nil, fmt.Errorf("failed to create request: %w", err)
+	}
+	httpReq.Header.Set("Content-Type", "application/json")
+
+	resp, err := a.httpClient.Do(httpReq)
+	if err != nil {
+		return nil, fmt.Errorf("chat request failed: %w", err)
+	}
+	defer resp.Body.Close()
+
+	var openaiResp openaiChatResponse
+	if err := json.NewDecoder(resp.Body).Decode(&openaiResp); err != nil {
+		return nil, fmt.Errorf("failed to decode response: %w", err)
+	}
+
+	return a.convertChatResponse(&openaiResp), nil
+}
+
+// StreamChat sends a streaming chat request
+func (a *Adapter) StreamChat(ctx context.Context, req *backends.ChatRequest) (<-chan backends.ChatChunk, error) {
+	if err := req.Validate(); err != nil {
+		return nil, fmt.Errorf("invalid request: %w", err)
+	}
+
+	openaiReq := a.convertChatRequest(req)
+	openaiReq["stream"] = true
+
+	body, err := json.Marshal(openaiReq)
+	if err != nil {
+		return nil, fmt.Errorf("failed to marshal request: %w", err)
+	}
+
+	httpReq, err := http.NewRequestWithContext(ctx, "POST", a.baseURL.String()+"/v1/chat/completions", bytes.NewReader(body))
+	if err != nil {
+		return nil, fmt.Errorf("failed to create request: %w", err)
+	}
+	httpReq.Header.Set("Content-Type", "application/json")
+	httpReq.Header.Set("Accept", "text/event-stream")
+
+	// Use a client without timeout for streaming
+	client := &http.Client{}
+	resp, err := client.Do(httpReq)
+	if err != nil {
+		return nil, fmt.Errorf("chat request failed: %w", err)
+	}
+
+	chunkCh := make(chan backends.ChatChunk)
+
+	go func() {
+		defer close(chunkCh)
+		defer resp.Body.Close()
+
+		a.parseSSEStream(ctx, resp.Body, chunkCh)
+	}()
+
+	return chunkCh, nil
+}
+
+// parseSSEStream parses Server-Sent Events and emits ChatChunks
+func (a *Adapter) parseSSEStream(ctx context.Context, body io.Reader, chunkCh chan<- backends.ChatChunk) {
+	scanner := bufio.NewScanner(body)
+
+	// Track accumulated tool call arguments
+	toolCallArgs := make(map[int]string)
+
+	for scanner.Scan() {
+		select {
+		case <-ctx.Done():
+			return
+		default:
+		}
+
+		line := scanner.Text()
+
+		// Skip empty lines and comments
+		if line == "" || strings.HasPrefix(line, ":") {
+			continue
+		}
+
+		// Parse SSE data line
+		if !strings.HasPrefix(line, "data: ") {
+			continue
+		}
+
+		data := strings.TrimPrefix(line, "data: ")
+
+		// Check for stream end
+		if data == "[DONE]" {
+			chunkCh <- backends.ChatChunk{Done: true}
+			return
+		}
+
+		var streamResp openaiStreamResponse
+		if err := json.Unmarshal([]byte(data), &streamResp); err != nil {
+			chunkCh <- backends.ChatChunk{Error: fmt.Sprintf("failed to parse SSE data: %v", err)}
+			continue
+		}
+
+		chunk := a.convertStreamResponse(&streamResp, toolCallArgs)
+		chunkCh <- chunk
+
+		if chunk.Done {
+			return
+		}
+	}
+
+	if err := scanner.Err(); err != nil && ctx.Err() == nil {
+		chunkCh <- backends.ChatChunk{Error: fmt.Sprintf("stream error: %v", err)}
+	}
+}
+
+// Info returns detailed information about the backend
+func (a *Adapter) Info(ctx context.Context) backends.BackendInfo {
+	info := backends.BackendInfo{
+		Type:         a.config.Type,
+		BaseURL:      a.config.BaseURL,
+		Capabilities: a.Capabilities(),
+	}
+
+	// Try to reach the models endpoint
+	if err := a.HealthCheck(ctx); err != nil {
+		info.Status = backends.BackendStatusDisconnected
+		info.Error = err.Error()
+		return info
+	}
+
+	info.Status = backends.BackendStatusConnected
+	return info
+}
+
+// Embed generates embeddings for the given input
+func (a *Adapter) Embed(ctx context.Context, model string, input []string) ([][]float64, error) {
+	body, err := json.Marshal(map[string]interface{}{
+		"model": model,
+		"input": input,
+	})
+	if err != nil {
+		return nil, fmt.Errorf("failed to marshal request: %w", err)
+	}
+
+	req, err := http.NewRequestWithContext(ctx, "POST", a.baseURL.String()+"/v1/embeddings", bytes.NewReader(body))
+	if err != nil {
+		return nil, fmt.Errorf("failed to create request: %w", err)
+	}
+	req.Header.Set("Content-Type", "application/json")
+
+	resp, err := a.httpClient.Do(req)
+	if err != nil {
+		return nil, fmt.Errorf("embed request failed: %w", err)
+	}
+	defer resp.Body.Close()
+
+	var embedResp struct {
+		Data []struct {
+			Embedding []float64 `json:"embedding"`
+			Index     int       `json:"index"`
+		} `json:"data"`
+	}
+	if err := json.NewDecoder(resp.Body).Decode(&embedResp); err != nil {
+		return nil, fmt.Errorf("failed to decode response: %w", err)
+	}
+
+	embeddings := make([][]float64, len(embedResp.Data))
+	for _, d := range embedResp.Data {
+		embeddings[d.Index] = d.Embedding
+	}
+
+	return embeddings, nil
+}
+
+// OpenAI API response types
+
+type openaiChatResponse struct {
+	ID      string         `json:"id"`
+	Object  string         `json:"object"`
+	Created int64          `json:"created"`
+	Model   string         `json:"model"`
+	Choices []openaiChoice `json:"choices"`
+	Usage   *openaiUsage   `json:"usage,omitempty"`
+}
+
+type openaiChoice struct {
+	Index        int            `json:"index"`
+	Message      *openaiMessage `json:"message,omitempty"`
+	Delta        *openaiMessage `json:"delta,omitempty"`
+	FinishReason string         `json:"finish_reason,omitempty"`
+}
+
+type openaiMessage struct {
+	Role      string           `json:"role,omitempty"`
+	Content   string           `json:"content,omitempty"`
+	ToolCalls []openaiToolCall `json:"tool_calls,omitempty"`
+}
+
+type openaiToolCall struct {
+	ID       string `json:"id,omitempty"`
+	Index    int    `json:"index,omitempty"`
+	Type     string `json:"type,omitempty"`
+	Function struct {
+		Name      string `json:"name,omitempty"`
+		Arguments string `json:"arguments,omitempty"`
+	} `json:"function"`
+}
+
+type openaiUsage struct {
+	PromptTokens     int `json:"prompt_tokens"`
+	CompletionTokens int `json:"completion_tokens"`
+	TotalTokens      int `json:"total_tokens"`
+}
+
+type openaiStreamResponse struct {
+	ID      string         `json:"id"`
+	Object  string         `json:"object"`
+	Created int64          `json:"created"`
+	Model   string         `json:"model"`
+	Choices []openaiChoice `json:"choices"`
+}
+
+// convertChatRequest converts a backends.ChatRequest to OpenAI format
+func (a *Adapter) convertChatRequest(req *backends.ChatRequest) map[string]interface{} {
+	messages := make([]map[string]interface{}, len(req.Messages))
+	for i, msg := range req.Messages {
+		m := map[string]interface{}{
+			"role": msg.Role,
+		}
+
+		// Handle messages with images (vision support)
+		if len(msg.Images) > 0 {
+			// Build content as array of parts for multimodal messages
+			contentParts := make([]map[string]interface{}, 0, len(msg.Images)+1)
+
+			// Add text part if content is not empty
+			if msg.Content != "" {
+				contentParts = append(contentParts, map[string]interface{}{
+					"type": "text",
+					"text": msg.Content,
+				})
+			}
+
+			// Add image parts
+			for _, img := range msg.Images {
+				// Images are expected as base64 data URLs or URLs
+				imageURL := img
+				if !strings.HasPrefix(img, "http://") && !strings.HasPrefix(img, "https://") && !strings.HasPrefix(img, "data:") {
+					// Assume base64 encoded image, default to JPEG
+					imageURL = "data:image/jpeg;base64," + img
+				}
+				contentParts = append(contentParts, map[string]interface{}{
+					"type": "image_url",
+					"image_url": map[string]interface{}{
+						"url": imageURL,
+					},
+				})
+			}
+
+			m["content"] = contentParts
+		} else {
+			// Plain text message
+			m["content"] = msg.Content
+		}
+
+		if msg.Name != "" {
+			m["name"] = msg.Name
+		}
+		if msg.ToolCallID != "" {
+			m["tool_call_id"] = msg.ToolCallID
+		}
+		messages[i] = m
+	}
+
+	openaiReq := map[string]interface{}{
+		"model":    req.Model,
+		"messages": messages,
+	}
+
+	// Add optional parameters
+	if req.Temperature != nil {
+		openaiReq["temperature"] = *req.Temperature
+	}
+	if req.TopP != nil {
+		openaiReq["top_p"] = *req.TopP
+	}
+	if req.MaxTokens != nil {
+		openaiReq["max_tokens"] = *req.MaxTokens
+	}
+	if len(req.Tools) > 0 {
+		openaiReq["tools"] = req.Tools
+	}
+
+	return openaiReq
+}
+
+// convertChatResponse converts an OpenAI response to backends.ChatChunk
+func (a *Adapter) convertChatResponse(resp *openaiChatResponse) *backends.ChatChunk {
+	chunk := &backends.ChatChunk{
+		Model: resp.Model,
+		Done:  true,
+	}
+
+	if len(resp.Choices) > 0 {
+		choice := resp.Choices[0]
+		if choice.Message != nil {
+			msg := &backends.ChatMessage{
+				Role:    choice.Message.Role,
+				Content: choice.Message.Content,
+			}
+
+			// Convert tool calls
+			for _, tc := range choice.Message.ToolCalls {
+				msg.ToolCalls = append(msg.ToolCalls, backends.ToolCall{
+					ID:   tc.ID,
+					Type: tc.Type,
+					Function: struct {
+						Name      string `json:"name"`
+						Arguments string `json:"arguments"`
+					}{
+						Name:      tc.Function.Name,
+						Arguments: tc.Function.Arguments,
+					},
+				})
+			}
+
+			chunk.Message = msg
+		}
+
+		if choice.FinishReason != "" {
+			chunk.DoneReason = choice.FinishReason
+		}
+	}
+
+	if resp.Usage != nil {
+		chunk.PromptEvalCount = resp.Usage.PromptTokens
+		chunk.EvalCount = resp.Usage.CompletionTokens
+	}
+
+	return chunk
+}
+
+// convertStreamResponse converts an OpenAI stream response to backends.ChatChunk
+func (a *Adapter) convertStreamResponse(resp *openaiStreamResponse, toolCallArgs map[int]string) backends.ChatChunk {
+	chunk := backends.ChatChunk{
+		Model: resp.Model,
+	}
+
+	if len(resp.Choices) > 0 {
+		choice := resp.Choices[0]
+
+		if choice.FinishReason != "" {
+			chunk.Done = true
+			chunk.DoneReason = choice.FinishReason
+		}
+
+		if choice.Delta != nil {
+			msg := &backends.ChatMessage{
+				Role:    choice.Delta.Role,
+				Content: choice.Delta.Content,
+			}
+
+			// Handle streaming tool calls
+			for _, tc := range choice.Delta.ToolCalls {
+				// Accumulate arguments
+				if tc.Function.Arguments != "" {
+					toolCallArgs[tc.Index] += tc.Function.Arguments
+				}
+
+				// Only add tool call when we have the initial info
+				if tc.ID != "" || tc.Function.Name != "" {
+					msg.ToolCalls = append(msg.ToolCalls, backends.ToolCall{
+						ID:   tc.ID,
+						Type: tc.Type,
+						Function: struct {
+							Name      string `json:"name"`
+							Arguments string `json:"arguments"`
+						}{
+							Name:      tc.Function.Name,
+							Arguments: toolCallArgs[tc.Index],
+						},
+					})
+				}
+			}
+
+			chunk.Message = msg
+		}
+	}
+
+	return chunk
+}

backend/internal/backends/openai/adapter_test.go

@@ -0,0 +1,594 @@
+package openai
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+	"time"
+
+	"vessel-backend/internal/backends"
+)
+
+func TestAdapter_Type(t *testing.T) {
+	tests := []struct {
+		name         string
+		backendType  backends.BackendType
+		expectedType backends.BackendType
+	}{
+		{"llamacpp type", backends.BackendTypeLlamaCpp, backends.BackendTypeLlamaCpp},
+		{"lmstudio type", backends.BackendTypeLMStudio, backends.BackendTypeLMStudio},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			adapter, _ := NewAdapter(backends.BackendConfig{
+				Type:    tt.backendType,
+				BaseURL: "http://localhost:8081",
+			})
+
+			if adapter.Type() != tt.expectedType {
+				t.Errorf("Type() = %v, want %v", adapter.Type(), tt.expectedType)
+			}
+		})
+	}
+}
+
+func TestAdapter_Config(t *testing.T) {
+	cfg := backends.BackendConfig{
+		Type:    backends.BackendTypeLlamaCpp,
+		BaseURL: "http://localhost:8081",
+		Enabled: true,
+	}
+
+	adapter, _ := NewAdapter(cfg)
+	got := adapter.Config()
+
+	if got.Type != cfg.Type {
+		t.Errorf("Config().Type = %v, want %v", got.Type, cfg.Type)
+	}
+	if got.BaseURL != cfg.BaseURL {
+		t.Errorf("Config().BaseURL = %v, want %v", got.BaseURL, cfg.BaseURL)
+	}
+}
+
+func TestAdapter_Capabilities(t *testing.T) {
+	t.Run("llamacpp capabilities", func(t *testing.T) {
+		adapter, _ := NewAdapter(backends.BackendConfig{
+			Type:    backends.BackendTypeLlamaCpp,
+			BaseURL: "http://localhost:8081",
+		})
+
+		caps := adapter.Capabilities()
+
+		if !caps.CanListModels {
+			t.Error("llama.cpp adapter should support listing models")
+		}
+		if caps.CanPullModels {
+			t.Error("llama.cpp adapter should NOT support pulling models")
+		}
+		if caps.CanDeleteModels {
+			t.Error("llama.cpp adapter should NOT support deleting models")
+		}
+		if caps.CanCreateModels {
+			t.Error("llama.cpp adapter should NOT support creating models")
+		}
+		if !caps.CanStreamChat {
+			t.Error("llama.cpp adapter should support streaming chat")
+		}
+		if !caps.CanEmbed {
+			t.Error("llama.cpp adapter should support embeddings")
+		}
+	})
+
+	t.Run("lmstudio capabilities", func(t *testing.T) {
+		adapter, _ := NewAdapter(backends.BackendConfig{
+			Type:    backends.BackendTypeLMStudio,
+			BaseURL: "http://localhost:1234",
+		})
+
+		caps := adapter.Capabilities()
+
+		if !caps.CanListModels {
+			t.Error("LM Studio adapter should support listing models")
+		}
+		if caps.CanPullModels {
+			t.Error("LM Studio adapter should NOT support pulling models")
+		}
+	})
+}
+
+func TestAdapter_HealthCheck(t *testing.T) {
+	t.Run("healthy server", func(t *testing.T) {
+		server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			if r.URL.Path == "/v1/models" {
+				json.NewEncoder(w).Encode(map[string]interface{}{
+					"data": []map[string]string{{"id": "llama3.2:8b"}},
+				})
+			}
+		}))
+		defer server.Close()
+
+		adapter, err := NewAdapter(backends.BackendConfig{
+			Type:    backends.BackendTypeLlamaCpp,
+			BaseURL: server.URL,
+		})
+		if err != nil {
+			t.Fatalf("Failed to create adapter: %v", err)
+		}
+
+		ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+		defer cancel()
+
+		if err := adapter.HealthCheck(ctx); err != nil {
+			t.Errorf("HealthCheck() error = %v, want nil", err)
+		}
+	})
+
+	t.Run("unreachable server", func(t *testing.T) {
+		adapter, _ := NewAdapter(backends.BackendConfig{
+			Type:    backends.BackendTypeLlamaCpp,
+			BaseURL: "http://localhost:19999",
+		})
+
+		ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
+		defer cancel()
+
+		if err := adapter.HealthCheck(ctx); err == nil {
+			t.Error("HealthCheck() expected error for unreachable server")
+		}
+	})
+}
+
+func TestAdapter_ListModels(t *testing.T) {
+	t.Run("returns model list", func(t *testing.T) {
+		server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			if r.URL.Path == "/v1/models" {
+				resp := map[string]interface{}{
+					"data": []map[string]interface{}{
+						{
+							"id":       "llama3.2-8b-instruct",
+							"object":   "model",
+							"owned_by": "local",
+							"created":  1700000000,
+						},
+						{
+							"id":       "mistral-7b-v0.2",
+							"object":   "model",
+							"owned_by": "local",
+							"created":  1700000001,
+						},
+					},
+				}
+				json.NewEncoder(w).Encode(resp)
+			}
+		}))
+		defer server.Close()
+
+		adapter, _ := NewAdapter(backends.BackendConfig{
+			Type:    backends.BackendTypeLlamaCpp,
+			BaseURL: server.URL,
+		})
+
+		ctx := context.Background()
+		models, err := adapter.ListModels(ctx)
+		if err != nil {
+			t.Fatalf("ListModels() error = %v", err)
+		}
+
+		if len(models) != 2 {
+			t.Errorf("ListModels() returned %d models, want 2", len(models))
+		}
+
+		if models[0].ID != "llama3.2-8b-instruct" {
+			t.Errorf("First model ID = %q, want %q", models[0].ID, "llama3.2-8b-instruct")
+		}
+	})
+
+	t.Run("handles empty model list", func(t *testing.T) {
+		server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			if r.URL.Path == "/v1/models" {
+				resp := map[string]interface{}{
+					"data": []map[string]interface{}{},
+				}
+				json.NewEncoder(w).Encode(resp)
+			}
+		}))
+		defer server.Close()
+
+		adapter, _ := NewAdapter(backends.BackendConfig{
+			Type:    backends.BackendTypeLlamaCpp,
+			BaseURL: server.URL,
+		})
+
+		models, err := adapter.ListModels(context.Background())
+		if err != nil {
+			t.Fatalf("ListModels() error = %v", err)
+		}
+
+		if len(models) != 0 {
+			t.Errorf("ListModels() returned %d models, want 0", len(models))
+		}
+	})
+}
+
+func TestAdapter_Chat(t *testing.T) {
+	t.Run("non-streaming chat", func(t *testing.T) {
+		server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			if r.URL.Path == "/v1/chat/completions" && r.Method == "POST" {
+				var req map[string]interface{}
+				json.NewDecoder(r.Body).Decode(&req)
+
+				// Check stream is false
+				if stream, ok := req["stream"].(bool); ok && stream {
+					t.Error("Expected stream=false for non-streaming chat")
+				}
+
+				resp := map[string]interface{}{
+					"id":      "chatcmpl-123",
+					"object":  "chat.completion",
+					"created": 1700000000,
+					"model":   "llama3.2:8b",
+					"choices": []map[string]interface{}{
+						{
+							"index": 0,
+							"message": map[string]interface{}{
+								"role":    "assistant",
+								"content": "Hello! How can I help you?",
+							},
+							"finish_reason": "stop",
+						},
+					},
+					"usage": map[string]int{
+						"prompt_tokens":     10,
+						"completion_tokens": 8,
+						"total_tokens":      18,
+					},
+				}
+				json.NewEncoder(w).Encode(resp)
+			}
+		}))
+		defer server.Close()
+
+		adapter, _ := NewAdapter(backends.BackendConfig{
+			Type:    backends.BackendTypeLlamaCpp,
+			BaseURL: server.URL,
+		})
+
+		req := &backends.ChatRequest{
+			Model: "llama3.2:8b",
+			Messages: []backends.ChatMessage{
+				{Role: "user", Content: "Hello"},
+			},
+		}
+
+		resp, err := adapter.Chat(context.Background(), req)
+		if err != nil {
+			t.Fatalf("Chat() error = %v", err)
+		}
+
+		if !resp.Done {
+			t.Error("Chat() response.Done = false, want true")
+		}
+
+		if resp.Message == nil || resp.Message.Content != "Hello! How can I help you?" {
+			t.Errorf("Chat() response content unexpected: %+v", resp.Message)
+		}
+	})
+}
+
+func TestAdapter_StreamChat(t *testing.T) {
+	t.Run("streaming chat with SSE", func(t *testing.T) {
+		server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			if r.URL.Path == "/v1/chat/completions" && r.Method == "POST" {
+				var req map[string]interface{}
+				json.NewDecoder(r.Body).Decode(&req)
+
+				// Check stream is true
+				if stream, ok := req["stream"].(bool); !ok || !stream {
+					t.Error("Expected stream=true for streaming chat")
+				}
+
+				w.Header().Set("Content-Type", "text/event-stream")
+				w.Header().Set("Cache-Control", "no-cache")
+				flusher := w.(http.Flusher)
+
+				// Send SSE chunks
+				chunks := []string{
+					`{"id":"chatcmpl-1","choices":[{"delta":{"role":"assistant","content":"Hello"}}]}`,
+					`{"id":"chatcmpl-1","choices":[{"delta":{"content":"!"}}]}`,
+					`{"id":"chatcmpl-1","choices":[{"delta":{},"finish_reason":"stop"}]}`,
+				}
+
+				for _, chunk := range chunks {
+					fmt.Fprintf(w, "data: %s\n\n", chunk)
+					flusher.Flush()
+				}
+				fmt.Fprintf(w, "data: [DONE]\n\n")
+				flusher.Flush()
+			}
+		}))
+		defer server.Close()
+
+		adapter, _ := NewAdapter(backends.BackendConfig{
+			Type:    backends.BackendTypeLlamaCpp,
+			BaseURL: server.URL,
+		})
+
+		streaming := true
+		req := &backends.ChatRequest{
+			Model: "llama3.2:8b",
+			Messages: []backends.ChatMessage{
+				{Role: "user", Content: "Hello"},
+			},
+			Stream: &streaming,
+		}
+
+		chunkCh, err := adapter.StreamChat(context.Background(), req)
+		if err != nil {
+			t.Fatalf("StreamChat() error = %v", err)
+		}
+
+		var chunks []backends.ChatChunk
+		for chunk := range chunkCh {
+			chunks = append(chunks, chunk)
+		}
+
+		if len(chunks) < 2 {
+			t.Errorf("StreamChat() received %d chunks, want at least 2", len(chunks))
+		}
+
+		// Last chunk should be done
+		if !chunks[len(chunks)-1].Done {
+			t.Error("Last chunk should have Done=true")
+		}
+	})
+
+	t.Run("handles context cancellation", func(t *testing.T) {
+		server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			if r.URL.Path == "/v1/chat/completions" {
+				w.Header().Set("Content-Type", "text/event-stream")
+				flusher := w.(http.Flusher)
+
+				// Send first chunk then wait
+				fmt.Fprintf(w, "data: %s\n\n", `{"id":"chatcmpl-1","choices":[{"delta":{"role":"assistant","content":"Starting..."}}]}`)
+				flusher.Flush()
+
+				// Wait long enough for context to be cancelled
+				time.Sleep(2 * time.Second)
+			}
+		}))
+		defer server.Close()
+
+		adapter, _ := NewAdapter(backends.BackendConfig{
+			Type:    backends.BackendTypeLlamaCpp,
+			BaseURL: server.URL,
+		})
+
+		ctx, cancel := context.WithTimeout(context.Background(), 100*time.Millisecond)
+		defer cancel()
+
+		streaming := true
+		req := &backends.ChatRequest{
+			Model: "llama3.2:8b",
+			Messages: []backends.ChatMessage{
+				{Role: "user", Content: "Hello"},
+			},
+			Stream: &streaming,
+		}
+
+		chunkCh, err := adapter.StreamChat(ctx, req)
+		if err != nil {
+			t.Fatalf("StreamChat() error = %v", err)
+		}
+
+		// Should receive at least one chunk before timeout
+		receivedChunks := 0
+		for range chunkCh {
+			receivedChunks++
+		}
+
+		if receivedChunks == 0 {
+			t.Error("Expected to receive at least one chunk before cancellation")
+		}
+	})
+}
+
+func TestAdapter_Info(t *testing.T) {
+	t.Run("connected server", func(t *testing.T) {
+		server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			if r.URL.Path == "/v1/models" {
+				json.NewEncoder(w).Encode(map[string]interface{}{
+					"data": []map[string]string{{"id": "llama3.2:8b"}},
+				})
+			}
+		}))
+		defer server.Close()
+
+		adapter, _ := NewAdapter(backends.BackendConfig{
+			Type:    backends.BackendTypeLlamaCpp,
+			BaseURL: server.URL,
+		})
+
+		info := adapter.Info(context.Background())
+
+		if info.Type != backends.BackendTypeLlamaCpp {
+			t.Errorf("Info().Type = %v, want %v", info.Type, backends.BackendTypeLlamaCpp)
+		}
+
+		if info.Status != backends.BackendStatusConnected {
+			t.Errorf("Info().Status = %v, want %v", info.Status, backends.BackendStatusConnected)
+		}
+	})
+
+	t.Run("disconnected server", func(t *testing.T) {
+		adapter, _ := NewAdapter(backends.BackendConfig{
+			Type:    backends.BackendTypeLlamaCpp,
+			BaseURL: "http://localhost:19999",
+		})
+
+		ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
+		defer cancel()
+
+		info := adapter.Info(ctx)
+
+		if info.Status != backends.BackendStatusDisconnected {
+			t.Errorf("Info().Status = %v, want %v", info.Status, backends.BackendStatusDisconnected)
+		}
+
+		if info.Error == "" {
+			t.Error("Info().Error should be set for disconnected server")
+		}
+	})
+}
+
+func TestAdapter_Embed(t *testing.T) {
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.URL.Path == "/v1/embeddings" && r.Method == "POST" {
+			resp := map[string]interface{}{
+				"data": []map[string]interface{}{
+					{"embedding": []float64{0.1, 0.2, 0.3}, "index": 0},
+					{"embedding": []float64{0.4, 0.5, 0.6}, "index": 1},
+				},
+			}
+			json.NewEncoder(w).Encode(resp)
+		}
+	}))
+	defer server.Close()
+
+	adapter, _ := NewAdapter(backends.BackendConfig{
+		Type:    backends.BackendTypeLlamaCpp,
+		BaseURL: server.URL,
+	})
+
+	embeddings, err := adapter.Embed(context.Background(), "nomic-embed-text", []string{"hello", "world"})
+	if err != nil {
+		t.Fatalf("Embed() error = %v", err)
+	}
+
+	if len(embeddings) != 2 {
+		t.Errorf("Embed() returned %d embeddings, want 2", len(embeddings))
+	}
+
+	if len(embeddings[0]) != 3 {
+		t.Errorf("First embedding has %d dimensions, want 3", len(embeddings[0]))
+	}
+}
+
+func TestNewAdapter_Validation(t *testing.T) {
+	t.Run("invalid URL", func(t *testing.T) {
+		_, err := NewAdapter(backends.BackendConfig{
+			Type:    backends.BackendTypeLlamaCpp,
+			BaseURL: "not-a-url",
+		})
+		if err == nil {
+			t.Error("NewAdapter() should fail with invalid URL")
+		}
+	})
+
+	t.Run("wrong backend type", func(t *testing.T) {
+		_, err := NewAdapter(backends.BackendConfig{
+			Type:    backends.BackendTypeOllama,
+			BaseURL: "http://localhost:8081",
+		})
+		if err == nil {
+			t.Error("NewAdapter() should fail with Ollama backend type")
+		}
+	})
+
+	t.Run("valid llamacpp config", func(t *testing.T) {
+		adapter, err := NewAdapter(backends.BackendConfig{
+			Type:    backends.BackendTypeLlamaCpp,
+			BaseURL: "http://localhost:8081",
+		})
+		if err != nil {
+			t.Errorf("NewAdapter() error = %v", err)
+		}
+		if adapter == nil {
+			t.Error("NewAdapter() returned nil adapter")
+		}
+	})
+
+	t.Run("valid lmstudio config", func(t *testing.T) {
+		adapter, err := NewAdapter(backends.BackendConfig{
+			Type:    backends.BackendTypeLMStudio,
+			BaseURL: "http://localhost:1234",
+		})
+		if err != nil {
+			t.Errorf("NewAdapter() error = %v", err)
+		}
+		if adapter == nil {
+			t.Error("NewAdapter() returned nil adapter")
+		}
+	})
+}
+
+func TestAdapter_ToolCalls(t *testing.T) {
+	t.Run("streaming with tool calls", func(t *testing.T) {
+		server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			if r.URL.Path == "/v1/chat/completions" {
+				w.Header().Set("Content-Type", "text/event-stream")
+				flusher := w.(http.Flusher)
+
+				// Send tool call chunks
+				chunks := []string{
+					`{"id":"chatcmpl-1","choices":[{"delta":{"role":"assistant","tool_calls":[{"id":"call_1","type":"function","function":{"name":"get_weather","arguments":""}}]}}]}`,
+					`{"id":"chatcmpl-1","choices":[{"delta":{"tool_calls":[{"index":0,"function":{"arguments":"{\"location\":"}}]}}]}`,
+					`{"id":"chatcmpl-1","choices":[{"delta":{"tool_calls":[{"index":0,"function":{"arguments":"\"Tokyo\"}"}}]}}]}`,
+					`{"id":"chatcmpl-1","choices":[{"delta":{},"finish_reason":"tool_calls"}]}`,
+				}
+
+				for _, chunk := range chunks {
+					fmt.Fprintf(w, "data: %s\n\n", chunk)
+					flusher.Flush()
+				}
+				fmt.Fprintf(w, "data: [DONE]\n\n")
+				flusher.Flush()
+			}
+		}))
+		defer server.Close()
+
+		adapter, _ := NewAdapter(backends.BackendConfig{
+			Type:    backends.BackendTypeLlamaCpp,
+			BaseURL: server.URL,
+		})
+
+		streaming := true
+		req := &backends.ChatRequest{
+			Model: "llama3.2:8b",
+			Messages: []backends.ChatMessage{
+				{Role: "user", Content: "What's the weather in Tokyo?"},
+			},
+			Stream: &streaming,
+			Tools: []backends.Tool{
+				{
+					Type: "function",
+					Function: struct {
+						Name        string                 `json:"name"`
+						Description string                 `json:"description"`
+						Parameters  map[string]interface{} `json:"parameters"`
+					}{
+						Name:        "get_weather",
+						Description: "Get weather for a location",
+					},
+				},
+			},
+		}
+
+		chunkCh, err := adapter.StreamChat(context.Background(), req)
+		if err != nil {
+			t.Fatalf("StreamChat() error = %v", err)
+		}
+
+		var lastChunk backends.ChatChunk
+		for chunk := range chunkCh {
+			lastChunk = chunk
+		}
+
+		if !lastChunk.Done {
+			t.Error("Last chunk should have Done=true")
+		}
+	})
+}

backend/internal/backends/registry.go

@@ -0,0 +1,255 @@
+package backends
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"os"
+	"sync"
+	"time"
+)
+
+// Registry manages multiple LLM backend instances
+type Registry struct {
+	mu       sync.RWMutex
+	backends map[BackendType]LLMBackend
+	active   BackendType
+}
+
+// NewRegistry creates a new backend registry
+func NewRegistry() *Registry {
+	return &Registry{
+		backends: make(map[BackendType]LLMBackend),
+	}
+}
+
+// Register adds a backend to the registry
+func (r *Registry) Register(backend LLMBackend) error {
+	r.mu.Lock()
+	defer r.mu.Unlock()
+
+	bt := backend.Type()
+	if _, exists := r.backends[bt]; exists {
+		return fmt.Errorf("backend %q already registered", bt)
+	}
+
+	r.backends[bt] = backend
+	return nil
+}
+
+// Unregister removes a backend from the registry
+func (r *Registry) Unregister(backendType BackendType) error {
+	r.mu.Lock()
+	defer r.mu.Unlock()
+
+	if _, exists := r.backends[backendType]; !exists {
+		return fmt.Errorf("backend %q not registered", backendType)
+	}
+
+	delete(r.backends, backendType)
+
+	// Clear active if it was the unregistered backend
+	if r.active == backendType {
+		r.active = ""
+	}
+
+	return nil
+}
+
+// Get retrieves a backend by type
+func (r *Registry) Get(backendType BackendType) (LLMBackend, bool) {
+	r.mu.RLock()
+	defer r.mu.RUnlock()
+
+	backend, ok := r.backends[backendType]
+	return backend, ok
+}
+
+// SetActive sets the active backend
+func (r *Registry) SetActive(backendType BackendType) error {
+	r.mu.Lock()
+	defer r.mu.Unlock()
+
+	if _, exists := r.backends[backendType]; !exists {
+		return fmt.Errorf("backend %q not registered", backendType)
+	}
+
+	r.active = backendType
+	return nil
+}
+
+// Active returns the currently active backend
+func (r *Registry) Active() LLMBackend {
+	r.mu.RLock()
+	defer r.mu.RUnlock()
+
+	if r.active == "" {
+		return nil
+	}
+
+	return r.backends[r.active]
+}
+
+// ActiveType returns the type of the currently active backend
+func (r *Registry) ActiveType() BackendType {
+	r.mu.RLock()
+	defer r.mu.RUnlock()
+
+	return r.active
+}
+
+// Backends returns all registered backend types
+func (r *Registry) Backends() []BackendType {
+	r.mu.RLock()
+	defer r.mu.RUnlock()
+
+	types := make([]BackendType, 0, len(r.backends))
+	for bt := range r.backends {
+		types = append(types, bt)
+	}
+	return types
+}
+
+// AllInfo returns information about all registered backends
+func (r *Registry) AllInfo(ctx context.Context) []BackendInfo {
+	r.mu.RLock()
+	defer r.mu.RUnlock()
+
+	infos := make([]BackendInfo, 0, len(r.backends))
+	for _, backend := range r.backends {
+		infos = append(infos, backend.Info(ctx))
+	}
+	return infos
+}
+
+// DiscoveryEndpoint represents a potential backend endpoint to probe
+type DiscoveryEndpoint struct {
+	Type    BackendType
+	BaseURL string
+}
+
+// DiscoveryResult represents the result of probing an endpoint
+type DiscoveryResult struct {
+	Type      BackendType `json:"type"`
+	BaseURL   string      `json:"baseUrl"`
+	Available bool        `json:"available"`
+	Version   string      `json:"version,omitempty"`
+	Error     string      `json:"error,omitempty"`
+}
+
+// Discover probes the given endpoints to find available backends
+func (r *Registry) Discover(ctx context.Context, endpoints []DiscoveryEndpoint) []DiscoveryResult {
+	results := make([]DiscoveryResult, len(endpoints))
+	var wg sync.WaitGroup
+
+	for i, endpoint := range endpoints {
+		wg.Add(1)
+		go func(idx int, ep DiscoveryEndpoint) {
+			defer wg.Done()
+			results[idx] = probeEndpoint(ctx, ep)
+		}(i, endpoint)
+	}
+
+	wg.Wait()
+	return results
+}
+
+// probeEndpoint checks if a backend is available at the given endpoint
+func probeEndpoint(ctx context.Context, endpoint DiscoveryEndpoint) DiscoveryResult {
+	result := DiscoveryResult{
+		Type:    endpoint.Type,
+		BaseURL: endpoint.BaseURL,
+	}
+
+	client := &http.Client{
+		Timeout: 3 * time.Second,
+	}
+
+	// Determine probe path based on backend type
+	var probePath string
+	switch endpoint.Type {
+	case BackendTypeOllama:
+		probePath = "/api/version"
+	case BackendTypeLlamaCpp, BackendTypeLMStudio:
+		probePath = "/v1/models"
+	default:
+		probePath = "/health"
+	}
+
+	req, err := http.NewRequestWithContext(ctx, "GET", endpoint.BaseURL+probePath, nil)
+	if err != nil {
+		result.Error = err.Error()
+		return result
+	}
+
+	resp, err := client.Do(req)
+	if err != nil {
+		result.Error = err.Error()
+		return result
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode == http.StatusOK {
+		result.Available = true
+	} else {
+		result.Error = fmt.Sprintf("HTTP %d", resp.StatusCode)
+	}
+
+	return result
+}
+
+// getEnvOrDefault returns the environment variable value or a default
+func getEnvOrDefault(key, defaultValue string) string {
+	if value := os.Getenv(key); value != "" {
+		return value
+	}
+	return defaultValue
+}
+
+// DefaultDiscoveryEndpoints returns the default endpoints to probe.
+// URLs can be overridden via environment variables (useful for Docker).
+func DefaultDiscoveryEndpoints() []DiscoveryEndpoint {
+	ollamaURL := getEnvOrDefault("OLLAMA_URL", "http://localhost:11434")
+	llamacppURL := getEnvOrDefault("LLAMACPP_URL", "http://localhost:8081")
+	lmstudioURL := getEnvOrDefault("LMSTUDIO_URL", "http://localhost:1234")
+
+	return []DiscoveryEndpoint{
+		{Type: BackendTypeOllama, BaseURL: ollamaURL},
+		{Type: BackendTypeLlamaCpp, BaseURL: llamacppURL},
+		{Type: BackendTypeLMStudio, BaseURL: lmstudioURL},
+	}
+}
+
+// DiscoverAndRegister probes endpoints and registers available backends
+func (r *Registry) DiscoverAndRegister(ctx context.Context, endpoints []DiscoveryEndpoint, adapterFactory AdapterFactory) []DiscoveryResult {
+	results := r.Discover(ctx, endpoints)
+
+	for _, result := range results {
+		if !result.Available {
+			continue
+		}
+
+		// Skip if already registered
+		if _, exists := r.Get(result.Type); exists {
+			continue
+		}
+
+		config := BackendConfig{
+			Type:    result.Type,
+			BaseURL: result.BaseURL,
+			Enabled: true,
+		}
+
+		adapter, err := adapterFactory(config)
+		if err != nil {
+			continue
+		}
+
+		r.Register(adapter)
+	}
+
+	return results
+}
+
+// AdapterFactory creates an LLMBackend from a config
+type AdapterFactory func(config BackendConfig) (LLMBackend, error)

backend/internal/backends/registry_test.go

@@ -0,0 +1,352 @@
+package backends
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+	"time"
+)
+
+func TestNewRegistry(t *testing.T) {
+	registry := NewRegistry()
+
+	if registry == nil {
+		t.Fatal("NewRegistry() returned nil")
+	}
+
+	if len(registry.Backends()) != 0 {
+		t.Errorf("New registry should have no backends, got %d", len(registry.Backends()))
+	}
+
+	if registry.Active() != nil {
+		t.Error("New registry should have no active backend")
+	}
+}
+
+func TestRegistry_Register(t *testing.T) {
+	registry := NewRegistry()
+
+	// Create a mock backend
+	mock := &mockBackend{
+		backendType: BackendTypeOllama,
+		config: BackendConfig{
+			Type:    BackendTypeOllama,
+			BaseURL: "http://localhost:11434",
+		},
+	}
+
+	err := registry.Register(mock)
+	if err != nil {
+		t.Fatalf("Register() error = %v", err)
+	}
+
+	if len(registry.Backends()) != 1 {
+		t.Errorf("Registry should have 1 backend, got %d", len(registry.Backends()))
+	}
+
+	// Should not allow duplicate registration
+	err = registry.Register(mock)
+	if err == nil {
+		t.Error("Register() should fail for duplicate backend type")
+	}
+}
+
+func TestRegistry_Get(t *testing.T) {
+	registry := NewRegistry()
+
+	mock := &mockBackend{
+		backendType: BackendTypeOllama,
+		config: BackendConfig{
+			Type:    BackendTypeOllama,
+			BaseURL: "http://localhost:11434",
+		},
+	}
+	registry.Register(mock)
+
+	t.Run("existing backend", func(t *testing.T) {
+		backend, ok := registry.Get(BackendTypeOllama)
+		if !ok {
+			t.Error("Get() should return ok=true for registered backend")
+		}
+		if backend != mock {
+			t.Error("Get() returned wrong backend")
+		}
+	})
+
+	t.Run("non-existing backend", func(t *testing.T) {
+		_, ok := registry.Get(BackendTypeLlamaCpp)
+		if ok {
+			t.Error("Get() should return ok=false for unregistered backend")
+		}
+	})
+}
+
+func TestRegistry_SetActive(t *testing.T) {
+	registry := NewRegistry()
+
+	mock := &mockBackend{
+		backendType: BackendTypeOllama,
+		config: BackendConfig{
+			Type:    BackendTypeOllama,
+			BaseURL: "http://localhost:11434",
+		},
+	}
+	registry.Register(mock)
+
+	t.Run("set registered backend as active", func(t *testing.T) {
+		err := registry.SetActive(BackendTypeOllama)
+		if err != nil {
+			t.Errorf("SetActive() error = %v", err)
+		}
+
+		active := registry.Active()
+		if active == nil {
+			t.Fatal("Active() returned nil after SetActive()")
+		}
+		if active.Type() != BackendTypeOllama {
+			t.Errorf("Active().Type() = %v, want %v", active.Type(), BackendTypeOllama)
+		}
+	})
+
+	t.Run("set unregistered backend as active", func(t *testing.T) {
+		err := registry.SetActive(BackendTypeLlamaCpp)
+		if err == nil {
+			t.Error("SetActive() should fail for unregistered backend")
+		}
+	})
+}
+
+func TestRegistry_ActiveType(t *testing.T) {
+	registry := NewRegistry()
+
+	t.Run("no active backend", func(t *testing.T) {
+		activeType := registry.ActiveType()
+		if activeType != "" {
+			t.Errorf("ActiveType() = %q, want empty string", activeType)
+		}
+	})
+
+	t.Run("with active backend", func(t *testing.T) {
+		mock := &mockBackend{backendType: BackendTypeOllama}
+		registry.Register(mock)
+		registry.SetActive(BackendTypeOllama)
+
+		activeType := registry.ActiveType()
+		if activeType != BackendTypeOllama {
+			t.Errorf("ActiveType() = %v, want %v", activeType, BackendTypeOllama)
+		}
+	})
+}
+
+func TestRegistry_Unregister(t *testing.T) {
+	registry := NewRegistry()
+
+	mock := &mockBackend{backendType: BackendTypeOllama}
+	registry.Register(mock)
+	registry.SetActive(BackendTypeOllama)
+
+	err := registry.Unregister(BackendTypeOllama)
+	if err != nil {
+		t.Errorf("Unregister() error = %v", err)
+	}
+
+	if len(registry.Backends()) != 0 {
+		t.Error("Registry should have no backends after unregister")
+	}
+
+	if registry.Active() != nil {
+		t.Error("Active backend should be nil after unregistering it")
+	}
+}
+
+func TestRegistry_AllInfo(t *testing.T) {
+	registry := NewRegistry()
+
+	mock1 := &mockBackend{
+		backendType: BackendTypeOllama,
+		config:      BackendConfig{Type: BackendTypeOllama, BaseURL: "http://localhost:11434"},
+		info: BackendInfo{
+			Type:    BackendTypeOllama,
+			Status:  BackendStatusConnected,
+			Version: "0.1.0",
+		},
+	}
+	mock2 := &mockBackend{
+		backendType: BackendTypeLlamaCpp,
+		config:      BackendConfig{Type: BackendTypeLlamaCpp, BaseURL: "http://localhost:8081"},
+		info: BackendInfo{
+			Type:   BackendTypeLlamaCpp,
+			Status: BackendStatusDisconnected,
+		},
+	}
+
+	registry.Register(mock1)
+	registry.Register(mock2)
+	registry.SetActive(BackendTypeOllama)
+
+	infos := registry.AllInfo(context.Background())
+
+	if len(infos) != 2 {
+		t.Errorf("AllInfo() returned %d infos, want 2", len(infos))
+	}
+
+	// Find the active one
+	var foundActive bool
+	for _, info := range infos {
+		if info.Type == BackendTypeOllama {
+			foundActive = true
+		}
+	}
+	if !foundActive {
+		t.Error("AllInfo() did not include ollama backend info")
+	}
+}
+
+func TestRegistry_Discover(t *testing.T) {
+	// Create test servers for each backend type
+	ollamaServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.URL.Path == "/api/version" || r.URL.Path == "/" {
+			json.NewEncoder(w).Encode(map[string]string{"version": "0.3.0"})
+		}
+	}))
+	defer ollamaServer.Close()
+
+	llamacppServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.URL.Path == "/v1/models" {
+			json.NewEncoder(w).Encode(map[string]interface{}{
+				"data": []map[string]string{{"id": "llama3.2:8b"}},
+			})
+		}
+		if r.URL.Path == "/health" {
+			json.NewEncoder(w).Encode(map[string]string{"status": "ok"})
+		}
+	}))
+	defer llamacppServer.Close()
+
+	registry := NewRegistry()
+
+	// Configure discovery endpoints
+	endpoints := []DiscoveryEndpoint{
+		{Type: BackendTypeOllama, BaseURL: ollamaServer.URL},
+		{Type: BackendTypeLlamaCpp, BaseURL: llamacppServer.URL},
+		{Type: BackendTypeLMStudio, BaseURL: "http://localhost:19999"}, // Not running
+	}
+
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+
+	results := registry.Discover(ctx, endpoints)
+
+	if len(results) != 3 {
+		t.Errorf("Discover() returned %d results, want 3", len(results))
+	}
+
+	// Check Ollama was discovered
+	var ollamaResult *DiscoveryResult
+	for i := range results {
+		if results[i].Type == BackendTypeOllama {
+			ollamaResult = &results[i]
+			break
+		}
+	}
+
+	if ollamaResult == nil {
+		t.Fatal("Ollama not found in discovery results")
+	}
+	if !ollamaResult.Available {
+		t.Errorf("Ollama should be available, error: %s", ollamaResult.Error)
+	}
+
+	// Check LM Studio was not discovered
+	var lmstudioResult *DiscoveryResult
+	for i := range results {
+		if results[i].Type == BackendTypeLMStudio {
+			lmstudioResult = &results[i]
+			break
+		}
+	}
+
+	if lmstudioResult == nil {
+		t.Fatal("LM Studio not found in discovery results")
+	}
+	if lmstudioResult.Available {
+		t.Error("LM Studio should NOT be available")
+	}
+}
+
+func TestRegistry_DefaultEndpoints(t *testing.T) {
+	endpoints := DefaultDiscoveryEndpoints()
+
+	if len(endpoints) < 3 {
+		t.Errorf("DefaultDiscoveryEndpoints() returned %d endpoints, want at least 3", len(endpoints))
+	}
+
+	// Check that all expected types are present
+	types := make(map[BackendType]bool)
+	for _, e := range endpoints {
+		types[e.Type] = true
+	}
+
+	if !types[BackendTypeOllama] {
+		t.Error("DefaultDiscoveryEndpoints() missing Ollama")
+	}
+	if !types[BackendTypeLlamaCpp] {
+		t.Error("DefaultDiscoveryEndpoints() missing llama.cpp")
+	}
+	if !types[BackendTypeLMStudio] {
+		t.Error("DefaultDiscoveryEndpoints() missing LM Studio")
+	}
+}
+
+// mockBackend implements LLMBackend for testing
+type mockBackend struct {
+	backendType BackendType
+	config      BackendConfig
+	info        BackendInfo
+	healthErr   error
+	models      []Model
+}
+
+func (m *mockBackend) Type() BackendType {
+	return m.backendType
+}
+
+func (m *mockBackend) Config() BackendConfig {
+	return m.config
+}
+
+func (m *mockBackend) HealthCheck(ctx context.Context) error {
+	return m.healthErr
+}
+
+func (m *mockBackend) ListModels(ctx context.Context) ([]Model, error) {
+	return m.models, nil
+}
+
+func (m *mockBackend) StreamChat(ctx context.Context, req *ChatRequest) (<-chan ChatChunk, error) {
+	ch := make(chan ChatChunk)
+	close(ch)
+	return ch, nil
+}
+
+func (m *mockBackend) Chat(ctx context.Context, req *ChatRequest) (*ChatChunk, error) {
+	return &ChatChunk{Done: true}, nil
+}
+
+func (m *mockBackend) Capabilities() BackendCapabilities {
+	return OllamaCapabilities()
+}
+
+func (m *mockBackend) Info(ctx context.Context) BackendInfo {
+	if m.info.Type != "" {
+		return m.info
+	}
+	return BackendInfo{
+		Type:         m.backendType,
+		BaseURL:      m.config.BaseURL,
+		Status:       BackendStatusConnected,
+		Capabilities: m.Capabilities(),
+	}
+}

backend/internal/backends/types.go

@@ -0,0 +1,245 @@
+package backends
+
+import (
+	"errors"
+	"fmt"
+	"net/url"
+	"strings"
+)
+
+// BackendType identifies the type of LLM backend
+type BackendType string
+
+const (
+	BackendTypeOllama   BackendType = "ollama"
+	BackendTypeLlamaCpp BackendType = "llamacpp"
+	BackendTypeLMStudio BackendType = "lmstudio"
+)
+
+// String returns the string representation of the backend type
+func (bt BackendType) String() string {
+	return string(bt)
+}
+
+// ParseBackendType parses a string into a BackendType
+func ParseBackendType(s string) (BackendType, error) {
+	switch strings.ToLower(s) {
+	case "ollama":
+		return BackendTypeOllama, nil
+	case "llamacpp", "llama.cpp", "llama-cpp":
+		return BackendTypeLlamaCpp, nil
+	case "lmstudio", "lm-studio", "lm_studio":
+		return BackendTypeLMStudio, nil
+	default:
+		return "", fmt.Errorf("unknown backend type: %q", s)
+	}
+}
+
+// BackendCapabilities describes what features a backend supports
+type BackendCapabilities struct {
+	CanListModels   bool `json:"canListModels"`
+	CanPullModels   bool `json:"canPullModels"`
+	CanDeleteModels bool `json:"canDeleteModels"`
+	CanCreateModels bool `json:"canCreateModels"`
+	CanStreamChat   bool `json:"canStreamChat"`
+	CanEmbed        bool `json:"canEmbed"`
+}
+
+// OllamaCapabilities returns the capabilities for Ollama backend
+func OllamaCapabilities() BackendCapabilities {
+	return BackendCapabilities{
+		CanListModels:   true,
+		CanPullModels:   true,
+		CanDeleteModels: true,
+		CanCreateModels: true,
+		CanStreamChat:   true,
+		CanEmbed:        true,
+	}
+}
+
+// LlamaCppCapabilities returns the capabilities for llama.cpp backend
+func LlamaCppCapabilities() BackendCapabilities {
+	return BackendCapabilities{
+		CanListModels:   true,
+		CanPullModels:   false,
+		CanDeleteModels: false,
+		CanCreateModels: false,
+		CanStreamChat:   true,
+		CanEmbed:        true,
+	}
+}
+
+// LMStudioCapabilities returns the capabilities for LM Studio backend
+func LMStudioCapabilities() BackendCapabilities {
+	return BackendCapabilities{
+		CanListModels:   true,
+		CanPullModels:   false,
+		CanDeleteModels: false,
+		CanCreateModels: false,
+		CanStreamChat:   true,
+		CanEmbed:        true,
+	}
+}
+
+// BackendStatus represents the connection status of a backend
+type BackendStatus string
+
+const (
+	BackendStatusConnected    BackendStatus = "connected"
+	BackendStatusDisconnected BackendStatus = "disconnected"
+	BackendStatusUnknown      BackendStatus = "unknown"
+)
+
+// BackendConfig holds configuration for a backend
+type BackendConfig struct {
+	Type    BackendType `json:"type"`
+	BaseURL string      `json:"baseUrl"`
+	Enabled bool        `json:"enabled"`
+}
+
+// Validate checks if the backend config is valid
+func (c BackendConfig) Validate() error {
+	if c.BaseURL == "" {
+		return errors.New("base URL is required")
+	}
+
+	u, err := url.Parse(c.BaseURL)
+	if err != nil {
+		return fmt.Errorf("invalid base URL: %w", err)
+	}
+
+	if u.Scheme == "" || u.Host == "" {
+		return errors.New("invalid URL: missing scheme or host")
+	}
+
+	return nil
+}
+
+// BackendInfo describes a configured backend and its current state
+type BackendInfo struct {
+	Type         BackendType         `json:"type"`
+	BaseURL      string              `json:"baseUrl"`
+	Status       BackendStatus       `json:"status"`
+	Capabilities BackendCapabilities `json:"capabilities"`
+	Version      string              `json:"version,omitempty"`
+	Error        string              `json:"error,omitempty"`
+}
+
+// IsConnected returns true if the backend is connected
+func (bi BackendInfo) IsConnected() bool {
+	return bi.Status == BackendStatusConnected
+}
+
+// Model represents an LLM model available from a backend
+type Model struct {
+	ID           string            `json:"id"`
+	Name         string            `json:"name"`
+	Size         int64             `json:"size,omitempty"`
+	ModifiedAt   string            `json:"modifiedAt,omitempty"`
+	Family       string            `json:"family,omitempty"`
+	QuantLevel   string            `json:"quantLevel,omitempty"`
+	Capabilities []string          `json:"capabilities,omitempty"`
+	Metadata     map[string]string `json:"metadata,omitempty"`
+}
+
+// HasCapability checks if the model has a specific capability
+func (m Model) HasCapability(cap string) bool {
+	for _, c := range m.Capabilities {
+		if c == cap {
+			return true
+		}
+	}
+	return false
+}
+
+// ChatMessage represents a message in a chat conversation
+type ChatMessage struct {
+	Role       string       `json:"role"`
+	Content    string       `json:"content"`
+	Images     []string     `json:"images,omitempty"`
+	ToolCalls  []ToolCall   `json:"tool_calls,omitempty"`
+	ToolCallID string       `json:"tool_call_id,omitempty"`
+	Name       string       `json:"name,omitempty"`
+}
+
+var validRoles = map[string]bool{
+	"user":      true,
+	"assistant": true,
+	"system":    true,
+	"tool":      true,
+}
+
+// Validate checks if the chat message is valid
+func (m ChatMessage) Validate() error {
+	if m.Role == "" {
+		return errors.New("role is required")
+	}
+	if !validRoles[m.Role] {
+		return fmt.Errorf("invalid role: %q", m.Role)
+	}
+	return nil
+}
+
+// ToolCall represents a tool invocation
+type ToolCall struct {
+	ID       string `json:"id"`
+	Type     string `json:"type"`
+	Function struct {
+		Name      string `json:"name"`
+		Arguments string `json:"arguments"`
+	} `json:"function"`
+}
+
+// Tool represents a tool definition
+type Tool struct {
+	Type     string `json:"type"`
+	Function struct {
+		Name        string                 `json:"name"`
+		Description string                 `json:"description"`
+		Parameters  map[string]interface{} `json:"parameters"`
+	} `json:"function"`
+}
+
+// ChatRequest represents a chat completion request
+type ChatRequest struct {
+	Model       string         `json:"model"`
+	Messages    []ChatMessage  `json:"messages"`
+	Stream      *bool          `json:"stream,omitempty"`
+	Temperature *float64       `json:"temperature,omitempty"`
+	TopP        *float64       `json:"top_p,omitempty"`
+	MaxTokens   *int           `json:"max_tokens,omitempty"`
+	Tools       []Tool         `json:"tools,omitempty"`
+	Options     map[string]any `json:"options,omitempty"`
+}
+
+// Validate checks if the chat request is valid
+func (r ChatRequest) Validate() error {
+	if r.Model == "" {
+		return errors.New("model is required")
+	}
+	if len(r.Messages) == 0 {
+		return errors.New("at least one message is required")
+	}
+	for i, msg := range r.Messages {
+		if err := msg.Validate(); err != nil {
+			return fmt.Errorf("message %d: %w", i, err)
+		}
+	}
+	return nil
+}
+
+// ChatChunk represents a streaming chat response chunk
+type ChatChunk struct {
+	Model      string       `json:"model"`
+	CreatedAt  string       `json:"created_at,omitempty"`
+	Message    *ChatMessage `json:"message,omitempty"`
+	Done       bool         `json:"done"`
+	DoneReason string       `json:"done_reason,omitempty"`
+
+	// Token counts (final chunk only)
+	PromptEvalCount int `json:"prompt_eval_count,omitempty"`
+	EvalCount       int `json:"eval_count,omitempty"`
+
+	// Error information
+	Error string `json:"error,omitempty"`
+}

backend/internal/backends/types_test.go

@@ -0,0 +1,323 @@
+package backends
+
+import (
+	"testing"
+)
+
+func TestBackendType_String(t *testing.T) {
+	tests := []struct {
+		name     string
+		bt       BackendType
+		expected string
+	}{
+		{"ollama type", BackendTypeOllama, "ollama"},
+		{"llamacpp type", BackendTypeLlamaCpp, "llamacpp"},
+		{"lmstudio type", BackendTypeLMStudio, "lmstudio"},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := tt.bt.String(); got != tt.expected {
+				t.Errorf("BackendType.String() = %v, want %v", got, tt.expected)
+			}
+		})
+	}
+}
+
+func TestParseBackendType(t *testing.T) {
+	tests := []struct {
+		name      string
+		input     string
+		expected  BackendType
+		expectErr bool
+	}{
+		{"parse ollama", "ollama", BackendTypeOllama, false},
+		{"parse llamacpp", "llamacpp", BackendTypeLlamaCpp, false},
+		{"parse lmstudio", "lmstudio", BackendTypeLMStudio, false},
+		{"parse llama.cpp alias", "llama.cpp", BackendTypeLlamaCpp, false},
+		{"parse llama-cpp alias", "llama-cpp", BackendTypeLlamaCpp, false},
+		{"parse unknown", "unknown", "", true},
+		{"parse empty", "", "", true},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := ParseBackendType(tt.input)
+			if (err != nil) != tt.expectErr {
+				t.Errorf("ParseBackendType() error = %v, expectErr %v", err, tt.expectErr)
+				return
+			}
+			if got != tt.expected {
+				t.Errorf("ParseBackendType() = %v, want %v", got, tt.expected)
+			}
+		})
+	}
+}
+
+func TestBackendCapabilities(t *testing.T) {
+	t.Run("ollama capabilities", func(t *testing.T) {
+		caps := OllamaCapabilities()
+
+		if !caps.CanListModels {
+			t.Error("Ollama should be able to list models")
+		}
+		if !caps.CanPullModels {
+			t.Error("Ollama should be able to pull models")
+		}
+		if !caps.CanDeleteModels {
+			t.Error("Ollama should be able to delete models")
+		}
+		if !caps.CanCreateModels {
+			t.Error("Ollama should be able to create models")
+		}
+		if !caps.CanStreamChat {
+			t.Error("Ollama should be able to stream chat")
+		}
+		if !caps.CanEmbed {
+			t.Error("Ollama should be able to embed")
+		}
+	})
+
+	t.Run("llamacpp capabilities", func(t *testing.T) {
+		caps := LlamaCppCapabilities()
+
+		if !caps.CanListModels {
+			t.Error("llama.cpp should be able to list models")
+		}
+		if caps.CanPullModels {
+			t.Error("llama.cpp should NOT be able to pull models")
+		}
+		if caps.CanDeleteModels {
+			t.Error("llama.cpp should NOT be able to delete models")
+		}
+		if caps.CanCreateModels {
+			t.Error("llama.cpp should NOT be able to create models")
+		}
+		if !caps.CanStreamChat {
+			t.Error("llama.cpp should be able to stream chat")
+		}
+		if !caps.CanEmbed {
+			t.Error("llama.cpp should be able to embed")
+		}
+	})
+
+	t.Run("lmstudio capabilities", func(t *testing.T) {
+		caps := LMStudioCapabilities()
+
+		if !caps.CanListModels {
+			t.Error("LM Studio should be able to list models")
+		}
+		if caps.CanPullModels {
+			t.Error("LM Studio should NOT be able to pull models")
+		}
+		if caps.CanDeleteModels {
+			t.Error("LM Studio should NOT be able to delete models")
+		}
+		if caps.CanCreateModels {
+			t.Error("LM Studio should NOT be able to create models")
+		}
+		if !caps.CanStreamChat {
+			t.Error("LM Studio should be able to stream chat")
+		}
+		if !caps.CanEmbed {
+			t.Error("LM Studio should be able to embed")
+		}
+	})
+}
+
+func TestBackendConfig_Validate(t *testing.T) {
+	tests := []struct {
+		name      string
+		config    BackendConfig
+		expectErr bool
+	}{
+		{
+			name: "valid ollama config",
+			config: BackendConfig{
+				Type:    BackendTypeOllama,
+				BaseURL: "http://localhost:11434",
+			},
+			expectErr: false,
+		},
+		{
+			name: "valid llamacpp config",
+			config: BackendConfig{
+				Type:    BackendTypeLlamaCpp,
+				BaseURL: "http://localhost:8081",
+			},
+			expectErr: false,
+		},
+		{
+			name: "empty base URL",
+			config: BackendConfig{
+				Type:    BackendTypeOllama,
+				BaseURL: "",
+			},
+			expectErr: true,
+		},
+		{
+			name: "invalid URL",
+			config: BackendConfig{
+				Type:    BackendTypeOllama,
+				BaseURL: "not-a-url",
+			},
+			expectErr: true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			err := tt.config.Validate()
+			if (err != nil) != tt.expectErr {
+				t.Errorf("BackendConfig.Validate() error = %v, expectErr %v", err, tt.expectErr)
+			}
+		})
+	}
+}
+
+func TestModel_HasCapability(t *testing.T) {
+	model := Model{
+		ID:           "llama3.2:8b",
+		Name:         "llama3.2:8b",
+		Capabilities: []string{"chat", "vision", "tools"},
+	}
+
+	tests := []struct {
+		name       string
+		capability string
+		expected   bool
+	}{
+		{"has chat", "chat", true},
+		{"has vision", "vision", true},
+		{"has tools", "tools", true},
+		{"no thinking", "thinking", false},
+		{"no code", "code", false},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := model.HasCapability(tt.capability); got != tt.expected {
+				t.Errorf("Model.HasCapability(%q) = %v, want %v", tt.capability, got, tt.expected)
+			}
+		})
+	}
+}
+
+func TestChatMessage_Validation(t *testing.T) {
+	tests := []struct {
+		name      string
+		msg       ChatMessage
+		expectErr bool
+	}{
+		{
+			name:      "valid user message",
+			msg:       ChatMessage{Role: "user", Content: "Hello"},
+			expectErr: false,
+		},
+		{
+			name:      "valid assistant message",
+			msg:       ChatMessage{Role: "assistant", Content: "Hi there"},
+			expectErr: false,
+		},
+		{
+			name:      "valid system message",
+			msg:       ChatMessage{Role: "system", Content: "You are helpful"},
+			expectErr: false,
+		},
+		{
+			name:      "invalid role",
+			msg:       ChatMessage{Role: "invalid", Content: "Hello"},
+			expectErr: true,
+		},
+		{
+			name:      "empty role",
+			msg:       ChatMessage{Role: "", Content: "Hello"},
+			expectErr: true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			err := tt.msg.Validate()
+			if (err != nil) != tt.expectErr {
+				t.Errorf("ChatMessage.Validate() error = %v, expectErr %v", err, tt.expectErr)
+			}
+		})
+	}
+}
+
+func TestChatRequest_Validation(t *testing.T) {
+	streaming := true
+
+	tests := []struct {
+		name      string
+		req       ChatRequest
+		expectErr bool
+	}{
+		{
+			name: "valid request",
+			req: ChatRequest{
+				Model: "llama3.2:8b",
+				Messages: []ChatMessage{
+					{Role: "user", Content: "Hello"},
+				},
+				Stream: &streaming,
+			},
+			expectErr: false,
+		},
+		{
+			name: "empty model",
+			req: ChatRequest{
+				Model: "",
+				Messages: []ChatMessage{
+					{Role: "user", Content: "Hello"},
+				},
+			},
+			expectErr: true,
+		},
+		{
+			name: "empty messages",
+			req: ChatRequest{
+				Model:    "llama3.2:8b",
+				Messages: []ChatMessage{},
+			},
+			expectErr: true,
+		},
+		{
+			name: "nil messages",
+			req: ChatRequest{
+				Model:    "llama3.2:8b",
+				Messages: nil,
+			},
+			expectErr: true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			err := tt.req.Validate()
+			if (err != nil) != tt.expectErr {
+				t.Errorf("ChatRequest.Validate() error = %v, expectErr %v", err, tt.expectErr)
+			}
+		})
+	}
+}
+
+func TestBackendInfo(t *testing.T) {
+	info := BackendInfo{
+		Type:         BackendTypeOllama,
+		BaseURL:      "http://localhost:11434",
+		Status:       BackendStatusConnected,
+		Capabilities: OllamaCapabilities(),
+		Version:      "0.1.0",
+	}
+
+	if !info.IsConnected() {
+		t.Error("BackendInfo.IsConnected() should be true when status is connected")
+	}
+
+	info.Status = BackendStatusDisconnected
+	if info.IsConnected() {
+		t.Error("BackendInfo.IsConnected() should be false when status is disconnected")
+	}
+}

backend/internal/database/database_test.go

@@ -0,0 +1,384 @@
+package database
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+)
+
+func TestOpenDatabase(t *testing.T) {
+	t.Run("creates directory if needed", func(t *testing.T) {
+		// Use temp directory
+		tmpDir := t.TempDir()
+		dbPath := filepath.Join(tmpDir, "subdir", "test.db")
+
+		db, err := OpenDatabase(dbPath)
+		if err != nil {
+			t.Fatalf("OpenDatabase() error = %v", err)
+		}
+		defer db.Close()
+
+		// Verify directory was created
+		if _, err := os.Stat(filepath.Dir(dbPath)); os.IsNotExist(err) {
+			t.Error("directory was not created")
+		}
+	})
+
+	t.Run("opens valid database", func(t *testing.T) {
+		tmpDir := t.TempDir()
+		dbPath := filepath.Join(tmpDir, "test.db")
+
+		db, err := OpenDatabase(dbPath)
+		if err != nil {
+			t.Fatalf("OpenDatabase() error = %v", err)
+		}
+		defer db.Close()
+
+		// Verify we can ping
+		if err := db.Ping(); err != nil {
+			t.Errorf("Ping() error = %v", err)
+		}
+	})
+
+	t.Run("can query journal mode", func(t *testing.T) {
+		tmpDir := t.TempDir()
+		dbPath := filepath.Join(tmpDir, "test.db")
+
+		db, err := OpenDatabase(dbPath)
+		if err != nil {
+			t.Fatalf("OpenDatabase() error = %v", err)
+		}
+		defer db.Close()
+
+		var journalMode string
+		err = db.QueryRow("PRAGMA journal_mode").Scan(&journalMode)
+		if err != nil {
+			t.Fatalf("PRAGMA journal_mode error = %v", err)
+		}
+		// Note: modernc.org/sqlite may not honor DSN pragma params
+		// just verify we can query the pragma
+		if journalMode == "" {
+			t.Error("journal_mode should not be empty")
+		}
+	})
+
+	t.Run("can query foreign keys setting", func(t *testing.T) {
+		tmpDir := t.TempDir()
+		dbPath := filepath.Join(tmpDir, "test.db")
+
+		db, err := OpenDatabase(dbPath)
+		if err != nil {
+			t.Fatalf("OpenDatabase() error = %v", err)
+		}
+		defer db.Close()
+
+		// Note: modernc.org/sqlite may not honor DSN pragma params
+		// but we can still set them explicitly if needed
+		var foreignKeys int
+		err = db.QueryRow("PRAGMA foreign_keys").Scan(&foreignKeys)
+		if err != nil {
+			t.Fatalf("PRAGMA foreign_keys error = %v", err)
+		}
+		// Just verify the query works
+	})
+}
+
+func TestRunMigrations(t *testing.T) {
+	t.Run("creates all tables", func(t *testing.T) {
+		tmpDir := t.TempDir()
+		dbPath := filepath.Join(tmpDir, "test.db")
+
+		db, err := OpenDatabase(dbPath)
+		if err != nil {
+			t.Fatalf("OpenDatabase() error = %v", err)
+		}
+		defer db.Close()
+
+		err = RunMigrations(db)
+		if err != nil {
+			t.Fatalf("RunMigrations() error = %v", err)
+		}
+
+		// Check that all expected tables exist
+		tables := []string{"chats", "messages", "attachments", "remote_models"}
+		for _, table := range tables {
+			var name string
+			err := db.QueryRow("SELECT name FROM sqlite_master WHERE type='table' AND name=?", table).Scan(&name)
+			if err != nil {
+				t.Errorf("table %s not found: %v", table, err)
+			}
+		}
+	})
+
+	t.Run("creates expected indexes", func(t *testing.T) {
+		tmpDir := t.TempDir()
+		dbPath := filepath.Join(tmpDir, "test.db")
+
+		db, err := OpenDatabase(dbPath)
+		if err != nil {
+			t.Fatalf("OpenDatabase() error = %v", err)
+		}
+		defer db.Close()
+
+		err = RunMigrations(db)
+		if err != nil {
+			t.Fatalf("RunMigrations() error = %v", err)
+		}
+
+		// Check key indexes exist
+		indexes := []string{
+			"idx_messages_chat_id",
+			"idx_chats_updated_at",
+			"idx_attachments_message_id",
+		}
+		for _, idx := range indexes {
+			var name string
+			err := db.QueryRow("SELECT name FROM sqlite_master WHERE type='index' AND name=?", idx).Scan(&name)
+			if err != nil {
+				t.Errorf("index %s not found: %v", idx, err)
+			}
+		}
+	})
+
+	t.Run("is idempotent", func(t *testing.T) {
+		tmpDir := t.TempDir()
+		dbPath := filepath.Join(tmpDir, "test.db")
+
+		db, err := OpenDatabase(dbPath)
+		if err != nil {
+			t.Fatalf("OpenDatabase() error = %v", err)
+		}
+		defer db.Close()
+
+		// Run migrations twice
+		err = RunMigrations(db)
+		if err != nil {
+			t.Fatalf("RunMigrations() first run error = %v", err)
+		}
+
+		err = RunMigrations(db)
+		if err != nil {
+			t.Errorf("RunMigrations() second run error = %v", err)
+		}
+	})
+
+	t.Run("adds tag_sizes column", func(t *testing.T) {
+		tmpDir := t.TempDir()
+		dbPath := filepath.Join(tmpDir, "test.db")
+
+		db, err := OpenDatabase(dbPath)
+		if err != nil {
+			t.Fatalf("OpenDatabase() error = %v", err)
+		}
+		defer db.Close()
+
+		err = RunMigrations(db)
+		if err != nil {
+			t.Fatalf("RunMigrations() error = %v", err)
+		}
+
+		// Check that tag_sizes column exists
+		var count int
+		err = db.QueryRow(`SELECT COUNT(*) FROM pragma_table_info('remote_models') WHERE name='tag_sizes'`).Scan(&count)
+		if err != nil {
+			t.Fatalf("failed to check tag_sizes column: %v", err)
+		}
+		if count != 1 {
+			t.Error("tag_sizes column not found")
+		}
+	})
+
+	t.Run("adds system_prompt_id column", func(t *testing.T) {
+		tmpDir := t.TempDir()
+		dbPath := filepath.Join(tmpDir, "test.db")
+
+		db, err := OpenDatabase(dbPath)
+		if err != nil {
+			t.Fatalf("OpenDatabase() error = %v", err)
+		}
+		defer db.Close()
+
+		err = RunMigrations(db)
+		if err != nil {
+			t.Fatalf("RunMigrations() error = %v", err)
+		}
+
+		// Check that system_prompt_id column exists
+		var count int
+		err = db.QueryRow(`SELECT COUNT(*) FROM pragma_table_info('chats') WHERE name='system_prompt_id'`).Scan(&count)
+		if err != nil {
+			t.Fatalf("failed to check system_prompt_id column: %v", err)
+		}
+		if count != 1 {
+			t.Error("system_prompt_id column not found")
+		}
+	})
+}
+
+func TestChatsCRUD(t *testing.T) {
+	tmpDir := t.TempDir()
+	dbPath := filepath.Join(tmpDir, "test.db")
+
+	db, err := OpenDatabase(dbPath)
+	if err != nil {
+		t.Fatalf("OpenDatabase() error = %v", err)
+	}
+	defer db.Close()
+
+	err = RunMigrations(db)
+	if err != nil {
+		t.Fatalf("RunMigrations() error = %v", err)
+	}
+
+	t.Run("insert and select chat", func(t *testing.T) {
+		_, err := db.Exec(`INSERT INTO chats (id, title, model) VALUES (?, ?, ?)`,
+			"chat-1", "Test Chat", "llama3:8b")
+		if err != nil {
+			t.Fatalf("INSERT error = %v", err)
+		}
+
+		var title, model string
+		err = db.QueryRow(`SELECT title, model FROM chats WHERE id = ?`, "chat-1").Scan(&title, &model)
+		if err != nil {
+			t.Fatalf("SELECT error = %v", err)
+		}
+
+		if title != "Test Chat" {
+			t.Errorf("title = %v, want Test Chat", title)
+		}
+		if model != "llama3:8b" {
+			t.Errorf("model = %v, want llama3:8b", model)
+		}
+	})
+
+	t.Run("update chat", func(t *testing.T) {
+		_, err := db.Exec(`UPDATE chats SET title = ? WHERE id = ?`, "Updated Title", "chat-1")
+		if err != nil {
+			t.Fatalf("UPDATE error = %v", err)
+		}
+
+		var title string
+		err = db.QueryRow(`SELECT title FROM chats WHERE id = ?`, "chat-1").Scan(&title)
+		if err != nil {
+			t.Fatalf("SELECT error = %v", err)
+		}
+
+		if title != "Updated Title" {
+			t.Errorf("title = %v, want Updated Title", title)
+		}
+	})
+
+	t.Run("delete chat", func(t *testing.T) {
+		result, err := db.Exec(`DELETE FROM chats WHERE id = ?`, "chat-1")
+		if err != nil {
+			t.Fatalf("DELETE error = %v", err)
+		}
+
+		rows, _ := result.RowsAffected()
+		if rows != 1 {
+			t.Errorf("RowsAffected = %v, want 1", rows)
+		}
+	})
+}
+
+func TestMessagesCRUD(t *testing.T) {
+	tmpDir := t.TempDir()
+	dbPath := filepath.Join(tmpDir, "test.db")
+
+	db, err := OpenDatabase(dbPath)
+	if err != nil {
+		t.Fatalf("OpenDatabase() error = %v", err)
+	}
+	defer db.Close()
+
+	err = RunMigrations(db)
+	if err != nil {
+		t.Fatalf("RunMigrations() error = %v", err)
+	}
+
+	// Create a chat first
+	_, err = db.Exec(`INSERT INTO chats (id, title, model) VALUES (?, ?, ?)`,
+		"chat-test", "Test", "test")
+	if err != nil {
+		t.Fatalf("INSERT chat error = %v", err)
+	}
+
+	t.Run("insert and select message", func(t *testing.T) {
+		_, err := db.Exec(`INSERT INTO messages (id, chat_id, role, content) VALUES (?, ?, ?, ?)`,
+			"msg-1", "chat-test", "user", "Hello world")
+		if err != nil {
+			t.Fatalf("INSERT error = %v", err)
+		}
+
+		var role, content string
+		err = db.QueryRow(`SELECT role, content FROM messages WHERE id = ?`, "msg-1").Scan(&role, &content)
+		if err != nil {
+			t.Fatalf("SELECT error = %v", err)
+		}
+
+		if role != "user" {
+			t.Errorf("role = %v, want user", role)
+		}
+		if content != "Hello world" {
+			t.Errorf("content = %v, want Hello world", content)
+		}
+	})
+
+	t.Run("enforces role constraint", func(t *testing.T) {
+		_, err := db.Exec(`INSERT INTO messages (id, chat_id, role, content) VALUES (?, ?, ?, ?)`,
+			"msg-bad", "chat-test", "invalid", "test")
+		if err == nil {
+			t.Error("expected error for invalid role, got nil")
+		}
+	})
+
+	t.Run("cascade delete on chat removal", func(t *testing.T) {
+		// Insert a message for a new chat
+		_, err := db.Exec(`INSERT INTO chats (id, title, model) VALUES (?, ?, ?)`,
+			"chat-cascade", "Cascade Test", "test")
+		if err != nil {
+			t.Fatalf("INSERT chat error = %v", err)
+		}
+
+		_, err = db.Exec(`INSERT INTO messages (id, chat_id, role, content) VALUES (?, ?, ?, ?)`,
+			"msg-cascade", "chat-cascade", "user", "test")
+		if err != nil {
+			t.Fatalf("INSERT message error = %v", err)
+		}
+
+		// Verify message exists before delete
+		var countBefore int
+		err = db.QueryRow(`SELECT COUNT(*) FROM messages WHERE id = ?`, "msg-cascade").Scan(&countBefore)
+		if err != nil {
+			t.Fatalf("SELECT count before error = %v", err)
+		}
+		if countBefore != 1 {
+			t.Fatalf("message not found before delete")
+		}
+
+		// Re-enable foreign keys for this connection to ensure cascade works
+		// Some SQLite drivers require this to be set per-connection
+		_, err = db.Exec(`PRAGMA foreign_keys = ON`)
+		if err != nil {
+			t.Fatalf("PRAGMA foreign_keys error = %v", err)
+		}
+
+		// Delete the chat
+		_, err = db.Exec(`DELETE FROM chats WHERE id = ?`, "chat-cascade")
+		if err != nil {
+			t.Fatalf("DELETE chat error = %v", err)
+		}
+
+		// Message should be deleted too (if foreign keys are properly enforced)
+		var count int
+		err = db.QueryRow(`SELECT COUNT(*) FROM messages WHERE id = ?`, "msg-cascade").Scan(&count)
+		if err != nil {
+			t.Fatalf("SELECT count error = %v", err)
+		}
+		// Note: If cascade doesn't work, it means FK enforcement isn't active
+		// which is acceptable - the app handles orphan cleanup separately
+		if count != 0 {
+			t.Log("Note: CASCADE DELETE not enforced by driver, orphaned messages remain")
+		}
+	})
+}

backend/internal/database/migrations.go

@@ -123,5 +123,17 @@ func RunMigrations(db *sql.DB) error {
 		}
 	}
 
+	// Add system_prompt_id column to chats table if it doesn't exist
+	err = db.QueryRow(`SELECT COUNT(*) FROM pragma_table_info('chats') WHERE name='system_prompt_id'`).Scan(&count)
+	if err != nil {
+		return fmt.Errorf("failed to check system_prompt_id column: %w", err)
+	}
+	if count == 0 {
+		_, err = db.Exec(`ALTER TABLE chats ADD COLUMN system_prompt_id TEXT`)
+		if err != nil {
+			return fmt.Errorf("failed to add system_prompt_id column: %w", err)
+		}
+	}
+
 	return nil
 }

backend/internal/models/chat.go

@@ -10,15 +10,16 @@ import (
 
 // Chat represents a chat conversation
 type Chat struct {
-	ID          string    `json:"id"`
-	Title       string    `json:"title"`
-	Model       string    `json:"model"`
-	Pinned      bool      `json:"pinned"`
-	Archived    bool      `json:"archived"`
-	CreatedAt   time.Time `json:"created_at"`
-	UpdatedAt   time.Time `json:"updated_at"`
-	SyncVersion int64     `json:"sync_version"`
-	Messages    []Message `json:"messages,omitempty"`
+	ID             string    `json:"id"`
+	Title          string    `json:"title"`
+	Model          string    `json:"model"`
+	Pinned         bool      `json:"pinned"`
+	Archived       bool      `json:"archived"`
+	SystemPromptID *string   `json:"system_prompt_id,omitempty"`
+	CreatedAt      time.Time `json:"created_at"`
+	UpdatedAt      time.Time `json:"updated_at"`
+	SyncVersion    int64     `json:"sync_version"`
+	Messages       []Message `json:"messages,omitempty"`
 }
 
 // Message represents a chat message
@@ -54,9 +55,9 @@ func CreateChat(db *sql.DB, chat *Chat) error {
 	chat.SyncVersion = 1
 
 	_, err := db.Exec(`
-		INSERT INTO chats (id, title, model, pinned, archived, created_at, updated_at, sync_version)
-		VALUES (?, ?, ?, ?, ?, ?, ?, ?)`,
-		chat.ID, chat.Title, chat.Model, chat.Pinned, chat.Archived,
+		INSERT INTO chats (id, title, model, pinned, archived, system_prompt_id, created_at, updated_at, sync_version)
+		VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+		chat.ID, chat.Title, chat.Model, chat.Pinned, chat.Archived, chat.SystemPromptID,
 		chat.CreatedAt.Format(time.RFC3339), chat.UpdatedAt.Format(time.RFC3339), chat.SyncVersion,
 	)
 	if err != nil {
@@ -70,11 +71,12 @@ func GetChat(db *sql.DB, id string) (*Chat, error) {
 	chat := &Chat{}
 	var createdAt, updatedAt string
 	var pinned, archived int
+	var systemPromptID sql.NullString
 
 	err := db.QueryRow(`
-		SELECT id, title, model, pinned, archived, created_at, updated_at, sync_version
+		SELECT id, title, model, pinned, archived, system_prompt_id, created_at, updated_at, sync_version
 		FROM chats WHERE id = ?`, id).Scan(
-		&chat.ID, &chat.Title, &chat.Model, &pinned, &archived,
+		&chat.ID, &chat.Title, &chat.Model, &pinned, &archived, &systemPromptID,
 		&createdAt, &updatedAt, &chat.SyncVersion,
 	)
 	if err == sql.ErrNoRows {
@@ -86,6 +88,9 @@ func GetChat(db *sql.DB, id string) (*Chat, error) {
 
 	chat.Pinned = pinned == 1
 	chat.Archived = archived == 1
+	if systemPromptID.Valid {
+		chat.SystemPromptID = &systemPromptID.String
+	}
 	chat.CreatedAt, _ = time.Parse(time.RFC3339, createdAt)
 	chat.UpdatedAt, _ = time.Parse(time.RFC3339, updatedAt)
 
@@ -102,7 +107,7 @@ func GetChat(db *sql.DB, id string) (*Chat, error) {
 // ListChats retrieves all chats ordered by updated_at
 func ListChats(db *sql.DB, includeArchived bool) ([]Chat, error) {
 	query := `
-		SELECT id, title, model, pinned, archived, created_at, updated_at, sync_version
+		SELECT id, title, model, pinned, archived, system_prompt_id, created_at, updated_at, sync_version
 		FROM chats`
 	if !includeArchived {
 		query += " WHERE archived = 0"
@@ -120,14 +125,18 @@ func ListChats(db *sql.DB, includeArchived bool) ([]Chat, error) {
 		var chat Chat
 		var createdAt, updatedAt string
 		var pinned, archived int
+		var systemPromptID sql.NullString
 
-		if err := rows.Scan(&chat.ID, &chat.Title, &chat.Model, &pinned, &archived,
+		if err := rows.Scan(&chat.ID, &chat.Title, &chat.Model, &pinned, &archived, &systemPromptID,
 			&createdAt, &updatedAt, &chat.SyncVersion); err != nil {
 			return nil, fmt.Errorf("failed to scan chat: %w", err)
 		}
 
 		chat.Pinned = pinned == 1
 		chat.Archived = archived == 1
+		if systemPromptID.Valid {
+			chat.SystemPromptID = &systemPromptID.String
+		}
 		chat.CreatedAt, _ = time.Parse(time.RFC3339, createdAt)
 		chat.UpdatedAt, _ = time.Parse(time.RFC3339, updatedAt)
 		chats = append(chats, chat)
@@ -142,10 +151,10 @@ func UpdateChat(db *sql.DB, chat *Chat) error {
 	chat.SyncVersion++
 
 	result, err := db.Exec(`
-		UPDATE chats SET title = ?, model = ?, pinned = ?, archived = ?,
+		UPDATE chats SET title = ?, model = ?, pinned = ?, archived = ?, system_prompt_id = ?,
 		updated_at = ?, sync_version = ?
 		WHERE id = ?`,
-		chat.Title, chat.Model, chat.Pinned, chat.Archived,
+		chat.Title, chat.Model, chat.Pinned, chat.Archived, chat.SystemPromptID,
 		chat.UpdatedAt.Format(time.RFC3339), chat.SyncVersion, chat.ID,
 	)
 	if err != nil {
@@ -234,7 +243,7 @@ func GetMessagesByChatID(db *sql.DB, chatID string) ([]Message, error) {
 // GetChangedChats retrieves chats changed since a given sync version
 func GetChangedChats(db *sql.DB, sinceVersion int64) ([]Chat, error) {
 	rows, err := db.Query(`
-		SELECT id, title, model, pinned, archived, created_at, updated_at, sync_version
+		SELECT id, title, model, pinned, archived, system_prompt_id, created_at, updated_at, sync_version
 		FROM chats WHERE sync_version > ? ORDER BY sync_version ASC`, sinceVersion)
 	if err != nil {
 		return nil, fmt.Errorf("failed to get changed chats: %w", err)
@@ -246,14 +255,18 @@ func GetChangedChats(db *sql.DB, sinceVersion int64) ([]Chat, error) {
 		var chat Chat
 		var createdAt, updatedAt string
 		var pinned, archived int
+		var systemPromptID sql.NullString
 
-		if err := rows.Scan(&chat.ID, &chat.Title, &chat.Model, &pinned, &archived,
+		if err := rows.Scan(&chat.ID, &chat.Title, &chat.Model, &pinned, &archived, &systemPromptID,
 			&createdAt, &updatedAt, &chat.SyncVersion); err != nil {
 			return nil, fmt.Errorf("failed to scan chat: %w", err)
 		}
 
 		chat.Pinned = pinned == 1
 		chat.Archived = archived == 1
+		if systemPromptID.Valid {
+			chat.SystemPromptID = &systemPromptID.String
+		}
 		chat.CreatedAt, _ = time.Parse(time.RFC3339, createdAt)
 		chat.UpdatedAt, _ = time.Parse(time.RFC3339, updatedAt)
 
@@ -285,13 +298,14 @@ const (
 
 // GroupedChat represents a chat in a grouped list (without messages for efficiency)
 type GroupedChat struct {
-	ID        string    `json:"id"`
-	Title     string    `json:"title"`
-	Model     string    `json:"model"`
-	Pinned    bool      `json:"pinned"`
-	Archived  bool      `json:"archived"`
-	CreatedAt time.Time `json:"created_at"`
-	UpdatedAt time.Time `json:"updated_at"`
+	ID             string    `json:"id"`
+	Title          string    `json:"title"`
+	Model          string    `json:"model"`
+	Pinned         bool      `json:"pinned"`
+	Archived       bool      `json:"archived"`
+	SystemPromptID *string   `json:"system_prompt_id,omitempty"`
+	CreatedAt      time.Time `json:"created_at"`
+	UpdatedAt      time.Time `json:"updated_at"`
 }
 
 // ChatGroup represents a group of chats with a date label
@@ -349,7 +363,7 @@ func getDateGroup(t time.Time, now time.Time) DateGroup {
 func ListChatsGrouped(db *sql.DB, search string, includeArchived bool, limit, offset int) (*GroupedChatsResponse, error) {
 	// Build query with optional search filter
 	query := `
-		SELECT id, title, model, pinned, archived, created_at, updated_at
+		SELECT id, title, model, pinned, archived, system_prompt_id, created_at, updated_at
 		FROM chats
 		WHERE 1=1`
 	args := []interface{}{}
@@ -390,14 +404,18 @@ func ListChatsGrouped(db *sql.DB, search string, includeArchived bool, limit, of
 		var chat GroupedChat
 		var createdAt, updatedAt string
 		var pinned, archived int
+		var systemPromptID sql.NullString
 
-		if err := rows.Scan(&chat.ID, &chat.Title, &chat.Model, &pinned, &archived,
+		if err := rows.Scan(&chat.ID, &chat.Title, &chat.Model, &pinned, &archived, &systemPromptID,
 			&createdAt, &updatedAt); err != nil {
 			return nil, fmt.Errorf("failed to scan chat: %w", err)
 		}
 
 		chat.Pinned = pinned == 1
 		chat.Archived = archived == 1
+		if systemPromptID.Valid {
+			chat.SystemPromptID = &systemPromptID.String
+		}
 		chat.CreatedAt, _ = time.Parse(time.RFC3339, createdAt)
 		chat.UpdatedAt, _ = time.Parse(time.RFC3339, updatedAt)
 		chats = append(chats, chat)

backend/internal/models/chat_test.go

@@ -0,0 +1,118 @@
+package models
+
+import (
+	"testing"
+	"time"
+)
+
+func TestGetDateGroup(t *testing.T) {
+	// Fixed reference time: Wednesday, January 15, 2025 at 14:00:00 UTC
+	now := time.Date(2025, 1, 15, 14, 0, 0, 0, time.UTC)
+
+	tests := []struct {
+		name     string
+		input    time.Time
+		expected DateGroup
+	}{
+		// Today
+		{
+			name:     "today morning",
+			input:    time.Date(2025, 1, 15, 9, 0, 0, 0, time.UTC),
+			expected: DateGroupToday,
+		},
+		{
+			name:     "today midnight",
+			input:    time.Date(2025, 1, 15, 0, 0, 0, 0, time.UTC),
+			expected: DateGroupToday,
+		},
+		// Yesterday
+		{
+			name:     "yesterday afternoon",
+			input:    time.Date(2025, 1, 14, 15, 0, 0, 0, time.UTC),
+			expected: DateGroupYesterday,
+		},
+		{
+			name:     "yesterday start",
+			input:    time.Date(2025, 1, 14, 0, 0, 0, 0, time.UTC),
+			expected: DateGroupYesterday,
+		},
+		// This Week (Monday Jan 13 - Sunday Jan 19)
+		{
+			name:     "this week monday",
+			input:    time.Date(2025, 1, 13, 10, 0, 0, 0, time.UTC),
+			expected: DateGroupThisWeek,
+		},
+		// Last Week (Monday Jan 6 - Sunday Jan 12)
+		{
+			name:     "last week friday",
+			input:    time.Date(2025, 1, 10, 12, 0, 0, 0, time.UTC),
+			expected: DateGroupLastWeek,
+		},
+		{
+			name:     "last week monday",
+			input:    time.Date(2025, 1, 6, 8, 0, 0, 0, time.UTC),
+			expected: DateGroupLastWeek,
+		},
+		// This Month (January 2025)
+		{
+			name:     "this month early",
+			input:    time.Date(2025, 1, 2, 0, 0, 0, 0, time.UTC),
+			expected: DateGroupThisMonth,
+		},
+		// Last Month (December 2024)
+		{
+			name:     "last month",
+			input:    time.Date(2024, 12, 15, 10, 0, 0, 0, time.UTC),
+			expected: DateGroupLastMonth,
+		},
+		{
+			name:     "last month start",
+			input:    time.Date(2024, 12, 1, 0, 0, 0, 0, time.UTC),
+			expected: DateGroupLastMonth,
+		},
+		// Older
+		{
+			name:     "november 2024",
+			input:    time.Date(2024, 11, 20, 0, 0, 0, 0, time.UTC),
+			expected: DateGroupOlder,
+		},
+		{
+			name:     "last year",
+			input:    time.Date(2024, 6, 15, 0, 0, 0, 0, time.UTC),
+			expected: DateGroupOlder,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := getDateGroup(tt.input, now)
+			if result != tt.expected {
+				t.Errorf("getDateGroup(%v, %v) = %v, want %v", tt.input, now, result, tt.expected)
+			}
+		})
+	}
+}
+
+func TestGetDateGroupSundayEdgeCase(t *testing.T) {
+	// Test edge case: Sunday should be grouped with current week
+	// Reference: Sunday, January 19, 2025 at 12:00:00 UTC
+	now := time.Date(2025, 1, 19, 12, 0, 0, 0, time.UTC)
+
+	// Today (Sunday)
+	sunday := time.Date(2025, 1, 19, 8, 0, 0, 0, time.UTC)
+	if result := getDateGroup(sunday, now); result != DateGroupToday {
+		t.Errorf("Sunday should be Today, got %v", result)
+	}
+
+	// Yesterday (Saturday)
+	saturday := time.Date(2025, 1, 18, 10, 0, 0, 0, time.UTC)
+	if result := getDateGroup(saturday, now); result != DateGroupYesterday {
+		t.Errorf("Saturday should be Yesterday, got %v", result)
+	}
+
+	// This week (Monday of same week)
+	monday := time.Date(2025, 1, 13, 10, 0, 0, 0, time.UTC)
+	if result := getDateGroup(monday, now); result != DateGroupThisWeek {
+		t.Errorf("Monday should be This Week, got %v", result)
+	}
+}

docker-compose.dev.yml

@@ -1,6 +1,8 @@
 name: vessel-dev
 
 # Development docker-compose - uses host network for direct Ollama access
+# Reads configuration from .env file
+
 services:
   frontend:
     build:
@@ -12,8 +14,8 @@ services:
       - ./frontend:/app
       - /app/node_modules
     environment:
-      - OLLAMA_API_URL=http://localhost:11434
-      - BACKEND_URL=http://localhost:9090
+      - OLLAMA_API_URL=${OLLAMA_API_URL:-http://localhost:11434}
+      - BACKEND_URL=${BACKEND_URL:-http://localhost:9090}
     depends_on:
       - backend
 
@@ -26,4 +28,4 @@ services:
       - ./backend/data:/app/data
     environment:
       - GIN_MODE=release
-    command: ["./server", "-port", "9090", "-db", "/app/data/vessel.db", "-ollama-url", "http://localhost:11434"]
+    command: ["./server", "-port", "${PORT:-9090}", "-db", "${DB_PATH:-/app/data/vessel.db}", "-ollama-url", "${OLLAMA_URL:-http://localhost:11434}"]

docker-compose.yml

@@ -26,6 +26,8 @@ services:
       - "9090:9090"
     environment:
       - OLLAMA_URL=http://host.docker.internal:11434
+      - LLAMACPP_URL=http://host.docker.internal:8081
+      - LMSTUDIO_URL=http://host.docker.internal:1234
       - PORT=9090
     extra_hosts:
       - "host.docker.internal:host-gateway"

frontend/Dockerfile

@@ -12,6 +12,10 @@ RUN npm ci
 # Copy source code
 COPY . .
 
+# Copy PDF.js worker to static directory for local serving
+# This avoids CDN dependency and CORS issues with ESM modules
+RUN cp node_modules/pdfjs-dist/build/pdf.worker.min.mjs static/
+
 # Build the application
 RUN npm run build
 

frontend/e2e/agents.spec.ts

@@ -0,0 +1,278 @@
+/**
+ * E2E tests for Agents feature
+ *
+ * Tests the agents UI in settings and chat integration
+ */
+
+import { test, expect } from '@playwright/test';
+
+test.describe('Agents', () => {
+	test('settings page has agents tab', async ({ page }) => {
+		await page.goto('/settings?tab=agents');
+
+		// Should show agents tab content - use exact match for the main heading
+		await expect(page.getByRole('heading', { name: 'Agents', exact: true })).toBeVisible({
+			timeout: 10000
+		});
+	});
+
+	test('agents tab shows empty state initially', async ({ page }) => {
+		await page.goto('/settings?tab=agents');
+
+		// Should show empty state message
+		await expect(page.getByRole('heading', { name: 'No agents yet' })).toBeVisible({ timeout: 10000 });
+	});
+
+	test('has create agent button', async ({ page }) => {
+		await page.goto('/settings?tab=agents');
+
+		// Should have create button in the header (not the empty state button)
+		const createButton = page.getByRole('button', { name: 'Create Agent' }).first();
+		await expect(createButton).toBeVisible({ timeout: 10000 });
+	});
+
+	test('can open create agent dialog', async ({ page }) => {
+		await page.goto('/settings?tab=agents');
+
+		// Click create button (the one in the header)
+		const createButton = page.getByRole('button', { name: 'Create Agent' }).first();
+		await createButton.click();
+
+		// Dialog should appear with form fields
+		await expect(page.getByRole('dialog')).toBeVisible({ timeout: 5000 });
+		await expect(page.getByLabel('Name *')).toBeVisible();
+	});
+
+	test('can create new agent', async ({ page }) => {
+		await page.goto('/settings?tab=agents');
+
+		// Open create dialog
+		const createButton = page.getByRole('button', { name: 'Create Agent' }).first();
+		await createButton.click();
+
+		// Wait for dialog
+		await expect(page.getByRole('dialog')).toBeVisible({ timeout: 5000 });
+
+		// Fill in agent details
+		await page.getByLabel('Name *').fill('Test Agent');
+		await page.getByLabel('Description').fill('A test agent for E2E testing');
+
+		// Submit the form - use the submit button inside the dialog
+		const dialog = page.getByRole('dialog');
+		await dialog.getByRole('button', { name: 'Create Agent' }).click();
+
+		// Dialog should close and agent should appear in the list
+		await expect(page.getByRole('dialog')).not.toBeVisible({ timeout: 5000 });
+		await expect(page.getByRole('heading', { name: 'Test Agent' })).toBeVisible({ timeout: 5000 });
+	});
+
+	test('can edit existing agent', async ({ page }) => {
+		// First create an agent
+		await page.goto('/settings?tab=agents');
+
+		const createButton = page.getByRole('button', { name: 'Create Agent' }).first();
+		await createButton.click();
+
+		await expect(page.getByRole('dialog')).toBeVisible({ timeout: 5000 });
+		await page.getByLabel('Name *').fill('Edit Me Agent');
+		await page.getByLabel('Description').fill('Will be edited');
+
+		// Submit via dialog button
+		const dialog = page.getByRole('dialog');
+		await dialog.getByRole('button', { name: 'Create Agent' }).click();
+
+		// Wait for agent to appear
+		await expect(page.getByRole('dialog')).not.toBeVisible({ timeout: 5000 });
+		await expect(page.getByText('Edit Me Agent')).toBeVisible({ timeout: 5000 });
+
+		// Click edit button (aria-label)
+		const editButton = page.getByRole('button', { name: 'Edit agent' });
+		await editButton.click();
+
+		// Edit the name in the dialog
+		await expect(page.getByRole('dialog')).toBeVisible({ timeout: 5000 });
+		await page.getByLabel('Name *').fill('Edited Agent');
+
+		// Save changes
+		await dialog.getByRole('button', { name: 'Save Changes' }).click();
+
+		// Should show updated name
+		await expect(page.getByRole('dialog')).not.toBeVisible({ timeout: 5000 });
+		await expect(page.getByText('Edited Agent')).toBeVisible({ timeout: 5000 });
+	});
+
+	test('can delete agent', async ({ page }) => {
+		// First create an agent
+		await page.goto('/settings?tab=agents');
+
+		const createButton = page.getByRole('button', { name: 'Create Agent' }).first();
+		await createButton.click();
+
+		await expect(page.getByRole('dialog')).toBeVisible({ timeout: 5000 });
+		await page.getByLabel('Name *').fill('Delete Me Agent');
+		await page.getByLabel('Description').fill('Will be deleted');
+
+		const dialog = page.getByRole('dialog');
+		await dialog.getByRole('button', { name: 'Create Agent' }).click();
+
+		// Wait for agent to appear
+		await expect(page.getByRole('dialog')).not.toBeVisible({ timeout: 5000 });
+		await expect(page.getByText('Delete Me Agent')).toBeVisible({ timeout: 5000 });
+
+		// Click delete button (aria-label)
+		const deleteButton = page.getByRole('button', { name: 'Delete agent' });
+		await deleteButton.click();
+
+		// Confirm deletion in dialog - look for the Delete button in the confirm dialog
+		await expect(page.getByRole('dialog')).toBeVisible({ timeout: 5000 });
+		const confirmDialog = page.getByRole('dialog');
+		await confirmDialog.getByRole('button', { name: 'Delete' }).click();
+
+		// Agent should be removed
+		await expect(page.getByRole('heading', { name: 'Delete Me Agent' })).not.toBeVisible({ timeout: 5000 });
+	});
+
+	test('can navigate to agents tab via navigation', async ({ page }) => {
+		await page.goto('/settings');
+
+		// Click on agents tab link
+		const agentsTab = page.getByRole('link', { name: 'Agents' });
+		await agentsTab.click();
+
+		// URL should update
+		await expect(page).toHaveURL(/tab=agents/);
+
+		// Agents content should be visible
+		await expect(page.getByRole('heading', { name: 'Agents', exact: true })).toBeVisible();
+	});
+});
+
+test.describe('Agent Tool Selection', () => {
+	test('can select tools for agent', async ({ page }) => {
+		await page.goto('/settings?tab=agents');
+
+		// Open create dialog
+		const createButton = page.getByRole('button', { name: 'Create Agent' }).first();
+		await createButton.click();
+
+		await expect(page.getByRole('dialog')).toBeVisible({ timeout: 5000 });
+		await page.getByLabel('Name *').fill('Tool Agent');
+		await page.getByLabel('Description').fill('Agent with specific tools');
+
+		// Look for Allowed Tools section
+		await expect(page.getByText('Allowed Tools', { exact: true })).toBeVisible({ timeout: 5000 });
+
+		// Save the agent
+		const dialog = page.getByRole('dialog');
+		await dialog.getByRole('button', { name: 'Create Agent' }).click();
+
+		// Agent should be created
+		await expect(page.getByRole('dialog')).not.toBeVisible({ timeout: 5000 });
+		await expect(page.getByText('Tool Agent')).toBeVisible({ timeout: 5000 });
+	});
+});
+
+test.describe('Agent Prompt Selection', () => {
+	test('can assign prompt to agent', async ({ page }) => {
+		await page.goto('/settings?tab=agents');
+
+		// Open create dialog
+		const createButton = page.getByRole('button', { name: 'Create Agent' }).first();
+		await createButton.click();
+
+		await expect(page.getByRole('dialog')).toBeVisible({ timeout: 5000 });
+		await page.getByLabel('Name *').fill('Prompt Agent');
+		await page.getByLabel('Description').fill('Agent with a prompt');
+
+		// Look for System Prompt selector
+		await expect(page.getByLabel('System Prompt')).toBeVisible({ timeout: 5000 });
+
+		// Save the agent
+		const dialog = page.getByRole('dialog');
+		await dialog.getByRole('button', { name: 'Create Agent' }).click();
+
+		// Agent should be created
+		await expect(page.getByRole('dialog')).not.toBeVisible({ timeout: 5000 });
+		await expect(page.getByText('Prompt Agent')).toBeVisible({ timeout: 5000 });
+	});
+});
+
+test.describe('Agent Chat Integration', () => {
+	test('agent selector appears on home page', async ({ page }) => {
+		await page.goto('/');
+
+		// Agent selector button should be visible (shows "No agent" by default)
+		await expect(page.getByRole('button', { name: /No agent/i })).toBeVisible({ timeout: 10000 });
+	});
+
+	test('agent selector dropdown shows "No agents" when none exist', async ({ page }) => {
+		await page.goto('/');
+
+		// Click on agent selector
+		const agentButton = page.getByRole('button', { name: /No agent/i });
+		await agentButton.click();
+
+		// Should show "No agents available" message
+		await expect(page.getByText('No agents available')).toBeVisible({ timeout: 5000 });
+
+		// Should have link to create agents
+		await expect(page.getByRole('link', { name: 'Create one' })).toBeVisible();
+	});
+
+	test('agent selector shows created agents', async ({ page }) => {
+		// First create an agent
+		await page.goto('/settings?tab=agents');
+
+		const createButton = page.getByRole('button', { name: 'Create Agent' }).first();
+		await createButton.click();
+
+		await expect(page.getByRole('dialog')).toBeVisible({ timeout: 5000 });
+		await page.getByLabel('Name *').fill('Chat Agent');
+		await page.getByLabel('Description').fill('Agent for chat testing');
+
+		const dialog = page.getByRole('dialog');
+		await dialog.getByRole('button', { name: 'Create Agent' }).click();
+
+		await expect(page.getByRole('dialog')).not.toBeVisible({ timeout: 5000 });
+
+		// Now go to home page and check agent selector
+		await page.goto('/');
+
+		const agentButton = page.getByRole('button', { name: /No agent/i });
+		await agentButton.click();
+
+		// Should show the created agent
+		await expect(page.getByText('Chat Agent')).toBeVisible({ timeout: 5000 });
+		await expect(page.getByText('Agent for chat testing')).toBeVisible();
+	});
+
+	test('can select agent from dropdown', async ({ page }) => {
+		// First create an agent
+		await page.goto('/settings?tab=agents');
+
+		const createButton = page.getByRole('button', { name: 'Create Agent' }).first();
+		await createButton.click();
+
+		await expect(page.getByRole('dialog')).toBeVisible({ timeout: 5000 });
+		await page.getByLabel('Name *').fill('Selectable Agent');
+		await page.getByLabel('Description').fill('Can be selected');
+
+		const dialog = page.getByRole('dialog');
+		await dialog.getByRole('button', { name: 'Create Agent' }).click();
+
+		await expect(page.getByRole('dialog')).not.toBeVisible({ timeout: 5000 });
+
+		// Go to home page
+		await page.goto('/');
+
+		// Open agent selector
+		const agentButton = page.getByRole('button', { name: /No agent/i });
+		await agentButton.click();
+
+		// Select the agent
+		await page.getByText('Selectable Agent').click();
+
+		// Button should now show the agent name
+		await expect(page.getByRole('button', { name: /Selectable Agent/i })).toBeVisible({ timeout: 5000 });
+	});
+});

frontend/e2e/app.spec.ts

@@ -0,0 +1,307 @@
+/**
+ * E2E tests for core application functionality
+ *
+ * Tests the main app UI, navigation, and user interactions
+ */
+
+import { test, expect } from '@playwright/test';
+
+test.describe('App Loading', () => {
+	test('loads the application', async ({ page }) => {
+		await page.goto('/');
+
+		// Should have the main app container
+		await expect(page.locator('body')).toBeVisible();
+
+		// Should have the sidebar (aside element with aria-label)
+		await expect(page.locator('aside[aria-label="Sidebar navigation"]')).toBeVisible();
+	});
+
+	test('shows the Vessel branding', async ({ page }) => {
+		await page.goto('/');
+
+		// Look for Vessel text in sidebar
+		await expect(page.getByText('Vessel')).toBeVisible({ timeout: 10000 });
+	});
+
+	test('has proper page title', async ({ page }) => {
+		await page.goto('/');
+
+		await expect(page).toHaveTitle(/vessel/i);
+	});
+});
+
+test.describe('Sidebar Navigation', () => {
+	test('sidebar is visible', async ({ page }) => {
+		await page.goto('/');
+
+		// Sidebar is an aside element
+		const sidebar = page.locator('aside[aria-label="Sidebar navigation"]');
+		await expect(sidebar).toBeVisible();
+	});
+
+	test('has new chat link', async ({ page }) => {
+		await page.goto('/');
+
+		// New Chat is an anchor tag with "New Chat" text
+		const newChatLink = page.getByRole('link', { name: /new chat/i });
+		await expect(newChatLink).toBeVisible();
+	});
+
+	test('clicking new chat navigates to home', async ({ page }) => {
+		await page.goto('/settings');
+
+		// Click new chat link
+		const newChatLink = page.getByRole('link', { name: /new chat/i });
+		await newChatLink.click();
+
+		// Should navigate to home
+		await expect(page).toHaveURL('/');
+	});
+
+	test('has settings link', async ({ page }) => {
+		await page.goto('/');
+
+		// Settings is an anchor tag
+		const settingsLink = page.getByRole('link', { name: /settings/i });
+		await expect(settingsLink).toBeVisible();
+	});
+
+	test('can navigate to settings', async ({ page }) => {
+		await page.goto('/');
+
+		// Click settings link
+		const settingsLink = page.getByRole('link', { name: /settings/i });
+		await settingsLink.click();
+
+		// Should navigate to settings
+		await expect(page).toHaveURL('/settings');
+	});
+
+	test('has new project button', async ({ page }) => {
+		await page.goto('/');
+
+		// New Project button
+		const newProjectButton = page.getByRole('button', { name: /new project/i });
+		await expect(newProjectButton).toBeVisible();
+	});
+
+	test('has import button', async ({ page }) => {
+		await page.goto('/');
+
+		// Import button has aria-label
+		const importButton = page.getByRole('button', { name: /import/i });
+		await expect(importButton).toBeVisible();
+	});
+});
+
+test.describe('Settings Page', () => {
+	test('settings page loads', async ({ page }) => {
+		await page.goto('/settings');
+
+		// Should show settings content
+		await expect(page.getByText(/general|models|prompts|tools/i).first()).toBeVisible({
+			timeout: 10000
+		});
+	});
+
+	test('has settings tabs', async ({ page }) => {
+		await page.goto('/settings');
+
+		// Wait for page to load
+		await page.waitForLoadState('networkidle');
+
+		// Should have multiple tabs/sections
+		const content = await page.content();
+		expect(content.toLowerCase()).toMatch(/general|models|prompts|tools|memory/);
+	});
+});
+
+test.describe('Chat Interface', () => {
+	test('home page shows chat area', async ({ page }) => {
+		await page.goto('/');
+
+		// Look for chat-related elements (message input area)
+		const chatArea = page.locator('main, [class*="chat"]').first();
+		await expect(chatArea).toBeVisible();
+	});
+
+	test('has textarea for message input', async ({ page }) => {
+		await page.goto('/');
+
+		// Chat input textarea
+		const textarea = page.locator('textarea').first();
+		await expect(textarea).toBeVisible({ timeout: 10000 });
+	});
+
+	test('can type in chat input', async ({ page }) => {
+		await page.goto('/');
+
+		// Find and type in textarea
+		const textarea = page.locator('textarea').first();
+		await textarea.fill('Hello, this is a test message');
+
+		await expect(textarea).toHaveValue('Hello, this is a test message');
+	});
+
+	test('has send button', async ({ page }) => {
+		await page.goto('/');
+
+		// Send button (usually has submit type or send icon)
+		const sendButton = page
+			.locator('button[type="submit"]')
+			.or(page.getByRole('button', { name: /send/i }));
+		await expect(sendButton.first()).toBeVisible({ timeout: 10000 });
+	});
+});
+
+test.describe('Model Selection', () => {
+	test('chat page renders model-related UI', async ({ page }) => {
+		await page.goto('/');
+
+		// The app should render without crashing
+		// Model selection depends on Ollama availability
+		await expect(page.locator('body')).toBeVisible();
+
+		// Check that there's either a model selector or a message about models
+		const hasModelUI = await page
+			.locator('[class*="model"], [class*="Model"]')
+			.or(page.getByText(/model|ollama/i))
+			.count();
+
+		// Just verify app renders - model UI depends on backend state
+		expect(hasModelUI).toBeGreaterThanOrEqual(0);
+	});
+});
+
+test.describe('Responsive Design', () => {
+	test('works on mobile viewport', async ({ page }) => {
+		await page.setViewportSize({ width: 375, height: 667 });
+		await page.goto('/');
+
+		// App should still render
+		await expect(page.locator('body')).toBeVisible();
+		await expect(page.getByText('Vessel')).toBeVisible();
+	});
+
+	test('sidebar collapses on mobile', async ({ page }) => {
+		await page.setViewportSize({ width: 375, height: 667 });
+		await page.goto('/');
+
+		// Sidebar should be collapsed (width: 0) on mobile
+		const sidebar = page.locator('aside[aria-label="Sidebar navigation"]');
+
+		// Check if sidebar has collapsed class or is hidden
+		await expect(sidebar).toHaveClass(/w-0|hidden/);
+	});
+
+	test('works on tablet viewport', async ({ page }) => {
+		await page.setViewportSize({ width: 768, height: 1024 });
+		await page.goto('/');
+
+		await expect(page.locator('body')).toBeVisible();
+	});
+
+	test('works on desktop viewport', async ({ page }) => {
+		await page.setViewportSize({ width: 1920, height: 1080 });
+		await page.goto('/');
+
+		await expect(page.locator('body')).toBeVisible();
+
+		// Sidebar should be visible on desktop
+		const sidebar = page.locator('aside[aria-label="Sidebar navigation"]');
+		await expect(sidebar).toBeVisible();
+	});
+});
+
+test.describe('Accessibility', () => {
+	test('has main content area', async ({ page }) => {
+		await page.goto('/');
+
+		// Should have main element
+		const main = page.locator('main');
+		await expect(main).toBeVisible();
+	});
+
+	test('sidebar has proper aria-label', async ({ page }) => {
+		await page.goto('/');
+
+		const sidebar = page.locator('aside[aria-label="Sidebar navigation"]');
+		await expect(sidebar).toBeVisible();
+	});
+
+	test('interactive elements are focusable', async ({ page }) => {
+		await page.goto('/');
+
+		// New Chat link should be focusable
+		const newChatLink = page.getByRole('link', { name: /new chat/i });
+		await newChatLink.focus();
+		await expect(newChatLink).toBeFocused();
+	});
+
+	test('can tab through interface', async ({ page }) => {
+		await page.goto('/');
+
+		// Focus on the first interactive element in the page
+		const firstLink = page.getByRole('link').first();
+		await firstLink.focus();
+
+		// Tab should move focus to another element
+		await page.keyboard.press('Tab');
+
+		// Wait a bit for focus to shift
+		await page.waitForTimeout(100);
+
+		// Verify we can interact with the page via keyboard
+		// Just check that pressing Tab doesn't cause errors
+		await page.keyboard.press('Tab');
+		await page.keyboard.press('Tab');
+
+		// Page should still be responsive
+		await expect(page.locator('body')).toBeVisible();
+	});
+});
+
+test.describe('Import Dialog', () => {
+	test('import button opens dialog', async ({ page }) => {
+		await page.goto('/');
+
+		// Click import button
+		const importButton = page.getByRole('button', { name: /import/i });
+		await importButton.click();
+
+		// Dialog should appear
+		await expect(page.getByRole('dialog')).toBeVisible({ timeout: 5000 });
+	});
+
+	test('import dialog can be closed', async ({ page }) => {
+		await page.goto('/');
+
+		// Open import dialog
+		const importButton = page.getByRole('button', { name: /import/i });
+		await importButton.click();
+
+		// Wait for dialog
+		const dialog = page.getByRole('dialog');
+		await expect(dialog).toBeVisible();
+
+		// Press escape to close
+		await page.keyboard.press('Escape');
+
+		// Dialog should be closed
+		await expect(dialog).not.toBeVisible({ timeout: 2000 });
+	});
+});
+
+test.describe('Project Modal', () => {
+	test('new project button opens modal', async ({ page }) => {
+		await page.goto('/');
+
+		// Click new project button
+		const newProjectButton = page.getByRole('button', { name: /new project/i });
+		await newProjectButton.click();
+
+		// Modal should appear
+		await expect(page.getByRole('dialog')).toBeVisible({ timeout: 5000 });
+	});
+});

frontend/package-lock.json

@@ -1,12 +1,13 @@
 {
   "name": "vessel",
-  "version": "0.3.0",
+  "version": "0.5.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "vessel",
-      "version": "0.3.0",
+      "version": "0.5.2",
+      "hasInstallScript": true,
       "dependencies": {
         "@codemirror/lang-javascript": "^6.2.3",
         "@codemirror/lang-json": "^6.0.1",
@@ -15,6 +16,8 @@
         "@skeletonlabs/skeleton": "^2.10.0",
         "@skeletonlabs/tw-plugin": "^0.4.0",
         "@sveltejs/adapter-node": "^5.4.0",
+        "@tanstack/svelte-virtual": "^3.13.15",
+        "@tanstack/virtual-core": "^3.13.15",
         "@types/dompurify": "^3.0.5",
         "codemirror": "^6.0.1",
         "dexie": "^4.0.10",
@@ -24,6 +27,7 @@
         "shiki": "^1.26.0"
       },
       "devDependencies": {
+        "@playwright/test": "^1.57.0",
         "@sveltejs/adapter-auto": "^4.0.0",
         "@sveltejs/kit": "^2.16.0",
         "@sveltejs/vite-plugin-svelte": "^5.1.1",
@@ -32,6 +36,7 @@
         "@testing-library/svelte": "^5.3.1",
         "@types/node": "^22.10.0",
         "autoprefixer": "^10.4.20",
+        "fake-indexeddb": "^6.2.5",
         "jsdom": "^27.4.0",
         "postcss": "^8.4.49",
         "svelte": "^5.16.0",
@@ -1170,6 +1175,22 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@playwright/test": {
+      "version": "1.57.0",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.57.0.tgz",
+      "integrity": "sha512-6TyEnHgd6SArQO8UO2OMTxshln3QMWBtPGrOCgs3wVEmQmwyuNtB10IZMfmYDE0riwNR1cu4q+pPcxMVtaG3TA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "playwright": "1.57.0"
+      },
+      "bin": {
+        "playwright": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@polka/url": {
       "version": "1.0.0-next.29",
       "license": "MIT"
@@ -1739,6 +1760,32 @@
         "tailwindcss": ">=3.0.0 || insiders || >=4.0.0-alpha.20 || >=4.0.0-beta.1"
       }
     },
+    "node_modules/@tanstack/svelte-virtual": {
+      "version": "3.13.15",
+      "resolved": "https://registry.npmjs.org/@tanstack/svelte-virtual/-/svelte-virtual-3.13.15.tgz",
+      "integrity": "sha512-3PPLI3hsyT70zSZhBkSIZXIarlN+GjFNKeKr2Wk1UR7EuEVtXgNlB/Zk0sYtaeJ4CvGvldQNakOvbdETnWAgeA==",
+      "license": "MIT",
+      "dependencies": {
+        "@tanstack/virtual-core": "3.13.15"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/tannerlinsley"
+      },
+      "peerDependencies": {
+        "svelte": "^3.48.0 || ^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/@tanstack/virtual-core": {
+      "version": "3.13.15",
+      "resolved": "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.13.15.tgz",
+      "integrity": "sha512-8cG3acM2cSIm3h8WxboHARAhQAJbYUhvmadvnN8uz8aziDwrbYb9KiARni+uY2qrLh49ycn+poGoxvtIAKhjog==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/tannerlinsley"
+      }
+    },
     "node_modules/@testing-library/dom": {
       "version": "10.4.1",
       "dev": true,
@@ -2511,6 +2558,16 @@
         "node": ">=12.0.0"
       }
     },
+    "node_modules/fake-indexeddb": {
+      "version": "6.2.5",
+      "resolved": "https://registry.npmjs.org/fake-indexeddb/-/fake-indexeddb-6.2.5.tgz",
+      "integrity": "sha512-CGnyrvbhPlWYMngksqrSSUT1BAVP49dZocrHuK0SvtR0D5TMs5wP0o3j7jexDJW01KSadjBp1M/71o/KR3nD1w==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/fast-glob": {
       "version": "3.3.3",
       "license": "MIT",
@@ -3151,6 +3208,53 @@
         "node": ">= 6"
       }
     },
+    "node_modules/playwright": {
+      "version": "1.57.0",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.57.0.tgz",
+      "integrity": "sha512-ilYQj1s8sr2ppEJ2YVadYBN0Mb3mdo9J0wQ+UuDhzYqURwSoW4n1Xs5vs7ORwgDGmyEh33tRMeS8KhdkMoLXQw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "playwright-core": "1.57.0"
+      },
+      "bin": {
+        "playwright": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "optionalDependencies": {
+        "fsevents": "2.3.2"
+      }
+    },
+    "node_modules/playwright-core": {
+      "version": "1.57.0",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.57.0.tgz",
+      "integrity": "sha512-agTcKlMw/mjBWOnD6kFZttAAGHgi/Nw0CZ2o6JqWSbMlI219lAFLZZCyqByTsvVAJq5XA5H8cA6PrvBRpBWEuQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "playwright-core": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/playwright/node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
     "node_modules/postcss": {
       "version": "8.5.6",
       "funding": [

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vessel",
-  "version": "0.4.8",
+  "version": "0.7.1",
   "private": true,
   "type": "module",
   "scripts": {
@@ -11,9 +11,13 @@
     "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
     "test": "vitest run",
     "test:watch": "vitest",
-    "test:coverage": "vitest run --coverage"
+    "test:coverage": "vitest run --coverage",
+    "test:e2e": "playwright test",
+    "test:e2e:ui": "playwright test --ui",
+    "postinstall": "cp node_modules/pdfjs-dist/build/pdf.worker.min.mjs static/ 2>/dev/null || true"
   },
   "devDependencies": {
+    "@playwright/test": "^1.57.0",
     "@sveltejs/adapter-auto": "^4.0.0",
     "@sveltejs/kit": "^2.16.0",
     "@sveltejs/vite-plugin-svelte": "^5.1.1",
@@ -22,6 +26,7 @@
     "@testing-library/svelte": "^5.3.1",
     "@types/node": "^22.10.0",
     "autoprefixer": "^10.4.20",
+    "fake-indexeddb": "^6.2.5",
     "jsdom": "^27.4.0",
     "postcss": "^8.4.49",
     "svelte": "^5.16.0",
@@ -37,10 +42,12 @@
     "@codemirror/lang-python": "^6.1.7",
     "@codemirror/theme-one-dark": "^6.1.2",
     "@skeletonlabs/skeleton": "^2.10.0",
-    "codemirror": "^6.0.1",
     "@skeletonlabs/tw-plugin": "^0.4.0",
     "@sveltejs/adapter-node": "^5.4.0",
+    "@tanstack/svelte-virtual": "^3.13.15",
+    "@tanstack/virtual-core": "^3.13.15",
     "@types/dompurify": "^3.0.5",
+    "codemirror": "^6.0.1",
     "dexie": "^4.0.10",
     "dompurify": "^3.2.0",
     "marked": "^15.0.0",

frontend/playwright.config.ts

@@ -0,0 +1,27 @@
+import { defineConfig, devices } from '@playwright/test';
+
+export default defineConfig({
+	testDir: './e2e',
+	fullyParallel: true,
+	forbidOnly: !!process.env.CI,
+	retries: process.env.CI ? 2 : 0,
+	workers: process.env.CI ? 1 : undefined,
+	reporter: 'html',
+	use: {
+		baseURL: process.env.BASE_URL || 'http://localhost:7842',
+		trace: 'on-first-retry',
+		screenshot: 'only-on-failure'
+	},
+	projects: [
+		{
+			name: 'chromium',
+			use: { ...devices['Desktop Chrome'] }
+		}
+	],
+	webServer: {
+		command: 'npm run dev',
+		url: 'http://localhost:7842',
+		reuseExistingServer: !process.env.CI,
+		timeout: 120000
+	}
+});

frontend/src/lib/backend/sync-manager.svelte.ts

@@ -330,6 +330,7 @@ class SyncManager {
 			updatedAt: new Date(backendChat.updated_at).getTime(),
 			isPinned: backendChat.pinned,
 			isArchived: backendChat.archived,
+			systemPromptId: backendChat.system_prompt_id ?? null,
 			messageCount: backendChat.messages?.length ?? existing?.messageCount ?? 0,
 			syncVersion: backendChat.sync_version
 		};
@@ -378,6 +379,7 @@ class SyncManager {
 			model: conv.model,
 			pinned: conv.isPinned,
 			archived: conv.isArchived,
+			system_prompt_id: conv.systemPromptId ?? undefined,
 			created_at: new Date(conv.createdAt).toISOString(),
 			updated_at: new Date(conv.updatedAt).toISOString(),
 			sync_version: conv.syncVersion ?? 1

frontend/src/lib/backend/types.ts

@@ -9,6 +9,7 @@ export interface BackendChat {
 	model: string;
 	pinned: boolean;
 	archived: boolean;
+	system_prompt_id?: string | null;
 	created_at: string;
 	updated_at: string;
 	sync_version: number;

frontend/src/lib/components/chat/AgentSelector.svelte

@@ -0,0 +1,217 @@
+<script lang="ts">
+	/**
+	 * AgentSelector - Dropdown to select an agent for the current conversation
+	 * Agents define a system prompt and tool set for the conversation
+	 */
+	import { agentsState, conversationsState, toastState } from '$lib/stores';
+	import { updateAgentId } from '$lib/storage';
+
+	interface Props {
+		conversationId?: string | null;
+		currentAgentId?: string | null;
+		/** Callback for 'new' mode - called when agent is selected without a conversation */
+		onSelect?: (agentId: string | null) => void;
+	}
+
+	let { conversationId = null, currentAgentId = null, onSelect }: Props = $props();
+
+	// UI state
+	let isOpen = $state(false);
+	let dropdownElement: HTMLDivElement | null = $state(null);
+
+	// Available agents from store
+	const agents = $derived(agentsState.sortedAgents);
+
+	// Current agent for this conversation
+	const currentAgent = $derived(
+		currentAgentId ? agents.find((a) => a.id === currentAgentId) : null
+	);
+
+	// Display text for the button
+	const buttonText = $derived(currentAgent?.name ?? 'No agent');
+
+	function toggleDropdown(): void {
+		isOpen = !isOpen;
+	}
+
+	function closeDropdown(): void {
+		isOpen = false;
+	}
+
+	async function handleSelect(agentId: string | null): Promise<void> {
+		// In 'new' mode (no conversation), use the callback
+		if (!conversationId) {
+			onSelect?.(agentId);
+			const agentName = agentId ? agents.find((a) => a.id === agentId)?.name : null;
+			toastState.success(agentName ? `Using "${agentName}"` : 'No agent selected');
+			closeDropdown();
+			return;
+		}
+
+		// Update in storage for existing conversation
+		const result = await updateAgentId(conversationId, agentId);
+		if (result.success) {
+			conversationsState.setAgentId(conversationId, agentId);
+			const agentName = agentId ? agents.find((a) => a.id === agentId)?.name : null;
+			toastState.success(agentName ? `Using "${agentName}"` : 'No agent selected');
+		} else {
+			toastState.error('Failed to update agent');
+		}
+
+		closeDropdown();
+	}
+
+	function handleClickOutside(event: MouseEvent): void {
+		if (dropdownElement && !dropdownElement.contains(event.target as Node)) {
+			closeDropdown();
+		}
+	}
+
+	function handleKeydown(event: KeyboardEvent): void {
+		if (event.key === 'Escape' && isOpen) {
+			closeDropdown();
+		}
+	}
+</script>
+
+<svelte:window onclick={handleClickOutside} onkeydown={handleKeydown} />
+
+<div class="relative" bind:this={dropdownElement}>
+	<!-- Trigger button -->
+	<button
+		type="button"
+		onclick={toggleDropdown}
+		class="flex items-center gap-1.5 rounded-lg px-2.5 py-1.5 text-xs font-medium transition-colors {currentAgent
+			? 'bg-indigo-500/20 text-indigo-300'
+			: 'text-theme-muted hover:bg-theme-secondary hover:text-theme-secondary'}"
+		title={currentAgent ? `Agent: ${currentAgent.name}` : 'Select an agent'}
+	>
+		<!-- Robot icon -->
+		<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="h-3.5 w-3.5">
+			<path fill-rule="evenodd" d="M10 1a.75.75 0 0 1 .75.75v1.5a.75.75 0 0 1-1.5 0v-1.5A.75.75 0 0 1 10 1ZM5.05 3.05a.75.75 0 0 1 1.06 0l1.062 1.06A.75.75 0 1 1 6.11 5.173L5.05 4.11a.75.75 0 0 1 0-1.06Zm9.9 0a.75.75 0 0 1 0 1.06l-1.06 1.062a.75.75 0 0 1-1.062-1.061l1.061-1.06a.75.75 0 0 1 1.06 0ZM3 8a7 7 0 0 1 14 0v2a1 1 0 0 0 1 1h.25a.75.75 0 0 1 0 1.5H18v1a3 3 0 0 1-3 3H5a3 3 0 0 1-3-3v-1h-.25a.75.75 0 0 1 0-1.5H2a1 1 0 0 0 1-1V8Zm5.75 3.5a.75.75 0 0 0-1.5 0v1a.75.75 0 0 0 1.5 0v-1Zm4 0a.75.75 0 0 0-1.5 0v1a.75.75 0 0 0 1.5 0v-1Z" clip-rule="evenodd" />
+		</svg>
+		<span class="max-w-[100px] truncate">{buttonText}</span>
+		<svg
+			xmlns="http://www.w3.org/2000/svg"
+			viewBox="0 0 20 20"
+			fill="currentColor"
+			class="h-3.5 w-3.5 transition-transform {isOpen ? 'rotate-180' : ''}"
+		>
+			<path
+				fill-rule="evenodd"
+				d="M5.22 8.22a.75.75 0 0 1 1.06 0L10 11.94l3.72-3.72a.75.75 0 1 1 1.06 1.06l-4.25 4.25a.75.75 0 0 1-1.06 0L5.22 9.28a.75.75 0 0 1 0-1.06Z"
+				clip-rule="evenodd"
+			/>
+		</svg>
+	</button>
+
+	<!-- Dropdown menu (opens upward) -->
+	{#if isOpen}
+		<div
+			class="absolute bottom-full left-0 z-50 mb-1 max-h-80 w-64 overflow-y-auto rounded-lg border border-theme bg-theme-secondary py-1 shadow-xl"
+		>
+			<!-- No agent option -->
+			<div class="px-3 py-1.5 text-xs font-medium text-theme-muted uppercase tracking-wide">
+				Default
+			</div>
+			<button
+				type="button"
+				onclick={() => handleSelect(null)}
+				class="flex w-full items-center gap-2 px-3 py-2 text-left text-sm transition-colors hover:bg-theme-tertiary {!currentAgentId
+					? 'bg-theme-tertiary/50 text-theme-primary'
+					: 'text-theme-secondary'}"
+			>
+				<div class="flex-1">
+					<span>No agent</span>
+					<div class="mt-0.5 text-xs text-theme-muted">
+						Use default tools and prompts
+					</div>
+				</div>
+				{#if !currentAgentId}
+					<svg
+						xmlns="http://www.w3.org/2000/svg"
+						viewBox="0 0 20 20"
+						fill="currentColor"
+						class="h-4 w-4 text-emerald-400"
+					>
+						<path
+							fill-rule="evenodd"
+							d="M16.704 4.153a.75.75 0 0 1 .143 1.052l-8 10.5a.75.75 0 0 1-1.127.075l-4.5-4.5a.75.75 0 0 1 1.06-1.06l3.894 3.893 7.48-9.817a.75.75 0 0 1 1.05-.143Z"
+							clip-rule="evenodd"
+						/>
+					</svg>
+				{/if}
+			</button>
+
+			{#if agents.length > 0}
+				<div class="my-1 border-t border-theme"></div>
+				<div class="px-3 py-1.5 text-xs font-medium text-theme-muted uppercase tracking-wide">
+					Your Agents
+				</div>
+
+				<!-- Available agents -->
+				{#each agents as agent}
+					<button
+						type="button"
+						onclick={() => handleSelect(agent.id)}
+						class="flex w-full flex-col gap-0.5 px-3 py-2 text-left transition-colors hover:bg-theme-tertiary {currentAgentId === agent.id
+							? 'bg-theme-tertiary/50'
+							: ''}"
+					>
+						<div class="flex items-center gap-2">
+							<span
+								class="flex-1 text-sm font-medium {currentAgentId === agent.id
+									? 'text-theme-primary'
+									: 'text-theme-secondary'}"
+							>
+								{agent.name}
+							</span>
+							{#if currentAgentId === agent.id}
+								<svg
+									xmlns="http://www.w3.org/2000/svg"
+									viewBox="0 0 20 20"
+									fill="currentColor"
+									class="h-4 w-4 text-emerald-400"
+								>
+									<path
+										fill-rule="evenodd"
+										d="M16.704 4.153a.75.75 0 0 1 .143 1.052l-8 10.5a.75.75 0 0 1-1.127.075l-4.5-4.5a.75.75 0 0 1 1.06-1.06l3.894 3.893 7.48-9.817a.75.75 0 0 1 1.05-.143Z"
+										clip-rule="evenodd"
+									/>
+								</svg>
+							{/if}
+						</div>
+						{#if agent.description}
+							<span class="line-clamp-1 text-xs text-theme-muted">{agent.description}</span>
+						{/if}
+						{#if agent.enabledToolNames.length > 0}
+							<span class="text-[10px] text-indigo-400">
+								{agent.enabledToolNames.length} tool{agent.enabledToolNames.length !== 1 ? 's' : ''}
+							</span>
+						{/if}
+					</button>
+				{/each}
+			{:else}
+				<div class="my-1 border-t border-theme"></div>
+				<div class="px-3 py-2 text-xs text-theme-muted">
+					No agents available. <a href="/settings?tab=agents" class="text-indigo-400 hover:underline"
+						>Create one</a
+					>
+				</div>
+			{/if}
+
+			<!-- Link to agents settings -->
+			<div class="mt-1 border-t border-theme"></div>
+			<a
+				href="/settings?tab=agents"
+				class="flex items-center gap-2 px-3 py-2 text-xs text-theme-muted hover:bg-theme-tertiary hover:text-theme-secondary"
+				onclick={closeDropdown}
+			>
+				<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="h-3.5 w-3.5">
+					<path fill-rule="evenodd" d="M8.34 1.804A1 1 0 0 1 9.32 1h1.36a1 1 0 0 1 .98.804l.295 1.473c.497.144.971.342 1.416.587l1.25-.834a1 1 0 0 1 1.262.125l.962.962a1 1 0 0 1 .125 1.262l-.834 1.25c.245.445.443.919.587 1.416l1.473.295a1 1 0 0 1 .804.98v1.36a1 1 0 0 1-.804.98l-1.473.295a6.95 6.95 0 0 1-.587 1.416l.834 1.25a1 1 0 0 1-.125 1.262l-.962.962a1 1 0 0 1-1.262.125l-1.25-.834a6.953 6.953 0 0 1-1.416.587l-.295 1.473a1 1 0 0 1-.98.804H9.32a1 1 0 0 1-.98-.804l-.295-1.473a6.957 6.957 0 0 1-1.416-.587l-1.25.834a1 1 0 0 1-1.262-.125l-.962-.962a1 1 0 0 1-.125-1.262l.834-1.25a6.957 6.957 0 0 1-.587-1.416l-1.473-.295A1 1 0 0 1 1 10.68V9.32a1 1 0 0 1 .804-.98l1.473-.295c.144-.497.342-.971.587-1.416l-.834-1.25a1 1 0 0 1 .125-1.262l.962-.962A1 1 0 0 1 5.38 3.03l1.25.834a6.957 6.957 0 0 1 1.416-.587l.294-1.473ZM13 10a3 3 0 1 1-6 0 3 3 0 0 1 6 0Z" clip-rule="evenodd" />
+				</svg>
+				Manage agents
+			</a>
+		</div>
+	{/if}
+</div>

frontend/src/lib/components/chat/AttachmentDisplay.svelte

@@ -0,0 +1,270 @@
+<script lang="ts">
+	/**
+	 * AttachmentDisplay - Shows attached files on messages
+	 * Displays compact badges with file info, supports image preview and download
+	 */
+
+	import { getAttachmentMetaByIds, getAttachment, createDownloadUrl } from '$lib/storage';
+	import type { AttachmentMeta, StoredAttachment } from '$lib/storage';
+
+	interface Props {
+		/** Array of attachment IDs to display */
+		attachmentIds: string[];
+	}
+
+	const { attachmentIds }: Props = $props();
+
+	// Attachment metadata loaded from IndexedDB
+	let attachments = $state<AttachmentMeta[]>([]);
+	let loading = $state(true);
+	let error = $state<string | null>(null);
+
+	// Image preview modal state
+	let previewImage = $state<{ url: string; filename: string } | null>(null);
+	let downloadingId = $state<string | null>(null);
+
+	// Load attachments when IDs change
+	$effect(() => {
+		if (attachmentIds.length > 0) {
+			loadAttachments();
+		} else {
+			attachments = [];
+			loading = false;
+		}
+	});
+
+	async function loadAttachments(): Promise<void> {
+		loading = true;
+		error = null;
+
+		const result = await getAttachmentMetaByIds(attachmentIds);
+		if (result.success) {
+			attachments = result.data;
+		} else {
+			error = result.error;
+		}
+		loading = false;
+	}
+
+	/**
+	 * Get icon for attachment type
+	 */
+	function getTypeIcon(type: string): string {
+		switch (type) {
+			case 'image':
+				return 'M2.25 15.75l5.159-5.159a2.25 2.25 0 013.182 0l5.159 5.159m-1.5-1.5l1.409-1.409a2.25 2.25 0 013.182 0l2.909 2.909m-18 3.75h16.5a1.5 1.5 0 001.5-1.5V6a1.5 1.5 0 00-1.5-1.5H3.75A1.5 1.5 0 002.25 6v12a1.5 1.5 0 001.5 1.5zm10.5-11.25h.008v.008h-.008V8.25zm.375 0a.375.375 0 11-.75 0 .375.375 0 01.75 0z';
+			case 'pdf':
+				return 'M19.5 14.25v-2.625a3.375 3.375 0 00-3.375-3.375h-1.5A1.125 1.125 0 0113.5 7.125v-1.5a3.375 3.375 0 00-3.375-3.375H8.25m0 12.75h7.5m-7.5 3H12M10.5 2.25H5.625c-.621 0-1.125.504-1.125 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125V11.25a9 9 0 00-9-9z';
+			case 'text':
+				return 'M19.5 14.25v-2.625a3.375 3.375 0 00-3.375-3.375h-1.5A1.125 1.125 0 0113.5 7.125v-1.5a3.375 3.375 0 00-3.375-3.375H8.25m2.25 0H5.625c-.621 0-1.125.504-1.125 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125V11.25a9 9 0 00-9-9z';
+			default:
+				return 'M18.375 12.739l-7.693 7.693a4.5 4.5 0 01-6.364-6.364l10.94-10.94A3 3 0 1119.5 7.372L8.552 18.32m.009-.01l-.01.01m5.699-9.941l-7.81 7.81a1.5 1.5 0 002.112 2.13';
+		}
+	}
+
+	/**
+	 * Get color class for attachment type
+	 */
+	function getTypeColor(type: string): string {
+		switch (type) {
+			case 'image':
+				return 'text-violet-400 bg-violet-500/20';
+			case 'pdf':
+				return 'text-red-400 bg-red-500/20';
+			case 'text':
+				return 'text-emerald-400 bg-emerald-500/20';
+			default:
+				return 'text-slate-400 bg-slate-500/20';
+		}
+	}
+
+	/**
+	 * Format file size for display
+	 */
+	function formatSize(bytes: number): string {
+		if (bytes < 1024) return `${bytes} B`;
+		if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`;
+		return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
+	}
+
+	/**
+	 * Handle attachment click - preview for images, download for others
+	 */
+	async function handleClick(attachment: AttachmentMeta): Promise<void> {
+		if (attachment.type === 'image') {
+			await showImagePreview(attachment);
+		} else {
+			await downloadAttachment(attachment);
+		}
+	}
+
+	/**
+	 * Show image preview modal
+	 */
+	async function showImagePreview(attachment: AttachmentMeta): Promise<void> {
+		const result = await getAttachment(attachment.id);
+		if (result.success && result.data) {
+			const url = createDownloadUrl(result.data);
+			previewImage = { url, filename: attachment.filename };
+		}
+	}
+
+	/**
+	 * Close image preview and revoke URL
+	 */
+	function closePreview(): void {
+		if (previewImage) {
+			URL.revokeObjectURL(previewImage.url);
+			previewImage = null;
+		}
+	}
+
+	/**
+	 * Download attachment
+	 */
+	async function downloadAttachment(attachment: AttachmentMeta): Promise<void> {
+		downloadingId = attachment.id;
+
+		try {
+			const result = await getAttachment(attachment.id);
+			if (result.success && result.data) {
+				const url = createDownloadUrl(result.data);
+				const a = document.createElement('a');
+				a.href = url;
+				a.download = attachment.filename;
+				document.body.appendChild(a);
+				a.click();
+				document.body.removeChild(a);
+				URL.revokeObjectURL(url);
+			}
+		} finally {
+			downloadingId = null;
+		}
+	}
+
+	/**
+	 * Handle keyboard events for attachment buttons
+	 */
+	function handleKeydown(event: KeyboardEvent, attachment: AttachmentMeta): void {
+		if (event.key === 'Enter' || event.key === ' ') {
+			event.preventDefault();
+			handleClick(attachment);
+		}
+	}
+</script>
+
+{#if loading}
+	<div class="flex items-center gap-2 text-sm text-theme-muted">
+		<svg class="h-4 w-4 animate-spin" viewBox="0 0 24 24" fill="none">
+			<circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
+			<path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4z"></path>
+		</svg>
+		<span>Loading attachments...</span>
+	</div>
+{:else if error}
+	<div class="text-sm text-red-400">
+		Failed to load attachments: {error}
+	</div>
+{:else if attachments.length > 0}
+	<div class="mt-2 flex flex-wrap gap-2">
+		{#each attachments as attachment (attachment.id)}
+			<button
+				type="button"
+				onclick={() => handleClick(attachment)}
+				onkeydown={(e) => handleKeydown(e, attachment)}
+				class="group flex items-center gap-2 rounded-lg px-3 py-1.5 text-sm transition-colors hover:brightness-110 {getTypeColor(attachment.type)}"
+				title={attachment.type === 'image' ? 'Click to preview' : 'Click to download'}
+			>
+				<!-- Type icon -->
+				<svg
+					xmlns="http://www.w3.org/2000/svg"
+					fill="none"
+					viewBox="0 0 24 24"
+					stroke-width="1.5"
+					stroke="currentColor"
+					class="h-4 w-4 flex-shrink-0"
+				>
+					<path stroke-linecap="round" stroke-linejoin="round" d={getTypeIcon(attachment.type)} />
+				</svg>
+
+				<!-- Filename (truncated) -->
+				<span class="max-w-[150px] truncate">
+					{attachment.filename}
+				</span>
+
+				<!-- Size -->
+				<span class="text-xs opacity-70">
+					{formatSize(attachment.size)}
+				</span>
+
+				<!-- Analyzed badge -->
+				{#if attachment.analyzed}
+					<span class="rounded bg-amber-500/30 px-1 py-0.5 text-[10px] font-medium text-amber-300" title="Content was summarized by AI">
+						analyzed
+					</span>
+				{/if}
+
+				<!-- Download/loading indicator -->
+				{#if downloadingId === attachment.id}
+					<svg class="h-3 w-3 animate-spin" viewBox="0 0 24 24" fill="none">
+						<circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
+						<path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4z"></path>
+					</svg>
+				{:else if attachment.type !== 'image'}
+					<svg
+						xmlns="http://www.w3.org/2000/svg"
+						fill="none"
+						viewBox="0 0 24 24"
+						stroke-width="1.5"
+						stroke="currentColor"
+						class="h-3 w-3 opacity-0 transition-opacity group-hover:opacity-100"
+					>
+						<path stroke-linecap="round" stroke-linejoin="round" d="M3 16.5v2.25A2.25 2.25 0 005.25 21h13.5A2.25 2.25 0 0021 18.75V16.5M16.5 12L12 16.5m0 0L7.5 12m4.5 4.5V3" />
+					</svg>
+				{/if}
+			</button>
+		{/each}
+	</div>
+{/if}
+
+<!-- Image preview modal -->
+{#if previewImage}
+	<div
+		class="fixed inset-0 z-50 flex items-center justify-center bg-black/80 backdrop-blur-sm"
+		role="dialog"
+		aria-modal="true"
+		aria-label="Image preview"
+	>
+		<button
+			type="button"
+			onclick={closePreview}
+			class="absolute inset-0"
+			aria-label="Close preview"
+		></button>
+
+		<div class="relative max-h-[90vh] max-w-[90vw]">
+			<img
+				src={previewImage.url}
+				alt={previewImage.filename}
+				class="max-h-[85vh] max-w-full rounded-lg object-contain"
+			/>
+
+			<!-- Close button -->
+			<button
+				type="button"
+				onclick={closePreview}
+				class="absolute -right-3 -top-3 flex h-8 w-8 items-center justify-center rounded-full bg-slate-800 text-white shadow-lg hover:bg-slate-700"
+				aria-label="Close preview"
+			>
+				<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" class="h-5 w-5">
+					<path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
+				</svg>
+			</button>
+
+			<!-- Filename -->
+			<div class="mt-2 text-center text-sm text-white/70">
+				{previewImage.filename}
+			</div>
+		</div>
+	</div>
+{/if}

frontend/src/lib/components/chat/BranchNavigator.svelte

@@ -2,7 +2,6 @@
 	/**
 	 * BranchNavigator - Navigate between message branches
 	 * Shows "< 1/3 >" style navigation for sibling messages
-	 * Supports keyboard navigation with arrow keys when focused
 	 */
 
 	import type { BranchInfo } from '$lib/types';
@@ -15,7 +14,7 @@
 	const { branchInfo, onSwitch }: Props = $props();
 
 	// Reference to the navigator container for focus management
-	let navigatorRef: HTMLDivElement | null = $state(null);
+	let navigatorRef: HTMLElement | null = $state(null);
 
 	// Track transition state for smooth animations
 	let isTransitioning = $state(false);
@@ -52,7 +51,7 @@
 	}
 
 	/**
-	 * Handle keyboard navigation when the component is focused
+	 * Handle keyboard navigation with arrow keys
 	 */
 	function handleKeydown(event: KeyboardEvent): void {
 		if (event.key === 'ArrowLeft' && canGoPrev) {
@@ -65,11 +64,10 @@
 	}
 </script>
 
-<div
+<nav
 	bind:this={navigatorRef}
 	class="inline-flex items-center gap-1 rounded-full bg-gray-100 px-2 py-0.5 text-xs text-gray-600 transition-all duration-150 ease-out dark:bg-gray-700 dark:text-gray-300"
 	class:opacity-50={isTransitioning}
-	role="navigation"
 	aria-label="Message branch navigation - Use left/right arrow keys to navigate"
 	tabindex="0"
 	onkeydown={handleKeydown}
@@ -126,16 +124,16 @@
 			/>
 		</svg>
 	</button>
-</div>
+</nav>
 
 <style>
 	/* Focus ring style for keyboard navigation */
-	div:focus {
+	nav:focus {
 		outline: none;
 		box-shadow: 0 0 0 2px rgba(59, 130, 246, 0.5);
 	}
 
-	div:focus-visible {
+	nav:focus-visible {
 		outline: none;
 		box-shadow: 0 0 0 2px rgba(59, 130, 246, 0.5);
 	}

frontend/src/lib/components/chat/BranchNavigator.test.ts

@@ -0,0 +1,154 @@
+/**
+ * BranchNavigator component tests
+ *
+ * Tests the message branch navigation component
+ */
+
+import { describe, it, expect, vi } from 'vitest';
+import { render, screen, fireEvent } from '@testing-library/svelte';
+import BranchNavigator from './BranchNavigator.svelte';
+
+describe('BranchNavigator', () => {
+	const defaultBranchInfo = {
+		currentIndex: 0,
+		totalCount: 3,
+		siblingIds: ['msg-1', 'msg-2', 'msg-3']
+	};
+
+	it('renders with branch info', () => {
+		render(BranchNavigator, {
+			props: {
+				branchInfo: defaultBranchInfo
+			}
+		});
+
+		// Should show 1/3 (currentIndex + 1)
+		expect(screen.getByText('1/3')).toBeDefined();
+	});
+
+	it('renders navigation role', () => {
+		render(BranchNavigator, {
+			props: {
+				branchInfo: defaultBranchInfo
+			}
+		});
+
+		const nav = screen.getByRole('navigation');
+		expect(nav).toBeDefined();
+		expect(nav.getAttribute('aria-label')).toContain('branch navigation');
+	});
+
+	it('has prev and next buttons', () => {
+		render(BranchNavigator, {
+			props: {
+				branchInfo: defaultBranchInfo
+			}
+		});
+
+		const buttons = screen.getAllByRole('button');
+		expect(buttons).toHaveLength(2);
+		expect(buttons[0].getAttribute('aria-label')).toContain('Previous');
+		expect(buttons[1].getAttribute('aria-label')).toContain('Next');
+	});
+
+	it('calls onSwitch with prev when prev button clicked', async () => {
+		const onSwitch = vi.fn();
+		render(BranchNavigator, {
+			props: {
+				branchInfo: defaultBranchInfo,
+				onSwitch
+			}
+		});
+
+		const prevButton = screen.getAllByRole('button')[0];
+		await fireEvent.click(prevButton);
+
+		expect(onSwitch).toHaveBeenCalledWith('prev');
+	});
+
+	it('calls onSwitch with next when next button clicked', async () => {
+		const onSwitch = vi.fn();
+		render(BranchNavigator, {
+			props: {
+				branchInfo: defaultBranchInfo,
+				onSwitch
+			}
+		});
+
+		const nextButton = screen.getAllByRole('button')[1];
+		await fireEvent.click(nextButton);
+
+		expect(onSwitch).toHaveBeenCalledWith('next');
+	});
+
+	it('updates display when currentIndex changes', () => {
+		const { rerender } = render(BranchNavigator, {
+			props: {
+				branchInfo: { ...defaultBranchInfo, currentIndex: 1 }
+			}
+		});
+
+		expect(screen.getByText('2/3')).toBeDefined();
+
+		rerender({
+			branchInfo: { ...defaultBranchInfo, currentIndex: 2 }
+		});
+
+		expect(screen.getByText('3/3')).toBeDefined();
+	});
+
+	it('handles keyboard navigation with left arrow', async () => {
+		const onSwitch = vi.fn();
+		render(BranchNavigator, {
+			props: {
+				branchInfo: defaultBranchInfo,
+				onSwitch
+			}
+		});
+
+		const nav = screen.getByRole('navigation');
+		await fireEvent.keyDown(nav, { key: 'ArrowLeft' });
+
+		expect(onSwitch).toHaveBeenCalledWith('prev');
+	});
+
+	it('handles keyboard navigation with right arrow', async () => {
+		const onSwitch = vi.fn();
+		render(BranchNavigator, {
+			props: {
+				branchInfo: defaultBranchInfo,
+				onSwitch
+			}
+		});
+
+		const nav = screen.getByRole('navigation');
+		await fireEvent.keyDown(nav, { key: 'ArrowRight' });
+
+		expect(onSwitch).toHaveBeenCalledWith('next');
+	});
+
+	it('is focusable for keyboard navigation', () => {
+		render(BranchNavigator, {
+			props: {
+				branchInfo: defaultBranchInfo
+			}
+		});
+
+		const nav = screen.getByRole('navigation');
+		expect(nav.getAttribute('tabindex')).toBe('0');
+	});
+
+	it('shows correct count for single message', () => {
+		render(BranchNavigator, {
+			props: {
+				branchInfo: {
+					currentIndex: 0,
+					totalCount: 1,
+					siblingIds: ['msg-1']
+				}
+			}
+		});
+
+		expect(screen.getByText('1/1')).toBeDefined();
+	});
+});

frontend/src/lib/components/chat/ChatInput.svelte

@@ -7,13 +7,14 @@
 
 	import { modelsState } from '$lib/stores';
 	import type { FileAttachment } from '$lib/types/attachment.js';
-	import { formatAttachmentsForMessage, processFile } from '$lib/utils/file-processor.js';
+	import { processFile } from '$lib/utils/file-processor.js';
 	import { isImageMimeType } from '$lib/types/attachment.js';
 	import { estimateMessageTokens, formatTokenCount } from '$lib/memory/tokenizer';
 	import FileUpload from './FileUpload.svelte';
 
 	interface Props {
-		onSend?: (content: string, images?: string[]) => void;
+		/** Callback when message is sent. Includes content, images for vision models, and pending file attachments to persist */
+		onSend?: (content: string, images?: string[], pendingAttachments?: FileAttachment[]) => void;
 		onStop?: () => void;
 		isStreaming?: boolean;
 		disabled?: boolean;
@@ -47,6 +48,7 @@
 	// Drag overlay state
 	let isDragOver = $state(false);
 	let dragCounter = 0; // Track enter/leave for nested elements
+	let dragResetTimeout: ReturnType<typeof setTimeout> | null = null;
 
 	// Derived state
 	const hasContent = $derived(
@@ -98,20 +100,14 @@
 
 	/**
 	 * Send the message
+	 * Passes raw attachments to ChatWindow which handles analysis
 	 */
 	function handleSend(): void {
 		if (!canSend) return;
 
-		let content = inputValue.trim();
+		const content = inputValue.trim();
 		const images = pendingImages.length > 0 ? [...pendingImages] : undefined;
-
-		// Prepend file attachments content to the message
-		if (pendingAttachments.length > 0) {
-			const attachmentContent = formatAttachmentsForMessage(pendingAttachments);
-			if (attachmentContent) {
-				content = attachmentContent + (content ? '\n\n' + content : '');
-			}
-		}
+		const attachments = pendingAttachments.length > 0 ? [...pendingAttachments] : undefined;
 
 		// Clear input, images, and attachments
 		inputValue = '';
@@ -123,7 +119,8 @@
 			textareaElement.style.height = 'auto';
 		}
 
-		onSend?.(content, images);
+		// Pass raw content + attachments to parent (ChatWindow handles analysis)
+		onSend?.(content, images, attachments);
 
 		// Keep focus on input after sending
 		requestAnimationFrame(() => focusInput());
@@ -172,19 +169,44 @@
 	$effect(() => {
 		if (disabled) return;
 
+		// Helper to reset drag state with optional delay
+		function resetDragState(): void {
+			dragCounter = 0;
+			isDragOver = false;
+			if (dragResetTimeout) {
+				clearTimeout(dragResetTimeout);
+				dragResetTimeout = null;
+			}
+		}
+
+		// Schedule a fallback reset in case events get lost
+		function scheduleFallbackReset(): void {
+			if (dragResetTimeout) {
+				clearTimeout(dragResetTimeout);
+			}
+			// Reset after 100ms of no drag activity
+			dragResetTimeout = setTimeout(() => {
+				if (isDragOver) {
+					resetDragState();
+				}
+			}, 100);
+		}
+
 		function onDragEnter(event: DragEvent): void {
 			if (!event.dataTransfer?.types.includes('Files')) return;
 			event.preventDefault();
 			dragCounter++;
 			isDragOver = true;
+			scheduleFallbackReset();
 		}
 
 		function onDragLeave(event: DragEvent): void {
 			event.preventDefault();
 			dragCounter--;
 			if (dragCounter <= 0) {
-				dragCounter = 0;
-				isDragOver = false;
+				resetDragState();
+			} else {
+				scheduleFallbackReset();
 			}
 		}
 
@@ -194,12 +216,13 @@
 			if (event.dataTransfer) {
 				event.dataTransfer.dropEffect = 'copy';
 			}
+			// Keep resetting the timeout while actively dragging
+			scheduleFallbackReset();
 		}
 
 		function onDrop(event: DragEvent): void {
 			event.preventDefault();
-			isDragOver = false;
-			dragCounter = 0;
+			resetDragState();
 
 			if (!event.dataTransfer?.files.length) return;
 			const files = Array.from(event.dataTransfer.files);
@@ -216,6 +239,9 @@
 			document.removeEventListener('dragleave', onDragLeave);
 			document.removeEventListener('dragover', onDragOver);
 			document.removeEventListener('drop', onDrop);
+			if (dragResetTimeout) {
+				clearTimeout(dragResetTimeout);
+			}
 		};
 	});
 
@@ -252,8 +278,13 @@
 			}
 		}
 
-		// Process other files
+		// Process other files (limit to 5 total attachments)
+		const MAX_ATTACHMENTS = 5;
 		for (const file of otherFiles) {
+			if (pendingAttachments.length >= MAX_ATTACHMENTS) {
+				console.warn(`Maximum ${MAX_ATTACHMENTS} files reached, skipping remaining files`);
+				break;
+			}
 			const result = await processFile(file);
 			if (result.success) {
 				pendingAttachments = [...pendingAttachments, result.attachment];
@@ -360,7 +391,7 @@
 		></textarea>
 
 		<!-- Action buttons -->
-		<div class="flex items-center">
+		<div class="flex items-center gap-2">
 			{#if showStopButton}
 				<!-- Stop button -->
 				<button

frontend/src/lib/components/chat/ChatWindow.svelte

@@ -4,11 +4,17 @@
 	 * Handles sending messages, streaming responses, and tool execution
 	 */
 
-	import { chatState, modelsState, conversationsState, toolsState, promptsState, toastState } from '$lib/stores';
+	import { chatState, modelsState, conversationsState, toolsState, promptsState, toastState, agentsState } from '$lib/stores';
+	import { backendsState } from '$lib/stores/backends.svelte';
+	import { resolveSystemPrompt } from '$lib/services/prompt-resolution.js';
 	import { serverConversationsState } from '$lib/stores/server-conversations.svelte';
 	import { streamingMetricsState } from '$lib/stores/streaming-metrics.svelte';
 	import { ollamaClient } from '$lib/ollama';
-	import { addMessage as addStoredMessage, updateConversation, createConversation as createStoredConversation } from '$lib/storage';
+	import { unifiedLLMClient, type ChatMessage as UnifiedChatMessage } from '$lib/llm';
+	import { addMessage as addStoredMessage, updateConversation, createConversation as createStoredConversation, saveAttachments } from '$lib/storage';
+	import type { FileAttachment } from '$lib/types/attachment.js';
+	import { fileAnalyzer, analyzeFilesInBatches, formatAnalyzedAttachment, type AnalysisResult } from '$lib/services/fileAnalyzer.js';
+	import { attachmentService } from '$lib/services/attachmentService.js';
 	import {
 		contextManager,
 		generateSummary,
@@ -19,10 +25,10 @@
 		formatResultsAsContext,
 		getKnowledgeBaseStats
 	} from '$lib/memory';
-	import { runToolCalls, formatToolResultsForChat, getFunctionModel, USE_FUNCTION_MODEL } from '$lib/tools';
+	import { runToolCalls, formatToolResultsForChat, getFunctionModel, USE_FUNCTION_MODEL, parseTextToolCalls } from '$lib/tools';
 	import type { OllamaMessage, OllamaToolCall, OllamaToolDefinition } from '$lib/ollama';
 	import type { Conversation } from '$lib/types/conversation';
-	import MessageList from './MessageList.svelte';
+	import VirtualMessageList from './VirtualMessageList.svelte';
 	import ChatInput from './ChatInput.svelte';
 	import EmptyState from './EmptyState.svelte';
 	import ContextUsageBar from './ContextUsageBar.svelte';
@@ -30,28 +36,35 @@
 	import SummaryBanner from './SummaryBanner.svelte';
 	import StreamingStats from './StreamingStats.svelte';
 	import SystemPromptSelector from './SystemPromptSelector.svelte';
+	import AgentSelector from './AgentSelector.svelte';
 	import ModelParametersPanel from '$lib/components/settings/ModelParametersPanel.svelte';
 	import { settingsState } from '$lib/stores/settings.svelte';
+	import { buildProjectContext, formatProjectContextForPrompt, hasProjectContext } from '$lib/services/project-context.js';
+	import { updateSummaryOnLeave } from '$lib/services/conversation-summary.js';
 
 	/**
 	 * Props interface for ChatWindow
 	 * - mode: 'new' for new chat page, 'conversation' for existing conversations
 	 * - onFirstMessage: callback for when first message is sent in 'new' mode
 	 * - conversation: conversation metadata when in 'conversation' mode
+	 * - initialMessage: auto-send this message when conversation loads (for new project chats)
 	 */
 	interface Props {
 		mode?: 'new' | 'conversation';
-		onFirstMessage?: (content: string, images?: string[]) => Promise<void>;
+		onFirstMessage?: (content: string, images?: string[], attachments?: FileAttachment[]) => Promise<void>;
 		conversation?: Conversation | null;
 		/** Bindable prop for thinking mode - synced with parent in 'new' mode */
 		thinkingEnabled?: boolean;
+		/** Initial message to auto-send when conversation loads */
+		initialMessage?: string | null;
 	}
 
 	let {
 		mode = 'new',
 		onFirstMessage,
 		conversation,
-		thinkingEnabled = $bindable(true)
+		thinkingEnabled = $bindable(true),
+		initialMessage = null
 	}: Props = $props();
 
 	// Local state for abort controller
@@ -62,11 +75,15 @@
 
 	// Context full modal state
 	let showContextFullModal = $state(false);
-	let pendingMessage: { content: string; images?: string[] } | null = $state(null);
+	let pendingMessage: { content: string; images?: string[]; attachments?: FileAttachment[] } | null = $state(null);
 
 	// Tool execution state
 	let isExecutingTools = $state(false);
 
+	// File analysis state
+	let isAnalyzingFiles = $state(false);
+	let analyzingFileNames = $state<string[]>([]);
+
 	// RAG (Retrieval-Augmented Generation) state
 	let ragEnabled = $state(true);
 	let hasKnowledgeBase = $state(false);
@@ -75,6 +92,9 @@
 	// System prompt for new conversations (before a conversation is created)
 	let newChatPromptId = $state<string | null>(null);
 
+	// Agent for new conversations (before a conversation is created)
+	let newChatAgentId = $state<string | null>(null);
+
 	// File picker trigger function (bound from ChatInput -> FileUpload)
 	let triggerFilePicker: (() => void) | undefined = $state();
 
@@ -118,6 +138,26 @@
 		}
 	});
 
+	// Track if initial message has been sent to prevent re-sending
+	let initialMessageSent = $state(false);
+
+	// Auto-send initial message when conversation is ready
+	$effect(() => {
+		if (
+			mode === 'conversation' &&
+			initialMessage &&
+			!initialMessageSent &&
+			chatState.conversationId === conversation?.id &&
+			!chatState.isStreaming
+		) {
+			initialMessageSent = true;
+			// Small delay to ensure UI is ready
+			setTimeout(() => {
+				handleSendMessage(initialMessage);
+			}, 100);
+		}
+	});
+
 	/**
 	 * Check if knowledge base has any documents
 	 */
@@ -132,12 +172,22 @@
 
 	/**
 	 * Retrieve relevant context from knowledge base for the query
+	 * @param query - The search query
+	 * @param projectId - If set, search only project docs; if null, search global docs; if undefined, search all
 	 */
-	async function retrieveRagContext(query: string): Promise<string | null> {
+	async function retrieveRagContext(
+		query: string,
+		projectId?: string | null
+	): Promise<string | null> {
 		if (!ragEnabled || !hasKnowledgeBase) return null;
 
 		try {
-			const results = await searchSimilar(query, 3, 0.5);
+			// Lower threshold (0.3) to catch more relevant results
+			const results = await searchSimilar(query, {
+				topK: 5,
+				threshold: 0.3,
+				projectId
+			});
 			if (results.length === 0) return null;
 
 			const context = formatResultsAsContext(results);
@@ -148,6 +198,27 @@
 		}
 	}
 
+	/**
+	 * Retrieve project context (instructions, summaries, chat history)
+	 * Only applicable when the conversation belongs to a project
+	 */
+	async function retrieveProjectContext(query: string): Promise<string | null> {
+		const projectId = conversation?.projectId;
+		const conversationId = chatState.conversationId;
+
+		if (!projectId || !conversationId) return null;
+
+		try {
+			const context = await buildProjectContext(projectId, conversationId, query);
+			if (!hasProjectContext(context)) return null;
+
+			return formatProjectContextForPrompt(context);
+		} catch (error) {
+			console.error('[ProjectContext] Failed to retrieve context:', error);
+			return null;
+		}
+	}
+
 	/**
 	 * Convert OllamaToolCall to the format expected by tool executor
 	 * Ollama doesn't provide IDs, so we generate them
@@ -164,9 +235,18 @@
 
 	/**
 	 * Get tool definitions for the API call
+	 * If an agent is selected, only returns tools the agent has enabled
 	 */
 	function getToolsForApi(): OllamaToolDefinition[] | undefined {
 		if (!toolsState.toolsEnabled) return undefined;
+
+		// If an agent is selected, filter tools by agent's enabled list
+		if (currentAgent) {
+			const tools = toolsState.getToolDefinitionsForAgent(currentAgent.enabledToolNames);
+			return tools.length > 0 ? tools as OllamaToolDefinition[] : undefined;
+		}
+
+		// No agent - use all enabled tools
 		const tools = toolsState.getEnabledToolDefinitions();
 		return tools.length > 0 ? tools as OllamaToolDefinition[] : undefined;
 	}
@@ -174,6 +254,13 @@
 	// Derived: Check if there are any messages
 	const hasMessages = $derived(chatState.visibleMessages.length > 0);
 
+	// Derived: Current agent (from conversation or new chat selection)
+	const currentAgent = $derived.by(() => {
+		const agentId = mode === 'conversation' ? conversation?.agentId : newChatAgentId;
+		if (!agentId) return null;
+		return agentsState.get(agentId) ?? null;
+	});
+
 	// Update context manager when model changes
 	$effect(() => {
 		const model = modelsState.selectedId;
@@ -213,16 +300,71 @@
 		}
 	});
 
+	// Track previous conversation for summary generation on switch
+	let previousConversationId: string | null = null;
+	let previousConversationMessages: typeof chatState.visibleMessages = [];
+
+	// Trigger summary generation when leaving a conversation
+	$effect(() => {
+		const currentId = conversation?.id || null;
+		const currentMessages = chatState.visibleMessages;
+		const currentModel = modelsState.selectedId;
+
+		// Store current messages for when we leave
+		if (currentId) {
+			previousConversationMessages = [...currentMessages];
+		}
+
+		// When conversation changes, summarize the previous one
+		if (previousConversationId && previousConversationId !== currentId && currentModel) {
+			// Need to copy values for the closure
+			const prevId = previousConversationId;
+			const prevMessages = previousConversationMessages.map((m) => ({
+				role: m.message.role,
+				content: m.message.content
+			}));
+
+			updateSummaryOnLeave(prevId, prevMessages, currentModel);
+		}
+
+		previousConversationId = currentId;
+	});
+
 	/**
 	 * Convert chat state messages to Ollama API format
 	 * Uses messagesForContext to exclude summarized originals but include summaries
+	 * Now includes attachment content loaded from IndexedDB
 	 */
-	function getMessagesForApi(): OllamaMessage[] {
-		return chatState.messagesForContext.map((node) => ({
-			role: node.message.role as OllamaMessage['role'],
-			content: node.message.content,
-			images: node.message.images
-		}));
+	async function getMessagesForApi(): Promise<OllamaMessage[]> {
+		const messages: OllamaMessage[] = [];
+
+		for (const node of chatState.messagesForContext) {
+			let content = node.message.content;
+			let images = node.message.images;
+
+			// Load attachment content if present
+			if (node.message.attachmentIds && node.message.attachmentIds.length > 0) {
+				// Load text content from attachments
+				const attachmentContent = await attachmentService.buildOllamaContent(node.message.attachmentIds);
+				if (attachmentContent) {
+					content = content + '\n\n' + attachmentContent;
+				}
+
+				// Load image base64 from attachments
+				const attachmentImages = await attachmentService.buildOllamaImages(node.message.attachmentIds);
+				if (attachmentImages.length > 0) {
+					images = [...(images || []), ...attachmentImages];
+				}
+			}
+
+			messages.push({
+				role: node.message.role as OllamaMessage['role'],
+				content,
+				images
+			});
+		}
+
+		return messages;
 	}
 
 	/**
@@ -271,6 +413,49 @@
 		}
 	}
 
+	/**
+	 * Handle automatic compaction of older messages
+	 * Called after assistant response completes when auto-compact is enabled
+	 */
+	async function handleAutoCompact(): Promise<void> {
+		// Check if auto-compact should be triggered
+		if (!contextManager.shouldAutoCompact()) return;
+
+		const selectedModel = modelsState.selectedId;
+		if (!selectedModel || isSummarizing) return;
+
+		const messages = chatState.visibleMessages;
+		const preserveCount = contextManager.getAutoCompactPreserveCount();
+		const { toSummarize } = selectMessagesForSummarization(messages, 0, preserveCount);
+
+		if (toSummarize.length < 2) return;
+
+		isSummarizing = true;
+
+		try {
+			// Generate summary using the LLM
+			const summary = await generateSummary(toSummarize, selectedModel);
+
+			// Mark original messages as summarized
+			const messageIdsToSummarize = toSummarize.map((node) => node.id);
+			chatState.markAsSummarized(messageIdsToSummarize);
+
+			// Insert the summary message (inline indicator will be shown by MessageList)
+			chatState.insertSummaryMessage(summary);
+
+			// Force context recalculation
+			contextManager.updateMessages(chatState.visibleMessages, true);
+
+			// Subtle notification for auto-compact (inline indicator is the primary feedback)
+			console.log(`[Auto-compact] Summarized ${toSummarize.length} messages`);
+		} catch (error) {
+			console.error('[Auto-compact] Failed:', error);
+			// Silent failure for auto-compact - don't interrupt user flow
+		} finally {
+			isSummarizing = false;
+		}
+	}
+
 	// =========================================================================
 	// Context Full Modal Handlers
 	// =========================================================================
@@ -284,9 +469,9 @@
 
 		// After summarization, try to send the pending message
 		if (pendingMessage && contextManager.contextUsage.percentage < 100) {
-			const { content, images } = pendingMessage;
+			const { content, images, attachments } = pendingMessage;
 			pendingMessage = null;
-			await handleSendMessage(content, images);
+			await handleSendMessage(content, images, attachments);
 		} else if (pendingMessage) {
 			// Still full after summarization - show toast
 			toastState.warning('Context still full after summarization. Try starting a new chat.');
@@ -313,10 +498,10 @@
 
 		// Try to send the message anyway (may fail or get truncated)
 		if (pendingMessage) {
-			const { content, images } = pendingMessage;
+			const { content, images, attachments } = pendingMessage;
 			pendingMessage = null;
 			// Bypass the context check by calling the inner logic directly
-			await sendMessageInternal(content, images);
+			await sendMessageInternal(content, images, attachments);
 		}
 	}
 
@@ -328,7 +513,7 @@
 	/**
 	 * Send a message - checks context and may show modal
 	 */
-	async function handleSendMessage(content: string, images?: string[]): Promise<void> {
+	async function handleSendMessage(content: string, images?: string[], attachments?: FileAttachment[]): Promise<void> {
 		const selectedModel = modelsState.selectedId;
 
 		if (!selectedModel) {
@@ -339,24 +524,46 @@
 		// Check if context is full (100%+)
 		if (contextManager.contextUsage.percentage >= 100) {
 			// Store pending message and show modal
-			pendingMessage = { content, images };
+			pendingMessage = { content, images, attachments };
 			showContextFullModal = true;
 			return;
 		}
 
-		await sendMessageInternal(content, images);
+		await sendMessageInternal(content, images, attachments);
+	}
+
+	/**
+	 * Get current model name based on active backend
+	 */
+	async function getCurrentModelName(): Promise<string | null> {
+		if (backendsState.activeType === 'ollama') {
+			return modelsState.selectedId;
+		} else if (backendsState.activeType === 'llamacpp' || backendsState.activeType === 'lmstudio') {
+			try {
+				const response = await fetch('/api/v1/ai/models');
+				if (response.ok) {
+					const data = await response.json();
+					if (data.models && data.models.length > 0) {
+						return data.models[0].name;
+					}
+				}
+			} catch (err) {
+				console.error('Failed to get model from backend:', err);
+			}
+		}
+		return null;
 	}
 
 	/**
 	 * Internal: Send message and stream response (bypasses context check)
 	 */
-	async function sendMessageInternal(content: string, images?: string[]): Promise<void> {
-		const selectedModel = modelsState.selectedId;
+	async function sendMessageInternal(content: string, images?: string[], attachments?: FileAttachment[]): Promise<void> {
+		const selectedModel = await getCurrentModelName();
 		if (!selectedModel) return;
 
 		// In 'new' mode with no messages yet, create conversation first
 		if (mode === 'new' && !hasMessages && onFirstMessage) {
-			await onFirstMessage(content, images);
+			await onFirstMessage(content, images, attachments);
 			return;
 		}
 
@@ -379,36 +586,161 @@
 			}
 		}
 
-		// Add user message to tree
+		// Collect attachment IDs if we have attachments to save
+		let attachmentIds: string[] | undefined;
+		if (attachments && attachments.length > 0) {
+			attachmentIds = attachments.map(a => a.id);
+		}
+
+		// Add user message to tree (including attachmentIds for display)
 		const userMessageId = chatState.addMessage({
 			role: 'user',
 			content,
-			images
+			images,
+			attachmentIds
 		});
 
-		// Persist user message to IndexedDB with the SAME ID as chatState
+		// Persist user message and attachments to IndexedDB
 		if (conversationId) {
 			const parentId = chatState.activePath.length >= 2
 				? chatState.activePath[chatState.activePath.length - 2]
 				: null;
-			await addStoredMessage(conversationId, { role: 'user', content, images }, parentId, userMessageId);
+
+			// Save attachments first (they need the messageId)
+			if (attachments && attachments.length > 0) {
+				// Use original File objects for storage (preserves binary data)
+				const files = attachments.map((a) => {
+					if (a.originalFile) {
+						return a.originalFile;
+					}
+					// Fallback: reconstruct from processed data (shouldn't be needed normally)
+					if (a.base64Data) {
+						const binary = atob(a.base64Data);
+						const bytes = new Uint8Array(binary.length);
+						for (let i = 0; i < binary.length; i++) {
+							bytes[i] = binary.charCodeAt(i);
+						}
+						return new File([bytes], a.filename, { type: a.mimeType });
+					}
+					// For text/PDF without original, create placeholder (download won't work)
+					console.warn(`No original file for attachment ${a.filename}, download may not work`);
+					return new File([a.textContent || ''], a.filename, { type: a.mimeType });
+				});
+
+				const saveResult = await saveAttachments(userMessageId, files, attachments);
+				if (!saveResult.success) {
+					console.error('Failed to save attachments:', saveResult.error);
+				}
+			}
+
+			// Save message with attachmentIds
+			await addStoredMessage(conversationId, { role: 'user', content, images, attachmentIds }, parentId, userMessageId);
 		}
 
-		// Stream assistant message with optional tool support
-		await streamAssistantResponse(selectedModel, userMessageId, conversationId);
+		// Process attachments if any
+		let contentForOllama = content;
+		let processingMessageId: string | undefined;
+
+		if (attachments && attachments.length > 0) {
+			// Show processing indicator - this message will become the assistant response
+			isAnalyzingFiles = true;
+			analyzingFileNames = attachments.map(a => a.filename);
+			processingMessageId = chatState.startStreaming();
+			const fileCount = attachments.length;
+			const fileLabel = fileCount === 1 ? 'file' : 'files';
+			chatState.setStreamContent(`Processing ${fileCount} ${fileLabel}...`);
+
+			try {
+				// Check if any files need actual LLM analysis
+				// Force analysis when >3 files to prevent context overflow (max 5 files allowed)
+				const forceAnalysis = attachments.length > 3;
+				const filesToAnalyze = forceAnalysis
+					? attachments.filter(a => a.textContent && a.textContent.length > 2000)
+					: attachments.filter(a => fileAnalyzer.shouldAnalyze(a));
+
+				if (filesToAnalyze.length > 0) {
+					// Update indicator to show analysis
+					chatState.setStreamContent(`Analyzing ${filesToAnalyze.length} ${filesToAnalyze.length === 1 ? 'file' : 'files'}...`);
+
+					const analysisResults = await analyzeFilesInBatches(filesToAnalyze, selectedModel, 3);
+
+					// Update attachments with results
+					filesToAnalyze.forEach((file) => {
+						const result = analysisResults.get(file.id);
+						if (result) {
+							file.analyzed = result.analyzed;
+							file.summary = result.summary;
+						}
+					});
+
+					// Build formatted content with file summaries
+					const formattedParts: string[] = [content];
+
+					for (const attachment of attachments) {
+						const result = analysisResults.get(attachment.id);
+						if (result) {
+							formattedParts.push(formatAnalyzedAttachment(attachment, result));
+						} else if (attachment.textContent) {
+							// Non-analyzed text attachment
+							formattedParts.push(`<file name="${attachment.filename}">\n${attachment.textContent}\n</file>`);
+						}
+					}
+
+					contentForOllama = formattedParts.join('\n\n');
+				} else {
+					// No files need analysis, format with content
+					const parts: string[] = [content];
+					for (const a of attachments) {
+						if (a.textContent) {
+							parts.push(`<file name="${a.filename}">\n${a.textContent}\n</file>`);
+						}
+					}
+					contentForOllama = parts.join('\n\n');
+				}
+
+				// Keep "Processing..." visible - LLM streaming will replace it
+
+			} catch (error) {
+				console.error('[ChatWindow] File processing failed:', error);
+				chatState.setStreamContent('Processing failed, proceeding with original content...');
+				await new Promise(r => setTimeout(r, 1000));
+
+				// Fallback: use original content with raw file text
+				const parts: string[] = [content];
+				for (const a of attachments) {
+					if (a.textContent) {
+						parts.push(`<file name="${a.filename}">\n${a.textContent}\n</file>`);
+					}
+				}
+				contentForOllama = parts.join('\n\n');
+			} finally {
+				isAnalyzingFiles = false;
+				analyzingFileNames = [];
+			}
+		}
+
+		// Stream assistant message (reuse processing message if it exists)
+		await streamAssistantResponse(selectedModel, userMessageId, conversationId, contentForOllama, processingMessageId);
 	}
 
 	/**
 	 * Stream assistant response with tool call handling and RAG context
+	 * @param contentOverride Optional content to use instead of the last user message content (for formatted attachments)
 	 */
 	async function streamAssistantResponse(
 		model: string,
 		parentMessageId: string,
-		conversationId: string | null
+		conversationId: string | null,
+		contentOverride?: string,
+		existingMessageId?: string
 	): Promise<void> {
-		const assistantMessageId = chatState.startStreaming();
+		// Reuse existing message (e.g., from "Processing..." indicator) or create new one
+		const assistantMessageId = existingMessageId || chatState.startStreaming();
 		abortController = new AbortController();
 
+		// Track if we need to clear the "Processing..." text on first token
+		let needsClearOnFirstToken = !!existingMessageId;
+
 		// Start streaming metrics tracking
 		streamingMetricsState.startStream();
 
@@ -416,48 +748,68 @@
 		let pendingToolCalls: OllamaToolCall[] | null = null;
 
 		try {
-			let messages = getMessagesForApi();
+			let messages = await getMessagesForApi();
 			const tools = getToolsForApi();
 
-			// Build system prompt from active prompt + thinking + RAG context
-			const systemParts: string[] = [];
-
-			// Wait for prompts to be loaded
-			await promptsState.ready();
-
-			// Priority: per-conversation prompt > new chat prompt > global active prompt > none
-			let promptContent: string | null = null;
-			if (conversation?.systemPromptId) {
-				// Use per-conversation prompt
-				const conversationPrompt = promptsState.get(conversation.systemPromptId);
-				if (conversationPrompt) {
-					promptContent = conversationPrompt.content;
+			// If we have a content override (formatted attachments), replace the last user message content
+			if (contentOverride && messages.length > 0) {
+				const lastUserIndex = messages.findLastIndex(m => m.role === 'user');
+				if (lastUserIndex !== -1) {
+					messages = [
+						...messages.slice(0, lastUserIndex),
+						{ ...messages[lastUserIndex], content: contentOverride },
+						...messages.slice(lastUserIndex + 1)
+					];
 				}
-			} else if (newChatPromptId) {
-				// Use new chat selected prompt (before conversation is created)
-				const newChatPrompt = promptsState.get(newChatPromptId);
-				if (newChatPrompt) {
-					promptContent = newChatPrompt.content;
-				}
-			} else if (promptsState.activePrompt) {
-				// Fall back to global active prompt
-				promptContent = promptsState.activePrompt.content;
 			}
 
-			if (promptContent) {
-				systemParts.push(promptContent);
+			// Build system prompt from resolution service + RAG context
+			const systemParts: string[] = [];
+
+			// Resolve system prompt using priority chain:
+			// 1. Per-conversation prompt
+			// 2. New chat selection
+			// 3. Agent prompt (if agent selected)
+			// 4. Model-prompt mapping
+			// 5. Model-embedded prompt (from Modelfile)
+			// 6. Capability-matched prompt
+			// 7. Global active prompt
+			// 8. None
+			const resolvedPrompt = await resolveSystemPrompt(
+				model,
+				conversation?.systemPromptId,
+				newChatPromptId,
+				currentAgent?.promptId,
+				currentAgent?.name
+			);
+
+			if (resolvedPrompt.content) {
+				systemParts.push(resolvedPrompt.content);
+			}
+
+			// Project context: Retrieve instructions, summaries, and chat history
+			const lastUserMessage = messages.filter(m => m.role === 'user').pop();
+			if (lastUserMessage && conversation?.projectId) {
+				const projectContext = await retrieveProjectContext(lastUserMessage.content);
+				if (projectContext) {
+					systemParts.push(projectContext);
+				}
 			}
 
 			// RAG: Retrieve relevant context for the last user message
-			const lastUserMessage = messages.filter(m => m.role === 'user').pop();
+			// If in a project, search project documents; otherwise search global documents
 			if (lastUserMessage && ragEnabled && hasKnowledgeBase) {
-				const ragContext = await retrieveRagContext(lastUserMessage.content);
+				const ragProjectId = conversation?.projectId ?? null;
+				const ragContext = await retrieveRagContext(lastUserMessage.content, ragProjectId);
 				if (ragContext) {
 					lastRagContext = ragContext;
 					systemParts.push(`You have access to a knowledge base. Use the following relevant context to help answer the user's question. If the context isn't relevant, you can ignore it.\n\n${ragContext}`);
 				}
 			}
 
+			// Always add language instruction
+			systemParts.push('Always respond in the same language the user writes in. Default to English if unclear.');
+
 			// Inject combined system message
 			if (systemParts.length > 0) {
 				const systemMessage: OllamaMessage = {
@@ -479,7 +831,91 @@
 			let streamingThinking = '';
 			let thinkingClosed = false;
 
-			await ollamaClient.streamChatWithCallbacks(
+			// Common completion handler for both clients
+			const handleStreamComplete = async () => {
+				// Close thinking block if it was opened but not closed (e.g., tool calls without content)
+				if (streamingThinking && !thinkingClosed) {
+					chatState.appendToStreaming('</think>\n\n');
+					thinkingClosed = true;
+				}
+
+				chatState.finishStreaming();
+				streamingMetricsState.endStream();
+				abortController = null;
+
+				// Handle native tool calls if received (Ollama only)
+				if (pendingToolCalls && pendingToolCalls.length > 0) {
+					await executeToolsAndContinue(
+						model,
+						assistantMessageId,
+						pendingToolCalls,
+						conversationId
+					);
+					return; // Tool continuation handles persistence
+				}
+
+				// Check for text-based tool calls (models without native tool calling)
+				const node = chatState.messageTree.get(assistantMessageId);
+				if (node && toolsState.toolsEnabled) {
+					const { toolCalls: textToolCalls, cleanContent } = parseTextToolCalls(node.message.content);
+					if (textToolCalls.length > 0) {
+						// Convert to OllamaToolCall format
+						const convertedCalls: OllamaToolCall[] = textToolCalls.map(tc => ({
+							function: {
+								name: tc.name,
+								arguments: tc.arguments
+							}
+						}));
+
+						// Update message content to remove the raw tool call text
+						if (cleanContent !== node.message.content) {
+							node.message.content = cleanContent || 'Using tool...';
+						}
+
+						await executeToolsAndContinue(
+							model,
+							assistantMessageId,
+							convertedCalls,
+							conversationId
+						);
+						return; // Tool continuation handles persistence
+					}
+				}
+
+				// Persist assistant message to IndexedDB with the SAME ID as chatState
+				if (conversationId) {
+					const nodeForPersist = chatState.messageTree.get(assistantMessageId);
+					if (nodeForPersist) {
+						await addStoredMessage(
+							conversationId,
+							{ role: 'assistant', content: nodeForPersist.message.content },
+							parentMessageId,
+							assistantMessageId
+						);
+						await updateConversation(conversationId, {});
+						conversationsState.update(conversationId, {});
+					}
+				}
+
+				// Check for auto-compact after response completes
+				await handleAutoCompact();
+			};
+
+			// Common error handler for both clients
+			const handleStreamError = (error: unknown) => {
+				console.error('Streaming error:', error);
+				// Show error to user instead of leaving "Processing..."
+				const errorMsg = error instanceof Error ? error.message : 'Unknown error';
+				chatState.setStreamContent(`⚠️ Error: ${errorMsg}`);
+				chatState.finishStreaming();
+				streamingMetricsState.endStream();
+				abortController = null;
+			};
+
+			// Use appropriate client based on active backend
+			if (backendsState.activeType === 'ollama') {
+				// Ollama - full feature support (thinking, native tool calls)
+				await ollamaClient.streamChatWithCallbacks(
 				{
 					model: chatModel,
 					messages,
@@ -489,6 +925,11 @@
 				},
 				{
 					onThinkingToken: (token) => {
+						// Clear "Processing..." on first token
+						if (needsClearOnFirstToken) {
+							chatState.setStreamContent('');
+							needsClearOnFirstToken = false;
+						}
 						// Accumulate thinking and update the message
 						if (!streamingThinking) {
 							// Start the thinking block
@@ -500,6 +941,11 @@
 						streamingMetricsState.incrementTokens();
 					},
 					onToken: (token) => {
+						// Clear "Processing..." on first token
+						if (needsClearOnFirstToken) {
+							chatState.setStreamContent('');
+							needsClearOnFirstToken = false;
+						}
 						// Close thinking block when content starts
 						if (streamingThinking && !thinkingClosed) {
 							chatState.appendToStreaming('</think>\n\n');
@@ -513,53 +959,47 @@
 						// Store tool calls to process after streaming completes
 						pendingToolCalls = toolCalls;
 					},
-					onComplete: async () => {
-						// Close thinking block if it was opened but not closed (e.g., tool calls without content)
-						if (streamingThinking && !thinkingClosed) {
-							chatState.appendToStreaming('</think>\n\n');
-							thinkingClosed = true;
-						}
-
-						chatState.finishStreaming();
-						streamingMetricsState.endStream();
-						abortController = null;
-
-						// Handle tool calls if received
-						if (pendingToolCalls && pendingToolCalls.length > 0) {
-							await executeToolsAndContinue(
-								model,
-								assistantMessageId,
-								pendingToolCalls,
-								conversationId
-							);
-							return; // Tool continuation handles persistence
-						}
-
-						// Persist assistant message to IndexedDB with the SAME ID as chatState
-						if (conversationId) {
-							const node = chatState.messageTree.get(assistantMessageId);
-							if (node) {
-								await addStoredMessage(
-									conversationId,
-									{ role: 'assistant', content: node.message.content },
-									parentMessageId,
-									assistantMessageId
-								);
-								await updateConversation(conversationId, {});
-								conversationsState.update(conversationId, {});
-							}
-						}
-					},
-					onError: (error) => {
-						console.error('Streaming error:', error);
-						chatState.finishStreaming();
-						streamingMetricsState.endStream();
-						abortController = null;
-					}
+					onComplete: handleStreamComplete,
+					onError: handleStreamError
 				},
 				abortController.signal
 			);
+			} else {
+				// llama.cpp / LM Studio - basic streaming via unified API
+				const unifiedMessages: UnifiedChatMessage[] = messages.map(m => ({
+					role: m.role as 'system' | 'user' | 'assistant' | 'tool',
+					content: m.content,
+					images: m.images
+				}));
+
+				await unifiedLLMClient.streamChatWithCallbacks(
+					{
+						model: chatModel,
+						messages: unifiedMessages,
+						options: settingsState.apiParameters
+					},
+					{
+						onToken: (token) => {
+							// Clear "Processing..." on first token
+							if (needsClearOnFirstToken) {
+								chatState.setStreamContent('');
+								needsClearOnFirstToken = false;
+							}
+							chatState.appendToStreaming(token);
+							// Track content tokens for metrics
+							streamingMetricsState.incrementTokens();
+						},
+						onComplete: handleStreamComplete,
+						onError: handleStreamError
+					},
+					abortController.signal
+				);
+			}
 		} catch (error) {
+			console.error('Failed to send message:', error);
+			// Show error to user
+			const errorMsg = error instanceof Error ? error.message : 'Unknown error';
+			chatState.setStreamContent(`⚠️ Error: ${errorMsg}`);
 			toastState.error('Failed to send message. Please try again.');
 			chatState.finishStreaming();
 			streamingMetricsState.endStream();
@@ -708,7 +1148,7 @@
 
 		try {
 			// Get messages for API - excludes the current empty assistant message being streamed
-			const messages = getMessagesForApi().filter(m => m.content !== '');
+			const messages = (await getMessagesForApi()).filter(m => m.content !== '');
 			const tools = getToolsForApi();
 
 			// Use function model for tool routing if enabled and tools are present
@@ -736,7 +1176,7 @@
 						streamingMetricsState.endStream();
 						abortController = null;
 
-						// Handle tool calls if received
+						// Handle native tool calls if received
 						if (pendingToolCalls && pendingToolCalls.length > 0) {
 							await executeToolsAndContinue(
 								selectedModel,
@@ -747,13 +1187,41 @@
 							return;
 						}
 
+						// Check for text-based tool calls (models without native tool calling)
+						const node = chatState.messageTree.get(newMessageId);
+						if (node && toolsState.toolsEnabled) {
+							const { toolCalls: textToolCalls, cleanContent } = parseTextToolCalls(node.message.content);
+							if (textToolCalls.length > 0) {
+								// Convert to OllamaToolCall format
+								const convertedCalls: OllamaToolCall[] = textToolCalls.map(tc => ({
+									function: {
+										name: tc.name,
+										arguments: tc.arguments
+									}
+								}));
+
+								// Update message content to remove the raw tool call text
+								if (cleanContent !== node.message.content) {
+									node.message.content = cleanContent || 'Using tool...';
+								}
+
+								await executeToolsAndContinue(
+									selectedModel,
+									newMessageId,
+									convertedCalls,
+									conversationId
+								);
+								return;
+							}
+						}
+
 						// Persist regenerated assistant message to IndexedDB with the SAME ID
 						if (conversationId && parentUserMessageId) {
-							const node = chatState.messageTree.get(newMessageId);
-							if (node) {
+							const nodeForPersist = chatState.messageTree.get(newMessageId);
+							if (nodeForPersist) {
 								await addStoredMessage(
 									conversationId,
-									{ role: 'assistant', content: node.message.content },
+									{ role: 'assistant', content: nodeForPersist.message.content },
 									parentUserMessageId,
 									newMessageId
 								);
@@ -765,6 +1233,8 @@
 					},
 					onError: (error) => {
 						console.error('Regenerate error:', error);
+						const errorMsg = error instanceof Error ? error.message : 'Unknown error';
+						chatState.setStreamContent(`⚠️ Error: ${errorMsg}`);
 						chatState.finishStreaming();
 						streamingMetricsState.endStream();
 						abortController = null;
@@ -773,6 +1243,9 @@
 				abortController.signal
 			);
 		} catch (error) {
+			console.error('Failed to regenerate:', error);
+			const errorMsg = error instanceof Error ? error.message : 'Unknown error';
+			chatState.setStreamContent(`⚠️ Error: ${errorMsg}`);
 			toastState.error('Failed to regenerate. Please try again.');
 			chatState.finishStreaming();
 			streamingMetricsState.endStream();
@@ -826,7 +1299,7 @@
 <div class="flex h-full flex-col bg-theme-primary">
 	{#if hasMessages}
 		<div class="flex-1 overflow-hidden">
-			<MessageList
+			<VirtualMessageList
 				onRegenerate={handleRegenerate}
 				onEditMessage={handleEditMessage}
 				showThinking={thinkingEnabled}
@@ -886,13 +1359,28 @@
 						<SystemPromptSelector
 							conversationId={conversation.id}
 							currentPromptId={conversation.systemPromptId}
+							modelName={modelsState.selectedId ?? undefined}
 						/>
 					{:else if mode === 'new'}
 						<SystemPromptSelector
 							currentPromptId={newChatPromptId}
+							modelName={modelsState.selectedId ?? undefined}
 							onSelect={(promptId) => (newChatPromptId = promptId)}
 						/>
 					{/if}
+
+					<!-- Agent selector -->
+					{#if mode === 'conversation' && conversation}
+						<AgentSelector
+							conversationId={conversation.id}
+							currentAgentId={conversation.agentId}
+						/>
+					{:else if mode === 'new'}
+						<AgentSelector
+							currentAgentId={newChatAgentId}
+							onSelect={(agentId) => (newChatAgentId = agentId)}
+						/>
+					{/if}
 				</div>
 
 				<!-- Right side: Attach files + Thinking mode toggle -->
@@ -922,6 +1410,7 @@
 								type="button"
 								role="switch"
 								aria-checked={thinkingEnabled}
+								aria-label="Toggle thinking mode"
 								onclick={() => (thinkingEnabled = !thinkingEnabled)}
 								class="relative inline-flex h-5 w-9 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-amber-500 focus:ring-offset-2 focus:ring-offset-theme-primary {thinkingEnabled ? 'bg-amber-600' : 'bg-theme-tertiary'}"
 							>

frontend/src/lib/components/chat/FilePreview.svelte

@@ -1,11 +1,10 @@
 <script lang="ts">
 	/**
-	 * FilePreview.svelte - Preview for attached text/PDF files
-	 * Shows filename, size, and expandable content preview
-	 * Includes remove button on hover
+	 * FilePreview.svelte - Compact preview badge for attached files
+	 * Shows filename, size, and type - no raw content dump
 	 */
 	import type { FileAttachment } from '$lib/types/attachment.js';
-	import { formatFileSize, getFileIcon } from '$lib/utils/file-processor.js';
+	import { formatFileSize } from '$lib/utils/file-processor.js';
 
 	interface Props {
 		attachment: FileAttachment;
@@ -13,99 +12,124 @@
 		readonly?: boolean;
 	}
 
-	const { attachment, onRemove, readonly = false }: Props = $props();
+	const props: Props = $props();
 
-	// Expansion state for content preview
-	let isExpanded = $state(false);
-
-	// Truncate preview to first N characters
-	const PREVIEW_LENGTH = 200;
-	const hasContent = attachment.textContent && attachment.textContent.length > 0;
-	const previewText = $derived(
-		attachment.textContent
-			? attachment.textContent.slice(0, PREVIEW_LENGTH) +
-				(attachment.textContent.length > PREVIEW_LENGTH ? '...' : '')
-			: ''
-	);
+	// Derived values to ensure reactivity
+	const attachment = $derived(props.attachment);
+	const onRemove = $derived(props.onRemove);
+	const readonly = $derived(props.readonly ?? false);
 
 	function handleRemove() {
 		onRemove?.(attachment.id);
 	}
 
-	function toggleExpand() {
-		if (hasContent) {
-			isExpanded = !isExpanded;
+	/**
+	 * Get icon path for attachment type
+	 */
+	function getIconPath(type: string): string {
+		switch (type) {
+			case 'pdf':
+				return 'M19.5 14.25v-2.625a3.375 3.375 0 00-3.375-3.375h-1.5A1.125 1.125 0 0113.5 7.125v-1.5a3.375 3.375 0 00-3.375-3.375H8.25m0 12.75h7.5m-7.5 3H12M10.5 2.25H5.625c-.621 0-1.125.504-1.125 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125V11.25a9 9 0 00-9-9z';
+			case 'text':
+				return 'M19.5 14.25v-2.625a3.375 3.375 0 00-3.375-3.375h-1.5A1.125 1.125 0 0113.5 7.125v-1.5a3.375 3.375 0 00-3.375-3.375H8.25m2.25 0H5.625c-.621 0-1.125.504-1.125 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125V11.25a9 9 0 00-9-9z';
+			default:
+				return 'M18.375 12.739l-7.693 7.693a4.5 4.5 0 01-6.364-6.364l10.94-10.94A3 3 0 1119.5 7.372L8.552 18.32m.009-.01l-.01.01m5.699-9.941l-7.81 7.81a1.5 1.5 0 002.112 2.13';
 		}
 	}
+
+	/**
+	 * Get color classes for attachment type
+	 */
+	function getTypeStyle(type: string): { icon: string; badge: string; badgeText: string } {
+		switch (type) {
+			case 'pdf':
+				return {
+					icon: 'text-red-400',
+					badge: 'bg-red-500/20',
+					badgeText: 'text-red-300'
+				};
+			case 'text':
+				return {
+					icon: 'text-emerald-400',
+					badge: 'bg-emerald-500/20',
+					badgeText: 'text-emerald-300'
+				};
+			default:
+				return {
+					icon: 'text-slate-400',
+					badge: 'bg-slate-500/20',
+					badgeText: 'text-slate-300'
+				};
+		}
+	}
+
+	/**
+	 * Get file extension for display
+	 */
+	function getExtension(filename: string): string {
+		const ext = filename.split('.').pop()?.toUpperCase();
+		return ext || 'FILE';
+	}
+
+	const style = $derived(getTypeStyle(attachment.type));
+	const extension = $derived(getExtension(attachment.filename));
 </script>
 
 <div
-	class="group relative flex items-start gap-3 rounded-lg border border-theme/50 bg-theme-secondary/50 p-3 transition-colors hover:bg-theme-secondary"
+	class="group relative inline-flex items-center gap-2.5 rounded-xl border border-theme/30 bg-theme-secondary/60 px-3 py-2 transition-all hover:border-theme/50 hover:bg-theme-secondary"
 >
 	<!-- File icon -->
-	<div class="flex h-10 w-10 shrink-0 items-center justify-center rounded-lg bg-theme-tertiary/50 text-lg">
-		{getFileIcon(attachment.type)}
+	<div class="flex h-8 w-8 shrink-0 items-center justify-center rounded-lg {style.badge}">
+		<svg
+			xmlns="http://www.w3.org/2000/svg"
+			fill="none"
+			viewBox="0 0 24 24"
+			stroke-width="1.5"
+			stroke="currentColor"
+			class="h-4 w-4 {style.icon}"
+		>
+			<path stroke-linecap="round" stroke-linejoin="round" d={getIconPath(attachment.type)} />
+		</svg>
 	</div>
 
 	<!-- File info -->
 	<div class="min-w-0 flex-1">
-		<div class="flex items-start justify-between gap-2">
-			<div class="min-w-0">
-				<p class="truncate text-sm font-medium text-theme-secondary" title={attachment.filename}>
-					{attachment.filename}
-				</p>
-				<p class="text-xs text-theme-muted">
-					{formatFileSize(attachment.size)}
-					{#if attachment.type === 'pdf'}
-						<span class="text-theme-muted">·</span>
-						<span class="text-violet-400">PDF</span>
-					{/if}
-				</p>
-			</div>
-
-			<!-- Remove button (only when not readonly) -->
-			{#if !readonly && onRemove}
-				<button
-					type="button"
-					onclick={handleRemove}
-					class="shrink-0 rounded p-1 text-theme-muted opacity-0 transition-all hover:bg-red-900/30 hover:text-red-400 group-hover:opacity-100"
-					aria-label="Remove file"
-					title="Remove"
-				>
-					<svg
-						xmlns="http://www.w3.org/2000/svg"
-						viewBox="0 0 20 20"
-						fill="currentColor"
-						class="h-4 w-4"
-					>
-						<path
-							d="M6.28 5.22a.75.75 0 0 0-1.06 1.06L8.94 10l-3.72 3.72a.75.75 0 1 0 1.06 1.06L10 11.06l3.72 3.72a.75.75 0 1 0 1.06-1.06L11.06 10l3.72-3.72a.75.75 0 0 0-1.06-1.06L10 8.94 6.28 5.22Z"
-						/>
-					</svg>
-				</button>
+		<p class="max-w-[180px] truncate text-sm font-medium text-theme-primary" title={attachment.filename}>
+			{attachment.filename}
+		</p>
+		<div class="flex items-center gap-1.5 text-xs text-theme-muted">
+			<span>{formatFileSize(attachment.size)}</span>
+			<span class="opacity-50">·</span>
+			<span class="rounded px-1 py-0.5 text-[10px] font-medium {style.badge} {style.badgeText}">
+				{extension}
+			</span>
+			{#if attachment.truncated}
+				<span class="rounded bg-amber-500/20 px-1 py-0.5 text-[10px] font-medium text-amber-300" title="Content was truncated due to size">
+					truncated
+				</span>
 			{/if}
 		</div>
-
-		<!-- Content preview (expandable) -->
-		{#if hasContent}
-			<button
-				type="button"
-				onclick={toggleExpand}
-				class="mt-2 w-full text-left"
-			>
-				<div
-					class="rounded border border-theme/50 bg-theme-primary/50 p-2 text-xs text-theme-muted transition-colors hover:border-theme-subtle"
-				>
-					{#if isExpanded}
-						<pre class="max-h-60 overflow-auto whitespace-pre-wrap break-words font-mono">{attachment.textContent}</pre>
-					{:else}
-						<p class="truncate font-mono">{previewText}</p>
-					{/if}
-					<p class="mt-1 text-[10px] text-theme-muted">
-						{isExpanded ? 'Click to collapse' : 'Click to expand'}
-					</p>
-				</div>
-			</button>
-		{/if}
 	</div>
+
+	<!-- Remove button -->
+	{#if !readonly && onRemove}
+		<button
+			type="button"
+			onclick={handleRemove}
+			class="ml-1 shrink-0 rounded-lg p-1.5 text-theme-muted opacity-0 transition-all hover:bg-red-500/20 hover:text-red-400 group-hover:opacity-100"
+			aria-label="Remove file"
+			title="Remove"
+		>
+			<svg
+				xmlns="http://www.w3.org/2000/svg"
+				viewBox="0 0 20 20"
+				fill="currentColor"
+				class="h-4 w-4"
+			>
+				<path
+					d="M6.28 5.22a.75.75 0 0 0-1.06 1.06L8.94 10l-3.72 3.72a.75.75 0 1 0 1.06 1.06L10 11.06l3.72 3.72a.75.75 0 1 0 1.06-1.06L11.06 10l3.72-3.72a.75.75 0 0 0-1.06-1.06L10 8.94 6.28 5.22Z"
+				/>
+			</svg>
+		</button>
+	{/if}
 </div>

frontend/src/lib/components/chat/FileUpload.svelte

@@ -52,6 +52,9 @@
 	let errorMessage = $state<string | null>(null);
 	let fileInputRef: HTMLInputElement | null = $state(null);
 
+	// Constants
+	const MAX_ATTACHMENTS = 5;
+
 	// Derived states
 	const hasAttachments = $derived(attachments.length > 0);
 	const hasImages = $derived(images.length > 0);
@@ -73,17 +76,21 @@
 
 	/**
 	 * Process multiple files
+	 * @param files - Files to process
+	 * @param fromPaste - Whether files came from a paste event (affects image handling)
 	 */
-	async function processFiles(files: File[]) {
+	async function processFiles(files: File[], fromPaste = false) {
 		isProcessing = true;
 		errorMessage = null;
 
 		const newAttachments: FileAttachment[] = [];
 		const errors: string[] = [];
+		const imageFiles: File[] = [];
 
 		for (const file of files) {
-			// Skip images - they're handled by ImageUpload
+			// Collect images separately
 			if (isImageMimeType(file.type)) {
+				imageFiles.push(file);
 				continue;
 			}
 
@@ -95,8 +102,27 @@
 			}
 		}
 
+		// Handle collected image files
+		if (imageFiles.length > 0) {
+			if (supportsVision) {
+				// Forward to image processing
+				await processImageFiles(imageFiles);
+			} else if (!fromPaste) {
+				// Only show error if user explicitly selected images (not paste)
+				errors.push(`Images require a vision-capable model (e.g., llava, bakllava)`);
+			}
+		}
+
 		if (newAttachments.length > 0) {
-			onAttachmentsChange([...attachments, ...newAttachments]);
+			const combined = [...attachments, ...newAttachments];
+			if (combined.length > MAX_ATTACHMENTS) {
+				const kept = combined.slice(0, MAX_ATTACHMENTS);
+				const dropped = combined.length - MAX_ATTACHMENTS;
+				onAttachmentsChange(kept);
+				errors.push(`Maximum ${MAX_ATTACHMENTS} files allowed. ${dropped} file(s) not added.`);
+			} else {
+				onAttachmentsChange(combined);
+			}
 		}
 
 		if (errors.length > 0) {
@@ -152,7 +178,8 @@
 
 		// Handle non-image files
 		if (files.length > 0) {
-			processFiles(files);
+			event.preventDefault(); // Prevent browser from pasting as text
+			processFiles(files, true);
 		}
 
 		// Handle image files

frontend/src/lib/components/chat/HtmlPreview.svelte

@@ -13,12 +13,25 @@
 		height?: number;
 	}
 
-	const { html, title = 'Preview', height = 300 }: Props = $props();
+	const props: Props = $props();
+
+	// Derive values from props
+	const html = $derived(props.html);
+	const title = $derived(props.title ?? 'Preview');
+	const height = $derived(props.height ?? 300);
 
 	// State
 	let iframeRef: HTMLIFrameElement | null = $state(null);
 	let isExpanded = $state(false);
-	let actualHeight = $state(height);
+	// actualHeight tracks the current display height, synced from prop when not expanded
+	let actualHeight = $state(props.height ?? 300);
+
+	// Sync actualHeight when height prop changes (only when not expanded)
+	$effect(() => {
+		if (!isExpanded) {
+			actualHeight = height;
+		}
+	});
 
 	// Generate a complete HTML document if the code is just a fragment
 	const fullHtml = $derived.by(() => {

frontend/src/lib/components/chat/ImageUpload.svelte

@@ -48,7 +48,12 @@
 	 * Process and add files to the images array
 	 */
 	async function handleFiles(files: FileList | File[]): Promise<void> {
-		if (!canAddMore) return;
+		if (!canAddMore) {
+			// Show error when max reached
+			errorMessage = `Maximum ${maxImages} images allowed`;
+			setTimeout(() => { errorMessage = null; }, 3000);
+			return;
+		}
 
 		const fileArray = Array.from(files);
 		const validFiles = fileArray.filter(isValidImageType);
@@ -63,13 +68,15 @@
 		const remainingSlots = maxImages - images.length;
 		const filesToProcess = validFiles.slice(0, remainingSlots);
 
+		// Clear previous error when starting new upload
+		errorMessage = null;
+
 		if (filesToProcess.length < validFiles.length) {
 			errorMessage = `Only ${remainingSlots} image${remainingSlots === 1 ? '' : 's'} can be added. Maximum: ${maxImages}`;
 			setTimeout(() => { errorMessage = null; }, 3000);
 		}
 
 		isProcessing = true;
-		errorMessage = null;
 
 		try {
 			const newImages: string[] = [];

frontend/src/lib/components/chat/MessageContent.svelte

@@ -29,6 +29,9 @@
 	// Supports both <thinking>...</thinking> and <think>...</think> (qwen3 format)
 	const THINKING_PATTERN = /<(?:thinking|think)>([\s\S]*?)<\/(?:thinking|think)>/g;
 
+	// Pattern to find file attachment blocks (content shown via AttachmentDisplay badges instead)
+	const FILE_BLOCK_PATTERN = /<file\s+[^>]*>[\s\S]*?<\/file>/g;
+
 	// Pattern to detect JSON tool call objects (for models that output them as text)
 	// Matches: {"name": "...", "arguments": {...}}
 	const JSON_TOOL_CALL_PATTERN = /^(\s*\{[\s\S]*"name"\s*:\s*"[^"]+"\s*,\s*"arguments"\s*:\s*\{[\s\S]*\}\s*\}\s*)$/;
@@ -72,6 +75,13 @@
 			.trim();
 	}
 
+	/**
+	 * Strip file attachment blocks (content shown via AttachmentDisplay)
+	 */
+	function stripFileBlocks(text: string): string {
+		return text.replace(FILE_BLOCK_PATTERN, '').trim();
+	}
+
 	/**
 	 * Check if text contains tool execution results
 	 */
@@ -319,7 +329,8 @@
 	}
 
 	// Clean and parse content into parts
-	const cleanedContent = $derived(cleanToolText(content));
+	// Strip file blocks (shown via AttachmentDisplay) and tool text
+	const cleanedContent = $derived(stripFileBlocks(cleanToolText(content)));
 	const parsedContent = $derived.by(() => {
 		const result = parseContent(cleanedContent);
 		// Debug: Log if thinking blocks were found

frontend/src/lib/components/chat/MessageItem.svelte

@@ -10,6 +10,7 @@
 	import BranchNavigator from './BranchNavigator.svelte';
 	import StreamingIndicator from './StreamingIndicator.svelte';
 	import ToolCallDisplay from './ToolCallDisplay.svelte';
+	import AttachmentDisplay from './AttachmentDisplay.svelte';
 
 	interface Props {
 		node: MessageNode;
@@ -43,6 +44,7 @@
 	const isSystem = $derived(node.message.role === 'system');
 	const hasContent = $derived(node.message.content.length > 0);
 	const hasToolCalls = $derived(node.message.toolCalls && node.message.toolCalls.length > 0);
+	const hasAttachments = $derived(node.message.attachmentIds && node.message.attachmentIds.length > 0);
 
 	// Detect summary messages (compressed conversation history)
 	const isSummaryMessage = $derived(node.message.isSummary === true);
@@ -228,6 +230,10 @@
 					/>
 				{/if}
 
+				{#if hasAttachments && node.message.attachmentIds}
+					<AttachmentDisplay attachmentIds={node.message.attachmentIds} />
+				{/if}
+
 				{#if hasToolCalls && node.message.toolCalls}
 					<ToolCallDisplay toolCalls={node.message.toolCalls} />
 				{/if}

frontend/src/lib/components/chat/MessageList.svelte

@@ -7,6 +7,7 @@
 	import { chatState } from '$lib/stores';
 	import type { MessageNode, BranchInfo } from '$lib/types';
 	import MessageItem from './MessageItem.svelte';
+	import SummarizationIndicator from './SummarizationIndicator.svelte';
 
 	interface Props {
 		onRegenerate?: () => void;
@@ -208,6 +209,10 @@
 	>
 		<div class="mx-auto max-w-4xl px-4 py-6">
 			{#each chatState.visibleMessages as node, index (node.id)}
+				<!-- Show summarization indicator before summary messages -->
+				{#if node.message.isSummary}
+					<SummarizationIndicator />
+				{/if}
 				<MessageItem
 					{node}
 					branchInfo={getBranchInfo(node)}

frontend/src/lib/components/chat/SummarizationIndicator.svelte

@@ -0,0 +1,17 @@
+<script lang="ts">
+	/**
+	 * SummarizationIndicator - Visual marker showing where conversation was summarized
+	 * Displayed in the message list to indicate context compaction occurred
+	 */
+</script>
+
+<div class="flex items-center gap-3 py-4" role="separator" aria-label="Conversation summarized">
+	<div class="flex-1 border-t border-dashed border-emerald-500/30"></div>
+	<div class="flex items-center gap-2 text-xs text-emerald-500">
+		<svg xmlns="http://www.w3.org/2000/svg" class="h-3.5 w-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+			<path stroke-linecap="round" stroke-linejoin="round" d="M4 7v10c0 2.21 3.582 4 8 4s8-1.79 8-4V7M4 7c0 2.21 3.582 4 8 4s8-1.79 8-4M4 7c0-2.21 3.582-4 8-4s8 1.79 8 4" />
+		</svg>
+		<span>Earlier messages summarized</span>
+	</div>
+	<div class="flex-1 border-t border-dashed border-emerald-500/30"></div>
+</div>

frontend/src/lib/components/chat/SystemPromptSelector.svelte

@@ -1,59 +1,131 @@
 <script lang="ts">
 	/**
 	 * SystemPromptSelector - Dropdown to select a system prompt for the current conversation
-	 * Allows per-conversation prompt assignment with quick preview
-	 * In 'new' mode (no conversationId), uses onSelect callback for local state management
+	 * Now model-aware: shows embedded prompts and resolved source indicators
 	 */
 	import { promptsState, conversationsState, toastState } from '$lib/stores';
 	import { updateSystemPrompt } from '$lib/storage';
+	import { modelInfoService } from '$lib/services/model-info-service.js';
+	import { modelPromptMappingsState } from '$lib/stores/model-prompt-mappings.svelte.js';
+	import {
+		resolveSystemPrompt,
+		getPromptSourceLabel,
+		type PromptSource
+	} from '$lib/services/prompt-resolution.js';
 
 	interface Props {
 		conversationId?: string | null;
 		currentPromptId?: string | null;
+		/** Model name for model-aware prompt resolution */
+		modelName?: string;
 		/** Callback for 'new' mode - called when prompt is selected without a conversation */
 		onSelect?: (promptId: string | null) => void;
 	}
 
-	let { conversationId = null, currentPromptId = null, onSelect }: Props = $props();
+	let { conversationId = null, currentPromptId = null, modelName = '', onSelect }: Props = $props();
 
 	// UI state
 	let isOpen = $state(false);
 	let dropdownElement: HTMLDivElement | null = $state(null);
 
+	// Model info state
+	let hasEmbeddedPrompt = $state(false);
+	let modelCapabilities = $state<string[]>([]);
+	let resolvedSource = $state<PromptSource>('none');
+	let resolvedPromptName = $state<string | undefined>(undefined);
+
 	// Available prompts from store
 	const prompts = $derived(promptsState.prompts);
 
-	// Current prompt for this conversation
+	// Current prompt for this conversation (explicit override)
 	const currentPrompt = $derived(
 		currentPromptId ? prompts.find((p) => p.id === currentPromptId) : null
 	);
 
-	// Display text for the button
-	const buttonText = $derived(currentPrompt?.name ?? 'No system prompt');
+	// Check if there's a model-prompt mapping
+	const hasModelMapping = $derived(modelName ? modelPromptMappingsState.hasMapping(modelName) : false);
+
+	// Display text for the button
+	const buttonText = $derived.by(() => {
+		if (currentPrompt) return currentPrompt.name;
+		if (resolvedPromptName && resolvedSource !== 'none') return resolvedPromptName;
+		return 'No system prompt';
+	});
+
+	// Source badge color
+	const sourceBadgeClass = $derived.by(() => {
+		switch (resolvedSource) {
+			case 'per-conversation':
+			case 'new-chat-selection':
+				return 'bg-violet-500/20 text-violet-300';
+			case 'model-mapping':
+				return 'bg-blue-500/20 text-blue-300';
+			case 'model-embedded':
+				return 'bg-amber-500/20 text-amber-300';
+			case 'capability-match':
+				return 'bg-emerald-500/20 text-emerald-300';
+			case 'global-active':
+				return 'bg-slate-500/20 text-slate-300';
+			default:
+				return 'bg-slate-500/20 text-slate-400';
+		}
+	});
+
+	// Load model info when modelName changes
+	$effect(() => {
+		if (modelName) {
+			loadModelInfo();
+		}
+	});
+
+	// Resolve prompt when relevant state changes
+	$effect(() => {
+		// Depend on these values to trigger re-resolution
+		const _promptId = currentPromptId;
+		const _model = modelName;
+		if (modelName) {
+			resolveCurrentPrompt();
+		}
+	});
+
+	async function loadModelInfo(): Promise<void> {
+		if (!modelName) return;
+		try {
+			const info = await modelInfoService.getModelInfo(modelName);
+			hasEmbeddedPrompt = info.systemPrompt !== null;
+			modelCapabilities = info.capabilities;
+		} catch {
+			hasEmbeddedPrompt = false;
+			modelCapabilities = [];
+		}
+	}
+
+	async function resolveCurrentPrompt(): Promise<void> {
+		if (!modelName) return;
+		try {
+			const resolved = await resolveSystemPrompt(modelName, currentPromptId, null);
+			resolvedSource = resolved.source;
+			resolvedPromptName = resolved.promptName;
+		} catch {
+			resolvedSource = 'none';
+			resolvedPromptName = undefined;
+		}
+	}
 
-	/**
-	 * Toggle dropdown
-	 */
 	function toggleDropdown(): void {
 		isOpen = !isOpen;
 	}
 
-	/**
-	 * Close dropdown
-	 */
 	function closeDropdown(): void {
 		isOpen = false;
 	}
 
-	/**
-	 * Handle prompt selection
-	 */
 	async function handleSelect(promptId: string | null): Promise<void> {
 		// In 'new' mode (no conversation), use the callback
 		if (!conversationId) {
 			onSelect?.(promptId);
 			const promptName = promptId ? prompts.find((p) => p.id === promptId)?.name : null;
-			toastState.success(promptName ? `Using "${promptName}"` : 'System prompt cleared');
+			toastState.success(promptName ? `Using "${promptName}"` : 'Using model default');
 			closeDropdown();
 			return;
 		}
@@ -61,10 +133,9 @@
 		// Update in storage for existing conversation
 		const result = await updateSystemPrompt(conversationId, promptId);
 		if (result.success) {
-			// Update in memory
 			conversationsState.setSystemPrompt(conversationId, promptId);
 			const promptName = promptId ? prompts.find((p) => p.id === promptId)?.name : null;
-			toastState.success(promptName ? `Using "${promptName}"` : 'System prompt cleared');
+			toastState.success(promptName ? `Using "${promptName}"` : 'Using model default');
 		} else {
 			toastState.error('Failed to update system prompt');
 		}
@@ -72,18 +143,12 @@
 		closeDropdown();
 	}
 
-	/**
-	 * Handle click outside to close
-	 */
 	function handleClickOutside(event: MouseEvent): void {
 		if (dropdownElement && !dropdownElement.contains(event.target as Node)) {
 			closeDropdown();
 		}
 	}
 
-	/**
-	 * Handle escape key
-	 */
 	function handleKeydown(event: KeyboardEvent): void {
 		if (event.key === 'Escape' && isOpen) {
 			closeDropdown();
@@ -98,24 +163,40 @@
 	<button
 		type="button"
 		onclick={toggleDropdown}
-		class="flex items-center gap-1.5 rounded-lg px-2.5 py-1.5 text-xs font-medium transition-colors {currentPrompt
-			? 'bg-violet-500/20 text-violet-300 hover:bg-violet-500/30'
+		class="flex items-center gap-1.5 rounded-lg px-2.5 py-1.5 text-xs font-medium transition-colors {resolvedSource !== 'none'
+			? sourceBadgeClass
 			: 'text-theme-muted hover:bg-theme-secondary hover:text-theme-secondary'}"
-		title={currentPrompt ? `System prompt: ${currentPrompt.name}` : 'Set system prompt'}
+		title={resolvedPromptName ? `System prompt: ${resolvedPromptName}` : 'Set system prompt'}
 	>
-		<svg
-			xmlns="http://www.w3.org/2000/svg"
-			viewBox="0 0 20 20"
-			fill="currentColor"
-			class="h-3.5 w-3.5"
-		>
-			<path
-				fill-rule="evenodd"
-				d="M18 10a8 8 0 1 1-16 0 8 8 0 0 1 16 0Zm-8-5a.75.75 0 0 1 .75.75v4.5a.75.75 0 0 1-1.5 0v-4.5A.75.75 0 0 1 10 5Zm0 10a1 1 0 1 0 0-2 1 1 0 0 0 0 2Z"
-				clip-rule="evenodd"
-			/>
-		</svg>
+		<!-- Icon based on source -->
+		{#if resolvedSource === 'model-embedded'}
+			<!-- Chip/CPU icon for embedded -->
+			<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="h-3.5 w-3.5">
+				<path d="M14 6H6v8h8V6Z" />
+				<path fill-rule="evenodd" d="M9.25 3V1.75a.75.75 0 0 1 1.5 0V3h1.5V1.75a.75.75 0 0 1 1.5 0V3h.5A2.75 2.75 0 0 1 17 5.75v.5h1.25a.75.75 0 0 1 0 1.5H17v1.5h1.25a.75.75 0 0 1 0 1.5H17v1.5h1.25a.75.75 0 0 1 0 1.5H17v.5A2.75 2.75 0 0 1 14.25 17h-.5v1.25a.75.75 0 0 1-1.5 0V17h-1.5v1.25a.75.75 0 0 1-1.5 0V17h-1.5v1.25a.75.75 0 0 1-1.5 0V17h-.5A2.75 2.75 0 0 1 3 14.25v-.5H1.75a.75.75 0 0 1 0-1.5H3v-1.5H1.75a.75.75 0 0 1 0-1.5H3v-1.5H1.75a.75.75 0 0 1 0-1.5H3v-.5A2.75 2.75 0 0 1 5.75 3h.5V1.75a.75.75 0 0 1 1.5 0V3h1.5ZM4.5 5.75c0-.69.56-1.25 1.25-1.25h8.5c.69 0 1.25.56 1.25 1.25v8.5c0 .69-.56 1.25-1.25 1.25h-8.5c-.69 0-1.25-.56-1.25-1.25v-8.5Z" clip-rule="evenodd" />
+			</svg>
+		{:else}
+			<!-- Default info icon -->
+			<svg
+				xmlns="http://www.w3.org/2000/svg"
+				viewBox="0 0 20 20"
+				fill="currentColor"
+				class="h-3.5 w-3.5"
+			>
+				<path
+					fill-rule="evenodd"
+					d="M18 10a8 8 0 1 1-16 0 8 8 0 0 1 16 0Zm-8-5a.75.75 0 0 1 .75.75v4.5a.75.75 0 0 1-1.5 0v-4.5A.75.75 0 0 1 10 5Zm0 10a1 1 0 1 0 0-2 1 1 0 0 0 0 2Z"
+					clip-rule="evenodd"
+				/>
+			</svg>
+		{/if}
 		<span class="max-w-[120px] truncate">{buttonText}</span>
+		<!-- Source indicator badge -->
+		{#if resolvedSource !== 'none' && resolvedSource !== 'per-conversation' && resolvedSource !== 'new-chat-selection'}
+			<span class="rounded px-1 py-0.5 text-[10px] opacity-75">
+				{getPromptSourceLabel(resolvedSource)}
+			</span>
+		{/if}
 		<svg
 			xmlns="http://www.w3.org/2000/svg"
 			viewBox="0 0 20 20"
@@ -130,12 +211,15 @@
 		</svg>
 	</button>
 
-	<!-- Dropdown menu -->
+	<!-- Dropdown menu (opens upward) -->
 	{#if isOpen}
 		<div
-			class="absolute left-0 top-full z-50 mt-1 w-64 rounded-lg border border-theme bg-theme-secondary py-1 shadow-xl"
+			class="absolute bottom-full left-0 z-50 mb-1 max-h-80 w-72 overflow-y-auto rounded-lg border border-theme bg-theme-secondary py-1 shadow-xl"
 		>
-			<!-- No prompt option -->
+			<!-- Model default section -->
+			<div class="px-3 py-1.5 text-xs font-medium text-theme-muted uppercase tracking-wide">
+				Model Default
+			</div>
 			<button
 				type="button"
 				onclick={() => handleSelect(null)}
@@ -143,7 +227,21 @@
 					? 'bg-theme-tertiary/50 text-theme-primary'
 					: 'text-theme-secondary'}"
 			>
-				<span class="flex-1">No system prompt</span>
+				<div class="flex-1">
+					<div class="flex items-center gap-2">
+						<span>Use model default</span>
+						{#if hasEmbeddedPrompt}
+							<span class="rounded bg-amber-500/20 px-1.5 py-0.5 text-[10px] text-amber-300">
+								Has embedded prompt
+							</span>
+						{/if}
+					</div>
+					{#if !currentPromptId && resolvedSource !== 'none'}
+						<div class="mt-0.5 text-xs text-theme-muted">
+							Currently: {resolvedPromptName ?? 'None'}
+						</div>
+					{/if}
+				</div>
 				{#if !currentPromptId}
 					<svg
 						xmlns="http://www.w3.org/2000/svg"
@@ -162,6 +260,9 @@
 
 			{#if prompts.length > 0}
 				<div class="my-1 border-t border-theme"></div>
+				<div class="px-3 py-1.5 text-xs font-medium text-theme-muted uppercase tracking-wide">
+					Your Prompts
+				</div>
 
 				<!-- Available prompts -->
 				{#each prompts as prompt}
@@ -205,12 +306,26 @@
 					</button>
 				{/each}
 			{:else}
+				<div class="my-1 border-t border-theme"></div>
 				<div class="px-3 py-2 text-xs text-theme-muted">
 					No prompts available. <a href="/prompts" class="text-violet-400 hover:underline"
 						>Create one</a
 					>
 				</div>
 			{/if}
+
+			<!-- Link to model defaults settings -->
+			<div class="mt-1 border-t border-theme"></div>
+			<a
+				href="/settings#model-prompts"
+				class="flex items-center gap-2 px-3 py-2 text-xs text-theme-muted hover:bg-theme-tertiary hover:text-theme-secondary"
+				onclick={closeDropdown}
+			>
+				<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="h-3.5 w-3.5">
+					<path fill-rule="evenodd" d="M8.34 1.804A1 1 0 0 1 9.32 1h1.36a1 1 0 0 1 .98.804l.295 1.473c.497.144.971.342 1.416.587l1.25-.834a1 1 0 0 1 1.262.125l.962.962a1 1 0 0 1 .125 1.262l-.834 1.25c.245.445.443.919.587 1.416l1.473.295a1 1 0 0 1 .804.98v1.36a1 1 0 0 1-.804.98l-1.473.295a6.95 6.95 0 0 1-.587 1.416l.834 1.25a1 1 0 0 1-.125 1.262l-.962.962a1 1 0 0 1-1.262.125l-1.25-.834a6.953 6.953 0 0 1-1.416.587l-.295 1.473a1 1 0 0 1-.98.804H9.32a1 1 0 0 1-.98-.804l-.295-1.473a6.957 6.957 0 0 1-1.416-.587l-1.25.834a1 1 0 0 1-1.262-.125l-.962-.962a1 1 0 0 1-.125-1.262l.834-1.25a6.957 6.957 0 0 1-.587-1.416l-1.473-.295A1 1 0 0 1 1 10.68V9.32a1 1 0 0 1 .804-.98l1.473-.295c.144-.497.342-.971.587-1.416l-.834-1.25a1 1 0 0 1 .125-1.262l.962-.962A1 1 0 0 1 5.38 3.03l1.25.834a6.957 6.957 0 0 1 1.416-.587l.294-1.473ZM13 10a3 3 0 1 1-6 0 3 3 0 0 1 6 0Z" clip-rule="evenodd" />
+				</svg>
+				Configure model defaults
+			</a>
 		</div>
 	{/if}
 </div>

frontend/src/lib/components/chat/ThinkingBlock.svelte

@@ -14,9 +14,15 @@
 		inProgress?: boolean;
 	}
 
-	const { content, defaultExpanded = false, inProgress = false }: Props = $props();
+	const props: Props = $props();
 
-	let isExpanded = $state(defaultExpanded);
+	// Initialize isExpanded from defaultExpanded prop
+	// This intentionally captures the initial value only - user controls expansion independently
+	let isExpanded = $state(props.defaultExpanded ?? false);
+
+	// Derived values from props for reactivity
+	const content = $derived(props.content);
+	const inProgress = $derived(props.inProgress ?? false);
 
 	// Keep collapsed during and after streaming - user can expand manually if desired
 

frontend/src/lib/components/chat/ThinkingBlock.test.ts

@@ -0,0 +1,121 @@
+/**
+ * ThinkingBlock component tests
+ *
+ * Tests the collapsible thinking/reasoning display component
+ */
+
+import { describe, it, expect } from 'vitest';
+import { render, screen, fireEvent } from '@testing-library/svelte';
+import ThinkingBlock from './ThinkingBlock.svelte';
+
+describe('ThinkingBlock', () => {
+	it('renders collapsed by default', () => {
+		render(ThinkingBlock, {
+			props: {
+				content: 'Some thinking content'
+			}
+		});
+
+		// Should show the header
+		expect(screen.getByText('Reasoning')).toBeDefined();
+		// Content should not be visible when collapsed
+		expect(screen.queryByText('Some thinking content')).toBeNull();
+	});
+
+	it('renders expanded when defaultExpanded is true', () => {
+		render(ThinkingBlock, {
+			props: {
+				content: 'Some thinking content',
+				defaultExpanded: true
+			}
+		});
+
+		// Content should be visible when expanded
+		// The content is rendered as HTML, so we check for the container
+		const content = screen.getByText(/Click to collapse/);
+		expect(content).toBeDefined();
+	});
+
+	it('toggles expand/collapse on click', async () => {
+		render(ThinkingBlock, {
+			props: {
+				content: 'Toggle content'
+			}
+		});
+
+		// Initially collapsed
+		expect(screen.getByText('Click to expand')).toBeDefined();
+
+		// Click to expand
+		const button = screen.getByRole('button');
+		await fireEvent.click(button);
+
+		// Should show collapse option
+		expect(screen.getByText('Click to collapse')).toBeDefined();
+
+		// Click to collapse
+		await fireEvent.click(button);
+
+		// Should show expand option again
+		expect(screen.getByText('Click to expand')).toBeDefined();
+	});
+
+	it('shows thinking indicator when in progress', () => {
+		render(ThinkingBlock, {
+			props: {
+				content: 'Current thinking...',
+				inProgress: true
+			}
+		});
+
+		expect(screen.getByText('Thinking...')).toBeDefined();
+	});
+
+	it('shows reasoning text when not in progress', () => {
+		render(ThinkingBlock, {
+			props: {
+				content: 'Completed thoughts',
+				inProgress: false
+			}
+		});
+
+		expect(screen.getByText('Reasoning')).toBeDefined();
+	});
+
+	it('shows brain emoji when not in progress', () => {
+		render(ThinkingBlock, {
+			props: {
+				content: 'Content',
+				inProgress: false
+			}
+		});
+
+		// The brain emoji is rendered as text
+		const brainEmoji = screen.queryByText('🧠');
+		expect(brainEmoji).toBeDefined();
+	});
+
+	it('has appropriate styling when in progress', () => {
+		const { container } = render(ThinkingBlock, {
+			props: {
+				content: 'In progress content',
+				inProgress: true
+			}
+		});
+
+		// Should have ring class for in-progress state
+		const wrapper = container.querySelector('.ring-1');
+		expect(wrapper).toBeDefined();
+	});
+
+	it('button is accessible', () => {
+		render(ThinkingBlock, {
+			props: {
+				content: 'Accessible content'
+			}
+		});
+
+		const button = screen.getByRole('button');
+		expect(button.getAttribute('type')).toBe('button');
+	});
+});

frontend/src/lib/components/chat/ToolCallDisplay.svelte

@@ -12,8 +12,8 @@
 
 	let { toolCalls }: Props = $props();
 
-	// Tool metadata for icons and colors
-	const toolMeta: Record<string, { icon: string; color: string; label: string }> = {
+	// Tool metadata for built-in tools (exact matches)
+	const builtinToolMeta: Record<string, { icon: string; color: string; label: string }> = {
 		get_location: {
 			icon: '📍',
 			color: 'from-rose-500 to-pink-600',
@@ -41,12 +41,103 @@
 		}
 	};
 
+	// Pattern-based styling for custom tools (checked in order, first match wins)
+	const toolPatterns: Array<{ patterns: string[]; icon: string; color: string; label: string }> = [
+		// Agentic Tools (check first for specific naming)
+		{ patterns: ['task_manager', 'task-manager', 'taskmanager'], icon: '📋', color: 'from-indigo-500 to-purple-600', label: 'Tasks' },
+		{ patterns: ['memory_store', 'memory-store', 'memorystore', 'scratchpad'], icon: '🧠', color: 'from-violet-500 to-purple-600', label: 'Memory' },
+		{ patterns: ['think_step', 'structured_thinking', 'reasoning'], icon: '💭', color: 'from-cyan-500 to-blue-600', label: 'Thinking' },
+		{ patterns: ['decision_matrix', 'decision-matrix', 'evaluate'], icon: '⚖️', color: 'from-amber-500 to-orange-600', label: 'Decision' },
+		{ patterns: ['project_planner', 'project-planner', 'breakdown'], icon: '📊', color: 'from-emerald-500 to-teal-600', label: 'Planning' },
+		// Design & UI
+		{ patterns: ['design', 'brief', 'ui', 'ux', 'layout', 'wireframe'], icon: '🎨', color: 'from-pink-500 to-rose-600', label: 'Design' },
+		{ patterns: ['color', 'palette', 'theme', 'style'], icon: '🎨', color: 'from-fuchsia-500 to-pink-600', label: 'Color' },
+		// Search & Discovery
+		{ patterns: ['search', 'find', 'lookup', 'query'], icon: '🔍', color: 'from-blue-500 to-cyan-600', label: 'Search' },
+		// Web & API
+		{ patterns: ['fetch', 'http', 'api', 'request', 'webhook'], icon: '🌐', color: 'from-violet-500 to-purple-600', label: 'API' },
+		{ patterns: ['url', 'link', 'web', 'scrape'], icon: '🔗', color: 'from-indigo-500 to-violet-600', label: 'Web' },
+		// Data & Analysis
+		{ patterns: ['data', 'analyze', 'stats', 'chart', 'graph', 'metric'], icon: '📊', color: 'from-cyan-500 to-blue-600', label: 'Analysis' },
+		{ patterns: ['json', 'transform', 'parse', 'convert', 'format'], icon: '🔄', color: 'from-sky-500 to-cyan-600', label: 'Transform' },
+		// Math & Calculation
+		{ patterns: ['calc', 'math', 'compute', 'formula', 'number'], icon: '🧮', color: 'from-emerald-500 to-teal-600', label: 'Calculate' },
+		// Time & Date
+		{ patterns: ['time', 'date', 'clock', 'schedule', 'calendar'], icon: '🕐', color: 'from-amber-500 to-orange-600', label: 'Time' },
+		// Location & Maps
+		{ patterns: ['location', 'geo', 'place', 'address', 'map', 'coord'], icon: '📍', color: 'from-rose-500 to-pink-600', label: 'Location' },
+		// Text & String
+		{ patterns: ['text', 'string', 'word', 'sentence', 'paragraph'], icon: '📝', color: 'from-slate-500 to-gray-600', label: 'Text' },
+		// Files & Storage
+		{ patterns: ['file', 'read', 'write', 'save', 'load', 'export', 'import'], icon: '📁', color: 'from-yellow-500 to-amber-600', label: 'File' },
+		// Communication
+		{ patterns: ['email', 'mail', 'send', 'message', 'notify', 'alert'], icon: '📧', color: 'from-red-500 to-rose-600', label: 'Message' },
+		// User & Auth
+		{ patterns: ['user', 'auth', 'login', 'account', 'profile', 'session'], icon: '👤', color: 'from-blue-500 to-indigo-600', label: 'User' },
+		// Database
+		{ patterns: ['database', 'db', 'sql', 'table', 'record', 'store'], icon: '🗄️', color: 'from-orange-500 to-red-600', label: 'Database' },
+		// Code & Execution
+		{ patterns: ['code', 'script', 'execute', 'run', 'shell', 'command'], icon: '💻', color: 'from-green-500 to-emerald-600', label: 'Code' },
+		// Images & Media
+		{ patterns: ['image', 'photo', 'picture', 'screenshot', 'media', 'video'], icon: '🖼️', color: 'from-purple-500 to-fuchsia-600', label: 'Media' },
+		// Weather
+		{ patterns: ['weather', 'forecast', 'temperature', 'climate'], icon: '🌤️', color: 'from-sky-400 to-blue-500', label: 'Weather' },
+		// Translation & Language
+		{ patterns: ['translate', 'language', 'i18n', 'locale'], icon: '🌍', color: 'from-teal-500 to-cyan-600', label: 'Translate' },
+		// Security & Encryption
+		{ patterns: ['encrypt', 'decrypt', 'hash', 'encode', 'decode', 'secure', 'password'], icon: '🔐', color: 'from-red-600 to-orange-600', label: 'Security' },
+		// Random & Generation
+		{ patterns: ['random', 'generate', 'uuid', 'create', 'make'], icon: '🎲', color: 'from-violet-500 to-purple-600', label: 'Generate' },
+		// Lists & Collections
+		{ patterns: ['list', 'array', 'collection', 'filter', 'sort'], icon: '📋', color: 'from-blue-400 to-indigo-500', label: 'List' },
+		// Validation & Check
+		{ patterns: ['valid', 'check', 'verify', 'test', 'assert'], icon: '✅', color: 'from-green-500 to-teal-600', label: 'Validate' }
+	];
+
 	const defaultMeta = {
 		icon: '⚙️',
-		color: 'from-gray-500 to-gray-600',
+		color: 'from-slate-500 to-slate-600',
 		label: 'Tool'
 	};
 
+	/**
+	 * Get tool metadata - checks builtin tools first, then pattern matches, then default
+	 */
+	function getToolMeta(toolName: string): { icon: string; color: string; label: string } {
+		// Check builtin tools first (exact match)
+		if (builtinToolMeta[toolName]) {
+			return builtinToolMeta[toolName];
+		}
+
+		// Pattern match for custom tools
+		const lowerName = toolName.toLowerCase();
+		for (const pattern of toolPatterns) {
+			if (pattern.patterns.some((p) => lowerName.includes(p))) {
+				return pattern;
+			}
+		}
+
+		// Default fallback
+		return defaultMeta;
+	}
+
+	/**
+	 * Convert tool name to human-readable label
+	 */
+	function formatToolLabel(toolName: string, detectedLabel: string): string {
+		// If it's a known builtin or detected pattern, use that label
+		if (detectedLabel !== 'Tool') {
+			return detectedLabel;
+		}
+		// Otherwise, humanize the tool name
+		return toolName
+			.replace(/_/g, ' ')
+			.replace(/([a-z])([A-Z])/g, '$1 $2')
+			.split(' ')
+			.map((w) => w.charAt(0).toUpperCase() + w.slice(1).toLowerCase())
+			.join(' ');
+	}
+
 	/**
 	 * Parse arguments to display-friendly format
 	 */
@@ -200,7 +291,8 @@
 
 <div class="my-3 space-y-2">
 	{#each toolCalls as call (call.id)}
-		{@const meta = toolMeta[call.name] || defaultMeta}
+		{@const meta = getToolMeta(call.name)}
+		{@const displayLabel = formatToolLabel(call.name, meta.label)}
 		{@const args = parseArgs(call.arguments)}
 		{@const argEntries = Object.entries(args).filter(([_, v]) => v !== undefined && v !== null)}
 		{@const isExpanded = expandedCalls.has(call.id)}
@@ -216,12 +308,12 @@
 					class="flex w-full items-center gap-3 px-4 py-3 text-left transition-colors hover:bg-slate-100/50 dark:hover:bg-slate-700/50"
 				>
 					<!-- Icon -->
-					<span class="text-xl" role="img" aria-label={meta.label}>{meta.icon}</span>
+					<span class="text-xl" role="img" aria-label={displayLabel}>{meta.icon}</span>
 
 					<!-- Tool name and summary -->
 					<div class="min-w-0 flex-1">
 						<div class="flex items-center gap-2">
-							<span class="font-medium text-slate-800 dark:text-slate-100">{meta.label}</span>
+							<span class="font-medium text-slate-800 dark:text-slate-100">{displayLabel}</span>
 							<span class="font-mono text-xs text-slate-500 dark:text-slate-400">{call.name}</span>
 						</div>
 

frontend/src/lib/components/chat/VirtualMessageList.svelte

@@ -0,0 +1,314 @@
+<script lang="ts">
+	/**
+	 * VirtualMessageList - Virtualized message list for large conversations
+	 * Only renders visible messages for performance with long chats
+	 *
+	 * Uses @tanstack/svelte-virtual for virtualization.
+	 * Falls back to regular rendering if virtualization fails.
+	 */
+
+	import { createVirtualizer } from '@tanstack/svelte-virtual';
+	import { chatState } from '$lib/stores';
+	import type { MessageNode, BranchInfo } from '$lib/types';
+	import MessageItem from './MessageItem.svelte';
+	import SummarizationIndicator from './SummarizationIndicator.svelte';
+	import { onMount } from 'svelte';
+
+	interface Props {
+		onRegenerate?: () => void;
+		onEditMessage?: (messageId: string, newContent: string) => void;
+		showThinking?: boolean;
+	}
+
+	const { onRegenerate, onEditMessage, showThinking = true }: Props = $props();
+
+	// Container reference
+	let scrollContainer: HTMLDivElement | null = $state(null);
+
+	// Track if component is mounted (scroll container available)
+	let isMounted = $state(false);
+
+	// Track user scroll state
+	let userScrolledAway = $state(false);
+	let autoScrollEnabled = $state(true);
+	let wasStreaming = false;
+
+	// Height cache for measured items (message ID -> height)
+	const heightCache = new Map<string, number>();
+
+	// Default estimated height for messages
+	const DEFAULT_ITEM_HEIGHT = 150;
+
+	// Threshold for scroll detection
+	const SCROLL_THRESHOLD = 100;
+
+	// Get visible messages
+	const messages = $derived(chatState.visibleMessages);
+
+	// Set mounted after component mounts
+	onMount(() => {
+		isMounted = true;
+	});
+
+	// Create virtualizer - only functional after mount when scrollContainer exists
+	const virtualizer = createVirtualizer({
+		get count() {
+			return messages.length;
+		},
+		getScrollElement: () => scrollContainer,
+		estimateSize: (index: number) => {
+			const msg = messages[index];
+			if (!msg) return DEFAULT_ITEM_HEIGHT;
+			return heightCache.get(msg.id) ?? DEFAULT_ITEM_HEIGHT;
+		},
+		overscan: 5,
+	});
+
+	// Get virtual items with fallback
+	const virtualItems = $derived.by(() => {
+		if (!isMounted || !scrollContainer) {
+			return [];
+		}
+		return $virtualizer.getVirtualItems();
+	});
+
+	// Check if we should use fallback (non-virtual) rendering
+	const useFallback = $derived(
+		messages.length > 0 && virtualItems.length === 0 && isMounted
+	);
+
+	// Track conversation changes to clear cache
+	let lastConversationId: string | null = null;
+	$effect(() => {
+		const currentId = chatState.conversationId;
+		if (currentId !== lastConversationId) {
+			heightCache.clear();
+			lastConversationId = currentId;
+		}
+	});
+
+	// Force measure after mount and when scroll container becomes available
+	$effect(() => {
+		if (isMounted && scrollContainer && messages.length > 0) {
+			// Use setTimeout to ensure DOM is fully ready
+			setTimeout(() => {
+				$virtualizer.measure();
+			}, 0);
+		}
+	});
+
+	// Handle streaming scroll behavior
+	$effect(() => {
+		const isStreaming = chatState.isStreaming;
+
+		if (isStreaming && !wasStreaming) {
+			autoScrollEnabled = true;
+			if (!userScrolledAway && scrollContainer) {
+				requestAnimationFrame(() => {
+					if (useFallback) {
+						scrollContainer?.scrollTo({ top: scrollContainer.scrollHeight });
+					} else {
+						$virtualizer.scrollToIndex(messages.length - 1, { align: 'end' });
+					}
+				});
+			}
+		}
+
+		wasStreaming = isStreaming;
+	});
+
+	// Scroll to bottom during streaming
+	$effect(() => {
+		const buffer = chatState.streamBuffer;
+		const isStreaming = chatState.isStreaming;
+
+		if (isStreaming && buffer && autoScrollEnabled && scrollContainer) {
+			requestAnimationFrame(() => {
+				if (useFallback) {
+					scrollContainer?.scrollTo({ top: scrollContainer.scrollHeight });
+				} else {
+					$virtualizer.scrollToIndex(messages.length - 1, { align: 'end' });
+				}
+			});
+		}
+	});
+
+	// Scroll when new messages are added
+	let previousMessageCount = 0;
+	$effect(() => {
+		const currentCount = messages.length;
+
+		if (currentCount > previousMessageCount && currentCount > 0 && scrollContainer) {
+			autoScrollEnabled = true;
+			userScrolledAway = false;
+			requestAnimationFrame(() => {
+				if (useFallback) {
+					scrollContainer?.scrollTo({ top: scrollContainer.scrollHeight });
+				} else {
+					$virtualizer.scrollToIndex(currentCount - 1, { align: 'end' });
+				}
+			});
+		}
+
+		previousMessageCount = currentCount;
+	});
+
+	// Handle scroll events
+	function handleScroll(): void {
+		if (!scrollContainer) return;
+
+		const { scrollTop, scrollHeight, clientHeight } = scrollContainer;
+		userScrolledAway = scrollHeight - scrollTop - clientHeight > SCROLL_THRESHOLD;
+
+		if (userScrolledAway && chatState.isStreaming) {
+			autoScrollEnabled = false;
+		}
+	}
+
+	// Scroll to bottom button handler
+	function scrollToBottom(): void {
+		if (!scrollContainer) return;
+
+		if (useFallback) {
+			scrollContainer.scrollTo({ top: scrollContainer.scrollHeight, behavior: 'smooth' });
+		} else if (messages.length > 0) {
+			$virtualizer.scrollToIndex(messages.length - 1, { align: 'end', behavior: 'smooth' });
+		}
+	}
+
+	// Measure item height after render (for virtualized mode)
+	function measureItem(node: HTMLElement, index: number) {
+		const msg = messages[index];
+		if (!msg) return { destroy: () => {} };
+
+		const resizeObserver = new ResizeObserver((entries) => {
+			for (const entry of entries) {
+				const height = entry.contentRect.height;
+				if (height > 0 && heightCache.get(msg.id) !== height) {
+					heightCache.set(msg.id, height);
+					$virtualizer.measure();
+				}
+			}
+		});
+
+		resizeObserver.observe(node);
+
+		// Initial measurement
+		const height = node.getBoundingClientRect().height;
+		if (height > 0) {
+			heightCache.set(msg.id, height);
+		}
+
+		return {
+			destroy() {
+				resizeObserver.disconnect();
+			}
+		};
+	}
+
+	// Get branch info for a message
+	function getBranchInfo(node: MessageNode): BranchInfo | null {
+		const info = chatState.getBranchInfo(node.id);
+		if (info && info.totalCount > 1) {
+			return info;
+		}
+		return null;
+	}
+
+	// Handle branch switch
+	function handleBranchSwitch(messageId: string, direction: 'prev' | 'next'): void {
+		chatState.switchBranch(messageId, direction);
+	}
+
+	// Check if message is streaming
+	function isStreamingMessage(node: MessageNode): boolean {
+		return chatState.isStreaming && chatState.streamingMessageId === node.id;
+	}
+
+	// Check if message is last
+	function isLastMessage(index: number): boolean {
+		return index === messages.length - 1;
+	}
+
+	// Show scroll button
+	const showScrollButton = $derived(userScrolledAway && messages.length > 0);
+</script>
+
+<div class="relative h-full">
+	<div
+		bind:this={scrollContainer}
+		onscroll={handleScroll}
+		class="h-full overflow-y-auto"
+		role="log"
+		aria-live="polite"
+		aria-label="Chat messages"
+	>
+		<div class="mx-auto max-w-4xl px-4 py-6">
+			{#if useFallback}
+				<!-- Fallback: Regular rendering when virtualization isn't working -->
+				{#each messages as node, index (node.id)}
+					{#if node.message.isSummary}
+						<SummarizationIndicator />
+					{/if}
+					<MessageItem
+						{node}
+						branchInfo={getBranchInfo(node)}
+						isStreaming={isStreamingMessage(node)}
+						isLast={isLastMessage(index)}
+						{showThinking}
+						onBranchSwitch={(direction) => handleBranchSwitch(node.id, direction)}
+						onRegenerate={onRegenerate}
+						onEdit={(newContent) => onEditMessage?.(node.id, newContent)}
+					/>
+				{/each}
+			{:else}
+				<!-- Virtualized rendering -->
+				<div
+					style="height: {$virtualizer.getTotalSize()}px; width: 100%; position: relative;"
+				>
+					{#each virtualItems as virtualRow (virtualRow.key)}
+						{@const node = messages[virtualRow.index]}
+						{@const index = virtualRow.index}
+						{#if node}
+							<div
+								style="position: absolute; top: 0; left: 0; width: 100%; transform: translateY({virtualRow.start}px);"
+								use:measureItem={index}
+							>
+								{#if node.message.isSummary}
+									<SummarizationIndicator />
+								{/if}
+								<MessageItem
+									{node}
+									branchInfo={getBranchInfo(node)}
+									isStreaming={isStreamingMessage(node)}
+									isLast={isLastMessage(index)}
+									{showThinking}
+									onBranchSwitch={(direction) => handleBranchSwitch(node.id, direction)}
+									onRegenerate={onRegenerate}
+									onEdit={(newContent) => onEditMessage?.(node.id, newContent)}
+								/>
+							</div>
+						{/if}
+					{/each}
+				</div>
+			{/if}
+		</div>
+	</div>
+
+	<!-- Scroll to bottom button -->
+	{#if showScrollButton}
+		<button
+			type="button"
+			onclick={scrollToBottom}
+			class="absolute bottom-4 left-1/2 -translate-x-1/2 rounded-full bg-theme-tertiary px-4 py-2 text-sm text-theme-secondary shadow-lg transition-all hover:bg-theme-secondary"
+			aria-label="Scroll to latest message"
+		>
+			<span class="flex items-center gap-2">
+				<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" viewBox="0 0 20 20" fill="currentColor">
+					<path fill-rule="evenodd" d="M10 18a1 1 0 01-.707-.293l-5-5a1 1 0 011.414-1.414L10 15.586l4.293-4.293a1 1 0 011.414 1.414l-5 5A1 1 0 0110 18z" clip-rule="evenodd" />
+				</svg>
+				Jump to latest
+			</span>
+		</button>
+	{/if}
+</div>

frontend/src/lib/components/chat/index.ts

@@ -24,6 +24,9 @@ export { default as ChatInput } from './ChatInput.svelte';
 export { default as ImageUpload } from './ImageUpload.svelte';
 export { default as ImagePreview } from './ImagePreview.svelte';
 
+// Attachment display
+export { default as AttachmentDisplay } from './AttachmentDisplay.svelte';
+
 // Code display
 export { default as CodeBlock } from './CodeBlock.svelte';
 

frontend/src/lib/components/layout/ConversationItem.svelte

@@ -1,13 +1,14 @@
 <script lang="ts">
 	/**
 	 * ConversationItem.svelte - Single conversation row in the sidebar
-	 * Shows title, model, and hover actions (pin, export, delete)
+	 * Shows title, model, and hover actions (pin, move, export, delete)
 	 */
 	import type { Conversation } from '$lib/types/conversation.js';
 	import { goto } from '$app/navigation';
 	import { conversationsState, uiState, chatState, toastState } from '$lib/stores';
 	import { deleteConversation } from '$lib/storage';
 	import { ExportDialog } from '$lib/components/shared';
+	import MoveToProjectModal from '$lib/components/projects/MoveToProjectModal.svelte';
 
 	interface Props {
 		conversation: Conversation;
@@ -19,6 +20,9 @@
 	// Export dialog state
 	let showExportDialog = $state(false);
 
+	// Move to project dialog state
+	let showMoveDialog = $state(false);
+
 	/** Format relative time for display */
 	function formatRelativeTime(date: Date): string {
 		const now = new Date();
@@ -48,6 +52,13 @@
 		showExportDialog = true;
 	}
 
+	/** Handle move to project */
+	function handleMove(e: MouseEvent) {
+		e.preventDefault();
+		e.stopPropagation();
+		showMoveDialog = true;
+	}
+
 	/** Handle delete */
 	async function handleDelete(e: MouseEvent) {
 		e.preventDefault();
@@ -87,14 +98,18 @@
 	<!-- Chat icon -->
 	<div class="mt-0.5 shrink-0">
 		{#if conversation.isPinned}
-			<!-- Pin icon for pinned conversations -->
+			<!-- Bookmark icon for pinned conversations -->
 			<svg
 				xmlns="http://www.w3.org/2000/svg"
 				class="h-4 w-4 text-emerald-500"
-				viewBox="0 0 20 20"
+				viewBox="0 0 24 24"
 				fill="currentColor"
 			>
-				<path d="M10.75 4.75a.75.75 0 0 0-1.5 0v4.5h-4.5a.75.75 0 0 0 0 1.5h4.5v4.5a.75.75 0 0 0 1.5 0v-4.5h4.5a.75.75 0 0 0 0-1.5h-4.5v-4.5Z" />
+				<path
+					fill-rule="evenodd"
+					d="M6.32 2.577a49.255 49.255 0 0 1 11.36 0c1.497.174 2.57 1.46 2.57 2.93V21a.75.75 0 0 1-1.085.67L12 18.089l-7.165 3.583A.75.75 0 0 1 3.75 21V5.507c0-1.47 1.073-2.756 2.57-2.93Z"
+					clip-rule="evenodd"
+				/>
 			</svg>
 		{:else}
 			<!-- Regular chat bubble -->
@@ -136,49 +151,60 @@
 	</div>
 
 	<!-- Action buttons (always visible on mobile, hover on desktop) -->
-	<div class="absolute right-2 top-1/2 flex -translate-y-1/2 items-center gap-1 transition-opacity {uiState.isMobile ? 'opacity-100' : 'opacity-0 group-hover:opacity-100'}">
+	<div class="absolute right-2 top-1/2 flex -translate-y-1/2 items-center gap-0.5 rounded-md bg-theme-secondary/90 px-1 py-0.5 shadow-sm transition-opacity {uiState.isMobile ? 'opacity-100' : 'opacity-0 group-hover:opacity-100'}">
 		<!-- Pin/Unpin button -->
 		<button
 			type="button"
 			onclick={handlePin}
-			class="rounded p-1 text-theme-muted transition-colors hover:bg-theme-tertiary hover:text-theme-primary"
+			class="rounded p-1 transition-colors hover:bg-theme-tertiary {conversation.isPinned ? 'text-emerald-500 hover:text-emerald-400' : 'text-theme-secondary hover:text-theme-primary'}"
 			aria-label={conversation.isPinned ? 'Unpin conversation' : 'Pin conversation'}
 			title={conversation.isPinned ? 'Unpin' : 'Pin'}
 		>
-			{#if conversation.isPinned}
-				<!-- Unpin icon (filled) -->
-				<svg
-					xmlns="http://www.w3.org/2000/svg"
-					class="h-4 w-4"
-					viewBox="0 0 20 20"
-					fill="currentColor"
-				>
-					<path d="M8.75 10.25a.75.75 0 0 0 0 1.5h2.5a.75.75 0 0 0 0-1.5h-2.5Z" />
-				</svg>
-			{:else}
-				<!-- Pin icon (outline) -->
-				<svg
-					xmlns="http://www.w3.org/2000/svg"
-					class="h-4 w-4"
-					fill="none"
-					viewBox="0 0 24 24"
-					stroke="currentColor"
-					stroke-width="2"
-				>
-					<path
-						stroke-linecap="round"
-						stroke-linejoin="round"
-						d="M3 6.75A.75.75 0 0 1 3.75 6h16.5a.75.75 0 0 1 0 1.5H3.75A.75.75 0 0 1 3 6.75ZM3 12a.75.75 0 0 1 .75-.75h16.5a.75.75 0 0 1 0 1.5H3.75A.75.75 0 0 1 3 12Zm0 5.25a.75.75 0 0 1 .75-.75h16.5a.75.75 0 0 1 0 1.5H3.75a.75.75 0 0 1-.75-.75Z"
-					/>
-				</svg>
-			{/if}
+			<svg
+				xmlns="http://www.w3.org/2000/svg"
+				class="h-4 w-4"
+				fill={conversation.isPinned ? 'currentColor' : 'none'}
+				viewBox="0 0 24 24"
+				stroke="currentColor"
+				stroke-width="1.5"
+			>
+				<path
+					stroke-linecap="round"
+					stroke-linejoin="round"
+					d="M17.593 3.322c1.1.128 1.907 1.077 1.907 2.185V21L12 17.25 4.5 21V5.507c0-1.108.806-2.057 1.907-2.185a48.507 48.507 0 0 1 11.186 0Z"
+				/>
+			</svg>
+		</button>
+
+		<!-- Move to project button -->
+		<button
+			type="button"
+			onclick={handleMove}
+			class="rounded p-1 text-theme-secondary transition-colors hover:bg-theme-tertiary hover:text-theme-primary"
+			aria-label="Move to project"
+			title="Move to project"
+		>
+			<svg
+				xmlns="http://www.w3.org/2000/svg"
+				class="h-4 w-4"
+				fill="none"
+				viewBox="0 0 24 24"
+				stroke="currentColor"
+				stroke-width="2"
+			>
+				<path
+					stroke-linecap="round"
+					stroke-linejoin="round"
+					d="M2.25 12.75V12A2.25 2.25 0 0 1 4.5 9.75h15A2.25 2.25 0 0 1 21.75 12v.75m-8.69-6.44-2.12-2.12a1.5 1.5 0 0 0-1.061-.44H4.5A2.25 2.25 0 0 0 2.25 6v12a2.25 2.25 0 0 0 2.25 2.25h15A2.25 2.25 0 0 0 21.75 18V9a2.25 2.25 0 0 0-2.25-2.25h-5.379a1.5 1.5 0 0 1-1.06-.44Z"
+				/>
+			</svg>
 		</button>
 
 		<!-- Export button -->
 		<button
 			type="button"
 			onclick={handleExport}
-			class="rounded p-1 text-theme-muted transition-colors hover:bg-theme-tertiary hover:text-theme-primary"
+			class="rounded p-1 text-theme-secondary transition-colors hover:bg-theme-tertiary hover:text-theme-primary"
 			aria-label="Export conversation"
 			title="Export"
 		>
@@ -202,7 +228,7 @@
 		<button
 			type="button"
 			onclick={handleDelete}
-			class="rounded p-1 text-theme-muted transition-colors hover:bg-red-900/50 hover:text-red-400"
+			class="rounded p-1 text-theme-secondary transition-colors hover:bg-red-900/50 hover:text-red-400"
 			aria-label="Delete conversation"
 			title="Delete"
 		>
@@ -230,3 +256,10 @@
 	isOpen={showExportDialog}
 	onClose={() => (showExportDialog = false)}
 />
+
+<!-- Move to Project Modal -->
+<MoveToProjectModal
+	conversationId={conversation.id}
+	isOpen={showMoveDialog}
+	onClose={() => (showMoveDialog = false)}
+/>

frontend/src/lib/components/layout/ConversationList.svelte

@@ -1,17 +1,44 @@
 <script lang="ts">
 	/**
-	 * ConversationList.svelte - Chat history list grouped by date
-	 * Uses local conversationsState for immediate updates (offline-first)
+	 * ConversationList.svelte - Chat history list with projects and date groups
+	 * Shows projects as folders at the top, then ungrouped conversations by date
 	 */
-	import { conversationsState, chatState } from '$lib/stores';
+	import { conversationsState, chatState, projectsState } from '$lib/stores';
 	import ConversationItem from './ConversationItem.svelte';
+	import ProjectFolder from './ProjectFolder.svelte';
+	import type { Conversation } from '$lib/types/conversation.js';
+
+	interface Props {
+		onEditProject?: (projectId: string) => void;
+	}
+
+	let { onEditProject }: Props = $props();
 
 	// State for showing archived conversations
 	let showArchived = $state(false);
+
+	// Derived: Conversations without a project, grouped by date
+	const ungroupedConversations = $derived.by(() => {
+		return conversationsState.withoutProject();
+	});
+
+	// Derived: Check if there are any project folders or ungrouped conversations
+	const hasAnyContent = $derived.by(() => {
+		return projectsState.projects.length > 0 || ungroupedConversations.length > 0;
+	});
+
+	// Derived: Map of project ID to conversations (cached to avoid repeated calls)
+	const projectConversationsMap = $derived.by(() => {
+		const map = new Map<string, Conversation[]>();
+		for (const project of projectsState.projects) {
+			map.set(project.id, conversationsState.forProject(project.id));
+		}
+		return map;
+	});
 </script>
 
 <div class="flex flex-col px-2 py-1">
-	{#if conversationsState.grouped.length === 0}
+	{#if !hasAnyContent && conversationsState.grouped.length === 0}
 		<!-- Empty state -->
 		<div class="flex flex-col items-center justify-center px-4 py-8 text-center">
 			<svg
@@ -43,24 +70,45 @@
 			{/if}
 		</div>
 	{:else}
-		<!-- Grouped conversations -->
-		{#each conversationsState.grouped as { group, conversations } (group)}
-			<div class="mb-2">
-				<!-- Group header -->
+		<!-- Projects section -->
+		{#if projectsState.sortedProjects.length > 0}
+			<div class="mb-3">
 				<h3 class="sticky top-0 z-10 bg-theme-primary px-2 py-1.5 text-xs font-medium uppercase tracking-wider text-theme-muted">
-					{group}
+					Projects
 				</h3>
-
-				<!-- Conversations in this group -->
 				<div class="flex flex-col gap-0.5">
-					{#each conversations as conversation (conversation.id)}
-						<ConversationItem
-							{conversation}
-							isSelected={chatState.conversationId === conversation.id}
+					{#each projectsState.sortedProjects as project (project.id)}
+						<ProjectFolder
+							{project}
+							conversations={projectConversationsMap.get(project.id) ?? []}
+							{onEditProject}
 						/>
 					{/each}
 				</div>
 			</div>
+		{/if}
+
+		<!-- Ungrouped conversations (by date) -->
+		{#each conversationsState.grouped as { group, conversations } (group)}
+			{@const ungroupedInGroup = conversations.filter(c => !c.projectId)}
+			{#if ungroupedInGroup.length > 0}
+				<div class="mb-2">
+					<!-- Group header -->
+					<h3 class="sticky top-0 z-10 bg-theme-primary px-2 py-1.5 text-xs font-medium uppercase tracking-wider text-theme-muted">
+						{group}
+					</h3>
+
+					<!-- Conversations in this group (without project) -->
+					<div class="flex flex-col gap-0.5">
+						{#each ungroupedInGroup as conversation (conversation.id)}
+							<ConversationItem
+								{conversation}
+								isSelected={chatState.conversationId === conversation.id}
+							/>
+						{/each}
+					</div>
+				</div>
+			{/if}
 		{/each}
 
 		<!-- Archived section -->

frontend/src/lib/components/layout/ProjectFolder.svelte

@@ -0,0 +1,143 @@
+<script lang="ts">
+	/**
+	 * ProjectFolder.svelte - Collapsible folder for project conversations
+	 * Shows project name, color indicator, and nested conversations
+	 */
+	import type { Project } from '$lib/stores/projects.svelte.js';
+	import type { Conversation } from '$lib/types/conversation.js';
+	import { projectsState, chatState } from '$lib/stores';
+	import ConversationItem from './ConversationItem.svelte';
+	import { goto } from '$app/navigation';
+
+	interface Props {
+		project: Project;
+		conversations: Conversation[];
+		onEditProject?: (projectId: string) => void;
+	}
+
+	let { project, conversations, onEditProject }: Props = $props();
+
+	// Track if this project is expanded
+	const isExpanded = $derived(!projectsState.collapsedIds.has(project.id));
+
+	/** Toggle folder collapse state */
+	async function handleToggle(e: MouseEvent) {
+		e.preventDefault();
+		e.stopPropagation();
+		await projectsState.toggleCollapse(project.id);
+	}
+
+	/** Navigate to project page */
+	function handleOpenProject(e: MouseEvent) {
+		e.preventDefault();
+		e.stopPropagation();
+		goto(`/projects/${project.id}`);
+	}
+
+	/** Handle project settings click */
+	function handleSettings(e: MouseEvent) {
+		e.preventDefault();
+		e.stopPropagation();
+		onEditProject?.(project.id);
+	}
+</script>
+
+<div class="mb-1">
+	<!-- Project header -->
+	<div class="group flex w-full items-center gap-2 rounded-lg px-2 py-1.5 text-left transition-colors hover:bg-theme-secondary/60">
+		<!-- Collapse indicator (clickable) -->
+		<button
+			type="button"
+			onclick={handleToggle}
+			class="shrink-0 rounded p-0.5 text-theme-muted transition-colors hover:text-theme-primary"
+			aria-label={isExpanded ? 'Collapse project' : 'Expand project'}
+		>
+			<svg
+				xmlns="http://www.w3.org/2000/svg"
+				class="h-3 w-3 transition-transform {isExpanded ? 'rotate-90' : ''}"
+				viewBox="0 0 20 20"
+				fill="currentColor"
+			>
+				<path
+					fill-rule="evenodd"
+					d="M7.21 14.77a.75.75 0 01.02-1.06L11.168 10 7.23 6.29a.75.75 0 111.04-1.08l4.5 4.25a.75.75 0 010 1.08l-4.5 4.25a.75.75 0 01-1.06-.02z"
+					clip-rule="evenodd"
+				/>
+			</svg>
+		</button>
+
+		<!-- Project link (folder icon + name) - navigates to project page -->
+		<a
+			href="/projects/{project.id}"
+			onclick={handleOpenProject}
+			class="flex flex-1 items-center gap-2 truncate"
+			title="Open project"
+		>
+			<!-- Folder icon with project color -->
+			<svg
+				xmlns="http://www.w3.org/2000/svg"
+				class="h-4 w-4 shrink-0"
+				viewBox="0 0 20 20"
+				fill={project.color || '#10b981'}
+			>
+				<path d="M2 6a2 2 0 012-2h5l2 2h5a2 2 0 012 2v6a2 2 0 01-2 2H4a2 2 0 01-2-2V6z" />
+			</svg>
+
+			<!-- Project name -->
+			<span class="flex-1 truncate text-sm font-medium text-theme-secondary hover:text-theme-primary">
+				{project.name}
+			</span>
+		</a>
+
+		<!-- Conversation count -->
+		<span class="shrink-0 text-xs text-theme-muted">
+			{conversations.length}
+		</span>
+
+		<!-- Settings button (hidden until hover) -->
+		<button
+			type="button"
+			onclick={handleSettings}
+			class="shrink-0 rounded p-1 text-theme-secondary opacity-0 transition-opacity hover:bg-theme-tertiary hover:text-theme-primary group-hover:opacity-100"
+			aria-label="Project settings"
+			title="Settings"
+		>
+			<svg
+				xmlns="http://www.w3.org/2000/svg"
+				class="h-3.5 w-3.5"
+				fill="none"
+				viewBox="0 0 24 24"
+				stroke="currentColor"
+				stroke-width="2"
+			>
+				<path
+					stroke-linecap="round"
+					stroke-linejoin="round"
+					d="M10.343 3.94c.09-.542.56-.94 1.11-.94h1.093c.55 0 1.02.398 1.11.94l.149.894c.07.424.384.764.78.93.398.164.855.142 1.205-.108l.737-.527a1.125 1.125 0 011.45.12l.773.774c.39.389.44 1.002.12 1.45l-.527.737c-.25.35-.272.806-.107 1.204.165.397.505.71.93.78l.893.15c.543.09.94.56.94 1.109v1.094c0 .55-.397 1.02-.94 1.11l-.893.149c-.425.07-.765.383-.93.78-.165.398-.143.854.107 1.204l.527.738c.32.447.269 1.06-.12 1.45l-.774.773a1.125 1.125 0 01-1.449.12l-.738-.527c-.35-.25-.806-.272-1.203-.107-.397.165-.71.505-.781.929l-.149.894c-.09.542-.56.94-1.11.94h-1.094c-.55 0-1.019-.398-1.11-.94l-.148-.894c-.071-.424-.384-.764-.781-.93-.398-.164-.854-.142-1.204.108l-.738.527c-.447.32-1.06.269-1.45-.12l-.773-.774a1.125 1.125 0 01-.12-1.45l.527-.737c.25-.35.273-.806.108-1.204-.165-.397-.505-.71-.93-.78l-.894-.15c-.542-.09-.94-.56-.94-1.109v-1.094c0-.55.398-1.02.94-1.11l.894-.149c.424-.07.765-.383.93-.78.165-.398.143-.854-.107-1.204l-.527-.738a1.125 1.125 0 01.12-1.45l.773-.773a1.125 1.125 0 011.45-.12l.737.527c.35.25.807.272 1.204.107.397-.165.71-.505.78-.929l.15-.894z"
+				/>
+				<path stroke-linecap="round" stroke-linejoin="round" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />
+			</svg>
+		</button>
+	</div>
+
+	<!-- Conversations in this project -->
+	{#if isExpanded && conversations.length > 0}
+		<div class="ml-3 flex flex-col gap-0.5 border-l border-theme/30 pl-2">
+			{#each conversations as conversation (conversation.id)}
+				<ConversationItem
+					{conversation}
+					isSelected={chatState.conversationId === conversation.id}
+				/>
+			{/each}
+		</div>
+	{/if}
+
+	<!-- Empty state for expanded folder with no conversations -->
+	{#if isExpanded && conversations.length === 0}
+		<div class="ml-3 border-l border-theme/30 pl-2">
+			<p class="px-3 py-2 text-xs text-theme-muted italic">
+				No conversations yet
+			</p>
+		</div>
+	{/if}
+</div>

frontend/src/lib/components/layout/Sidenav.svelte

@@ -1,20 +1,33 @@
 <script lang="ts">
 	/**
 	 * Sidenav.svelte - Collapsible sidebar for the Ollama chat UI
-	 * Contains navigation header, search, and conversation list
+	 * Contains navigation header, search, projects, and conversation list
 	 */
 	import { page } from '$app/stores';
 	import { uiState } from '$lib/stores';
 	import SidenavHeader from './SidenavHeader.svelte';
 	import SidenavSearch from './SidenavSearch.svelte';
 	import ConversationList from './ConversationList.svelte';
-	import { SettingsModal } from '$lib/components/shared';
+	import ProjectModal from '$lib/components/projects/ProjectModal.svelte';
 
-	// Check if a path is active
-	const isActive = (path: string) => $page.url.pathname === path;
+	// Project modal state
+	let showProjectModal = $state(false);
+	let editingProjectId = $state<string | null>(null);
 
-	// Settings modal state
-	let settingsOpen = $state(false);
+	function handleCreateProject() {
+		editingProjectId = null;
+		showProjectModal = true;
+	}
+
+	function handleEditProject(projectId: string) {
+		editingProjectId = projectId;
+		showProjectModal = true;
+	}
+
+	function handleCloseProjectModal() {
+		showProjectModal = false;
+		editingProjectId = null;
+	}
 </script>
 
 <!-- Overlay for mobile (closes sidenav when clicking outside) -->
@@ -42,106 +55,41 @@
 		<!-- Search bar -->
 		<SidenavSearch />
 
-		<!-- Conversation list (scrollable) -->
-		<div class="flex-1 overflow-y-auto overflow-x-hidden">
-			<ConversationList />
-		</div>
-
-		<!-- Footer / Navigation links -->
-		<div class="border-t border-theme p-3 space-y-1">
-			<!-- Model Browser link -->
-			<a
-				href="/models"
-				class="flex w-full items-center gap-3 rounded-lg px-3 py-2 text-sm transition-colors {isActive('/models') ? 'bg-cyan-500/20 text-cyan-600 dark:bg-cyan-900/30 dark:text-cyan-400' : 'text-theme-muted hover:bg-theme-hover hover:text-theme-primary'}"
-			>
-				<svg
-					xmlns="http://www.w3.org/2000/svg"
-					class="h-5 w-5"
-					fill="none"
-					viewBox="0 0 24 24"
-					stroke="currentColor"
-					stroke-width="1.5"
-				>
-					<path
-						stroke-linecap="round"
-						stroke-linejoin="round"
-						d="M9.75 3.104v5.714a2.25 2.25 0 0 1-.659 1.591L5 14.5M9.75 3.104c-.251.023-.501.05-.75.082m.75-.082a24.301 24.301 0 0 1 4.5 0m0 0v5.714c0 .597.237 1.17.659 1.591L19.8 15.3M14.25 3.104c.251.023.501.05.75.082M19.8 15.3l-1.57.393A9.065 9.065 0 0 1 12 15a9.065 9.065 0 0 0-6.23.693L5 14.5m14.8.8 1.402 1.402c1.232 1.232.65 3.318-1.067 3.611A48.309 48.309 0 0 1 12 21c-2.773 0-5.491-.235-8.135-.687-1.718-.293-2.3-2.379-1.067-3.61L5 14.5"
-					/>
-				</svg>
-				<span>Models</span>
-			</a>
-
-			<!-- Knowledge Base link -->
-			<a
-				href="/knowledge"
-				class="flex w-full items-center gap-3 rounded-lg px-3 py-2 text-sm transition-colors {isActive('/knowledge') ? 'bg-blue-500/20 text-blue-600 dark:bg-blue-900/30 dark:text-blue-400' : 'text-theme-muted hover:bg-theme-hover hover:text-theme-primary'}"
-			>
-				<svg
-					xmlns="http://www.w3.org/2000/svg"
-					class="h-5 w-5"
-					fill="none"
-					viewBox="0 0 24 24"
-					stroke="currentColor"
-					stroke-width="1.5"
-				>
-					<path
-						stroke-linecap="round"
-						stroke-linejoin="round"
-						d="M12 6.042A8.967 8.967 0 0 0 6 3.75c-1.052 0-2.062.18-3 .512v14.25A8.987 8.987 0 0 1 6 18c2.305 0 4.408.867 6 2.292m0-14.25a8.966 8.966 0 0 1 6-2.292c1.052 0 2.062.18 3 .512v14.25A8.987 8.987 0 0 0 18 18a8.967 8.967 0 0 0-6 2.292m0-14.25v14.25"
-					/>
-				</svg>
-				<span>Knowledge Base</span>
-			</a>
-
-			<!-- Tools link -->
-			<a
-				href="/tools"
-				class="flex w-full items-center gap-3 rounded-lg px-3 py-2 text-sm transition-colors {isActive('/tools') ? 'bg-emerald-500/20 text-emerald-600 dark:bg-emerald-900/30 dark:text-emerald-400' : 'text-theme-muted hover:bg-theme-hover hover:text-theme-primary'}"
-			>
-				<svg
-					xmlns="http://www.w3.org/2000/svg"
-					class="h-5 w-5"
-					fill="none"
-					viewBox="0 0 24 24"
-					stroke="currentColor"
-					stroke-width="1.5"
-				>
-					<path
-						stroke-linecap="round"
-						stroke-linejoin="round"
-						d="M11.42 15.17 17.25 21A2.652 2.652 0 0 0 21 17.25l-5.877-5.877M11.42 15.17l2.496-3.03c.317-.384.74-.626 1.208-.766M11.42 15.17l-4.655 5.653a2.548 2.548 0 1 1-3.586-3.586l6.837-5.63m5.108-.233c.55-.164 1.163-.188 1.743-.14a4.5 4.5 0 0 0 4.486-6.336l-3.276 3.277a3.004 3.004 0 0 1-2.25-2.25l3.276-3.276a4.5 4.5 0 0 0-6.336 4.486c.091 1.076-.071 2.264-.904 2.95l-.102.085m-1.745 1.437L5.909 7.5H4.5L2.25 3.75l1.5-1.5L7.5 4.5v1.409l4.26 4.26m-1.745 1.437 1.745-1.437m6.615 8.206L15.75 15.75M4.867 19.125h.008v.008h-.008v-.008Z"
-					/>
-				</svg>
-				<span>Tools</span>
-			</a>
-
-			<!-- Prompts link -->
-			<a
-				href="/prompts"
-				class="flex w-full items-center gap-3 rounded-lg px-3 py-2 text-sm transition-colors {isActive('/prompts') ? 'bg-purple-500/20 text-purple-600 dark:bg-purple-900/30 dark:text-purple-400' : 'text-theme-muted hover:bg-theme-hover hover:text-theme-primary'}"
-			>
-				<svg
-					xmlns="http://www.w3.org/2000/svg"
-					class="h-5 w-5"
-					fill="none"
-					viewBox="0 0 24 24"
-					stroke="currentColor"
-					stroke-width="1.5"
-				>
-					<path
-						stroke-linecap="round"
-						stroke-linejoin="round"
-						d="M19.5 14.25v-2.625a3.375 3.375 0 0 0-3.375-3.375h-1.5A1.125 1.125 0 0 1 13.5 7.125v-1.5a3.375 3.375 0 0 0-3.375-3.375H8.25m0 12.75h7.5m-7.5 3H12M10.5 2.25H5.625c-.621 0-1.125.504-1.125 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125V11.25a9 9 0 0 0-9-9Z"
-					/>
-				</svg>
-				<span>Prompts</span>
-			</a>
-
-			<!-- Settings button -->
+		<!-- Create Project button -->
+		<div class="px-3 pb-2">
 			<button
 				type="button"
-				onclick={() => (settingsOpen = true)}
-				class="flex w-full items-center gap-3 rounded-lg px-3 py-2 text-sm text-theme-muted transition-colors hover:bg-theme-hover hover:text-theme-primary"
+				onclick={handleCreateProject}
+				class="flex w-full items-center gap-2 rounded-lg border border-dashed border-theme px-3 py-2 text-sm text-theme-muted transition-colors hover:border-emerald-500/50 hover:bg-theme-secondary/50 hover:text-emerald-500"
+			>
+				<svg
+					xmlns="http://www.w3.org/2000/svg"
+					class="h-4 w-4"
+					fill="none"
+					viewBox="0 0 24 24"
+					stroke="currentColor"
+					stroke-width="2"
+				>
+					<path
+						stroke-linecap="round"
+						stroke-linejoin="round"
+						d="M12 4.5v15m7.5-7.5h-15"
+					/>
+				</svg>
+				<span>New Project</span>
+			</button>
+		</div>
+
+		<!-- Conversation list (scrollable) -->
+		<div class="flex-1 overflow-y-auto overflow-x-hidden">
+			<ConversationList onEditProject={handleEditProject} />
+		</div>
+
+		<!-- Footer / Settings link -->
+		<div class="border-t border-theme p-3">
+			<a
+				href="/settings"
+				class="flex w-full items-center gap-3 rounded-lg px-3 py-2 text-sm transition-colors {$page.url.pathname.startsWith('/settings') ? 'bg-violet-500/20 text-violet-600 dark:bg-violet-900/30 dark:text-violet-400' : 'text-theme-muted hover:bg-theme-hover hover:text-theme-primary'}"
 			>
 				<svg
 					xmlns="http://www.w3.org/2000/svg"
@@ -159,10 +107,14 @@
 					<path stroke-linecap="round" stroke-linejoin="round" d="M15 12a3 3 0 1 1-6 0 3 3 0 0 1 6 0Z" />
 				</svg>
 				<span>Settings</span>
-			</button>
+			</a>
 		</div>
 	</div>
 </aside>
 
-<!-- Settings Modal -->
-<SettingsModal isOpen={settingsOpen} onClose={() => (settingsOpen = false)} />
+<!-- Project Modal -->
+<ProjectModal
+	isOpen={showProjectModal}
+	onClose={handleCloseProjectModal}
+	projectId={editingProjectId}
+/>

frontend/src/lib/components/layout/SidenavSearch.svelte

@@ -1,20 +1,31 @@
 <script lang="ts">
 	/**
-	 * SidenavSearch.svelte - Search input for filtering conversations
-	 * Uses local conversationsState for instant client-side filtering
+	 * SidenavSearch.svelte - Search input that navigates to search page
 	 */
+	import { goto } from '$app/navigation';
 	import { conversationsState } from '$lib/stores';
 
-	// Handle input change - directly updates store for instant filtering
+	let searchValue = $state('');
+
+	// Handle input change - only filter locally, navigate on Enter
 	function handleInput(e: Event) {
 		const value = (e.target as HTMLInputElement).value;
-		conversationsState.searchQuery = value;
+		searchValue = value;
+		conversationsState.searchQuery = value; // Local filtering in sidebar
 	}
 
 	// Handle clear button
 	function handleClear() {
+		searchValue = '';
 		conversationsState.clearSearch();
 	}
+
+	// Handle Enter key to navigate to search page
+	function handleKeydown(e: KeyboardEvent) {
+		if (e.key === 'Enter' && searchValue.trim()) {
+			goto(`/search?query=${encodeURIComponent(searchValue)}`);
+		}
+	}
 </script>
 
 <div class="px-3 pb-2">
@@ -38,15 +49,16 @@
 		<!-- Search input -->
 		<input
 			type="text"
-			value={conversationsState.searchQuery}
+			bind:value={searchValue}
 			oninput={handleInput}
+			onkeydown={handleKeydown}
 			placeholder="Search conversations..."
 			data-search-input
-			class="w-full rounded-lg border border-theme-subtle bg-theme-tertiary/50 py-2 pl-10 pr-9 text-sm text-theme-primary placeholder-theme-placeholder transition-colors focus:border-violet-500/50 focus:bg-theme-tertiary focus:outline-none focus:ring-1 focus:ring-violet-500/50"
+			class="w-full rounded-lg border border-theme bg-slate-800 py-2 pl-10 pr-9 text-sm text-white placeholder-slate-400 transition-colors focus:border-violet-500/50 focus:bg-slate-700 focus:outline-none focus:ring-1 focus:ring-violet-500/50"
 		/>
 
 		<!-- Clear button (visible when there's text) -->
-		{#if conversationsState.searchQuery}
+		{#if searchValue}
 			<button
 				type="button"
 				onclick={handleClear}

frontend/src/lib/components/layout/SyncStatusIndicator.svelte

@@ -0,0 +1,71 @@
+<script lang="ts">
+	/**
+	 * SyncStatusIndicator.svelte - Compact sync status indicator for TopNav
+	 * Shows connection status with backend: synced, syncing, error, or offline
+	 */
+	import { syncState } from '$lib/backend';
+
+	/** Computed status for display */
+	let displayStatus = $derived.by(() => {
+		if (syncState.status === 'offline' || !syncState.isOnline) {
+			return 'offline';
+		}
+		if (syncState.status === 'error') {
+			return 'error';
+		}
+		if (syncState.status === 'syncing') {
+			return 'syncing';
+		}
+		return 'synced';
+	});
+
+	/** Tooltip text based on status */
+	let tooltipText = $derived.by(() => {
+		switch (displayStatus) {
+			case 'offline':
+				return 'Backend offline - data stored locally only';
+			case 'error':
+				return syncState.lastError
+					? `Sync error: ${syncState.lastError}`
+					: 'Sync error - check backend connection';
+			case 'syncing':
+				return 'Syncing...';
+			case 'synced':
+				if (syncState.lastSyncTime) {
+					const ago = getTimeAgo(syncState.lastSyncTime);
+					return `Synced ${ago}`;
+				}
+				return 'Synced';
+		}
+	});
+
+	/** Format relative time */
+	function getTimeAgo(date: Date): string {
+		const seconds = Math.floor((Date.now() - date.getTime()) / 1000);
+		if (seconds < 60) return 'just now';
+		if (seconds < 3600) return `${Math.floor(seconds / 60)}m ago`;
+		if (seconds < 86400) return `${Math.floor(seconds / 3600)}h ago`;
+		return `${Math.floor(seconds / 86400)}d ago`;
+	}
+</script>
+
+<div class="relative flex items-center" title={tooltipText}>
+	<!-- Status dot -->
+	<span
+		class="inline-block h-2 w-2 rounded-full {displayStatus === 'synced'
+			? 'bg-emerald-500'
+			: displayStatus === 'syncing'
+				? 'animate-pulse bg-amber-500'
+				: 'bg-red-500'}"
+		aria-hidden="true"
+	></span>
+
+	<!-- Pending count badge (only when error/offline with pending items) -->
+	{#if (displayStatus === 'error' || displayStatus === 'offline') && syncState.pendingCount > 0}
+		<span
+			class="ml-1 rounded-full bg-red-500/20 px-1.5 py-0.5 text-[10px] font-medium text-red-500"
+		>
+			{syncState.pendingCount}
+		</span>
+	{/if}
+</div>

frontend/src/lib/components/layout/TopNav.svelte

@@ -9,6 +9,7 @@
 	import ExportDialog from '$lib/components/shared/ExportDialog.svelte';
 	import ConfirmDialog from '$lib/components/shared/ConfirmDialog.svelte';
 	import ContextUsageBar from '$lib/components/chat/ContextUsageBar.svelte';
+	import SyncStatusIndicator from './SyncStatusIndicator.svelte';
 
 	interface Props {
 		/** Slot for the model select dropdown */
@@ -167,8 +168,13 @@
 			</div>
 		{/if}
 
-		<!-- Right section: Theme toggle + Chat actions -->
+		<!-- Right section: Sync status + Theme toggle + Chat actions -->
 		<div class="flex items-center gap-1">
+			<!-- Sync status indicator (always visible) -->
+			<div class="mr-1 px-2">
+				<SyncStatusIndicator />
+			</div>
+
 			<!-- Theme toggle (always visible) -->
 			<button
 				type="button"

frontend/src/lib/components/models/ModelEditorDialog.svelte

@@ -0,0 +1,311 @@
+<script lang="ts">
+	/**
+	 * ModelEditorDialog - Dialog for creating/editing custom Ollama models
+	 * Supports two modes: create (new model) and edit (update system prompt)
+	 */
+
+	import { modelsState, promptsState } from '$lib/stores';
+	import { modelCreationState, type ModelEditorMode } from '$lib/stores/model-creation.svelte.js';
+	import { modelInfoService } from '$lib/services/model-info-service.js';
+
+	interface Props {
+		/** Whether the dialog is open */
+		isOpen: boolean;
+		/** Mode: create or edit */
+		mode: ModelEditorMode;
+		/** For edit mode: the model being edited */
+		editingModel?: string;
+		/** For edit mode: the current system prompt */
+		currentSystemPrompt?: string;
+		/** For edit mode: the base model (parent) */
+		baseModel?: string;
+		/** Callback when dialog is closed */
+		onClose: () => void;
+	}
+
+	let { isOpen, mode, editingModel, currentSystemPrompt, baseModel, onClose }: Props = $props();
+
+	// Form state
+	let modelName = $state('');
+	let selectedBaseModel = $state('');
+	let systemPrompt = $state('');
+	let usePromptLibrary = $state(false);
+	let selectedPromptId = $state<string | null>(null);
+
+	// Initialize form when opening
+	$effect(() => {
+		if (isOpen) {
+			if (mode === 'edit' && editingModel) {
+				modelName = editingModel;
+				selectedBaseModel = baseModel || '';
+				systemPrompt = currentSystemPrompt || '';
+			} else {
+				modelName = '';
+				selectedBaseModel = modelsState.chatModels[0]?.name || '';
+				systemPrompt = '';
+			}
+			usePromptLibrary = false;
+			selectedPromptId = null;
+			modelCreationState.reset();
+		}
+	});
+
+	// Get system prompt content (either from textarea or prompt library)
+	const effectiveSystemPrompt = $derived(
+		usePromptLibrary && selectedPromptId
+			? promptsState.get(selectedPromptId)?.content || ''
+			: systemPrompt
+	);
+
+	// Validation
+	const isValid = $derived(
+		modelName.trim().length > 0 &&
+		(mode === 'edit' || selectedBaseModel.length > 0) &&
+		effectiveSystemPrompt.trim().length > 0
+	);
+
+	async function handleSubmit(event: Event): Promise<void> {
+		event.preventDefault();
+		if (!isValid || modelCreationState.isCreating) return;
+
+		const base = mode === 'edit' ? (baseModel || editingModel || '') : selectedBaseModel;
+		const success = mode === 'edit'
+			? await modelCreationState.update(modelName, base, effectiveSystemPrompt)
+			: await modelCreationState.create(modelName, base, effectiveSystemPrompt);
+
+		if (success) {
+			// Close after short delay to show success status
+			setTimeout(() => {
+				onClose();
+			}, 500);
+		}
+	}
+
+	function handleBackdropClick(event: MouseEvent): void {
+		if (event.target === event.currentTarget && !modelCreationState.isCreating) {
+			onClose();
+		}
+	}
+
+	function handleKeydown(event: KeyboardEvent): void {
+		if (event.key === 'Escape' && !modelCreationState.isCreating) {
+			onClose();
+		}
+	}
+
+	function handleCancel(): void {
+		if (modelCreationState.isCreating) {
+			modelCreationState.cancel();
+		} else {
+			onClose();
+		}
+	}
+</script>
+
+<svelte:window onkeydown={handleKeydown} />
+
+{#if isOpen}
+	<!-- Backdrop -->
+	<div
+		class="fixed inset-0 z-50 flex items-center justify-center bg-black/60 backdrop-blur-sm p-4"
+		onclick={handleBackdropClick}
+		onkeydown={handleKeydown}
+		role="dialog"
+		aria-modal="true"
+		aria-labelledby="model-editor-title"
+		tabindex="-1"
+	>
+		<!-- Dialog -->
+		<div class="w-full max-w-lg rounded-xl bg-theme-secondary shadow-xl">
+			<div class="border-b border-theme px-6 py-4">
+				<h2 id="model-editor-title" class="text-lg font-semibold text-theme-primary">
+					{mode === 'edit' ? 'Edit Model System Prompt' : 'Create Custom Model'}
+				</h2>
+				{#if mode === 'edit'}
+					<p class="mt-1 text-xs text-theme-muted">
+						This will re-create the model with the new system prompt
+					</p>
+				{/if}
+			</div>
+
+			{#if modelCreationState.isCreating}
+				<!-- Progress view -->
+				<div class="p-6">
+					<div class="flex flex-col items-center justify-center py-8">
+						<div class="h-10 w-10 animate-spin rounded-full border-3 border-theme-subtle border-t-violet-500 mb-4"></div>
+						<p class="text-sm text-theme-secondary mb-2">
+							{mode === 'edit' ? 'Updating model...' : 'Creating model...'}
+						</p>
+						<p class="text-xs text-theme-muted text-center max-w-xs">
+							{modelCreationState.status}
+						</p>
+					</div>
+
+					<div class="flex justify-center">
+						<button
+							type="button"
+							onclick={handleCancel}
+							class="rounded-lg px-4 py-2 text-sm text-red-400 hover:bg-red-900/20"
+						>
+							Cancel
+						</button>
+					</div>
+				</div>
+			{:else if modelCreationState.error}
+				<!-- Error view -->
+				<div class="p-6">
+					<div class="rounded-lg bg-red-900/20 border border-red-500/30 p-4 mb-4">
+						<p class="text-sm text-red-400">{modelCreationState.error}</p>
+					</div>
+					<div class="flex justify-end gap-3">
+						<button
+							type="button"
+							onclick={() => modelCreationState.reset()}
+							class="rounded-lg px-4 py-2 text-sm text-theme-secondary hover:bg-theme-tertiary"
+						>
+							Try Again
+						</button>
+						<button
+							type="button"
+							onclick={onClose}
+							class="rounded-lg bg-theme-tertiary px-4 py-2 text-sm text-theme-secondary hover:bg-theme-hover"
+						>
+							Close
+						</button>
+					</div>
+				</div>
+			{:else}
+				<!-- Form view -->
+				<form onsubmit={handleSubmit} class="p-6">
+					<div class="space-y-4">
+						{#if mode === 'create'}
+							<!-- Base model selection -->
+							<div>
+								<label for="base-model" class="mb-1 block text-sm font-medium text-theme-secondary">
+									Base Model <span class="text-red-400">*</span>
+								</label>
+								<select
+									id="base-model"
+									bind:value={selectedBaseModel}
+									class="w-full rounded-lg border border-theme-subtle bg-theme-tertiary px-3 py-2 text-theme-primary focus:border-violet-500 focus:outline-none focus:ring-1 focus:ring-violet-500"
+								>
+									{#each modelsState.chatModels as model (model.name)}
+										<option value={model.name}>{model.name}</option>
+									{/each}
+								</select>
+								<p class="mt-1 text-xs text-theme-muted">
+									The model to derive from
+								</p>
+							</div>
+						{/if}
+
+						<!-- Model name -->
+						<div>
+							<label for="model-name" class="mb-1 block text-sm font-medium text-theme-secondary">
+								Model Name <span class="text-red-400">*</span>
+							</label>
+							<input
+								id="model-name"
+								type="text"
+								bind:value={modelName}
+								placeholder="e.g., my-coding-assistant"
+								disabled={mode === 'edit'}
+								class="w-full rounded-lg border border-theme-subtle bg-theme-tertiary px-3 py-2 text-theme-primary placeholder-theme-muted focus:border-violet-500 focus:outline-none focus:ring-1 focus:ring-violet-500 disabled:opacity-60"
+								autocomplete="off"
+								autocorrect="off"
+								autocapitalize="off"
+								spellcheck="false"
+							/>
+							{#if mode === 'create'}
+								<p class="mt-1 text-xs text-theme-muted">
+									Use lowercase letters, numbers, and hyphens
+								</p>
+							{/if}
+						</div>
+
+						<!-- System prompt source toggle -->
+						<div class="flex items-center gap-4">
+							<button
+								type="button"
+								onclick={() => usePromptLibrary = false}
+								class="text-sm {!usePromptLibrary ? 'text-violet-400 font-medium' : 'text-theme-muted hover:text-theme-secondary'}"
+							>
+								Write prompt
+							</button>
+							<span class="text-theme-muted">|</span>
+							<button
+								type="button"
+								onclick={() => usePromptLibrary = true}
+								class="text-sm {usePromptLibrary ? 'text-violet-400 font-medium' : 'text-theme-muted hover:text-theme-secondary'}"
+							>
+								Use from library
+							</button>
+						</div>
+
+						{#if usePromptLibrary}
+							<!-- Prompt library selector -->
+							<div>
+								<label for="prompt-library" class="mb-1 block text-sm font-medium text-theme-secondary">
+									Select Prompt <span class="text-red-400">*</span>
+								</label>
+								<select
+									id="prompt-library"
+									bind:value={selectedPromptId}
+									class="w-full rounded-lg border border-theme-subtle bg-theme-tertiary px-3 py-2 text-theme-primary focus:border-violet-500 focus:outline-none focus:ring-1 focus:ring-violet-500"
+								>
+									<option value={null}>-- Select a prompt --</option>
+									{#each promptsState.prompts as prompt (prompt.id)}
+										<option value={prompt.id}>{prompt.name}</option>
+									{/each}
+								</select>
+								{#if selectedPromptId}
+									{@const selectedPrompt = promptsState.get(selectedPromptId)}
+									{#if selectedPrompt}
+										<div class="mt-2 rounded-lg bg-theme-tertiary p-3 text-xs text-theme-muted max-h-32 overflow-y-auto">
+											{selectedPrompt.content}
+										</div>
+									{/if}
+								{/if}
+							</div>
+						{:else}
+							<!-- System prompt textarea -->
+							<div>
+								<label for="system-prompt" class="mb-1 block text-sm font-medium text-theme-secondary">
+									System Prompt <span class="text-red-400">*</span>
+								</label>
+								<textarea
+									id="system-prompt"
+									bind:value={systemPrompt}
+									placeholder="You are a helpful assistant that..."
+									rows="6"
+									class="w-full resize-none rounded-lg border border-theme-subtle bg-theme-tertiary px-3 py-2 font-mono text-sm text-theme-primary placeholder-theme-muted focus:border-violet-500 focus:outline-none focus:ring-1 focus:ring-violet-500"
+								></textarea>
+								<p class="mt-1 text-xs text-theme-muted">
+									{systemPrompt.length} characters
+								</p>
+							</div>
+						{/if}
+					</div>
+
+					<!-- Actions -->
+					<div class="mt-6 flex justify-end gap-3">
+						<button
+							type="button"
+							onclick={handleCancel}
+							class="rounded-lg px-4 py-2 text-sm text-theme-secondary hover:bg-theme-tertiary"
+						>
+							Cancel
+						</button>
+						<button
+							type="submit"
+							disabled={!isValid}
+							class="rounded-lg bg-violet-600 px-4 py-2 text-sm font-medium text-white hover:bg-violet-500 disabled:cursor-not-allowed disabled:opacity-50"
+						>
+							{mode === 'edit' ? 'Update Model' : 'Create Model'}
+						</button>
+					</div>
+				</form>
+			{/if}
+		</div>
+	</div>
+{/if}

frontend/src/lib/components/models/PullModelDialog.svelte

@@ -40,9 +40,11 @@
 	<div
 		class="fixed inset-0 z-50 flex items-center justify-center bg-black/60 backdrop-blur-sm"
 		onclick={handleBackdropClick}
+		onkeydown={handleKeydown}
 		role="dialog"
 		aria-modal="true"
 		aria-labelledby="pull-dialog-title"
+		tabindex="-1"
 	>
 		<!-- Dialog -->
 		<div class="w-full max-w-md rounded-xl bg-theme-secondary p-6 shadow-xl">

frontend/src/lib/components/projects/MoveToProjectModal.svelte

@@ -0,0 +1,178 @@
+<script lang="ts">
+	/**
+	 * MoveToProjectModal - Move a conversation to a different project
+	 */
+	import { projectsState, conversationsState, toastState } from '$lib/stores';
+	import { moveConversationToProject } from '$lib/storage/conversations.js';
+
+	interface Props {
+		isOpen: boolean;
+		onClose: () => void;
+		conversationId: string;
+	}
+
+	let { isOpen, onClose, conversationId }: Props = $props();
+
+	let isLoading = $state(false);
+
+	// Get current conversation's project
+	const currentConversation = $derived.by(() => {
+		return conversationsState.find(conversationId);
+	});
+
+	const currentProjectId = $derived(currentConversation?.projectId || null);
+
+	async function handleSelect(projectId: string | null) {
+		if (projectId === currentProjectId) {
+			onClose();
+			return;
+		}
+
+		isLoading = true;
+
+		try {
+			const result = await moveConversationToProject(conversationId, projectId);
+			if (result.success) {
+				// Update local state
+				conversationsState.moveToProject(conversationId, projectId);
+
+				const projectName = projectId
+					? projectsState.projects.find(p => p.id === projectId)?.name || 'project'
+					: 'No Project';
+				toastState.success(`Moved to ${projectName}`);
+				onClose();
+			} else {
+				toastState.error('Failed to move conversation');
+			}
+		} catch {
+			toastState.error('Failed to move conversation');
+		} finally {
+			isLoading = false;
+		}
+	}
+
+	function handleBackdropClick(event: MouseEvent): void {
+		if (event.target === event.currentTarget) {
+			onClose();
+		}
+	}
+
+	function handleKeydown(event: KeyboardEvent): void {
+		if (event.key === 'Escape') {
+			onClose();
+		}
+	}
+</script>
+
+<svelte:window on:keydown={handleKeydown} />
+
+{#if isOpen}
+	<!-- Backdrop -->
+	<div
+		class="fixed inset-0 z-50 flex items-center justify-center bg-black/60 backdrop-blur-sm"
+		onclick={handleBackdropClick}
+		onkeydown={handleKeydown}
+		role="dialog"
+		aria-modal="true"
+		aria-labelledby="move-dialog-title"
+		tabindex="-1"
+	>
+		<!-- Dialog -->
+		<div class="mx-4 w-full max-w-sm rounded-xl border border-theme bg-theme-primary shadow-2xl">
+			<!-- Header -->
+			<div class="flex items-center justify-between border-b border-theme px-6 py-4">
+				<h2 id="move-dialog-title" class="text-lg font-semibold text-theme-primary">
+					Move to Project
+				</h2>
+				<button
+					type="button"
+					onclick={onClose}
+					class="rounded-lg p-1.5 text-theme-muted transition-colors hover:bg-theme-secondary hover:text-theme-primary"
+					aria-label="Close dialog"
+				>
+					<svg
+						xmlns="http://www.w3.org/2000/svg"
+						class="h-5 w-5"
+						fill="none"
+						viewBox="0 0 24 24"
+						stroke="currentColor"
+						stroke-width="2"
+					>
+						<path stroke-linecap="round" stroke-linejoin="round" d="M6 18 18 6M6 6l12 12" />
+					</svg>
+				</button>
+			</div>
+
+			<!-- Content -->
+			<div class="max-h-[50vh] overflow-y-auto px-2 py-3">
+				{#if isLoading}
+					<div class="flex items-center justify-center py-8">
+						<div class="h-6 w-6 animate-spin rounded-full border-2 border-emerald-500 border-t-transparent"></div>
+					</div>
+				{:else}
+					<!-- No Project option -->
+					<button
+						type="button"
+						onclick={() => handleSelect(null)}
+						class="flex w-full items-center gap-3 rounded-lg px-4 py-3 text-left transition-colors hover:bg-theme-secondary {currentProjectId === null ? 'bg-theme-secondary' : ''}"
+					>
+						<svg
+							xmlns="http://www.w3.org/2000/svg"
+							class="h-5 w-5 text-theme-muted"
+							fill="none"
+							viewBox="0 0 24 24"
+							stroke="currentColor"
+							stroke-width="1.5"
+						>
+							<path
+								stroke-linecap="round"
+								stroke-linejoin="round"
+								d="M2.25 12.75V12A2.25 2.25 0 0 1 4.5 9.75h15A2.25 2.25 0 0 1 21.75 12v.75m-8.69-6.44-2.12-2.12a1.5 1.5 0 0 0-1.061-.44H4.5A2.25 2.25 0 0 0 2.25 6v12a2.25 2.25 0 0 0 2.25 2.25h15A2.25 2.25 0 0 0 21.75 18V9a2.25 2.25 0 0 0-2.25-2.25h-5.379a1.5 1.5 0 0 1-1.06-.44Z"
+							/>
+						</svg>
+						<span class="text-sm text-theme-secondary">No Project</span>
+						{#if currentProjectId === null}
+							<svg xmlns="http://www.w3.org/2000/svg" class="ml-auto h-5 w-5 text-emerald-500" viewBox="0 0 20 20" fill="currentColor">
+								<path fill-rule="evenodd" d="M16.704 4.153a.75.75 0 0 1 .143 1.052l-8 10.5a.75.75 0 0 1-1.127.075l-4.5-4.5a.75.75 0 0 1 1.06-1.06l3.894 3.893 7.48-9.817a.75.75 0 0 1 1.05-.143Z" clip-rule="evenodd" />
+							</svg>
+						{/if}
+					</button>
+
+					<!-- Project options -->
+					{#if projectsState.sortedProjects.length > 0}
+						<div class="my-2 border-t border-theme"></div>
+						{#each projectsState.sortedProjects as project (project.id)}
+							<button
+								type="button"
+								onclick={() => handleSelect(project.id)}
+								class="flex w-full items-center gap-3 rounded-lg px-4 py-3 text-left transition-colors hover:bg-theme-secondary {currentProjectId === project.id ? 'bg-theme-secondary' : ''}"
+							>
+								<svg
+									xmlns="http://www.w3.org/2000/svg"
+									class="h-5 w-5 shrink-0"
+									viewBox="0 0 20 20"
+									fill={project.color || '#10b981'}
+								>
+									<path d="M2 6a2 2 0 012-2h5l2 2h5a2 2 0 012 2v6a2 2 0 01-2 2H4a2 2 0 01-2-2V6z" />
+								</svg>
+								<span class="truncate text-sm text-theme-secondary">{project.name}</span>
+								{#if currentProjectId === project.id}
+									<svg xmlns="http://www.w3.org/2000/svg" class="ml-auto h-5 w-5 shrink-0 text-emerald-500" viewBox="0 0 20 20" fill="currentColor">
+										<path fill-rule="evenodd" d="M16.704 4.153a.75.75 0 0 1 .143 1.052l-8 10.5a.75.75 0 0 1-1.127.075l-4.5-4.5a.75.75 0 0 1 1.06-1.06l3.894 3.893 7.48-9.817a.75.75 0 0 1 1.05-.143Z" clip-rule="evenodd" />
+									</svg>
+								{/if}
+							</button>
+						{/each}
+					{/if}
+
+					<!-- Empty state -->
+					{#if projectsState.sortedProjects.length === 0}
+						<p class="px-4 py-6 text-center text-sm text-theme-muted">
+							No projects yet. Create one from the sidebar.
+						</p>
+					{/if}
+				{/if}
+			</div>
+		</div>
+	</div>
+{/if}

frontend/src/lib/components/projects/ProjectModal.svelte

@@ -0,0 +1,475 @@
+<script lang="ts">
+	/**
+	 * ProjectModal - Create/Edit project with tabs for settings, instructions, and links
+	 */
+	import { projectsState, toastState } from '$lib/stores';
+	import type { Project } from '$lib/stores/projects.svelte.js';
+	import { addProjectLink, deleteProjectLink, getProjectLinks, type ProjectLink } from '$lib/storage/projects.js';
+	import { ConfirmDialog } from '$lib/components/shared';
+
+	interface Props {
+		isOpen: boolean;
+		onClose: () => void;
+		projectId?: string | null;
+		onUpdate?: () => void; // Called when project data changes (links added/deleted, etc.)
+	}
+
+	let { isOpen, onClose, projectId = null, onUpdate }: Props = $props();
+
+	// Form state
+	let name = $state('');
+	let description = $state('');
+	let instructions = $state('');
+	let color = $state('#10b981');
+	let links = $state<ProjectLink[]>([]);
+	let newLinkUrl = $state('');
+	let newLinkTitle = $state('');
+	let newLinkDescription = $state('');
+	let isLoading = $state(false);
+	let activeTab = $state<'settings' | 'instructions' | 'links'>('settings');
+	let showDeleteConfirm = $state(false);
+
+	// Predefined colors for quick selection
+	const presetColors = [
+		'#10b981', // emerald
+		'#3b82f6', // blue
+		'#8b5cf6', // violet
+		'#f59e0b', // amber
+		'#ef4444', // red
+		'#ec4899', // pink
+		'#06b6d4', // cyan
+		'#84cc16', // lime
+	];
+
+	// Get existing project data when editing
+	const existingProject = $derived.by(() => {
+		if (!projectId) return null;
+		return projectsState.projects.find(p => p.id === projectId) || null;
+	});
+
+	// Modal title
+	const modalTitle = $derived(projectId ? 'Edit Project' : 'Create Project');
+
+	// Reset form when modal opens/closes or project changes
+	$effect(() => {
+		if (isOpen) {
+			if (existingProject) {
+				name = existingProject.name;
+				description = existingProject.description || '';
+				instructions = existingProject.instructions || '';
+				color = existingProject.color || '#10b981';
+				loadProjectLinks();
+			} else {
+				name = '';
+				description = '';
+				instructions = '';
+				color = '#10b981';
+				links = [];
+			}
+			activeTab = 'settings';
+		}
+	});
+
+	async function loadProjectLinks() {
+		if (!projectId) return;
+		const result = await getProjectLinks(projectId);
+		if (result.success) {
+			links = result.data;
+		}
+	}
+
+	async function handleSave() {
+		if (!name.trim()) {
+			toastState.error('Project name is required');
+			return;
+		}
+
+		isLoading = true;
+
+		try {
+			if (projectId) {
+				// Update existing project
+				const success = await projectsState.update(projectId, {
+					name: name.trim(),
+					description: description.trim(),
+					instructions: instructions.trim(),
+					color
+				});
+
+				if (success) {
+					toastState.success('Project updated');
+					onClose();
+				} else {
+					toastState.error('Failed to update project');
+				}
+			} else {
+				// Create new project
+				const project = await projectsState.add({
+					name: name.trim(),
+					description: description.trim(),
+					instructions: instructions.trim(),
+					color
+				});
+
+				if (project) {
+					toastState.success('Project created');
+					onClose();
+				} else {
+					toastState.error('Failed to create project');
+				}
+			}
+		} finally {
+			isLoading = false;
+		}
+	}
+
+	function handleDeleteClick() {
+		if (!projectId) return;
+		showDeleteConfirm = true;
+	}
+
+	async function handleDeleteConfirm() {
+		if (!projectId) return;
+		showDeleteConfirm = false;
+		isLoading = true;
+
+		try {
+			const success = await projectsState.remove(projectId);
+			if (success) {
+				toastState.success('Project deleted');
+				onClose();
+			} else {
+				toastState.error('Failed to delete project');
+			}
+		} finally {
+			isLoading = false;
+		}
+	}
+
+	async function handleAddLink() {
+		if (!projectId || !newLinkUrl.trim()) {
+			toastState.error('URL is required');
+			return;
+		}
+
+		try {
+			const result = await addProjectLink({
+				projectId,
+				url: newLinkUrl.trim(),
+				title: newLinkTitle.trim() || newLinkUrl.trim(),
+				description: newLinkDescription.trim()
+			});
+
+			if (result.success) {
+				links = [...links, result.data];
+				newLinkUrl = '';
+				newLinkTitle = '';
+				newLinkDescription = '';
+				toastState.success('Link added');
+				onUpdate?.(); // Notify parent to refresh
+			} else {
+				toastState.error('Failed to add link');
+			}
+		} catch {
+			toastState.error('Failed to add link');
+		}
+	}
+
+	async function handleDeleteLink(linkId: string) {
+		try {
+			const result = await deleteProjectLink(linkId);
+			if (result.success) {
+				links = links.filter(l => l.id !== linkId);
+				toastState.success('Link removed');
+				onUpdate?.(); // Notify parent to refresh
+			} else {
+				toastState.error('Failed to remove link');
+			}
+		} catch {
+			toastState.error('Failed to remove link');
+		}
+	}
+
+	function handleBackdropClick(event: MouseEvent): void {
+		if (event.target === event.currentTarget) {
+			onClose();
+		}
+	}
+
+	function handleKeydown(event: KeyboardEvent): void {
+		if (event.key === 'Escape') {
+			onClose();
+		}
+	}
+</script>
+
+<svelte:window on:keydown={handleKeydown} />
+
+{#if isOpen}
+	<!-- Backdrop -->
+	<div
+		class="fixed inset-0 z-50 flex items-center justify-center bg-black/60 backdrop-blur-sm"
+		onclick={handleBackdropClick}
+		onkeydown={handleKeydown}
+		role="dialog"
+		aria-modal="true"
+		aria-labelledby="project-dialog-title"
+		tabindex="-1"
+	>
+		<!-- Dialog -->
+		<div class="mx-4 w-full max-w-lg rounded-xl border border-theme bg-theme-primary shadow-2xl">
+			<!-- Header -->
+			<div class="flex items-center justify-between border-b border-theme px-6 py-4">
+				<h2 id="project-dialog-title" class="text-lg font-semibold text-theme-primary">
+					{modalTitle}
+				</h2>
+				<button
+					type="button"
+					onclick={onClose}
+					class="rounded-lg p-1.5 text-theme-muted transition-colors hover:bg-theme-secondary hover:text-theme-primary"
+					aria-label="Close dialog"
+				>
+					<svg
+						xmlns="http://www.w3.org/2000/svg"
+						class="h-5 w-5"
+						fill="none"
+						viewBox="0 0 24 24"
+						stroke="currentColor"
+						stroke-width="2"
+					>
+						<path stroke-linecap="round" stroke-linejoin="round" d="M6 18 18 6M6 6l12 12" />
+					</svg>
+				</button>
+			</div>
+
+			<!-- Tabs -->
+			<div class="border-b border-theme px-6">
+				<div class="flex gap-4">
+					<button
+						type="button"
+						onclick={() => (activeTab = 'settings')}
+						class="relative py-3 text-sm font-medium transition-colors {activeTab === 'settings' ? 'text-emerald-500' : 'text-theme-muted hover:text-theme-primary'}"
+					>
+						Settings
+						{#if activeTab === 'settings'}
+							<div class="absolute bottom-0 left-0 right-0 h-0.5 bg-emerald-500"></div>
+						{/if}
+					</button>
+					<button
+						type="button"
+						onclick={() => (activeTab = 'instructions')}
+						class="relative py-3 text-sm font-medium transition-colors {activeTab === 'instructions' ? 'text-emerald-500' : 'text-theme-muted hover:text-theme-primary'}"
+					>
+						Instructions
+						{#if activeTab === 'instructions'}
+							<div class="absolute bottom-0 left-0 right-0 h-0.5 bg-emerald-500"></div>
+						{/if}
+					</button>
+					{#if projectId}
+						<button
+							type="button"
+							onclick={() => (activeTab = 'links')}
+							class="relative py-3 text-sm font-medium transition-colors {activeTab === 'links' ? 'text-emerald-500' : 'text-theme-muted hover:text-theme-primary'}"
+						>
+							Links ({links.length})
+							{#if activeTab === 'links'}
+								<div class="absolute bottom-0 left-0 right-0 h-0.5 bg-emerald-500"></div>
+							{/if}
+						</button>
+					{/if}
+				</div>
+			</div>
+
+			<!-- Content -->
+			<div class="max-h-[50vh] overflow-y-auto px-6 py-4">
+				{#if activeTab === 'settings'}
+					<!-- Settings Tab -->
+					<div class="space-y-4">
+						<!-- Name -->
+						<div>
+							<label for="project-name" class="mb-1.5 block text-sm font-medium text-theme-secondary">
+								Name <span class="text-red-500">*</span>
+							</label>
+							<input
+								id="project-name"
+								type="text"
+								bind:value={name}
+								placeholder="My Project"
+								class="w-full rounded-lg border border-theme bg-theme-tertiary px-3 py-2 text-sm text-theme-primary placeholder-theme-muted focus:border-emerald-500/50 focus:outline-none focus:ring-1 focus:ring-emerald-500/50"
+							/>
+						</div>
+
+						<!-- Description -->
+						<div>
+							<label for="project-description" class="mb-1.5 block text-sm font-medium text-theme-secondary">
+								Description
+							</label>
+							<input
+								id="project-description"
+								type="text"
+								bind:value={description}
+								placeholder="Optional description"
+								class="w-full rounded-lg border border-theme bg-theme-tertiary px-3 py-2 text-sm text-theme-primary placeholder-theme-muted focus:border-emerald-500/50 focus:outline-none focus:ring-1 focus:ring-emerald-500/50"
+							/>
+						</div>
+
+						<!-- Color -->
+						<div>
+							<span class="mb-1.5 block text-sm font-medium text-theme-secondary">
+								Color
+							</span>
+							<div class="flex items-center gap-2">
+								{#each presetColors as presetColor}
+									<button
+										type="button"
+										onclick={() => (color = presetColor)}
+										class="h-6 w-6 rounded-full border-2 transition-transform hover:scale-110 {color === presetColor ? 'border-white shadow-lg' : 'border-transparent'}"
+										style="background-color: {presetColor}"
+										aria-label="Select color {presetColor}"
+									></button>
+								{/each}
+								<input
+									type="color"
+									bind:value={color}
+									class="h-6 w-6 cursor-pointer rounded border-0 bg-transparent"
+									title="Custom color"
+								/>
+							</div>
+						</div>
+					</div>
+				{:else if activeTab === 'instructions'}
+					<!-- Instructions Tab -->
+					<div>
+						<label for="project-instructions" class="mb-1.5 block text-sm font-medium text-theme-secondary">
+							Project Instructions
+						</label>
+						<p class="mb-2 text-xs text-theme-muted">
+							These instructions are injected into the system prompt for all chats in this project.
+						</p>
+						<textarea
+							id="project-instructions"
+							bind:value={instructions}
+							rows="10"
+							placeholder="You are helping with..."
+							class="w-full rounded-lg border border-theme bg-theme-tertiary px-3 py-2 text-sm text-theme-primary placeholder-theme-muted focus:border-emerald-500/50 focus:outline-none focus:ring-1 focus:ring-emerald-500/50"
+						></textarea>
+					</div>
+				{:else if activeTab === 'links'}
+					<!-- Links Tab -->
+					<div class="space-y-4">
+						<!-- Add new link form -->
+						<div class="rounded-lg border border-theme bg-theme-secondary/30 p-3">
+							<h4 class="mb-2 text-sm font-medium text-theme-secondary">Add Reference Link</h4>
+							<div class="space-y-2">
+								<input
+									type="url"
+									bind:value={newLinkUrl}
+									placeholder="https://..."
+									class="w-full rounded border border-theme bg-theme-tertiary px-2 py-1.5 text-sm text-theme-primary placeholder-theme-muted focus:border-emerald-500/50 focus:outline-none"
+								/>
+								<input
+									type="text"
+									bind:value={newLinkTitle}
+									placeholder="Title (optional)"
+									class="w-full rounded border border-theme bg-theme-tertiary px-2 py-1.5 text-sm text-theme-primary placeholder-theme-muted focus:border-emerald-500/50 focus:outline-none"
+								/>
+								<input
+									type="text"
+									bind:value={newLinkDescription}
+									placeholder="Description (optional)"
+									class="w-full rounded border border-theme bg-theme-tertiary px-2 py-1.5 text-sm text-theme-primary placeholder-theme-muted focus:border-emerald-500/50 focus:outline-none"
+								/>
+								<button
+									type="button"
+									onclick={handleAddLink}
+									disabled={!newLinkUrl.trim()}
+									class="w-full rounded bg-emerald-600 px-3 py-1.5 text-sm font-medium text-white transition-colors hover:bg-emerald-500 disabled:opacity-50"
+								>
+									Add Link
+								</button>
+							</div>
+						</div>
+
+						<!-- Existing links -->
+						{#if links.length === 0}
+							<p class="py-4 text-center text-sm text-theme-muted">No links added yet</p>
+						{:else}
+							<div class="space-y-2">
+								{#each links as link (link.id)}
+									<div class="flex items-start gap-2 rounded-lg border border-theme bg-theme-secondary/30 p-2">
+										<div class="min-w-0 flex-1">
+											<a
+												href={link.url}
+												target="_blank"
+												rel="noopener noreferrer"
+												class="block truncate text-sm font-medium text-emerald-500 hover:text-emerald-400"
+											>
+												{link.title}
+											</a>
+											{#if link.description}
+												<p class="truncate text-xs text-theme-muted">{link.description}</p>
+											{/if}
+										</div>
+										<button
+											type="button"
+											onclick={() => handleDeleteLink(link.id)}
+											class="shrink-0 rounded p-1 text-theme-muted hover:bg-red-900/50 hover:text-red-400"
+											aria-label="Remove link"
+										>
+											<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+												<path stroke-linecap="round" stroke-linejoin="round" d="M6 18 18 6M6 6l12 12" />
+											</svg>
+										</button>
+									</div>
+								{/each}
+							</div>
+						{/if}
+					</div>
+				{/if}
+			</div>
+
+			<!-- Footer -->
+			<div class="flex items-center justify-between border-t border-theme px-6 py-4">
+				<div>
+					{#if projectId}
+						<button
+							type="button"
+							onclick={handleDeleteClick}
+							disabled={isLoading}
+							class="rounded-lg px-4 py-2 text-sm font-medium text-red-500 transition-colors hover:bg-red-900/30 disabled:opacity-50"
+						>
+							Delete Project
+						</button>
+					{/if}
+				</div>
+				<div class="flex gap-3">
+					<button
+						type="button"
+						onclick={onClose}
+						class="rounded-lg px-4 py-2 text-sm font-medium text-theme-muted transition-colors hover:bg-theme-secondary hover:text-theme-primary"
+					>
+						Cancel
+					</button>
+					<button
+						type="button"
+						onclick={handleSave}
+						disabled={isLoading || !name.trim()}
+						class="rounded-lg bg-emerald-600 px-4 py-2 text-sm font-medium text-white transition-colors hover:bg-emerald-500 disabled:opacity-50"
+					>
+						{isLoading ? 'Saving...' : projectId ? 'Save Changes' : 'Create Project'}
+					</button>
+				</div>
+			</div>
+		</div>
+	</div>
+{/if}
+
+<ConfirmDialog
+	isOpen={showDeleteConfirm}
+	title="Delete Project"
+	message="Delete this project? Conversations will be unlinked but not deleted."
+	confirmText="Delete"
+	variant="danger"
+	onConfirm={handleDeleteConfirm}
+	onCancel={() => (showDeleteConfirm = false)}
+/>

frontend/src/lib/components/settings/AIProvidersTab.svelte

@@ -0,0 +1,74 @@
+<script lang="ts">
+	/**
+	 * AIProvidersTab - Combined Backends and Models management
+	 * Sub-tabs for backend configuration and model management
+	 * Models sub-tab only available when Ollama is active
+	 */
+	import { backendsState } from '$lib/stores/backends.svelte';
+	import BackendsPanel from './BackendsPanel.svelte';
+	import ModelsTab from './ModelsTab.svelte';
+
+	type SubTab = 'backends' | 'models';
+
+	let activeSubTab = $state<SubTab>('backends');
+
+	// Models tab only available for Ollama
+	const isOllamaActive = $derived(backendsState.activeType === 'ollama');
+
+	// If Models tab is active but Ollama is no longer active, switch to Backends
+	$effect(() => {
+		if (activeSubTab === 'models' && !isOllamaActive) {
+			activeSubTab = 'backends';
+		}
+	});
+</script>
+
+<div class="space-y-6">
+	<!-- Sub-tab Navigation -->
+	<div class="flex gap-1 border-b border-theme">
+		<button
+			type="button"
+			onclick={() => (activeSubTab = 'backends')}
+			class="flex items-center gap-2 border-b-2 px-4 py-2 text-sm font-medium transition-colors {activeSubTab === 'backends'
+				? 'border-violet-500 text-violet-400'
+				: 'border-transparent text-theme-muted hover:border-theme hover:text-theme-primary'}"
+		>
+			<svg class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+				<path stroke-linecap="round" stroke-linejoin="round" d="M5 12h14M5 12a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2v4a2 2 0 0 1-2 2M5 12a2 2 0 0 0-2 2v4a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-4a2 2 0 0 0-2-2m-2-4h.01M17 16h.01" />
+			</svg>
+			Backends
+		</button>
+		{#if isOllamaActive}
+			<button
+				type="button"
+				onclick={() => (activeSubTab = 'models')}
+				class="flex items-center gap-2 border-b-2 px-4 py-2 text-sm font-medium transition-colors {activeSubTab === 'models'
+					? 'border-violet-500 text-violet-400'
+					: 'border-transparent text-theme-muted hover:border-theme hover:text-theme-primary'}"
+			>
+				<svg class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+					<path stroke-linecap="round" stroke-linejoin="round" d="M8.25 3v1.5M4.5 8.25H3m18 0h-1.5M4.5 12H3m18 0h-1.5m-15 3.75H3m18 0h-1.5M8.25 19.5V21M12 3v1.5m0 15V21m3.75-18v1.5m0 15V21m-9-1.5h10.5a2.25 2.25 0 0 0 2.25-2.25V6.75a2.25 2.25 0 0 0-2.25-2.25H6.75A2.25 2.25 0 0 0 4.5 6.75v10.5a2.25 2.25 0 0 0 2.25 2.25Zm.75-12h9v9h-9v-9Z" />
+				</svg>
+				Models
+			</button>
+		{:else}
+			<span
+				class="flex cursor-not-allowed items-center gap-2 border-b-2 border-transparent px-4 py-2 text-sm font-medium text-theme-muted/50"
+				title="Models tab only available when Ollama is the active backend"
+			>
+				<svg class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+					<path stroke-linecap="round" stroke-linejoin="round" d="M8.25 3v1.5M4.5 8.25H3m18 0h-1.5M4.5 12H3m18 0h-1.5m-15 3.75H3m18 0h-1.5M8.25 19.5V21M12 3v1.5m0 15V21m3.75-18v1.5m0 15V21m-9-1.5h10.5a2.25 2.25 0 0 0 2.25-2.25V6.75a2.25 2.25 0 0 0-2.25-2.25H6.75A2.25 2.25 0 0 0 4.5 6.75v10.5a2.25 2.25 0 0 0 2.25 2.25Zm.75-12h9v9h-9v-9Z" />
+				</svg>
+				Models
+				<span class="text-xs">(Ollama only)</span>
+			</span>
+		{/if}
+	</div>
+
+	<!-- Sub-tab Content -->
+	{#if activeSubTab === 'backends'}
+		<BackendsPanel />
+	{:else if activeSubTab === 'models'}
+		<ModelsTab />
+	{/if}
+</div>

frontend/src/lib/components/settings/AboutTab.svelte

@@ -0,0 +1,194 @@
+<script lang="ts">
+	/**
+	 * AboutTab - App information, version, and update status
+	 */
+	import { versionState } from '$lib/stores';
+
+	const GITHUB_URL = 'https://github.com/VikingOwl91/vessel';
+	const ISSUES_URL = `${GITHUB_URL}/issues`;
+	const LICENSE = 'MIT';
+
+	async function handleCheckForUpdates(): Promise<void> {
+		await versionState.checkForUpdates();
+	}
+
+	function formatLastChecked(timestamp: number): string {
+		if (!timestamp) return 'Never';
+		const date = new Date(timestamp);
+		return date.toLocaleString();
+	}
+</script>
+
+<div class="space-y-8">
+	<!-- App Identity -->
+	<section>
+		<div class="flex items-center gap-6">
+			<div class="flex h-20 w-20 items-center justify-center rounded-xl bg-gradient-to-br from-violet-500 to-indigo-600">
+				<svg xmlns="http://www.w3.org/2000/svg" class="h-12 w-12" viewBox="0 0 24 24">
+					<path d="M12 20 L4 6 Q4 5 5 5 L8 5 L12 12.5 L16 5 L19 5 Q20 5 20 6 L12 20 Z" fill="white"/>
+				</svg>
+			</div>
+			<div>
+				<h1 class="text-3xl font-bold text-theme-primary">Vessel</h1>
+				<p class="mt-1 text-theme-muted">
+					A modern interface for local AI with chat, tools, and memory management.
+				</p>
+				{#if versionState.current}
+					<div class="mt-2 flex items-center gap-2">
+						<span class="rounded-full bg-emerald-500/20 px-3 py-0.5 text-sm font-medium text-emerald-400">
+							v{versionState.current}
+						</span>
+					</div>
+				{/if}
+			</div>
+		</div>
+	</section>
+
+	<!-- Version & Updates -->
+	<section>
+		<h2 class="mb-4 flex items-center gap-2 text-lg font-semibold text-theme-primary">
+			<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-blue-400" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+				<path stroke-linecap="round" stroke-linejoin="round" d="M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0 3.181 3.183a8.25 8.25 0 0 0 13.803-3.7M4.031 9.865a8.25 8.25 0 0 1 13.803-3.7l3.181 3.182m0-4.991v4.99" />
+			</svg>
+			Updates
+		</h2>
+
+		<div class="rounded-lg border border-theme bg-theme-secondary p-4 space-y-4">
+			{#if versionState.hasUpdate}
+				<div class="flex items-start gap-3 rounded-lg bg-amber-500/10 border border-amber-500/30 p-3">
+					<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-amber-400 flex-shrink-0 mt-0.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+						<path stroke-linecap="round" stroke-linejoin="round" d="M12 9v3.75m9-.75a9 9 0 1 1-18 0 9 9 0 0 1 18 0Zm-9 3.75h.008v.008H12v-.008Z" />
+					</svg>
+					<div class="flex-1">
+						<p class="font-medium text-amber-200">Update Available</p>
+						<p class="text-sm text-amber-300/80">
+							Version {versionState.latest} is available. You're currently on v{versionState.current}.
+						</p>
+					</div>
+				</div>
+			{:else}
+				<div class="flex items-center gap-3">
+					<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-emerald-400" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+						<path stroke-linecap="round" stroke-linejoin="round" d="M9 12.75 11.25 15 15 9.75M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" />
+					</svg>
+					<span class="text-sm text-theme-secondary">You're running the latest version</span>
+				</div>
+			{/if}
+
+			<div class="flex flex-wrap gap-3">
+				<button
+					type="button"
+					onclick={handleCheckForUpdates}
+					disabled={versionState.isChecking}
+					class="flex items-center gap-2 rounded-lg bg-theme-tertiary px-4 py-2 text-sm font-medium text-theme-secondary transition-colors hover:bg-theme-hover disabled:opacity-50 disabled:cursor-not-allowed"
+				>
+					{#if versionState.isChecking}
+						<svg class="h-4 w-4 animate-spin" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
+							<circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
+							<path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
+						</svg>
+						Checking...
+					{:else}
+						<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+							<path stroke-linecap="round" stroke-linejoin="round" d="M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0 3.181 3.183a8.25 8.25 0 0 0 13.803-3.7M4.031 9.865a8.25 8.25 0 0 1 13.803-3.7l3.181 3.182m0-4.991v4.99" />
+						</svg>
+						Check for Updates
+					{/if}
+				</button>
+
+				{#if versionState.hasUpdate && versionState.updateUrl}
+					<a
+						href={versionState.updateUrl}
+						target="_blank"
+						rel="noopener noreferrer"
+						class="flex items-center gap-2 rounded-lg bg-emerald-600 px-4 py-2 text-sm font-medium text-white transition-colors hover:bg-emerald-500"
+					>
+						<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+							<path stroke-linecap="round" stroke-linejoin="round" d="M3 16.5v2.25A2.25 2.25 0 0 0 5.25 21h13.5A2.25 2.25 0 0 0 21 18.75V16.5M16.5 12 12 16.5m0 0L7.5 12m4.5 4.5V3" />
+						</svg>
+						Download v{versionState.latest}
+					</a>
+				{/if}
+			</div>
+
+			{#if versionState.lastChecked}
+				<p class="text-xs text-theme-muted">
+					Last checked: {formatLastChecked(versionState.lastChecked)}
+				</p>
+			{/if}
+		</div>
+	</section>
+
+	<!-- Links -->
+	<section>
+		<h2 class="mb-4 flex items-center gap-2 text-lg font-semibold text-theme-primary">
+			<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-purple-400" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+				<path stroke-linecap="round" stroke-linejoin="round" d="M13.19 8.688a4.5 4.5 0 0 1 1.242 7.244l-4.5 4.5a4.5 4.5 0 0 1-6.364-6.364l1.757-1.757m13.35-.622 1.757-1.757a4.5 4.5 0 0 0-6.364-6.364l-4.5 4.5a4.5 4.5 0 0 0 1.242 7.244" />
+			</svg>
+			Links
+		</h2>
+
+		<div class="grid gap-3 sm:grid-cols-2">
+			<a
+				href={GITHUB_URL}
+				target="_blank"
+				rel="noopener noreferrer"
+				class="flex items-center gap-3 rounded-lg border border-theme bg-theme-secondary p-4 transition-colors hover:bg-theme-tertiary"
+			>
+				<svg class="h-6 w-6 text-theme-secondary" fill="currentColor" viewBox="0 0 24 24">
+					<path fill-rule="evenodd" d="M12 2C6.477 2 2 6.484 2 12.017c0 4.425 2.865 8.18 6.839 9.504.5.092.682-.217.682-.483 0-.237-.008-.868-.013-1.703-2.782.605-3.369-1.343-3.369-1.343-.454-1.158-1.11-1.466-1.11-1.466-.908-.62.069-.608.069-.608 1.003.07 1.531 1.032 1.531 1.032.892 1.53 2.341 1.088 2.91.832.092-.647.35-1.088.636-1.338-2.22-.253-4.555-1.113-4.555-4.951 0-1.093.39-1.988 1.029-2.688-.103-.253-.446-1.272.098-2.65 0 0 .84-.27 2.75 1.026A9.564 9.564 0 0112 6.844c.85.004 1.705.115 2.504.337 1.909-1.296 2.747-1.027 2.747-1.027.546 1.379.202 2.398.1 2.651.64.7 1.028 1.595 1.028 2.688 0 3.848-2.339 4.695-4.566 4.943.359.309.678.92.678 1.855 0 1.338-.012 2.419-.012 2.747 0 .268.18.58.688.482A10.019 10.019 0 0022 12.017C22 6.484 17.522 2 12 2z" clip-rule="evenodd" />
+				</svg>
+				<div>
+					<p class="font-medium text-theme-primary">GitHub Repository</p>
+					<p class="text-xs text-theme-muted">Source code and releases</p>
+				</div>
+			</a>
+
+			<a
+				href={ISSUES_URL}
+				target="_blank"
+				rel="noopener noreferrer"
+				class="flex items-center gap-3 rounded-lg border border-theme bg-theme-secondary p-4 transition-colors hover:bg-theme-tertiary"
+			>
+				<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6 text-theme-secondary" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+					<path stroke-linecap="round" stroke-linejoin="round" d="M12 12.75c1.148 0 2.278.08 3.383.237 1.037.146 1.866.966 1.866 2.013 0 3.728-2.35 6.75-5.25 6.75S6.75 18.728 6.75 15c0-1.046.83-1.867 1.866-2.013A24.204 24.204 0 0 1 12 12.75Zm0 0c2.883 0 5.647.508 8.207 1.44a23.91 23.91 0 0 1-1.152 6.06M12 12.75c-2.883 0-5.647.508-8.208 1.44.125 2.104.52 4.136 1.153 6.06M12 12.75a2.25 2.25 0 0 0 2.248-2.354M12 12.75a2.25 2.25 0 0 1-2.248-2.354M12 8.25c.995 0 1.971-.08 2.922-.236.403-.066.74-.358.795-.762a3.778 3.778 0 0 0-.399-2.25M12 8.25c-.995 0-1.97-.08-2.922-.236-.402-.066-.74-.358-.795-.762a3.734 3.734 0 0 1 .4-2.253M12 8.25a2.25 2.25 0 0 0-2.248 2.146M12 8.25a2.25 2.25 0 0 1 2.248 2.146M8.683 5a6.032 6.032 0 0 1-1.155-1.002c.07-.63.27-1.222.574-1.747m.581 2.749A3.75 3.75 0 0 1 15.318 5m0 0c.427-.283.815-.62 1.155-.999a4.471 4.471 0 0 0-.575-1.752M4.921 6a24.048 24.048 0 0 0-.392 3.314c1.668.546 3.416.914 5.223 1.082M19.08 6c.205 1.08.337 2.187.392 3.314a23.882 23.882 0 0 1-5.223 1.082" />
+				</svg>
+				<div>
+					<p class="font-medium text-theme-primary">Report an Issue</p>
+					<p class="text-xs text-theme-muted">Bug reports and feature requests</p>
+				</div>
+			</a>
+		</div>
+	</section>
+
+	<!-- Tech Stack & License -->
+	<section>
+		<h2 class="mb-4 flex items-center gap-2 text-lg font-semibold text-theme-primary">
+			<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-teal-400" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+				<path stroke-linecap="round" stroke-linejoin="round" d="m6.75 7.5 3 2.25-3 2.25m4.5 0h3m-9 8.25h13.5A2.25 2.25 0 0 0 21 18V6a2.25 2.25 0 0 0-2.25-2.25H5.25A2.25 2.25 0 0 0 3 6v12a2.25 2.25 0 0 0 2.25 2.25Z" />
+			</svg>
+			Technical Info
+		</h2>
+
+		<div class="rounded-lg border border-theme bg-theme-secondary p-4 space-y-4">
+			<div>
+				<p class="text-sm font-medium text-theme-secondary">Built With</p>
+				<div class="mt-2 flex flex-wrap gap-2">
+					<span class="rounded-full bg-orange-500/20 px-3 py-1 text-xs font-medium text-orange-300">Svelte 5</span>
+					<span class="rounded-full bg-blue-500/20 px-3 py-1 text-xs font-medium text-blue-300">SvelteKit</span>
+					<span class="rounded-full bg-cyan-500/20 px-3 py-1 text-xs font-medium text-cyan-300">Go</span>
+					<span class="rounded-full bg-sky-500/20 px-3 py-1 text-xs font-medium text-sky-300">Tailwind CSS</span>
+					<span class="rounded-full bg-emerald-500/20 px-3 py-1 text-xs font-medium text-emerald-300">Ollama</span>
+					<span class="rounded-full bg-purple-500/20 px-3 py-1 text-xs font-medium text-purple-300">llama.cpp</span>
+				</div>
+			</div>
+
+			<div class="border-t border-theme pt-4">
+				<p class="text-sm font-medium text-theme-secondary">License</p>
+				<p class="mt-1 text-sm text-theme-muted">
+					Released under the <span class="text-theme-secondary">{LICENSE}</span> license
+				</p>
+			</div>
+		</div>
+	</section>
+</div>

frontend/src/lib/components/settings/AgentsTab.svelte

@@ -0,0 +1,500 @@
+<script lang="ts">
+	/**
+	 * AgentsTab - Agent management settings tab
+	 * CRUD operations for agents with prompt and tool configuration
+	 */
+	import { agentsState, promptsState, toolsState } from '$lib/stores';
+	import type { Agent } from '$lib/storage';
+	import { ConfirmDialog } from '$lib/components/shared';
+
+	let showEditor = $state(false);
+	let editingAgent = $state<Agent | null>(null);
+	let searchQuery = $state('');
+	let deleteConfirm = $state<{ show: boolean; agent: Agent | null }>({ show: false, agent: null });
+
+	// Form state
+	let formName = $state('');
+	let formDescription = $state('');
+	let formPromptId = $state<string | null>(null);
+	let formPreferredModel = $state<string | null>(null);
+	let formEnabledTools = $state<Set<string>>(new Set());
+
+	// Stats
+	const stats = $derived({
+		total: agentsState.agents.length
+	});
+
+	// Filtered agents based on search
+	const filteredAgents = $derived(
+		searchQuery.trim()
+			? agentsState.sortedAgents.filter(
+					(a) =>
+						a.name.toLowerCase().includes(searchQuery.toLowerCase()) ||
+						a.description.toLowerCase().includes(searchQuery.toLowerCase())
+				)
+			: agentsState.sortedAgents
+	);
+
+	// Available tools for selection
+	const availableTools = $derived(
+		toolsState.getAllToolsWithState().map((t) => ({
+			name: t.definition.function.name,
+			description: t.definition.function.description,
+			isBuiltin: t.isBuiltin
+		}))
+	);
+
+	function openCreateEditor(): void {
+		editingAgent = null;
+		formName = '';
+		formDescription = '';
+		formPromptId = null;
+		formPreferredModel = null;
+		formEnabledTools = new Set();
+		showEditor = true;
+	}
+
+	function openEditEditor(agent: Agent): void {
+		editingAgent = agent;
+		formName = agent.name;
+		formDescription = agent.description;
+		formPromptId = agent.promptId;
+		formPreferredModel = agent.preferredModel;
+		formEnabledTools = new Set(agent.enabledToolNames);
+		showEditor = true;
+	}
+
+	function closeEditor(): void {
+		showEditor = false;
+		editingAgent = null;
+	}
+
+	async function handleSave(): Promise<void> {
+		if (!formName.trim()) return;
+
+		const data = {
+			name: formName.trim(),
+			description: formDescription.trim(),
+			promptId: formPromptId,
+			preferredModel: formPreferredModel,
+			enabledToolNames: Array.from(formEnabledTools)
+		};
+
+		if (editingAgent) {
+			await agentsState.update(editingAgent.id, data);
+		} else {
+			await agentsState.add(data);
+		}
+
+		closeEditor();
+	}
+
+	function handleDelete(agent: Agent): void {
+		deleteConfirm = { show: true, agent };
+	}
+
+	async function confirmDelete(): Promise<void> {
+		if (deleteConfirm.agent) {
+			await agentsState.remove(deleteConfirm.agent.id);
+		}
+		deleteConfirm = { show: false, agent: null };
+	}
+
+	function toggleTool(toolName: string): void {
+		const newSet = new Set(formEnabledTools);
+		if (newSet.has(toolName)) {
+			newSet.delete(toolName);
+		} else {
+			newSet.add(toolName);
+		}
+		formEnabledTools = newSet;
+	}
+
+	function getPromptName(promptId: string | null): string {
+		if (!promptId) return 'No prompt';
+		const prompt = promptsState.get(promptId);
+		return prompt?.name ?? 'Unknown prompt';
+	}
+</script>
+
+<div>
+	<!-- Header -->
+	<div class="mb-6 flex items-center justify-between">
+		<div>
+			<h2 class="text-xl font-bold text-theme-primary">Agents</h2>
+			<p class="mt-1 text-sm text-theme-muted">
+				Create specialized agents with custom prompts and tool sets
+			</p>
+		</div>
+
+		<button
+			type="button"
+			onclick={openCreateEditor}
+			class="flex items-center gap-2 rounded-lg bg-violet-600 px-4 py-2 text-sm font-medium text-white transition-colors hover:bg-violet-700"
+		>
+			<svg class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+				<path stroke-linecap="round" stroke-linejoin="round" d="M12 4v16m8-8H4" />
+			</svg>
+			Create Agent
+		</button>
+	</div>
+
+	<!-- Stats -->
+	<div class="mb-6 grid grid-cols-2 gap-4 sm:grid-cols-4">
+		<div class="rounded-lg border border-theme bg-theme-secondary p-4">
+			<p class="text-sm text-theme-muted">Total Agents</p>
+			<p class="mt-1 text-2xl font-semibold text-theme-primary">{stats.total}</p>
+		</div>
+	</div>
+
+	<!-- Search -->
+	{#if agentsState.agents.length > 0}
+		<div class="mb-6">
+			<div class="relative">
+				<svg
+					class="absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2 text-theme-muted"
+					fill="none"
+					viewBox="0 0 24 24"
+					stroke="currentColor"
+					stroke-width="2"
+				>
+					<path
+						stroke-linecap="round"
+						stroke-linejoin="round"
+						d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z"
+					/>
+				</svg>
+				<input
+					type="text"
+					bind:value={searchQuery}
+					placeholder="Search agents..."
+					class="w-full rounded-lg border border-theme bg-theme-secondary py-2 pl-10 pr-4 text-sm text-theme-primary placeholder:text-theme-muted focus:border-violet-500 focus:outline-none focus:ring-1 focus:ring-violet-500"
+				/>
+				{#if searchQuery}
+					<button
+						type="button"
+						onclick={() => (searchQuery = '')}
+						class="absolute right-3 top-1/2 -translate-y-1/2 text-theme-muted hover:text-theme-primary"
+						aria-label="Clear search"
+					>
+						<svg class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+							<path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
+						</svg>
+					</button>
+				{/if}
+			</div>
+		</div>
+	{/if}
+
+	<!-- Agents List -->
+	{#if filteredAgents.length === 0 && agentsState.agents.length === 0}
+		<div class="rounded-lg border border-dashed border-theme bg-theme-secondary/50 p-8 text-center">
+			<svg
+				class="mx-auto h-12 w-12 text-theme-muted"
+				fill="none"
+				viewBox="0 0 24 24"
+				stroke="currentColor"
+				stroke-width="1.5"
+			>
+				<path
+					stroke-linecap="round"
+					stroke-linejoin="round"
+					d="M15.75 6a3.75 3.75 0 1 1-7.5 0 3.75 3.75 0 0 1 7.5 0ZM4.501 20.118a7.5 7.5 0 0 1 14.998 0A17.933 17.933 0 0 1 12 21.75c-2.676 0-5.216-.584-7.499-1.632Z"
+				/>
+			</svg>
+			<h4 class="mt-4 text-sm font-medium text-theme-secondary">No agents yet</h4>
+			<p class="mt-1 text-sm text-theme-muted">
+				Create agents to combine prompts and tools for specialized tasks
+			</p>
+			<button
+				type="button"
+				onclick={openCreateEditor}
+				class="mt-4 inline-flex items-center gap-2 rounded-lg border border-violet-500 px-4 py-2 text-sm font-medium text-violet-400 transition-colors hover:bg-violet-900/30"
+			>
+				<svg class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+					<path stroke-linecap="round" stroke-linejoin="round" d="M12 4v16m8-8H4" />
+				</svg>
+				Create Your First Agent
+			</button>
+		</div>
+	{:else if filteredAgents.length === 0}
+		<div class="rounded-lg border border-dashed border-theme bg-theme-secondary/50 p-8 text-center">
+			<p class="text-sm text-theme-muted">No agents match your search</p>
+		</div>
+	{:else}
+		<div class="space-y-3">
+			{#each filteredAgents as agent (agent.id)}
+				<div class="rounded-lg border border-theme bg-theme-secondary">
+					<div class="p-4">
+						<div class="flex items-start gap-4">
+							<!-- Agent Icon -->
+							<div
+								class="flex h-10 w-10 flex-shrink-0 items-center justify-center rounded-lg bg-violet-900/30 text-violet-400"
+							>
+								<svg class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+									<path
+										stroke-linecap="round"
+										stroke-linejoin="round"
+										d="M15.75 6a3.75 3.75 0 1 1-7.5 0 3.75 3.75 0 0 1 7.5 0ZM4.501 20.118a7.5 7.5 0 0 1 14.998 0A17.933 17.933 0 0 1 12 21.75c-2.676 0-5.216-.584-7.499-1.632Z"
+									/>
+								</svg>
+							</div>
+
+							<!-- Content -->
+							<div class="min-w-0 flex-1">
+								<div class="flex items-center gap-2">
+									<h4 class="font-semibold text-theme-primary">{agent.name}</h4>
+									{#if agent.promptId}
+										<span class="rounded-full bg-blue-900/40 px-2 py-0.5 text-xs font-medium text-blue-300">
+											{getPromptName(agent.promptId)}
+										</span>
+									{/if}
+									{#if agent.enabledToolNames.length > 0}
+										<span
+											class="rounded-full bg-emerald-900/40 px-2 py-0.5 text-xs font-medium text-emerald-300"
+										>
+											{agent.enabledToolNames.length} tools
+										</span>
+									{/if}
+								</div>
+
+								{#if agent.description}
+									<p class="mt-1 text-sm text-theme-muted line-clamp-2">
+										{agent.description}
+									</p>
+								{/if}
+							</div>
+
+							<!-- Actions -->
+							<div class="flex items-center gap-2">
+								<button
+									type="button"
+									onclick={() => openEditEditor(agent)}
+									class="rounded-lg p-2 text-theme-muted transition-colors hover:bg-theme-tertiary hover:text-theme-primary"
+									aria-label="Edit agent"
+								>
+									<svg class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+										<path
+											stroke-linecap="round"
+											stroke-linejoin="round"
+											d="M16.862 4.487l1.687-1.688a1.875 1.875 0 112.652 2.652L10.582 16.07a4.5 4.5 0 01-1.897 1.13L6 18l.8-2.685a4.5 4.5 0 011.13-1.897l8.932-8.931zm0 0L19.5 7.125M18 14v4.75A2.25 2.25 0 0115.75 21H5.25A2.25 2.25 0 013 18.75V8.25A2.25 2.25 0 015.25 6H10"
+										/>
+									</svg>
+								</button>
+								<button
+									type="button"
+									onclick={() => handleDelete(agent)}
+									class="rounded-lg p-2 text-theme-muted transition-colors hover:bg-red-900/30 hover:text-red-400"
+									aria-label="Delete agent"
+								>
+									<svg class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+										<path
+											stroke-linecap="round"
+											stroke-linejoin="round"
+											d="M14.74 9l-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 01-2.244 2.077H8.084a2.25 2.25 0 01-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 00-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 013.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 00-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 00-7.5 0"
+										/>
+									</svg>
+								</button>
+							</div>
+						</div>
+					</div>
+				</div>
+			{/each}
+		</div>
+	{/if}
+
+	<!-- Info Section -->
+	<section class="mt-8 rounded-lg border border-theme bg-gradient-to-br from-theme-secondary/80 to-theme-secondary/40 p-5">
+		<h4 class="flex items-center gap-2 text-sm font-semibold text-theme-primary">
+			<svg class="h-5 w-5 text-violet-400" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+				<path
+					stroke-linecap="round"
+					stroke-linejoin="round"
+					d="M9.663 17h4.673M12 3v1m6.364 1.636l-.707.707M21 12h-1M4 12H3m3.343-5.657l-.707-.707m2.828 9.9a5 5 0 117.072 0l-.548.547A3.374 3.374 0 0014 18.469V19a2 2 0 11-4 0v-.531c0-.895-.356-1.754-.988-2.386l-.548-.547z"
+				/>
+			</svg>
+			About Agents
+		</h4>
+		<p class="mt-3 text-sm leading-relaxed text-theme-muted">
+			Agents combine a system prompt with a specific set of tools. When you select an agent for a
+			chat, it will use the agent's prompt and only have access to the agent's allowed tools.
+		</p>
+		<div class="mt-4 grid gap-3 sm:grid-cols-2">
+			<div class="rounded-lg bg-theme-tertiary/50 p-3">
+				<div class="flex items-center gap-2 text-xs font-medium text-blue-400">
+					<svg class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+						<path
+							stroke-linecap="round"
+							stroke-linejoin="round"
+							d="M7.5 8.25h9m-9 3H12m-9.75 1.51c0 1.6 1.123 2.994 2.707 3.227 1.129.166 2.27.293 3.423.379.35.026.67.21.865.501L12 21l2.755-4.133a1.14 1.14 0 0 1 .865-.501 48.172 48.172 0 0 0 3.423-.379c1.584-.233 2.707-1.626 2.707-3.228V6.741c0-1.602-1.123-2.995-2.707-3.228A48.394 48.394 0 0 0 12 3c-2.392 0-4.744.175-7.043.513C3.373 3.746 2.25 5.14 2.25 6.741v6.018Z"
+						/>
+					</svg>
+					System Prompt
+				</div>
+				<p class="mt-1 text-xs text-theme-muted">Defines the agent's personality and behavior</p>
+			</div>
+			<div class="rounded-lg bg-theme-tertiary/50 p-3">
+				<div class="flex items-center gap-2 text-xs font-medium text-emerald-400">
+					<svg class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+						<path
+							stroke-linecap="round"
+							stroke-linejoin="round"
+							d="M11.42 15.17L17.25 21A2.652 2.652 0 0021 17.25l-5.877-5.877M11.42 15.17l2.496-3.03c.317-.384.74-.626 1.208-.766M11.42 15.17l-4.655 5.653a2.548 2.548 0 11-3.586-3.586l6.837-5.63m5.108-.233c.55-.164 1.163-.188 1.743-.14a4.5 4.5 0 004.486-6.336l-3.276 3.277a3.004 3.004 0 01-2.25-2.25l3.276-3.276a4.5 4.5 0 00-6.336 4.486c.091 1.076-.071 2.264-.904 2.95l-.102.085m-1.745 1.437L5.909 7.5H4.5L2.25 3.75l1.5-1.5L7.5 4.5v1.409l4.26 4.26m-1.745 1.437l1.745-1.437m6.615 8.206L15.75 15.75M4.867 19.125h.008v.008h-.008v-.008z"
+						/>
+					</svg>
+					Tool Access
+				</div>
+				<p class="mt-1 text-xs text-theme-muted">Restricts which tools the agent can use</p>
+			</div>
+		</div>
+	</section>
+</div>
+
+<!-- Editor Dialog -->
+{#if showEditor}
+	<div
+		class="fixed inset-0 z-50 flex items-center justify-center bg-black/60 p-4"
+		role="dialog"
+		aria-modal="true"
+		aria-labelledby="agent-editor-title"
+	>
+		<div class="w-full max-w-2xl rounded-xl border border-theme bg-theme-primary shadow-2xl">
+			<!-- Header -->
+			<div class="flex items-center justify-between border-b border-theme px-6 py-4">
+				<h3 id="agent-editor-title" class="text-lg font-semibold text-theme-primary">
+					{editingAgent ? 'Edit Agent' : 'Create Agent'}
+				</h3>
+				<button
+					type="button"
+					onclick={closeEditor}
+					class="rounded p-1 text-theme-muted hover:bg-theme-tertiary hover:text-theme-primary"
+					aria-label="Close"
+				>
+					<svg class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+						<path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
+					</svg>
+				</button>
+			</div>
+
+			<!-- Form -->
+			<form
+				onsubmit={(e) => {
+					e.preventDefault();
+					handleSave();
+				}}
+				class="max-h-[70vh] overflow-y-auto p-6"
+			>
+				<!-- Name -->
+				<div class="mb-4">
+					<label for="agent-name" class="mb-1 block text-sm font-medium text-theme-primary">
+						Name <span class="text-red-400">*</span>
+					</label>
+					<input
+						id="agent-name"
+						type="text"
+						bind:value={formName}
+						placeholder="e.g., Research Assistant"
+						required
+						class="w-full rounded-lg border border-theme bg-theme-secondary px-3 py-2 text-sm text-theme-primary placeholder:text-theme-muted focus:border-violet-500 focus:outline-none focus:ring-1 focus:ring-violet-500"
+					/>
+				</div>
+
+				<!-- Description -->
+				<div class="mb-4">
+					<label for="agent-description" class="mb-1 block text-sm font-medium text-theme-primary">
+						Description
+					</label>
+					<textarea
+						id="agent-description"
+						bind:value={formDescription}
+						placeholder="Describe what this agent does..."
+						rows={3}
+						class="w-full rounded-lg border border-theme bg-theme-secondary px-3 py-2 text-sm text-theme-primary placeholder:text-theme-muted focus:border-violet-500 focus:outline-none focus:ring-1 focus:ring-violet-500"
+					></textarea>
+				</div>
+
+				<!-- Prompt Selection -->
+				<div class="mb-4">
+					<label for="agent-prompt" class="mb-1 block text-sm font-medium text-theme-primary">
+						System Prompt
+					</label>
+					<select
+						id="agent-prompt"
+						bind:value={formPromptId}
+						class="w-full rounded-lg border border-theme bg-theme-secondary px-3 py-2 text-sm text-theme-primary focus:border-violet-500 focus:outline-none focus:ring-1 focus:ring-violet-500"
+					>
+						<option value={null}>No specific prompt (use defaults)</option>
+						{#each promptsState.prompts as prompt (prompt.id)}
+							<option value={prompt.id}>{prompt.name}</option>
+						{/each}
+					</select>
+					<p class="mt-1 text-xs text-theme-muted">
+						Select a prompt from your library to use with this agent
+					</p>
+				</div>
+
+				<!-- Tools Selection -->
+				<div class="mb-4">
+					<span class="mb-2 block text-sm font-medium text-theme-primary"> Allowed Tools </span>
+					<div class="max-h-48 overflow-y-auto rounded-lg border border-theme bg-theme-secondary p-2">
+						{#if availableTools.length === 0}
+							<p class="p-2 text-sm text-theme-muted">No tools available</p>
+						{:else}
+							<div class="space-y-1">
+								{#each availableTools as tool (tool.name)}
+									<label
+										class="flex cursor-pointer items-center gap-2 rounded p-2 hover:bg-theme-tertiary"
+									>
+										<input
+											type="checkbox"
+											checked={formEnabledTools.has(tool.name)}
+											onchange={() => toggleTool(tool.name)}
+											class="h-4 w-4 rounded border-gray-600 bg-theme-tertiary text-violet-500 focus:ring-violet-500"
+										/>
+										<span class="text-sm text-theme-primary">{tool.name}</span>
+										{#if tool.isBuiltin}
+											<span class="text-xs text-blue-400">(built-in)</span>
+										{/if}
+									</label>
+								{/each}
+							</div>
+						{/if}
+					</div>
+					<p class="mt-1 text-xs text-theme-muted">
+						{formEnabledTools.size === 0
+							? 'All tools will be available (no restrictions)'
+							: `${formEnabledTools.size} tool(s) selected`}
+					</p>
+				</div>
+
+				<!-- Actions -->
+				<div class="mt-6 flex justify-end gap-3">
+					<button
+						type="button"
+						onclick={closeEditor}
+						class="rounded-lg border border-theme px-4 py-2 text-sm font-medium text-theme-secondary transition-colors hover:bg-theme-tertiary"
+					>
+						Cancel
+					</button>
+					<button
+						type="submit"
+						disabled={!formName.trim()}
+						class="rounded-lg bg-violet-600 px-4 py-2 text-sm font-medium text-white transition-colors hover:bg-violet-700 disabled:cursor-not-allowed disabled:opacity-50"
+					>
+						{editingAgent ? 'Save Changes' : 'Create Agent'}
+					</button>
+				</div>
+			</form>
+		</div>
+	</div>
+{/if}
+
+<ConfirmDialog
+	isOpen={deleteConfirm.show}
+	title="Delete Agent"
+	message={`Delete "${deleteConfirm.agent?.name}"? This cannot be undone.`}
+	confirmText="Delete"
+	variant="danger"
+	onConfirm={confirmDelete}
+	onCancel={() => (deleteConfirm = { show: false, agent: null })}
+/>

frontend/src/lib/components/settings/BackendsPanel.svelte

@@ -0,0 +1,305 @@
+<script lang="ts">
+	/**
+	 * BackendsPanel - Multi-backend LLM management
+	 * Configure and switch between Ollama, llama.cpp, and LM Studio
+	 */
+	import { onMount } from 'svelte';
+	import { backendsState, type BackendType, type BackendInfo, type DiscoveryResult } from '$lib/stores/backends.svelte';
+
+	let discovering = $state(false);
+	let discoveryResults = $state<DiscoveryResult[]>([]);
+	let showDiscoveryResults = $state(false);
+
+	async function handleDiscover(): Promise<void> {
+		discovering = true;
+		showDiscoveryResults = false;
+		try {
+			discoveryResults = await backendsState.discover();
+			showDiscoveryResults = true;
+			// Reload backends after discovery
+			await backendsState.load();
+		} finally {
+			discovering = false;
+		}
+	}
+
+	async function handleSetActive(type: BackendType): Promise<void> {
+		await backendsState.setActive(type);
+	}
+
+	function getBackendDisplayName(type: BackendType): string {
+		switch (type) {
+			case 'ollama':
+				return 'Ollama';
+			case 'llamacpp':
+				return 'llama.cpp';
+			case 'lmstudio':
+				return 'LM Studio';
+			default:
+				return type;
+		}
+	}
+
+	function getBackendDescription(type: BackendType): string {
+		switch (type) {
+			case 'ollama':
+				return 'Full model management - pull, delete, create custom models';
+			case 'llamacpp':
+				return 'OpenAI-compatible API - models loaded at server startup';
+			case 'lmstudio':
+				return 'OpenAI-compatible API - manage models via LM Studio app';
+			default:
+				return '';
+		}
+	}
+
+	function getDefaultPort(type: BackendType): string {
+		switch (type) {
+			case 'ollama':
+				return '11434';
+			case 'llamacpp':
+				return '8081';
+			case 'lmstudio':
+				return '1234';
+			default:
+				return '';
+		}
+	}
+
+	function getStatusColor(status: string): string {
+		switch (status) {
+			case 'connected':
+				return 'bg-green-500';
+			case 'disconnected':
+				return 'bg-red-500';
+			default:
+				return 'bg-yellow-500';
+		}
+	}
+
+	onMount(() => {
+		backendsState.load();
+	});
+</script>
+
+<div class="space-y-6">
+	<!-- Header -->
+	<div class="flex items-start justify-between gap-4">
+		<div>
+			<h2 class="text-xl font-bold text-theme-primary">AI Backends</h2>
+			<p class="mt-1 text-sm text-theme-muted">
+				Configure LLM backends: Ollama, llama.cpp server, or LM Studio
+			</p>
+		</div>
+		<button
+			type="button"
+			onclick={handleDiscover}
+			disabled={discovering}
+			class="flex items-center gap-2 rounded-lg bg-blue-600 px-4 py-2 text-sm font-medium text-white transition-colors hover:bg-blue-700 disabled:cursor-not-allowed disabled:opacity-50"
+		>
+			{#if discovering}
+				<svg class="h-4 w-4 animate-spin" viewBox="0 0 24 24">
+					<circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4" fill="none"></circle>
+					<path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
+				</svg>
+				<span>Discovering...</span>
+			{:else}
+				<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+					<path stroke-linecap="round" stroke-linejoin="round" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" />
+				</svg>
+				<span>Auto-Detect</span>
+			{/if}
+		</button>
+	</div>
+
+	<!-- Error Message -->
+	{#if backendsState.error}
+		<div class="rounded-lg border border-red-900/50 bg-red-900/20 p-4">
+			<div class="flex items-center gap-2 text-red-400">
+				<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+					<path stroke-linecap="round" stroke-linejoin="round" d="M12 8v4m0 4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
+				</svg>
+				<span>{backendsState.error}</span>
+				<button type="button" onclick={() => backendsState.clearError()} class="ml-auto text-red-400 hover:text-red-300" aria-label="Dismiss error">
+					<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+						<path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
+					</svg>
+				</button>
+			</div>
+		</div>
+	{/if}
+
+	<!-- Discovery Results -->
+	{#if showDiscoveryResults && discoveryResults.length > 0}
+		<div class="rounded-lg border border-theme bg-theme-secondary p-4">
+			<h3 class="mb-3 text-sm font-medium text-theme-secondary">Discovery Results</h3>
+			<div class="space-y-2">
+				{#each discoveryResults as result}
+					<div class="flex items-center justify-between rounded-lg bg-theme-tertiary/50 px-3 py-2">
+						<div class="flex items-center gap-3">
+							<span class="h-2 w-2 rounded-full {result.available ? 'bg-green-500' : 'bg-red-500'}"></span>
+							<span class="text-sm text-theme-primary">{getBackendDisplayName(result.type)}</span>
+							<span class="text-xs text-theme-muted">{result.baseUrl}</span>
+						</div>
+						<span class="text-xs {result.available ? 'text-green-400' : 'text-red-400'}">
+							{result.available ? 'Available' : result.error || 'Not found'}
+						</span>
+					</div>
+				{/each}
+			</div>
+			<button
+				type="button"
+				onclick={() => showDiscoveryResults = false}
+				class="mt-3 text-xs text-theme-muted hover:text-theme-primary"
+			>
+				Dismiss
+			</button>
+		</div>
+	{/if}
+
+	<!-- Active Backend Info -->
+	{#if backendsState.activeBackend}
+		<div class="rounded-lg border border-blue-900/50 bg-blue-900/20 p-4">
+			<div class="flex items-center gap-2 text-blue-400">
+				<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+					<path stroke-linecap="round" stroke-linejoin="round" d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z" />
+				</svg>
+				<span class="font-medium">Active: {getBackendDisplayName(backendsState.activeBackend.type)}</span>
+				{#if backendsState.activeBackend.version}
+					<span class="text-xs text-blue-300/70">v{backendsState.activeBackend.version}</span>
+				{/if}
+			</div>
+			<p class="mt-1 text-sm text-blue-300/70">{backendsState.activeBackend.baseUrl}</p>
+
+			<!-- Capabilities -->
+			<div class="mt-3 flex flex-wrap gap-2">
+				{#if backendsState.canPullModels}
+					<span class="rounded bg-green-900/30 px-2 py-1 text-xs text-green-400">Pull Models</span>
+				{/if}
+				{#if backendsState.canDeleteModels}
+					<span class="rounded bg-green-900/30 px-2 py-1 text-xs text-green-400">Delete Models</span>
+				{/if}
+				{#if backendsState.canCreateModels}
+					<span class="rounded bg-green-900/30 px-2 py-1 text-xs text-green-400">Create Custom</span>
+				{/if}
+				{#if backendsState.activeBackend.capabilities.canStreamChat}
+					<span class="rounded bg-blue-900/30 px-2 py-1 text-xs text-blue-400">Streaming</span>
+				{/if}
+				{#if backendsState.activeBackend.capabilities.canEmbed}
+					<span class="rounded bg-purple-900/30 px-2 py-1 text-xs text-purple-400">Embeddings</span>
+				{/if}
+			</div>
+		</div>
+	{:else if !backendsState.isLoading}
+		<div class="rounded-lg border border-amber-900/50 bg-amber-900/20 p-4">
+			<div class="flex items-center gap-2 text-amber-400">
+				<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+					<path stroke-linecap="round" stroke-linejoin="round" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z" />
+				</svg>
+				<span>No active backend configured. Click "Auto-Detect" to find available backends.</span>
+			</div>
+		</div>
+	{/if}
+
+	<!-- Backend Cards -->
+	<div class="space-y-4">
+		<h3 class="text-sm font-medium text-theme-secondary">Available Backends</h3>
+
+		{#if backendsState.isLoading}
+			<div class="space-y-3">
+				{#each Array(3) as _}
+					<div class="animate-pulse rounded-lg border border-theme bg-theme-secondary p-4">
+						<div class="flex items-center gap-4">
+							<div class="h-10 w-10 rounded-lg bg-theme-tertiary"></div>
+							<div class="flex-1">
+								<div class="h-5 w-32 rounded bg-theme-tertiary"></div>
+								<div class="mt-2 h-4 w-48 rounded bg-theme-tertiary"></div>
+							</div>
+						</div>
+					</div>
+				{/each}
+			</div>
+		{:else if backendsState.backends.length === 0}
+			<div class="rounded-lg border border-dashed border-theme bg-theme-secondary/50 p-8 text-center">
+				<svg xmlns="http://www.w3.org/2000/svg" class="mx-auto h-12 w-12 text-theme-muted" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="1.5">
+					<path stroke-linecap="round" stroke-linejoin="round" d="M5 12h14M5 12a2 2 0 01-2-2V6a2 2 0 012-2h14a2 2 0 012 2v4a2 2 0 01-2 2M5 12a2 2 0 00-2 2v4a2 2 0 002 2h14a2 2 0 002-2v-4a2 2 0 00-2-2m-2-4h.01M17 16h.01" />
+				</svg>
+				<h3 class="mt-4 text-sm font-medium text-theme-muted">No backends configured</h3>
+				<p class="mt-1 text-sm text-theme-muted">
+					Click "Auto-Detect" to scan for available LLM backends
+				</p>
+			</div>
+		{:else}
+			{#each backendsState.backends as backend}
+				{@const isActive = backendsState.activeType === backend.type}
+				<div class="rounded-lg border transition-colors {isActive ? 'border-blue-500 bg-blue-900/10' : 'border-theme bg-theme-secondary hover:border-theme-subtle'}">
+					<div class="p-4">
+						<div class="flex items-start justify-between">
+							<div class="flex items-center gap-4">
+								<!-- Backend Icon -->
+								<div class="flex h-12 w-12 items-center justify-center rounded-lg bg-theme-tertiary">
+									{#if backend.type === 'ollama'}
+										<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6 text-theme-primary" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+											<path stroke-linecap="round" stroke-linejoin="round" d="M5 12h14M5 12a2 2 0 01-2-2V6a2 2 0 012-2h14a2 2 0 012 2v4a2 2 0 01-2 2M5 12a2 2 0 00-2 2v4a2 2 0 002 2h14a2 2 0 002-2v-4a2 2 0 00-2-2" />
+										</svg>
+									{:else if backend.type === 'llamacpp'}
+										<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6 text-theme-primary" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+											<path stroke-linecap="round" stroke-linejoin="round" d="M10 20l4-16m4 4l4 4-4 4M6 16l-4-4 4-4" />
+										</svg>
+									{:else}
+										<svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6 text-theme-primary" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+											<path stroke-linecap="round" stroke-linejoin="round" d="M9.75 17L9 20l-1 1h8l-1-1-.75-3M3 13h18M5 17h14a2 2 0 002-2V5a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z" />
+										</svg>
+									{/if}
+								</div>
+
+								<div>
+									<div class="flex items-center gap-2">
+										<h4 class="font-medium text-theme-primary">{getBackendDisplayName(backend.type)}</h4>
+										<span class="flex items-center gap-1.5 rounded-full px-2 py-0.5 text-xs {backend.status === 'connected' ? 'bg-green-900/30 text-green-400' : 'bg-red-900/30 text-red-400'}">
+											<span class="h-1.5 w-1.5 rounded-full {getStatusColor(backend.status)}"></span>
+											{backend.status}
+										</span>
+										{#if isActive}
+											<span class="rounded bg-blue-600 px-2 py-0.5 text-xs font-medium text-white">Active</span>
+										{/if}
+									</div>
+									<p class="mt-1 text-sm text-theme-muted">{getBackendDescription(backend.type)}</p>
+									<p class="mt-1 text-xs text-theme-muted/70">{backend.baseUrl}</p>
+								</div>
+							</div>
+
+							<div class="flex items-center gap-2">
+								{#if !isActive && backend.status === 'connected'}
+									<button
+										type="button"
+										onclick={() => handleSetActive(backend.type)}
+										class="rounded-lg bg-blue-600 px-3 py-1.5 text-sm font-medium text-white transition-colors hover:bg-blue-700"
+									>
+										Set Active
+									</button>
+								{/if}
+							</div>
+						</div>
+
+						{#if backend.error}
+							<div class="mt-3 rounded bg-red-900/20 px-3 py-2 text-xs text-red-400">
+								{backend.error}
+							</div>
+						{/if}
+					</div>
+				</div>
+			{/each}
+		{/if}
+	</div>
+
+	<!-- Help Section -->
+	<div class="rounded-lg border border-theme bg-theme-secondary/50 p-4">
+		<h3 class="text-sm font-medium text-theme-secondary">Quick Start</h3>
+		<div class="mt-2 space-y-2 text-sm text-theme-muted">
+			<p><strong>Ollama:</strong> Run <code class="rounded bg-theme-tertiary px-1.5 py-0.5 text-xs">ollama serve</code> (default port 11434)</p>
+			<p><strong>llama.cpp:</strong> Run <code class="rounded bg-theme-tertiary px-1.5 py-0.5 text-xs">llama-server -m model.gguf</code> (default port 8081)</p>
+			<p><strong>LM Studio:</strong> Start local server from the app (default port 1234)</p>
+		</div>
+	</div>
+</div>

frontend/src/lib/components/settings/GeneralTab.svelte

@@ -0,0 +1,131 @@
+<script lang="ts">
+	/**
+	 * GeneralTab - General settings including appearance, defaults, shortcuts, and about
+	 */
+	import { modelsState, uiState } from '$lib/stores';
+	import { getPrimaryModifierDisplay } from '$lib/utils';
+
+	const modifierKey = getPrimaryModifierDisplay();
+
+	// Local state for default model selection
+	let defaultModel = $state<string | null>(modelsState.selectedId);
+
+	// Save default model when it changes
+	function handleModelChange(): void {
+		if (defaultModel) {
+			modelsState.select(defaultModel);
+		}
+	}
+</script>
+
+<div class="space-y-8">
+	<!-- Appearance Section -->
+	<section>
+		<h2 class="mb-4 flex items-center gap-2 text-lg font-semibold text-theme-primary">
+			<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-purple-400" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+				<path stroke-linecap="round" stroke-linejoin="round" d="M7 21a4 4 0 01-4-4V5a2 2 0 012-2h4a2 2 0 012 2v12a4 4 0 01-4 4zm0 0h12a2 2 0 002-2v-4a2 2 0 00-2-2h-2.343M11 7.343l1.657-1.657a2 2 0 012.828 0l2.829 2.829a2 2 0 010 2.828l-8.486 8.485M7 17h.01" />
+			</svg>
+			Appearance
+		</h2>
+
+		<div class="rounded-lg border border-theme bg-theme-secondary p-4 space-y-4">
+			<!-- Dark Mode Toggle -->
+			<div class="flex items-center justify-between">
+				<div>
+					<p class="text-sm font-medium text-theme-secondary">Dark Mode</p>
+					<p class="text-xs text-theme-muted">Toggle between light and dark theme</p>
+				</div>
+				<button
+					type="button"
+					onclick={() => uiState.toggleDarkMode()}
+					class="relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-purple-500 focus:ring-offset-2 focus:ring-offset-theme {uiState.darkMode ? 'bg-purple-600' : 'bg-theme-tertiary'}"
+					role="switch"
+					aria-checked={uiState.darkMode}
+					aria-label="Toggle dark mode"
+				>
+					<span
+						class="pointer-events-none inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out {uiState.darkMode ? 'translate-x-5' : 'translate-x-0'}"
+					></span>
+				</button>
+			</div>
+
+			<!-- System Theme Sync -->
+			<div class="flex items-center justify-between">
+				<div>
+					<p class="text-sm font-medium text-theme-secondary">Use System Theme</p>
+					<p class="text-xs text-theme-muted">Match your OS light/dark preference</p>
+				</div>
+				<button
+					type="button"
+					onclick={() => uiState.useSystemTheme()}
+					class="rounded-lg bg-theme-tertiary px-3 py-1.5 text-xs font-medium text-theme-secondary transition-colors hover:bg-theme-hover"
+				>
+					Sync with System
+				</button>
+			</div>
+		</div>
+	</section>
+
+	<!-- Chat Defaults Section -->
+	<section>
+		<h2 class="mb-4 flex items-center gap-2 text-lg font-semibold text-theme-primary">
+			<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-cyan-400" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+				<path stroke-linecap="round" stroke-linejoin="round" d="M8 12h.01M12 12h.01M16 12h.01M21 12c0 4.418-4.03 8-9 8a9.863 9.863 0 01-4.255-.949L3 20l1.395-3.72C3.512 15.042 3 13.574 3 12c0-4.418 4.03-8 9-8s9 3.582 9 8z" />
+			</svg>
+			Chat Defaults
+		</h2>
+
+		<div class="rounded-lg border border-theme bg-theme-secondary p-4">
+			<div>
+				<label for="default-model" class="text-sm font-medium text-theme-secondary">Default Model</label>
+				<p class="text-xs text-theme-muted mb-2">Model used for new conversations</p>
+				<select
+					id="default-model"
+					bind:value={defaultModel}
+					onchange={handleModelChange}
+					class="w-full rounded-lg border border-theme-subtle bg-theme-tertiary px-3 py-2 text-theme-secondary focus:border-cyan-500 focus:outline-none focus:ring-1 focus:ring-cyan-500"
+				>
+					{#each modelsState.chatModels as model}
+						<option value={model.name}>{model.name}</option>
+					{/each}
+				</select>
+			</div>
+		</div>
+	</section>
+
+	<!-- Keyboard Shortcuts Section -->
+	<section>
+		<h2 class="mb-4 flex items-center gap-2 text-lg font-semibold text-theme-primary">
+			<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-blue-400" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+				<path stroke-linecap="round" stroke-linejoin="round" d="M12 6.253v13m0-13C10.832 5.477 9.246 5 7.5 5S4.168 5.477 3 6.253v13C4.168 18.477 5.754 18 7.5 18s3.332.477 4.5 1.253m0-13C13.168 5.477 14.754 5 16.5 5c1.747 0 3.332.477 4.5 1.253v13C19.832 18.477 18.247 18 16.5 18c-1.746 0-3.332.477-4.5 1.253" />
+			</svg>
+			Keyboard Shortcuts
+		</h2>
+
+		<div class="rounded-lg border border-theme bg-theme-secondary p-4">
+			<div class="space-y-3">
+				<div class="flex justify-between items-center">
+					<span class="text-sm text-theme-secondary">New Chat</span>
+					<kbd class="rounded bg-theme-tertiary px-2 py-1 font-mono text-xs text-theme-muted">{modifierKey}+N</kbd>
+				</div>
+				<div class="flex justify-between items-center">
+					<span class="text-sm text-theme-secondary">Search</span>
+					<kbd class="rounded bg-theme-tertiary px-2 py-1 font-mono text-xs text-theme-muted">{modifierKey}+K</kbd>
+				</div>
+				<div class="flex justify-between items-center">
+					<span class="text-sm text-theme-secondary">Toggle Sidebar</span>
+					<kbd class="rounded bg-theme-tertiary px-2 py-1 font-mono text-xs text-theme-muted">{modifierKey}+B</kbd>
+				</div>
+				<div class="flex justify-between items-center">
+					<span class="text-sm text-theme-secondary">Send Message</span>
+					<kbd class="rounded bg-theme-tertiary px-2 py-1 font-mono text-xs text-theme-muted">Enter</kbd>
+				</div>
+				<div class="flex justify-between items-center">
+					<span class="text-sm text-theme-secondary">New Line</span>
+					<kbd class="rounded bg-theme-tertiary px-2 py-1 font-mono text-xs text-theme-muted">Shift+Enter</kbd>
+				</div>
+			</div>
+		</div>
+	</section>
+
+</div>

frontend/src/lib/components/settings/KnowledgeTab.svelte

@@ -0,0 +1,291 @@
+<script lang="ts">
+	/**
+	 * KnowledgeTab - Knowledge Base management
+	 */
+	import { onMount } from 'svelte';
+	import {
+		listDocuments,
+		addDocument,
+		deleteDocument,
+		getKnowledgeBaseStats,
+		formatTokenCount,
+		EMBEDDING_MODELS,
+		DEFAULT_EMBEDDING_MODEL
+	} from '$lib/memory';
+	import type { StoredDocument } from '$lib/storage/db';
+	import { toastState, modelsState } from '$lib/stores';
+	import { ConfirmDialog } from '$lib/components/shared';
+
+	let documents = $state<StoredDocument[]>([]);
+	let stats = $state({ documentCount: 0, chunkCount: 0, totalTokens: 0 });
+	let isLoading = $state(true);
+	let isUploading = $state(false);
+	let uploadProgress = $state({ current: 0, total: 0 });
+	let selectedModel = $state(DEFAULT_EMBEDDING_MODEL);
+	let dragOver = $state(false);
+	let deleteConfirm = $state<{ show: boolean; doc: StoredDocument | null }>({ show: false, doc: null });
+
+	let fileInput = $state<HTMLInputElement | null>(null);
+
+	onMount(async () => {
+		await refreshData();
+	});
+
+	async function refreshData() {
+		isLoading = true;
+		try {
+			documents = await listDocuments();
+			stats = await getKnowledgeBaseStats();
+		} catch (error) {
+			console.error('Failed to load documents:', error);
+			toastState.error('Failed to load knowledge base');
+		} finally {
+			isLoading = false;
+		}
+	}
+
+	async function handleFileSelect(event: Event) {
+		const input = event.target as HTMLInputElement;
+		if (input.files && input.files.length > 0) {
+			await processFiles(Array.from(input.files));
+		}
+		input.value = '';
+	}
+
+	async function handleDrop(event: DragEvent) {
+		event.preventDefault();
+		dragOver = false;
+
+		if (event.dataTransfer?.files) {
+			await processFiles(Array.from(event.dataTransfer.files));
+		}
+	}
+
+	async function processFiles(files: File[]) {
+		isUploading = true;
+
+		for (const file of files) {
+			try {
+				const content = await file.text();
+
+				if (!content.trim()) {
+					toastState.warning(`File "${file.name}" is empty, skipping`);
+					continue;
+				}
+
+				await addDocument(file.name, content, file.type || 'text/plain', {
+					embeddingModel: selectedModel,
+					onProgress: (current, total) => {
+						uploadProgress = { current, total };
+					}
+				});
+
+				toastState.success(`Added "${file.name}" to knowledge base`);
+			} catch (error) {
+				console.error(`Failed to process ${file.name}:`, error);
+				toastState.error(`Failed to add "${file.name}"`);
+			}
+		}
+
+		await refreshData();
+		isUploading = false;
+		uploadProgress = { current: 0, total: 0 };
+	}
+
+	function handleDeleteClick(doc: StoredDocument) {
+		deleteConfirm = { show: true, doc };
+	}
+
+	async function confirmDelete() {
+		if (!deleteConfirm.doc) return;
+		const doc = deleteConfirm.doc;
+		deleteConfirm = { show: false, doc: null };
+
+		try {
+			await deleteDocument(doc.id);
+			toastState.success(`Deleted "${doc.name}"`);
+			await refreshData();
+		} catch (error) {
+			console.error('Failed to delete document:', error);
+			toastState.error('Failed to delete document');
+		}
+	}
+
+	function formatDate(timestamp: number): string {
+		return new Date(timestamp).toLocaleDateString(undefined, {
+			year: 'numeric',
+			month: 'short',
+			day: 'numeric'
+		});
+	}
+
+	function formatSize(bytes: number): string {
+		if (bytes < 1024) return `${bytes} B`;
+		if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`;
+		return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
+	}
+</script>
+
+<div>
+	<!-- Header -->
+	<div class="mb-8">
+		<h2 class="text-xl font-bold text-theme-primary">Knowledge Base</h2>
+		<p class="mt-1 text-sm text-theme-muted">
+			Upload documents to enhance AI responses with your own knowledge
+		</p>
+	</div>
+
+	<!-- Stats -->
+	<div class="mb-6 grid grid-cols-3 gap-4">
+		<div class="rounded-lg border border-theme bg-theme-secondary p-4">
+			<p class="text-sm text-theme-muted">Documents</p>
+			<p class="mt-1 text-2xl font-semibold text-theme-primary">{stats.documentCount}</p>
+		</div>
+		<div class="rounded-lg border border-theme bg-theme-secondary p-4">
+			<p class="text-sm text-theme-muted">Chunks</p>
+			<p class="mt-1 text-2xl font-semibold text-theme-primary">{stats.chunkCount}</p>
+		</div>
+		<div class="rounded-lg border border-theme bg-theme-secondary p-4">
+			<p class="text-sm text-theme-muted">Total Tokens</p>
+			<p class="mt-1 text-2xl font-semibold text-theme-primary">{formatTokenCount(stats.totalTokens)}</p>
+		</div>
+	</div>
+
+	<!-- Upload Area -->
+	<div class="mb-8">
+		<div class="mb-3 flex items-center justify-between">
+			<h3 class="text-lg font-semibold text-theme-primary">Upload Documents</h3>
+			<select
+				bind:value={selectedModel}
+				class="rounded-md border border-theme-subtle bg-theme-tertiary px-3 py-1.5 text-sm text-theme-primary focus:border-blue-500 focus:outline-none focus:ring-1 focus:ring-blue-500"
+			>
+				{#each EMBEDDING_MODELS as model}
+					<option value={model}>{model}</option>
+				{/each}
+			</select>
+		</div>
+
+		<button
+			type="button"
+			class="w-full rounded-lg border-2 border-dashed p-8 text-center transition-colors {dragOver
+				? 'border-blue-500 bg-blue-900/20'
+				: 'border-theme-subtle hover:border-theme'}"
+			ondragover={(e) => { e.preventDefault(); dragOver = true; }}
+			ondragleave={() => (dragOver = false)}
+			ondrop={handleDrop}
+			onclick={() => fileInput?.click()}
+			disabled={isUploading}
+		>
+			{#if isUploading}
+				<div class="flex flex-col items-center">
+					<svg class="h-8 w-8 animate-spin text-blue-500" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
+						<circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
+						<path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
+					</svg>
+					<p class="mt-3 text-sm text-theme-muted">Processing... ({uploadProgress.current}/{uploadProgress.total} chunks)</p>
+				</div>
+			{:else}
+				<svg xmlns="http://www.w3.org/2000/svg" class="mx-auto h-12 w-12 text-theme-muted" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="1.5">
+					<path stroke-linecap="round" stroke-linejoin="round" d="M12 16.5V9.75m0 0l3 3m-3-3l-3 3M6.75 19.5a4.5 4.5 0 01-1.41-8.775 5.25 5.25 0 0110.233-2.33 3 3 0 013.758 3.848A3.752 3.752 0 0118 19.5H6.75z" />
+				</svg>
+				<p class="mt-3 text-sm text-theme-muted">Drag and drop files here, or click to browse</p>
+				<p class="mt-1 text-xs text-theme-muted">Supports .txt, .md, .json, and other text files</p>
+			{/if}
+		</button>
+
+		<input
+			bind:this={fileInput}
+			type="file"
+			multiple
+			accept=".txt,.md,.json,.csv,.xml,.html"
+			onchange={handleFileSelect}
+			class="hidden"
+		/>
+	</div>
+
+	<!-- Documents List -->
+	<div>
+		<h3 class="mb-4 text-lg font-semibold text-theme-primary">Documents</h3>
+
+		{#if isLoading}
+			<div class="flex items-center justify-center py-8">
+				<svg class="h-8 w-8 animate-spin text-theme-muted" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
+					<circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
+					<path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
+				</svg>
+			</div>
+		{:else if documents.length === 0}
+			<div class="rounded-lg border border-dashed border-theme bg-theme-secondary/50 p-8 text-center">
+				<svg xmlns="http://www.w3.org/2000/svg" class="mx-auto h-12 w-12 text-theme-muted" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="1.5">
+					<path stroke-linecap="round" stroke-linejoin="round" d="M19.5 14.25v-2.625a3.375 3.375 0 00-3.375-3.375h-1.5A1.125 1.125 0 0113.5 7.125v-1.5a3.375 3.375 0 00-3.375-3.375H8.25m2.25 0H5.625c-.621 0-1.125.504-1.125 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125V11.25a9 9 0 00-9-9z" />
+				</svg>
+				<h4 class="mt-4 text-sm font-medium text-theme-muted">No documents yet</h4>
+				<p class="mt-1 text-sm text-theme-muted">Upload documents to build your knowledge base</p>
+			</div>
+		{:else}
+			<div class="space-y-3">
+				{#each documents as doc (doc.id)}
+					<div class="flex items-center justify-between rounded-lg border border-theme bg-theme-secondary p-4">
+						<div class="flex items-center gap-3">
+							<svg xmlns="http://www.w3.org/2000/svg" class="h-8 w-8 text-blue-400" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="1.5">
+								<path stroke-linecap="round" stroke-linejoin="round" d="M19.5 14.25v-2.625a3.375 3.375 0 00-3.375-3.375h-1.5A1.125 1.125 0 0113.5 7.125v-1.5a3.375 3.375 0 00-3.375-3.375H8.25m0 12.75h7.5m-7.5 3H12M10.5 2.25H5.625c-.621 0-1.125.504-1.125 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125V11.25a9 9 0 00-9-9z" />
+							</svg>
+							<div>
+								<h4 class="font-medium text-theme-primary">{doc.name}</h4>
+								<p class="text-xs text-theme-muted">{formatSize(doc.size)} · {doc.chunkCount} chunks · Added {formatDate(doc.createdAt)}</p>
+							</div>
+						</div>
+
+						<button
+							type="button"
+							onclick={() => handleDeleteClick(doc)}
+							class="rounded p-2 text-theme-muted transition-colors hover:bg-red-900/30 hover:text-red-400"
+							aria-label="Delete document"
+						>
+							<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="1.5">
+								<path stroke-linecap="round" stroke-linejoin="round" d="M14.74 9l-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 01-2.244 2.077H8.084a2.25 2.25 0 01-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 00-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 013.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 00-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 00-7.5 0" />
+							</svg>
+						</button>
+					</div>
+				{/each}
+			</div>
+		{/if}
+	</div>
+
+	<!-- Info Section -->
+	<section class="mt-8 rounded-lg border border-theme bg-theme-secondary/50 p-4">
+		<h4 class="flex items-center gap-2 text-sm font-medium text-theme-secondary">
+			<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4 text-blue-400" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+				<path stroke-linecap="round" stroke-linejoin="round" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
+			</svg>
+			How RAG Works
+		</h4>
+		<p class="mt-2 text-sm text-theme-muted">
+			Documents are split into chunks and converted to embeddings. When you ask a question,
+			relevant chunks are found by similarity search and included in the AI's context.
+		</p>
+		{#if !modelsState.hasEmbeddingModel}
+			<p class="mt-2 text-sm text-amber-400">
+				<strong>No embedding model found.</strong> Install one to use the knowledge base:
+				<code class="ml-1 rounded bg-theme-tertiary px-1 text-theme-muted">ollama pull nomic-embed-text</code>
+			</p>
+		{:else}
+			<p class="mt-2 text-sm text-emerald-400">
+				Embedding model available: {modelsState.embeddingModels[0]?.name}
+				{#if modelsState.embeddingModels.length > 1}
+					<span class="text-theme-muted">(+{modelsState.embeddingModels.length - 1} more)</span>
+				{/if}
+			</p>
+		{/if}
+	</section>
+</div>
+
+<ConfirmDialog
+	isOpen={deleteConfirm.show}
+	title="Delete Document"
+	message={`Delete "${deleteConfirm.doc?.name}"? This cannot be undone.`}
+	confirmText="Delete"
+	variant="danger"
+	onConfirm={confirmDelete}
+	onCancel={() => (deleteConfirm = { show: false, doc: null })}
+/>

frontend/src/lib/components/settings/MemoryTab.svelte

@@ -0,0 +1,375 @@
+<script lang="ts">
+	/**
+	 * MemoryTab - Model parameters, embedding model, auto-compact, and model-prompt defaults
+	 */
+	import { onMount } from 'svelte';
+	import { modelsState, settingsState, promptsState } from '$lib/stores';
+	import { modelPromptMappingsState } from '$lib/stores/model-prompt-mappings.svelte.js';
+	import { modelInfoService, type ModelInfo } from '$lib/services/model-info-service.js';
+	import { PARAMETER_RANGES, PARAMETER_LABELS, PARAMETER_DESCRIPTIONS, AUTO_COMPACT_RANGES } from '$lib/types/settings';
+	import { EMBEDDING_MODELS } from '$lib/memory/embeddings';
+
+	// Model info cache for the settings page
+	let modelInfoCache = $state<Map<string, ModelInfo>>(new Map());
+	let isLoadingModelInfo = $state(false);
+
+	// Load model info for all available models
+	onMount(async () => {
+		isLoadingModelInfo = true;
+		try {
+			const models = modelsState.chatModels;
+			const infos = await Promise.all(
+				models.map(async (model) => {
+					const info = await modelInfoService.getModelInfo(model.name);
+					return [model.name, info] as [string, ModelInfo];
+				})
+			);
+			modelInfoCache = new Map(infos);
+		} finally {
+			isLoadingModelInfo = false;
+		}
+	});
+
+	// Handle prompt selection for a model
+	async function handleModelPromptChange(modelName: string, promptId: string | null): Promise<void> {
+		if (promptId === null) {
+			await modelPromptMappingsState.removeMapping(modelName);
+		} else {
+			await modelPromptMappingsState.setMapping(modelName, promptId);
+		}
+	}
+
+	// Get the currently mapped prompt ID for a model
+	function getMappedPromptId(modelName: string): string | undefined {
+		return modelPromptMappingsState.getMapping(modelName);
+	}
+
+	// Get current model defaults for reset functionality
+	const currentModelDefaults = $derived(
+		modelsState.selectedId ? modelsState.getModelDefaults(modelsState.selectedId) : undefined
+	);
+</script>
+
+<div class="space-y-8">
+	<!-- Memory Management Section -->
+	<section>
+		<h2 class="mb-4 flex items-center gap-2 text-lg font-semibold text-theme-primary">
+			<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-emerald-400" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+				<path stroke-linecap="round" stroke-linejoin="round" d="M4 7v10c0 2.21 3.582 4 8 4s8-1.79 8-4V7M4 7c0 2.21 3.582 4 8 4s8-1.79 8-4M4 7c0-2.21 3.582-4 8-4s8 1.79 8 4m0 5c0 2.21-3.582 4-8 4s-8-1.79-8-4" />
+			</svg>
+			Memory Management
+		</h2>
+
+		<div class="rounded-lg border border-theme bg-theme-secondary p-4 space-y-4">
+			<!-- Embedding Model Selector -->
+			<div class="pb-4 border-b border-theme">
+				<label for="embedding-model" class="text-sm font-medium text-theme-secondary">Embedding Model</label>
+				<p class="text-xs text-theme-muted mb-2">Model used for semantic search and conversation indexing</p>
+				<select
+					id="embedding-model"
+					value={settingsState.embeddingModel}
+					onchange={(e) => settingsState.updateEmbeddingModel(e.currentTarget.value)}
+					class="w-full rounded-lg border border-theme-subtle bg-theme-tertiary px-3 py-2 text-theme-secondary focus:border-emerald-500 focus:outline-none focus:ring-1 focus:ring-emerald-500"
+				>
+					{#each EMBEDDING_MODELS as model}
+						<option value={model}>{model}</option>
+					{/each}
+				</select>
+				{#if !modelsState.hasEmbeddingModel}
+					<p class="mt-2 text-xs text-amber-400">
+						No embedding model installed. Run <code class="bg-theme-tertiary px-1 rounded text-theme-muted">ollama pull {settingsState.embeddingModel}</code> to enable semantic search.
+					</p>
+				{:else}
+					{@const selectedInstalled = modelsState.embeddingModels.some(m => m.name.includes(settingsState.embeddingModel.split(':')[0]))}
+					{#if !selectedInstalled}
+						<p class="mt-2 text-xs text-amber-400">
+							Selected model not installed. Run <code class="bg-theme-tertiary px-1 rounded text-theme-muted">ollama pull {settingsState.embeddingModel}</code> or select an installed model.
+						</p>
+						<p class="mt-1 text-xs text-theme-muted">
+							Installed: {modelsState.embeddingModels.map(m => m.name).join(', ')}
+						</p>
+					{:else}
+						<p class="mt-2 text-xs text-emerald-400">
+							Model installed and ready.
+						</p>
+					{/if}
+				{/if}
+			</div>
+
+			<!-- Auto-Compact Toggle -->
+			<div class="flex items-center justify-between pb-4 border-b border-theme">
+				<div>
+					<p class="text-sm font-medium text-theme-secondary">Auto-Compact</p>
+					<p class="text-xs text-theme-muted">Automatically summarize older messages when context usage is high</p>
+				</div>
+				<button
+					type="button"
+					onclick={() => settingsState.toggleAutoCompact()}
+					class="relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-emerald-500 focus:ring-offset-2 focus:ring-offset-theme {settingsState.autoCompactEnabled ? 'bg-emerald-600' : 'bg-theme-tertiary'}"
+					role="switch"
+					aria-checked={settingsState.autoCompactEnabled}
+					aria-label="Toggle auto-compact"
+				>
+					<span
+						class="pointer-events-none inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out {settingsState.autoCompactEnabled ? 'translate-x-5' : 'translate-x-0'}"
+					></span>
+				</button>
+			</div>
+
+			{#if settingsState.autoCompactEnabled}
+				<!-- Threshold Slider -->
+				<div>
+					<div class="flex items-center justify-between mb-1">
+						<label for="compact-threshold" class="text-sm font-medium text-theme-secondary">Context Threshold</label>
+						<span class="text-sm text-theme-muted">{settingsState.autoCompactThreshold}%</span>
+					</div>
+					<p class="text-xs text-theme-muted mb-2">Trigger compaction when context usage exceeds this percentage</p>
+					<input
+						id="compact-threshold"
+						type="range"
+						min={AUTO_COMPACT_RANGES.threshold.min}
+						max={AUTO_COMPACT_RANGES.threshold.max}
+						step={AUTO_COMPACT_RANGES.threshold.step}
+						value={settingsState.autoCompactThreshold}
+						oninput={(e) => settingsState.updateAutoCompactThreshold(parseInt(e.currentTarget.value))}
+						class="w-full accent-emerald-500"
+					/>
+					<div class="flex justify-between text-xs text-theme-muted mt-1">
+						<span>{AUTO_COMPACT_RANGES.threshold.min}%</span>
+						<span>{AUTO_COMPACT_RANGES.threshold.max}%</span>
+					</div>
+				</div>
+
+				<!-- Preserve Count -->
+				<div>
+					<div class="flex items-center justify-between mb-1">
+						<label for="preserve-count" class="text-sm font-medium text-theme-secondary">Messages to Preserve</label>
+						<span class="text-sm text-theme-muted">{settingsState.autoCompactPreserveCount}</span>
+					</div>
+					<p class="text-xs text-theme-muted mb-2">Number of recent messages to keep intact (not summarized)</p>
+					<input
+						id="preserve-count"
+						type="range"
+						min={AUTO_COMPACT_RANGES.preserveCount.min}
+						max={AUTO_COMPACT_RANGES.preserveCount.max}
+						step={AUTO_COMPACT_RANGES.preserveCount.step}
+						value={settingsState.autoCompactPreserveCount}
+						oninput={(e) => settingsState.updateAutoCompactPreserveCount(parseInt(e.currentTarget.value))}
+						class="w-full accent-emerald-500"
+					/>
+					<div class="flex justify-between text-xs text-theme-muted mt-1">
+						<span>{AUTO_COMPACT_RANGES.preserveCount.min}</span>
+						<span>{AUTO_COMPACT_RANGES.preserveCount.max}</span>
+					</div>
+				</div>
+			{:else}
+				<p class="text-sm text-theme-muted py-2">
+					Enable auto-compact to automatically manage context usage. When enabled, older messages
+					will be summarized when context usage exceeds your threshold.
+				</p>
+			{/if}
+		</div>
+	</section>
+
+	<!-- Model Parameters Section -->
+	<section>
+		<h2 class="mb-4 flex items-center gap-2 text-lg font-semibold text-theme-primary">
+			<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-orange-400" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+				<path stroke-linecap="round" stroke-linejoin="round" d="M12 6V4m0 2a2 2 0 100 4m0-4a2 2 0 110 4m-6 8a2 2 0 100-4m0 4a2 2 0 110-4m0 4v2m0-6V4m6 6v10m6-2a2 2 0 100-4m0 4a2 2 0 110-4m0 4v2m0-6V4" />
+			</svg>
+			Model Parameters
+		</h2>
+
+		<div class="rounded-lg border border-theme bg-theme-secondary p-4 space-y-4">
+			<!-- Use Custom Parameters Toggle -->
+			<div class="flex items-center justify-between pb-4 border-b border-theme">
+				<div>
+					<p class="text-sm font-medium text-theme-secondary">Use Custom Parameters</p>
+					<p class="text-xs text-theme-muted">Override model defaults with custom values</p>
+				</div>
+				<button
+					type="button"
+					onclick={() => settingsState.toggleCustomParameters(currentModelDefaults)}
+					class="relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-orange-500 focus:ring-offset-2 focus:ring-offset-theme {settingsState.useCustomParameters ? 'bg-orange-600' : 'bg-theme-tertiary'}"
+					role="switch"
+					aria-checked={settingsState.useCustomParameters}
+					aria-label="Toggle custom model parameters"
+				>
+					<span
+						class="pointer-events-none inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out {settingsState.useCustomParameters ? 'translate-x-5' : 'translate-x-0'}"
+					></span>
+				</button>
+			</div>
+
+			{#if settingsState.useCustomParameters}
+				<!-- Temperature -->
+				<div>
+					<div class="flex items-center justify-between mb-1">
+						<label for="temperature" class="text-sm font-medium text-theme-secondary">{PARAMETER_LABELS.temperature}</label>
+						<span class="text-sm text-theme-muted">{settingsState.temperature.toFixed(2)}</span>
+					</div>
+					<p class="text-xs text-theme-muted mb-2">{PARAMETER_DESCRIPTIONS.temperature}</p>
+					<input
+						id="temperature"
+						type="range"
+						min={PARAMETER_RANGES.temperature.min}
+						max={PARAMETER_RANGES.temperature.max}
+						step={PARAMETER_RANGES.temperature.step}
+						value={settingsState.temperature}
+						oninput={(e) => settingsState.updateParameter('temperature', parseFloat(e.currentTarget.value))}
+						class="w-full accent-orange-500"
+					/>
+				</div>
+
+				<!-- Top K -->
+				<div>
+					<div class="flex items-center justify-between mb-1">
+						<label for="top_k" class="text-sm font-medium text-theme-secondary">{PARAMETER_LABELS.top_k}</label>
+						<span class="text-sm text-theme-muted">{settingsState.top_k}</span>
+					</div>
+					<p class="text-xs text-theme-muted mb-2">{PARAMETER_DESCRIPTIONS.top_k}</p>
+					<input
+						id="top_k"
+						type="range"
+						min={PARAMETER_RANGES.top_k.min}
+						max={PARAMETER_RANGES.top_k.max}
+						step={PARAMETER_RANGES.top_k.step}
+						value={settingsState.top_k}
+						oninput={(e) => settingsState.updateParameter('top_k', parseInt(e.currentTarget.value))}
+						class="w-full accent-orange-500"
+					/>
+				</div>
+
+				<!-- Top P -->
+				<div>
+					<div class="flex items-center justify-between mb-1">
+						<label for="top_p" class="text-sm font-medium text-theme-secondary">{PARAMETER_LABELS.top_p}</label>
+						<span class="text-sm text-theme-muted">{settingsState.top_p.toFixed(2)}</span>
+					</div>
+					<p class="text-xs text-theme-muted mb-2">{PARAMETER_DESCRIPTIONS.top_p}</p>
+					<input
+						id="top_p"
+						type="range"
+						min={PARAMETER_RANGES.top_p.min}
+						max={PARAMETER_RANGES.top_p.max}
+						step={PARAMETER_RANGES.top_p.step}
+						value={settingsState.top_p}
+						oninput={(e) => settingsState.updateParameter('top_p', parseFloat(e.currentTarget.value))}
+						class="w-full accent-orange-500"
+					/>
+				</div>
+
+				<!-- Context Length -->
+				<div>
+					<div class="flex items-center justify-between mb-1">
+						<label for="num_ctx" class="text-sm font-medium text-theme-secondary">{PARAMETER_LABELS.num_ctx}</label>
+						<span class="text-sm text-theme-muted">{settingsState.num_ctx.toLocaleString()}</span>
+					</div>
+					<p class="text-xs text-theme-muted mb-2">{PARAMETER_DESCRIPTIONS.num_ctx}</p>
+					<input
+						id="num_ctx"
+						type="range"
+						min={PARAMETER_RANGES.num_ctx.min}
+						max={PARAMETER_RANGES.num_ctx.max}
+						step={PARAMETER_RANGES.num_ctx.step}
+						value={settingsState.num_ctx}
+						oninput={(e) => settingsState.updateParameter('num_ctx', parseInt(e.currentTarget.value))}
+						class="w-full accent-orange-500"
+					/>
+				</div>
+
+				<!-- Reset Button -->
+				<div class="pt-2">
+					<button
+						type="button"
+						onclick={() => settingsState.resetToDefaults(currentModelDefaults)}
+						class="text-sm text-orange-400 hover:text-orange-300 transition-colors"
+					>
+						Reset to model defaults
+					</button>
+				</div>
+			{:else}
+				<p class="text-sm text-theme-muted py-2">
+					Using model defaults. Enable custom parameters to adjust temperature, sampling, and context length.
+				</p>
+			{/if}
+		</div>
+	</section>
+
+	<!-- Model-Prompt Defaults Section -->
+	<section>
+		<h2 class="mb-4 flex items-center gap-2 text-lg font-semibold text-theme-primary">
+			<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-violet-400" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+				<path stroke-linecap="round" stroke-linejoin="round" d="M19.5 14.25v-2.625a3.375 3.375 0 00-3.375-3.375h-1.5A1.125 1.125 0 0113.5 7.125v-1.5a3.375 3.375 0 00-3.375-3.375H8.25m0 12.75h7.5m-7.5 3H12M10.5 2.25H5.625c-.621 0-1.125.504-1.125 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125V11.25a9 9 0 00-9-9z" />
+			</svg>
+			Model-Prompt Defaults
+		</h2>
+
+		<div class="rounded-lg border border-theme bg-theme-secondary p-4">
+			<p class="text-sm text-theme-muted mb-4">
+				Set default system prompts for specific models. When no other prompt is selected, the model's default will be used automatically.
+			</p>
+
+			{#if isLoadingModelInfo}
+				<div class="flex items-center justify-center py-8">
+					<div class="h-6 w-6 animate-spin rounded-full border-2 border-theme-subtle border-t-violet-500"></div>
+					<span class="ml-2 text-sm text-theme-muted">Loading model info...</span>
+				</div>
+			{:else if modelsState.chatModels.length === 0}
+				<p class="text-sm text-theme-muted py-4 text-center">
+					No models available. Make sure Ollama is running.
+				</p>
+			{:else}
+				<div class="space-y-3">
+					{#each modelsState.chatModels as model (model.name)}
+						{@const modelInfo = modelInfoCache.get(model.name)}
+						{@const mappedPromptId = getMappedPromptId(model.name)}
+						<div class="rounded-lg border border-theme-subtle bg-theme-tertiary p-3">
+							<div class="flex items-start justify-between gap-4">
+								<div class="min-w-0 flex-1">
+									<div class="flex flex-wrap items-center gap-2">
+										<span class="font-medium text-theme-primary text-sm">{model.name}</span>
+										{#if modelInfo?.capabilities && modelInfo.capabilities.length > 0}
+											{#each modelInfo.capabilities as cap (cap)}
+												<span class="rounded bg-violet-900/50 px-1.5 py-0.5 text-xs text-violet-300">
+													{cap}
+												</span>
+											{/each}
+										{/if}
+										{#if modelInfo?.systemPrompt}
+											<span class="rounded bg-amber-900/50 px-1.5 py-0.5 text-xs text-amber-300" title="This model has a built-in system prompt">
+												embedded
+											</span>
+										{/if}
+									</div>
+								</div>
+
+								<select
+									value={mappedPromptId ?? ''}
+									onchange={(e) => {
+										const value = e.currentTarget.value;
+										handleModelPromptChange(model.name, value === '' ? null : value);
+									}}
+									class="rounded-lg border border-theme-subtle bg-theme-secondary px-2 py-1 text-sm text-theme-secondary focus:border-violet-500 focus:outline-none focus:ring-1 focus:ring-violet-500"
+								>
+									<option value="">
+										{modelInfo?.systemPrompt ? 'Use embedded prompt' : 'No default'}
+									</option>
+									{#each promptsState.prompts as prompt (prompt.id)}
+										<option value={prompt.id}>{prompt.name}</option>
+									{/each}
+								</select>
+							</div>
+
+							{#if modelInfo?.systemPrompt}
+								<p class="mt-2 text-xs text-theme-muted line-clamp-2">
+									<span class="font-medium text-amber-400">Embedded:</span> {modelInfo.systemPrompt}
+								</p>
+							{/if}
+						</div>
+					{/each}
+				</div>
+			{/if}
+		</div>
+	</section>
+</div>

frontend/src/lib/components/settings/ModelParametersPanel.svelte

@@ -93,13 +93,12 @@
 
 		<!-- Enable custom parameters toggle -->
 		<div class="mb-4 flex items-center justify-between">
-			<label class="flex items-center gap-2 text-sm text-theme-secondary">
-				<span>Use custom parameters</span>
-			</label>
+			<span class="text-sm text-theme-secondary">Use custom parameters</span>
 			<button
 				type="button"
 				role="switch"
 				aria-checked={settingsState.useCustomParameters}
+				aria-label="Toggle custom model parameters"
 				onclick={() => settingsState.toggleCustomParameters(modelDefaults)}
 				class="relative inline-flex h-5 w-9 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-sky-500 focus:ring-offset-2 focus:ring-offset-theme-secondary {settingsState.useCustomParameters ? 'bg-sky-600' : 'bg-theme-tertiary'}"
 			>

frontend/src/lib/components/settings/ModelsTab.svelte

@@ -0,0 +1,966 @@
+<script lang="ts">
+	/**
+	 * ModelsTab - Model browser and management
+	 * Browse and search models from ollama.com, manage local models
+	 */
+	import { onMount } from 'svelte';
+	import { modelRegistry } from '$lib/stores/model-registry.svelte';
+	import { localModelsState } from '$lib/stores/local-models.svelte';
+	import { modelsState } from '$lib/stores/models.svelte';
+	import { modelOperationsState } from '$lib/stores/model-operations.svelte';
+	import { ModelCard } from '$lib/components/models';
+	import PullModelDialog from '$lib/components/models/PullModelDialog.svelte';
+	import ModelEditorDialog from '$lib/components/models/ModelEditorDialog.svelte';
+	import { fetchTagSizes, type RemoteModel } from '$lib/api/model-registry';
+	import { modelInfoService, type ModelInfo } from '$lib/services/model-info-service';
+	import type { ModelEditorMode } from '$lib/stores/model-creation.svelte';
+
+	// Search debounce
+	let searchInput = $state('');
+	let searchTimeout: ReturnType<typeof setTimeout> | null = null;
+
+	function handleSearchInput(e: Event): void {
+		const value = (e.target as HTMLInputElement).value;
+		searchInput = value;
+
+		if (searchTimeout) clearTimeout(searchTimeout);
+		searchTimeout = setTimeout(() => {
+			modelRegistry.search(value);
+		}, 300);
+	}
+
+	function handleTypeFilter(type: 'official' | 'community' | ''): void {
+		modelRegistry.filterByType(type);
+	}
+
+	// Selected model for details panel
+	let selectedModel = $state<RemoteModel | null>(null);
+	let selectedTag = $state<string>('');
+	let pulling = $state(false);
+	let pullProgress = $state<{ status: string; completed?: number; total?: number } | null>(null);
+	let pullError = $state<string | null>(null);
+	let loadingSizes = $state(false);
+	let capabilitiesVerified = $state(false);
+
+	async function handleSelectModel(model: RemoteModel): Promise<void> {
+		selectedModel = model;
+		selectedTag = model.tags[0] || '';
+		pullProgress = null;
+		pullError = null;
+		capabilitiesVerified = false;
+
+		if (!model.tagSizes || Object.keys(model.tagSizes).length === 0) {
+			loadingSizes = true;
+			try {
+				const updatedModel = await fetchTagSizes(model.slug);
+				selectedModel = { ...model, tagSizes: updatedModel.tagSizes };
+			} catch (err) {
+				console.error('Failed to fetch tag sizes:', err);
+			} finally {
+				loadingSizes = false;
+			}
+		}
+
+		try {
+			const realCapabilities = await modelsState.fetchCapabilities(model.slug);
+			if (modelsState.hasCapability(model.slug, 'completion') || realCapabilities.length > 0) {
+				selectedModel = { ...selectedModel!, capabilities: realCapabilities };
+				capabilitiesVerified = true;
+			}
+		} catch {
+			capabilitiesVerified = false;
+		}
+	}
+
+	function closeDetails(): void {
+		selectedModel = null;
+		selectedTag = '';
+		pullProgress = null;
+		pullError = null;
+	}
+
+	async function pullModel(): Promise<void> {
+		if (!selectedModel || pulling) return;
+
+		const modelName = selectedTag
+			? `${selectedModel.slug}:${selectedTag}`
+			: selectedModel.slug;
+
+		pulling = true;
+		pullError = null;
+		pullProgress = { status: 'Starting pull...' };
+
+		try {
+			const response = await fetch('/api/v1/ollama/api/pull', {
+				method: 'POST',
+				headers: { 'Content-Type': 'application/json' },
+				body: JSON.stringify({ name: modelName })
+			});
+
+			if (!response.ok) {
+				throw new Error(`Failed to pull model: ${response.statusText}`);
+			}
+
+			const reader = response.body?.getReader();
+			if (!reader) throw new Error('No response body');
+
+			const decoder = new TextDecoder();
+			let buffer = '';
+
+			while (true) {
+				const { done, value } = await reader.read();
+				if (done) break;
+
+				buffer += decoder.decode(value, { stream: true });
+				const lines = buffer.split('\n');
+				buffer = lines.pop() || '';
+
+				for (const line of lines) {
+					if (!line.trim()) continue;
+					try {
+						const data = JSON.parse(line);
+						if (data.error) {
+							pullError = data.error;
+							break;
+						}
+						pullProgress = {
+							status: data.status || 'Pulling...',
+							completed: data.completed,
+							total: data.total
+						};
+					} catch {
+						// Skip invalid JSON
+					}
+				}
+			}
+
+			if (!pullError) {
+				pullProgress = { status: 'Pull complete!' };
+				await modelsState.refresh();
+				modelsState.select(modelName);
+			}
+		} catch (err) {
+			pullError = err instanceof Error ? err.message : 'Failed to pull model';
+		} finally {
+			pulling = false;
+		}
+	}
+
+	function formatDate(dateStr: string | undefined): string {
+		if (!dateStr) return 'Never';
+		const date = new Date(dateStr);
+		return date.toLocaleDateString('en-US', {
+			month: 'short',
+			day: 'numeric',
+			year: 'numeric',
+			hour: '2-digit',
+			minute: '2-digit'
+		});
+	}
+
+	function formatBytes(bytes: number): string {
+		if (bytes === 0) return '0 B';
+		const units = ['B', 'KB', 'MB', 'GB', 'TB'];
+		const k = 1024;
+		const i = Math.floor(Math.log(bytes) / Math.log(k));
+		const value = bytes / Math.pow(k, i);
+		return `${value.toFixed(i > 1 ? 1 : 0)} ${units[i]}`;
+	}
+
+	let deleteConfirm = $state<string | null>(null);
+	let deleting = $state(false);
+	let deleteError = $state<string | null>(null);
+
+	let modelEditorOpen = $state(false);
+	let modelEditorMode = $state<ModelEditorMode>('create');
+	let editingModelName = $state<string | undefined>(undefined);
+	let editingSystemPrompt = $state<string | undefined>(undefined);
+	let editingBaseModel = $state<string | undefined>(undefined);
+
+	let modelInfoCache = $state<Map<string, ModelInfo>>(new Map());
+
+	function openCreateDialog(): void {
+		modelEditorMode = 'create';
+		editingModelName = undefined;
+		editingSystemPrompt = undefined;
+		editingBaseModel = undefined;
+		modelEditorOpen = true;
+	}
+
+	async function openEditDialog(modelName: string): Promise<void> {
+		const info = await modelInfoService.getModelInfo(modelName);
+		if (!info.systemPrompt) return;
+
+		const localModel = localModelsState.models.find((m) => m.name === modelName);
+		const baseModel = localModel?.family || modelName;
+
+		modelEditorMode = 'edit';
+		editingModelName = modelName;
+		editingSystemPrompt = info.systemPrompt;
+		editingBaseModel = baseModel;
+		modelEditorOpen = true;
+	}
+
+	function closeModelEditor(): void {
+		modelEditorOpen = false;
+		localModelsState.refresh();
+	}
+
+	async function fetchModelInfoForLocalModels(): Promise<void> {
+		const newCache = new Map<string, ModelInfo>();
+		for (const model of localModelsState.models) {
+			try {
+				const info = await modelInfoService.getModelInfo(model.name);
+				newCache.set(model.name, info);
+			} catch {
+				// Ignore errors
+			}
+		}
+		modelInfoCache = newCache;
+	}
+
+	function hasEmbeddedPrompt(modelName: string): boolean {
+		const info = modelInfoCache.get(modelName);
+		return info?.systemPrompt !== null && info?.systemPrompt !== undefined && info.systemPrompt.length > 0;
+	}
+
+	async function deleteModel(modelName: string): Promise<void> {
+		if (deleting) return;
+
+		deleting = true;
+		deleteError = null;
+
+		try {
+			const response = await fetch('/api/v1/ollama/api/delete', {
+				method: 'DELETE',
+				headers: { 'Content-Type': 'application/json' },
+				body: JSON.stringify({ name: modelName })
+			});
+
+			if (!response.ok) {
+				const data = await response.json();
+				throw new Error(data.error || `Failed to delete: ${response.statusText}`);
+			}
+
+			await localModelsState.refresh();
+			await modelsState.refresh();
+			deleteConfirm = null;
+		} catch (err) {
+			deleteError = err instanceof Error ? err.message : 'Failed to delete model';
+		} finally {
+			deleting = false;
+		}
+	}
+
+	let activeTab = $state<'local' | 'browse'>('local');
+
+	let localSearchInput = $state('');
+	let localSearchTimeout: ReturnType<typeof setTimeout> | null = null;
+
+	function handleLocalSearchInput(e: Event): void {
+		const value = (e.target as HTMLInputElement).value;
+		localSearchInput = value;
+
+		if (localSearchTimeout) clearTimeout(localSearchTimeout);
+		localSearchTimeout = setTimeout(() => {
+			localModelsState.search(value);
+		}, 300);
+	}
+
+	$effect(() => {
+		if (localModelsState.models.length > 0) {
+			fetchModelInfoForLocalModels();
+		}
+	});
+
+	onMount(() => {
+		localModelsState.init();
+		modelRegistry.init();
+		modelsState.refresh().then(() => {
+			modelsState.fetchAllCapabilities();
+		});
+	});
+</script>
+
+<div class="flex h-full overflow-hidden">
+	<!-- Main Content -->
+	<div class="flex-1 overflow-y-auto">
+		<!-- Header -->
+		<div class="mb-6 flex items-start justify-between gap-4">
+			<div>
+				<h2 class="text-xl font-bold text-theme-primary">Models</h2>
+				<p class="mt-1 text-sm text-theme-muted">
+					Manage local models and browse ollama.com
+				</p>
+			</div>
+
+			<!-- Actions -->
+			<div class="flex items-center gap-3">
+				{#if activeTab === 'browse' && modelRegistry.syncStatus}
+					<div class="text-right text-xs text-theme-muted">
+						<div>{modelRegistry.syncStatus.modelCount} models cached</div>
+						<div>Last sync: {formatDate(modelRegistry.syncStatus.lastSync ?? undefined)}</div>
+					</div>
+				{/if}
+				{#if activeTab === 'browse'}
+					<button
+						type="button"
+						onclick={() => modelRegistry.sync()}
+						disabled={modelRegistry.syncing}
+						class="flex items-center gap-2 rounded-lg bg-blue-600 px-4 py-2 text-sm font-medium text-theme-primary transition-colors hover:bg-blue-700 disabled:cursor-not-allowed disabled:opacity-50"
+					>
+						{#if modelRegistry.syncing}
+							<svg class="h-4 w-4 animate-spin" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
+								<circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
+								<path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
+							</svg>
+							<span>Syncing...</span>
+						{:else}
+							<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+								<path stroke-linecap="round" stroke-linejoin="round" d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15" />
+							</svg>
+							<span>Sync Models</span>
+						{/if}
+					</button>
+				{:else}
+					<button
+						type="button"
+						onclick={openCreateDialog}
+						class="flex items-center gap-2 rounded-lg bg-violet-600 px-4 py-2 text-sm font-medium text-theme-primary transition-colors hover:bg-violet-500"
+					>
+						<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+							<path stroke-linecap="round" stroke-linejoin="round" d="M12 4v16m8-8H4" />
+						</svg>
+						<span>Create Custom</span>
+					</button>
+					<button
+						type="button"
+						onclick={() => modelOperationsState.openPullDialog()}
+						class="flex items-center gap-2 rounded-lg bg-sky-600 px-4 py-2 text-sm font-medium text-theme-primary transition-colors hover:bg-sky-500"
+					>
+						<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+							<path stroke-linecap="round" stroke-linejoin="round" d="M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-4l-4 4m0 0l-4-4m4 4V4" />
+						</svg>
+						<span>Pull Model</span>
+					</button>
+					<button
+						type="button"
+						onclick={() => localModelsState.checkUpdates()}
+						disabled={localModelsState.isCheckingUpdates}
+						class="flex items-center gap-2 rounded-lg border border-amber-700 bg-amber-900/20 px-4 py-2 text-sm font-medium text-amber-300 transition-colors hover:bg-amber-900/40 disabled:cursor-not-allowed disabled:opacity-50"
+					>
+						{#if localModelsState.isCheckingUpdates}
+							<svg class="h-4 w-4 animate-spin" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
+								<circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
+								<path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
+							</svg>
+							<span>Checking...</span>
+						{:else}
+							<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+								<path stroke-linecap="round" stroke-linejoin="round" d="M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-8l-4-4m0 0L8 8m4-4v12" />
+							</svg>
+							<span>Check Updates</span>
+						{/if}
+					</button>
+					<button
+						type="button"
+						onclick={() => localModelsState.refresh()}
+						disabled={localModelsState.loading}
+						class="flex items-center gap-2 rounded-lg border border-theme bg-theme-secondary px-4 py-2 text-sm font-medium text-theme-secondary transition-colors hover:bg-theme-tertiary disabled:cursor-not-allowed disabled:opacity-50"
+					>
+						{#if localModelsState.loading}
+							<svg class="h-4 w-4 animate-spin" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
+								<circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
+								<path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
+							</svg>
+						{:else}
+							<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+								<path stroke-linecap="round" stroke-linejoin="round" d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15" />
+							</svg>
+						{/if}
+						<span>Refresh</span>
+					</button>
+				{/if}
+			</div>
+		</div>
+
+		<!-- Tabs -->
+		<div class="mb-6 flex border-b border-theme">
+			<button
+				type="button"
+				onclick={() => activeTab = 'local'}
+				class="flex items-center gap-2 border-b-2 px-4 py-2 text-sm font-medium transition-colors {activeTab === 'local'
+					? 'border-blue-500 text-blue-400'
+					: 'border-transparent text-theme-muted hover:text-theme-primary'}"
+			>
+				<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+					<path stroke-linecap="round" stroke-linejoin="round" d="M5 12h14M5 12a2 2 0 01-2-2V6a2 2 0 012-2h14a2 2 0 012 2v4a2 2 0 01-2 2M5 12a2 2 0 00-2 2v4a2 2 0 002 2h14a2 2 0 002-2v-4a2 2 0 00-2-2m-2-4h.01M17 16h.01" />
+				</svg>
+				Local Models
+				<span class="rounded-full bg-theme-tertiary px-2 py-0.5 text-xs">{localModelsState.total}</span>
+				{#if localModelsState.updatesAvailable > 0}
+					<span class="rounded-full bg-amber-600 px-2 py-0.5 text-xs text-theme-primary" title="{localModelsState.updatesAvailable} update{localModelsState.updatesAvailable !== 1 ? 's' : ''} available">
+						{localModelsState.updatesAvailable}
+					</span>
+				{/if}
+			</button>
+			<button
+				type="button"
+				onclick={() => activeTab = 'browse'}
+				class="flex items-center gap-2 border-b-2 px-4 py-2 text-sm font-medium transition-colors {activeTab === 'browse'
+					? 'border-blue-500 text-blue-400'
+					: 'border-transparent text-theme-muted hover:text-theme-primary'}"
+			>
+				<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+					<path stroke-linecap="round" stroke-linejoin="round" d="M21 12a9 9 0 01-9 9m9-9a9 9 0 00-9-9m9 9H3m9 9a9 9 0 01-9-9m9 9c1.657 0 3-4.03 3-9s-1.343-9-3-9m0 18c-1.657 0-3-4.03-3-9s1.343-9 3-9m-9 9a9 9 0 019-9" />
+				</svg>
+				Browse ollama.com
+			</button>
+		</div>
+
+		<!-- Local Models Tab -->
+		{#if activeTab === 'local'}
+			{#if deleteError}
+				<div class="mb-4 rounded-lg border border-red-900/50 bg-red-900/20 p-4">
+					<div class="flex items-center gap-2 text-red-400">
+						<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+							<path stroke-linecap="round" stroke-linejoin="round" d="M12 8v4m0 4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
+						</svg>
+						<span>{deleteError}</span>
+						<button type="button" onclick={() => deleteError = null} class="ml-auto text-red-400 hover:text-red-300" aria-label="Dismiss error">
+							<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+								<path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
+							</svg>
+						</button>
+					</div>
+				</div>
+			{/if}
+
+			<!-- Local Models Search/Filter Bar -->
+			<div class="mb-4 flex flex-wrap items-center gap-4">
+				<div class="relative flex-1 min-w-[200px]">
+					<svg xmlns="http://www.w3.org/2000/svg" class="absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2 text-theme-muted" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+						<path stroke-linecap="round" stroke-linejoin="round" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" />
+					</svg>
+					<input
+						type="text"
+						value={localSearchInput}
+						oninput={handleLocalSearchInput}
+						placeholder="Search local models..."
+						class="w-full rounded-lg border border-theme bg-theme-secondary py-2 pl-10 pr-4 text-theme-primary placeholder-theme-placeholder focus:border-blue-500 focus:outline-none focus:ring-1 focus:ring-blue-500"
+					/>
+				</div>
+
+				{#if localModelsState.families.length > 0}
+					<select
+						value={localModelsState.familyFilter}
+						onchange={(e) => localModelsState.filterByFamily((e.target as HTMLSelectElement).value)}
+						class="rounded-lg border border-theme bg-theme-secondary px-3 py-2 text-sm text-theme-primary focus:border-blue-500 focus:outline-none focus:ring-1 focus:ring-blue-500"
+					>
+						<option value="">All Families</option>
+						{#each localModelsState.families as family}
+							<option value={family}>{family}</option>
+						{/each}
+					</select>
+				{/if}
+
+				<select
+					value={localModelsState.sortBy}
+					onchange={(e) => localModelsState.setSort((e.target as HTMLSelectElement).value as import('$lib/api/model-registry').LocalModelSortOption)}
+					class="rounded-lg border border-theme bg-theme-secondary px-3 py-2 text-sm text-theme-primary focus:border-blue-500 focus:outline-none focus:ring-1 focus:ring-blue-500"
+				>
+					<option value="name_asc">Name A-Z</option>
+					<option value="name_desc">Name Z-A</option>
+					<option value="size_desc">Largest</option>
+					<option value="size_asc">Smallest</option>
+					<option value="modified_desc">Recently Modified</option>
+					<option value="modified_asc">Oldest Modified</option>
+				</select>
+
+				{#if localModelsState.searchQuery || localModelsState.familyFilter || localModelsState.sortBy !== 'name_asc'}
+					<button
+						type="button"
+						onclick={() => { localModelsState.clearFilters(); localSearchInput = ''; }}
+						class="text-sm text-theme-muted hover:text-theme-primary"
+					>
+						Clear filters
+					</button>
+				{/if}
+			</div>
+
+			{#if localModelsState.loading}
+				<div class="space-y-3">
+					{#each Array(3) as _}
+						<div class="animate-pulse rounded-lg border border-theme bg-theme-secondary p-4">
+							<div class="flex items-center justify-between">
+								<div class="h-5 w-48 rounded bg-theme-tertiary"></div>
+								<div class="h-5 w-20 rounded bg-theme-tertiary"></div>
+							</div>
+						</div>
+					{/each}
+				</div>
+			{:else if localModelsState.models.length === 0}
+				<div class="rounded-lg border border-dashed border-theme bg-theme-secondary/50 p-12 text-center">
+					<svg xmlns="http://www.w3.org/2000/svg" class="mx-auto h-12 w-12 text-theme-muted" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="1.5">
+						<path stroke-linecap="round" stroke-linejoin="round" d="M20 7l-8-4-8 4m16 0l-8 4m8-4v10l-8 4m0-10L4 7m8 4v10M4 7v10l8 4" />
+					</svg>
+					<h3 class="mt-4 text-sm font-medium text-theme-muted">
+						{#if localModelsState.searchQuery || localModelsState.familyFilter}
+							No models match your filters
+						{:else}
+							No local models
+						{/if}
+					</h3>
+					<p class="mt-1 text-sm text-theme-muted">
+						{#if localModelsState.searchQuery || localModelsState.familyFilter}
+							Try adjusting your search or filters
+						{:else}
+							Browse ollama.com to pull models
+						{/if}
+					</p>
+					{#if !localModelsState.searchQuery && !localModelsState.familyFilter}
+						<button
+							type="button"
+							onclick={() => activeTab = 'browse'}
+							class="mt-4 rounded-lg bg-blue-600 px-4 py-2 text-sm font-medium text-theme-primary hover:bg-blue-700"
+						>
+							Browse Models
+						</button>
+					{/if}
+				</div>
+			{:else}
+				<div class="space-y-2">
+					{#each localModelsState.models as model (model.name)}
+						{@const caps = modelsState.getCapabilities(model.name) ?? []}
+						<div class="group rounded-lg border border-theme bg-theme-secondary p-4 transition-colors hover:border-theme-subtle">
+							<div class="flex items-center justify-between">
+								<div class="flex-1">
+									<div class="flex items-center gap-3">
+										<h3 class="font-medium text-theme-primary">{model.name}</h3>
+										{#if model.name === modelsState.selectedId}
+											<span class="rounded bg-blue-900/50 px-2 py-0.5 text-xs text-blue-300">Selected</span>
+										{/if}
+										{#if localModelsState.hasUpdate(model.name)}
+											<span class="rounded bg-amber-600 px-2 py-0.5 text-xs font-medium text-theme-primary" title="Update available">
+												Update
+											</span>
+										{/if}
+										{#if hasEmbeddedPrompt(model.name)}
+											<span class="rounded bg-violet-900/50 px-2 py-0.5 text-xs text-violet-300" title="Custom model with embedded system prompt">
+												Custom
+											</span>
+										{/if}
+									</div>
+									<div class="mt-1 flex items-center gap-4 text-xs text-theme-muted">
+										<span>{formatBytes(model.size)}</span>
+										<span>Family: {model.family}</span>
+										<span>Parameters: {model.parameterSize}</span>
+										<span>Quantization: {model.quantizationLevel}</span>
+									</div>
+									{#if caps.length > 0}
+										<div class="mt-2 flex flex-wrap gap-1.5">
+											{#if caps.includes('vision')}
+												<span class="inline-flex items-center gap-1 rounded px-1.5 py-0.5 text-xs bg-purple-900/50 text-purple-300">
+													<span>👁</span><span>Vision</span>
+												</span>
+											{/if}
+											{#if caps.includes('tools')}
+												<span class="inline-flex items-center gap-1 rounded px-1.5 py-0.5 text-xs bg-blue-900/50 text-blue-300">
+													<span>🔧</span><span>Tools</span>
+												</span>
+											{/if}
+											{#if caps.includes('thinking')}
+												<span class="inline-flex items-center gap-1 rounded px-1.5 py-0.5 text-xs bg-pink-900/50 text-pink-300">
+													<span>🧠</span><span>Thinking</span>
+												</span>
+											{/if}
+											{#if caps.includes('embedding')}
+												<span class="inline-flex items-center gap-1 rounded px-1.5 py-0.5 text-xs bg-amber-900/50 text-amber-300">
+													<span>📊</span><span>Embedding</span>
+												</span>
+											{/if}
+											{#if caps.includes('code')}
+												<span class="inline-flex items-center gap-1 rounded px-1.5 py-0.5 text-xs bg-emerald-900/50 text-emerald-300">
+													<span>💻</span><span>Code</span>
+												</span>
+											{/if}
+										</div>
+									{/if}
+								</div>
+								<div class="flex items-center gap-2">
+									{#if deleteConfirm === model.name}
+										<span class="text-sm text-theme-muted">Delete?</span>
+										<button
+											type="button"
+											onclick={() => deleteModel(model.name)}
+											disabled={deleting}
+											class="rounded bg-red-600 px-3 py-1 text-sm font-medium text-theme-primary hover:bg-red-700 disabled:opacity-50"
+										>
+											{deleting ? 'Deleting...' : 'Yes'}
+										</button>
+										<button
+											type="button"
+											onclick={() => deleteConfirm = null}
+											disabled={deleting}
+											class="rounded bg-theme-tertiary px-3 py-1 text-sm font-medium text-theme-secondary hover:bg-theme-secondary disabled:opacity-50"
+										>
+											No
+										</button>
+									{:else}
+										{#if hasEmbeddedPrompt(model.name)}
+											<button
+												type="button"
+												onclick={() => openEditDialog(model.name)}
+												class="rounded p-2 text-theme-muted opacity-0 transition-opacity hover:bg-theme-tertiary hover:text-violet-400 group-hover:opacity-100"
+												title="Edit system prompt"
+											>
+												<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+													<path stroke-linecap="round" stroke-linejoin="round" d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z" />
+												</svg>
+											</button>
+										{/if}
+										<button
+											type="button"
+											onclick={() => deleteConfirm = model.name}
+											class="rounded p-2 text-theme-muted opacity-0 transition-opacity hover:bg-theme-tertiary hover:text-red-400 group-hover:opacity-100"
+											title="Delete model"
+										>
+											<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+												<path stroke-linecap="round" stroke-linejoin="round" d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16" />
+											</svg>
+										</button>
+									{/if}
+								</div>
+							</div>
+						</div>
+					{/each}
+				</div>
+
+				{#if localModelsState.totalPages > 1}
+					<div class="mt-6 flex items-center justify-center gap-2">
+						<button
+							type="button"
+							onclick={() => localModelsState.prevPage()}
+							disabled={!localModelsState.hasPrevPage}
+							class="rounded-lg border border-theme bg-theme-secondary px-3 py-2 text-sm text-theme-primary hover:bg-theme-tertiary disabled:cursor-not-allowed disabled:opacity-50"
+						>
+							← Prev
+						</button>
+						<span class="px-3 text-sm text-theme-muted">
+							Page {localModelsState.currentPage + 1} of {localModelsState.totalPages}
+						</span>
+						<button
+							type="button"
+							onclick={() => localModelsState.nextPage()}
+							disabled={!localModelsState.hasNextPage}
+							class="rounded-lg border border-theme bg-theme-secondary px-3 py-2 text-sm text-theme-primary hover:bg-theme-tertiary disabled:cursor-not-allowed disabled:opacity-50"
+						>
+							Next →
+						</button>
+					</div>
+				{/if}
+			{/if}
+		{:else}
+			<!-- Browse Tab - Search and Filters -->
+			<div class="mb-6 flex flex-wrap items-center gap-4">
+				<div class="relative flex-1 min-w-[200px]">
+					<svg xmlns="http://www.w3.org/2000/svg" class="absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2 text-theme-muted" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+						<path stroke-linecap="round" stroke-linejoin="round" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" />
+					</svg>
+					<input
+						type="text"
+						value={searchInput}
+						oninput={handleSearchInput}
+						placeholder="Search models..."
+						class="w-full rounded-lg border border-theme bg-theme-secondary py-2 pl-10 pr-4 text-theme-primary placeholder-theme-placeholder focus:border-blue-500 focus:outline-none focus:ring-1 focus:ring-blue-500"
+					/>
+				</div>
+
+				<div class="flex rounded-lg border border-theme bg-theme-secondary p-1">
+					<button
+						type="button"
+						onclick={() => handleTypeFilter('')}
+						class="rounded-md px-3 py-1.5 text-sm font-medium transition-colors {modelRegistry.modelType === ''
+							? 'bg-theme-tertiary text-theme-primary'
+							: 'text-theme-muted hover:text-theme-primary'}"
+					>
+						All
+					</button>
+					<button
+						type="button"
+						onclick={() => handleTypeFilter('official')}
+						class="rounded-md px-3 py-1.5 text-sm font-medium transition-colors {modelRegistry.modelType === 'official'
+							? 'bg-blue-600 text-theme-primary'
+							: 'text-theme-muted hover:text-theme-primary'}"
+					>
+						Official
+					</button>
+					<button
+						type="button"
+						onclick={() => handleTypeFilter('community')}
+						class="rounded-md px-3 py-1.5 text-sm font-medium transition-colors {modelRegistry.modelType === 'community'
+							? 'bg-theme-tertiary text-theme-primary'
+							: 'text-theme-muted hover:text-theme-primary'}"
+					>
+						Community
+					</button>
+				</div>
+
+				<div class="flex items-center gap-2">
+					<label for="sort-select" class="text-sm text-theme-muted">Sort:</label>
+					<select
+						id="sort-select"
+						value={modelRegistry.sortBy}
+						onchange={(e) => modelRegistry.setSort((e.target as HTMLSelectElement).value as import('$lib/api/model-registry').ModelSortOption)}
+						class="rounded-lg border border-theme bg-theme-secondary px-3 py-1.5 text-sm text-theme-primary focus:border-blue-500 focus:outline-none focus:ring-1 focus:ring-blue-500"
+					>
+						<option value="pulls_desc">Most Popular</option>
+						<option value="pulls_asc">Least Popular</option>
+						<option value="name_asc">Name A-Z</option>
+						<option value="name_desc">Name Z-A</option>
+						<option value="updated_desc">Recently Updated</option>
+					</select>
+				</div>
+
+				<div class="text-sm text-theme-muted">
+					{modelRegistry.total} model{modelRegistry.total !== 1 ? 's' : ''} found
+				</div>
+			</div>
+
+			<!-- Capability Filters -->
+			<div class="mb-4 flex flex-wrap items-center gap-2">
+				<span class="text-sm text-theme-muted">Capabilities:</span>
+				<button type="button" onclick={() => modelRegistry.toggleCapability('vision')} class="inline-flex items-center gap-1.5 rounded-full px-3 py-1 text-sm transition-colors {modelRegistry.hasCapability('vision') ? 'bg-purple-600 text-theme-primary' : 'bg-theme-secondary text-theme-muted hover:bg-theme-tertiary hover:text-theme-primary'}">
+					<span>👁</span><span>Vision</span>
+				</button>
+				<button type="button" onclick={() => modelRegistry.toggleCapability('tools')} class="inline-flex items-center gap-1.5 rounded-full px-3 py-1 text-sm transition-colors {modelRegistry.hasCapability('tools') ? 'bg-blue-600 text-theme-primary' : 'bg-theme-secondary text-theme-muted hover:bg-theme-tertiary hover:text-theme-primary'}">
+					<span>🔧</span><span>Tools</span>
+				</button>
+				<button type="button" onclick={() => modelRegistry.toggleCapability('thinking')} class="inline-flex items-center gap-1.5 rounded-full px-3 py-1 text-sm transition-colors {modelRegistry.hasCapability('thinking') ? 'bg-pink-600 text-theme-primary' : 'bg-theme-secondary text-theme-muted hover:bg-theme-tertiary hover:text-theme-primary'}">
+					<span>🧠</span><span>Thinking</span>
+				</button>
+				<button type="button" onclick={() => modelRegistry.toggleCapability('embedding')} class="inline-flex items-center gap-1.5 rounded-full px-3 py-1 text-sm transition-colors {modelRegistry.hasCapability('embedding') ? 'bg-amber-600 text-theme-primary' : 'bg-theme-secondary text-theme-muted hover:bg-theme-tertiary hover:text-theme-primary'}">
+					<span>📊</span><span>Embedding</span>
+				</button>
+				<button type="button" onclick={() => modelRegistry.toggleCapability('cloud')} class="inline-flex items-center gap-1.5 rounded-full px-3 py-1 text-sm transition-colors {modelRegistry.hasCapability('cloud') ? 'bg-cyan-600 text-theme-primary' : 'bg-theme-secondary text-theme-muted hover:bg-theme-tertiary hover:text-theme-primary'}">
+					<span>☁️</span><span>Cloud</span>
+				</button>
+				<span class="ml-2 text-xs text-theme-muted opacity-60">from ollama.com</span>
+			</div>
+
+			<!-- Size Range Filters -->
+			<div class="mb-4 flex flex-wrap items-center gap-2">
+				<span class="text-sm text-theme-muted">Size:</span>
+				<button type="button" onclick={() => modelRegistry.toggleSizeRange('small')} class="rounded-full px-3 py-1 text-sm transition-colors {modelRegistry.hasSizeRange('small') ? 'bg-emerald-600 text-theme-primary' : 'bg-theme-secondary text-theme-muted hover:bg-theme-tertiary hover:text-theme-primary'}">≤3B</button>
+				<button type="button" onclick={() => modelRegistry.toggleSizeRange('medium')} class="rounded-full px-3 py-1 text-sm transition-colors {modelRegistry.hasSizeRange('medium') ? 'bg-emerald-600 text-theme-primary' : 'bg-theme-secondary text-theme-muted hover:bg-theme-tertiary hover:text-theme-primary'}">4-13B</button>
+				<button type="button" onclick={() => modelRegistry.toggleSizeRange('large')} class="rounded-full px-3 py-1 text-sm transition-colors {modelRegistry.hasSizeRange('large') ? 'bg-emerald-600 text-theme-primary' : 'bg-theme-secondary text-theme-muted hover:bg-theme-tertiary hover:text-theme-primary'}">14-70B</button>
+				<button type="button" onclick={() => modelRegistry.toggleSizeRange('xlarge')} class="rounded-full px-3 py-1 text-sm transition-colors {modelRegistry.hasSizeRange('xlarge') ? 'bg-emerald-600 text-theme-primary' : 'bg-theme-secondary text-theme-muted hover:bg-theme-tertiary hover:text-theme-primary'}">>70B</button>
+			</div>
+
+			<!-- Family Filter + Clear -->
+			<div class="mb-6 flex flex-wrap items-center gap-4">
+				{#if modelRegistry.availableFamilies.length > 0}
+					<div class="flex items-center gap-2">
+						<span class="text-sm text-theme-muted">Family:</span>
+						<select
+							value={modelRegistry.selectedFamily}
+							onchange={(e) => modelRegistry.setFamily((e.target as HTMLSelectElement).value)}
+							class="rounded-lg border border-theme bg-theme-secondary px-3 py-1.5 text-sm text-theme-primary focus:border-blue-500 focus:outline-none focus:ring-1 focus:ring-blue-500"
+						>
+							<option value="">All Families</option>
+							{#each modelRegistry.availableFamilies as family}
+								<option value={family}>{family}</option>
+							{/each}
+						</select>
+					</div>
+				{/if}
+
+				{#if modelRegistry.selectedCapabilities.length > 0 || modelRegistry.selectedSizeRanges.length > 0 || modelRegistry.selectedFamily || modelRegistry.modelType || modelRegistry.searchQuery || modelRegistry.sortBy !== 'pulls_desc'}
+					<button
+						type="button"
+						onclick={() => { modelRegistry.clearFilters(); searchInput = ''; }}
+						class="text-sm text-theme-muted hover:text-theme-primary"
+					>
+						Clear all filters
+					</button>
+				{/if}
+			</div>
+
+			{#if modelRegistry.error}
+				<div class="mb-6 rounded-lg border border-red-900/50 bg-red-900/20 p-4">
+					<div class="flex items-center gap-2 text-red-400">
+						<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+							<path stroke-linecap="round" stroke-linejoin="round" d="M12 8v4m0 4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
+						</svg>
+						<span>{modelRegistry.error}</span>
+					</div>
+				</div>
+			{/if}
+
+			{#if modelRegistry.loading}
+				<div class="grid grid-cols-1 gap-4 md:grid-cols-2 lg:grid-cols-3">
+					{#each Array(6) as _}
+						<div class="animate-pulse rounded-lg border border-theme bg-theme-secondary p-4">
+							<div class="flex items-start justify-between">
+								<div class="h-5 w-32 rounded bg-theme-tertiary"></div>
+								<div class="h-5 w-16 rounded bg-theme-tertiary"></div>
+							</div>
+							<div class="mt-3 h-4 w-full rounded bg-theme-tertiary"></div>
+							<div class="mt-2 h-4 w-2/3 rounded bg-theme-tertiary"></div>
+						</div>
+					{/each}
+				</div>
+			{:else if modelRegistry.models.length === 0}
+				<div class="rounded-lg border border-dashed border-theme bg-theme-secondary/50 p-12 text-center">
+					<svg xmlns="http://www.w3.org/2000/svg" class="mx-auto h-12 w-12 text-theme-muted" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="1.5">
+						<path stroke-linecap="round" stroke-linejoin="round" d="M9.75 3.104v5.714a2.25 2.25 0 01-.659 1.591L5 14.5M9.75 3.104c-.251.023-.501.05-.75.082m.75-.082a24.301 24.301 0 014.5 0m0 0v5.714c0 .597.237 1.17.659 1.591L19.8 15.3M14.25 3.104c.251.023.501.05.75.082M19.8 15.3l-1.57.393A9.065 9.065 0 0112 15a9.065 9.065 0 00-6.23.693L5 14.5m14.8.8l1.402 1.402c1.232 1.232.65 3.318-1.067 3.611l-.628.105a9.002 9.002 0 01-9.014 0l-.628-.105c-1.717-.293-2.3-2.379-1.067-3.61L5 14.5" />
+					</svg>
+					<h3 class="mt-4 text-sm font-medium text-theme-muted">No models found</h3>
+					<p class="mt-1 text-sm text-theme-muted">
+						{#if modelRegistry.searchQuery || modelRegistry.modelType}
+							Try adjusting your search or filters
+						{:else}
+							Click "Sync Models" to fetch models from ollama.com
+						{/if}
+					</p>
+				</div>
+			{:else}
+				<div class="grid grid-cols-1 gap-4 md:grid-cols-2 lg:grid-cols-3">
+					{#each modelRegistry.models as model (model.slug)}
+						<ModelCard {model} onSelect={handleSelectModel} />
+					{/each}
+				</div>
+
+				{#if modelRegistry.totalPages > 1}
+					<div class="mt-6 flex items-center justify-center gap-2">
+						<button type="button" onclick={() => modelRegistry.prevPage()} disabled={!modelRegistry.hasPrevPage} class="rounded-lg border border-theme bg-theme-secondary px-3 py-2 text-sm text-theme-muted transition-colors hover:bg-theme-tertiary hover:text-theme-primary disabled:cursor-not-allowed disabled:opacity-50" aria-label="Previous page">
+							<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+								<path stroke-linecap="round" stroke-linejoin="round" d="M15 19l-7-7 7-7" />
+							</svg>
+						</button>
+						<span class="text-sm text-theme-muted">Page {modelRegistry.currentPage + 1} of {modelRegistry.totalPages}</span>
+						<button type="button" onclick={() => modelRegistry.nextPage()} disabled={!modelRegistry.hasNextPage} class="rounded-lg border border-theme bg-theme-secondary px-3 py-2 text-sm text-theme-muted transition-colors hover:bg-theme-tertiary hover:text-theme-primary disabled:cursor-not-allowed disabled:opacity-50" aria-label="Next page">
+							<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+								<path stroke-linecap="round" stroke-linejoin="round" d="M9 5l7 7-7 7" />
+							</svg>
+						</button>
+					</div>
+				{/if}
+			{/if}
+		{/if}
+	</div>
+
+	<!-- Model Details Sidebar -->
+	{#if selectedModel}
+		<div class="w-80 flex-shrink-0 overflow-y-auto border-l border-theme bg-theme-secondary p-4">
+			<div class="mb-4 flex items-start justify-between">
+				<h3 class="text-lg font-semibold text-theme-primary">{selectedModel.name}</h3>
+				<button type="button" onclick={closeDetails} class="rounded p-1 text-theme-muted hover:bg-theme-tertiary hover:text-theme-primary" aria-label="Close details">
+					<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+						<path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
+					</svg>
+				</button>
+			</div>
+
+			<div class="mb-4">
+				<span class="rounded px-2 py-1 text-xs {selectedModel.modelType === 'official' ? 'bg-blue-900/50 text-blue-300' : 'bg-theme-tertiary text-theme-muted'}">
+					{selectedModel.modelType}
+				</span>
+			</div>
+
+			{#if selectedModel.description}
+				<div class="mb-4">
+					<h4 class="mb-2 text-sm font-medium text-theme-secondary">Description</h4>
+					<p class="text-sm text-theme-muted">{selectedModel.description}</p>
+				</div>
+			{/if}
+
+			{#if selectedModel.capabilities.length > 0}
+				<div class="mb-4">
+					<h4 class="mb-2 flex items-center gap-2 text-sm font-medium text-theme-secondary">
+						<span>Capabilities</span>
+						{#if capabilitiesVerified}
+							<span class="inline-flex items-center gap-1 rounded bg-green-900/30 px-1.5 py-0.5 text-xs text-green-400">✓ verified</span>
+						{:else}
+							<span class="inline-flex items-center gap-1 rounded bg-amber-900/30 px-1.5 py-0.5 text-xs text-amber-400">unverified</span>
+						{/if}
+					</h4>
+					<div class="flex flex-wrap gap-2">
+						{#each selectedModel.capabilities as cap}
+							<span class="rounded bg-theme-tertiary px-2 py-1 text-xs text-theme-secondary">{cap}</span>
+						{/each}
+					</div>
+				</div>
+			{/if}
+
+			<!-- Pull Section -->
+			<div class="mb-4">
+				<h4 class="mb-2 text-sm font-medium text-theme-secondary">Pull Model</h4>
+				{#if selectedModel.tags.length > 0}
+					<select bind:value={selectedTag} disabled={pulling} class="mb-2 w-full rounded-lg border border-theme bg-theme-secondary px-3 py-2 text-sm text-theme-primary disabled:opacity-50">
+						{#each selectedModel.tags as tag}
+							{@const size = selectedModel.tagSizes?.[tag]}
+							<option value={tag}>{selectedModel.slug}:{tag} {size ? `(${formatBytes(size)})` : ''}</option>
+						{/each}
+					</select>
+				{/if}
+				<button type="button" onclick={pullModel} disabled={pulling} class="flex w-full items-center justify-center gap-2 rounded-lg bg-blue-600 px-4 py-2 text-sm font-medium text-theme-primary hover:bg-blue-700 disabled:opacity-50">
+					{#if pulling}
+						<svg class="h-4 w-4 animate-spin" viewBox="0 0 24 24"><circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4" fill="none"></circle><path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path></svg>
+						Pulling...
+					{:else}
+						Pull Model
+					{/if}
+				</button>
+
+				{#if pullProgress}
+					<div class="mt-2 text-xs text-theme-muted">{pullProgress.status}</div>
+					{#if pullProgress.completed !== undefined && pullProgress.total}
+						<div class="mt-1 h-2 w-full overflow-hidden rounded-full bg-theme-tertiary">
+							<div class="h-full bg-blue-500 transition-all" style="width: {Math.round((pullProgress.completed / pullProgress.total) * 100)}%"></div>
+						</div>
+					{/if}
+				{/if}
+
+				{#if pullError}
+					<div class="mt-2 rounded border border-red-900/50 bg-red-900/20 p-2 text-xs text-red-400">{pullError}</div>
+				{/if}
+			</div>
+
+			<a href={selectedModel.url} target="_blank" rel="noopener noreferrer" class="flex w-full items-center justify-center gap-2 rounded-lg border border-theme bg-theme-secondary px-4 py-2 text-sm text-theme-secondary hover:bg-theme-tertiary">
+				View on ollama.com
+			</a>
+		</div>
+	{/if}
+</div>
+
+<PullModelDialog />
+<ModelEditorDialog isOpen={modelEditorOpen} mode={modelEditorMode} editingModel={editingModelName} currentSystemPrompt={editingSystemPrompt} baseModel={editingBaseModel} onClose={closeModelEditor} />
+
+{#if modelOperationsState.activePulls.size > 0}
+	<div class="fixed bottom-0 left-0 right-0 z-40 border-t border-theme bg-theme-secondary/95 p-4 backdrop-blur-sm">
+		<div class="mx-auto max-w-4xl space-y-3">
+			<h3 class="text-sm font-medium text-theme-secondary">Active Downloads</h3>
+			{#each [...modelOperationsState.activePulls.entries()] as [name, pull]}
+				<div class="rounded-lg bg-theme-primary/50 p-3">
+					<div class="mb-2 flex items-center justify-between">
+						<span class="font-medium text-theme-secondary">{name}</span>
+						<button type="button" onclick={() => modelOperationsState.cancelPull(name)} class="text-xs text-red-400 hover:text-red-300">Cancel</button>
+					</div>
+					<div class="mb-1 flex items-center gap-3">
+						<div class="h-2 flex-1 overflow-hidden rounded-full bg-theme-tertiary">
+							<div class="h-full bg-sky-500 transition-all" style="width: {pull.progress.percent}%"></div>
+						</div>
+						<span class="text-xs text-theme-muted">{pull.progress.percent}%</span>
+					</div>
+					<div class="flex items-center justify-between text-xs text-theme-muted">
+						<span>{pull.progress.status}</span>
+						{#if pull.progress.speed}
+							<span>{modelOperationsState.formatBytes(pull.progress.speed)}/s</span>
+						{/if}
+					</div>
+				</div>
+			{/each}
+		</div>
+	</div>
+{/if}

frontend/src/lib/components/settings/PromptsTab.svelte

@@ -0,0 +1,462 @@
+<script lang="ts">
+	/**
+	 * PromptsTab - System prompts management
+	 */
+	import { promptsState, type Prompt } from '$lib/stores';
+	import {
+		getAllPromptTemplates,
+		getPromptCategories,
+		categoryInfo,
+		type PromptTemplate,
+		type PromptCategory
+	} from '$lib/prompts/templates';
+	import { ConfirmDialog } from '$lib/components/shared';
+
+	type Tab = 'my-prompts' | 'browse-templates';
+	let activeTab = $state<Tab>('my-prompts');
+	let deleteConfirm = $state<{ show: boolean; prompt: Prompt | null }>({ show: false, prompt: null });
+
+	let showEditor = $state(false);
+	let editingPrompt = $state<Prompt | null>(null);
+
+	let formName = $state('');
+	let formDescription = $state('');
+	let formContent = $state('');
+	let formIsDefault = $state(false);
+	let formTargetCapabilities = $state<string[]>([]);
+	let isSaving = $state(false);
+
+	let selectedCategory = $state<PromptCategory | 'all'>('all');
+	let previewTemplate = $state<PromptTemplate | null>(null);
+	let addingTemplateId = $state<string | null>(null);
+
+	const templates = getAllPromptTemplates();
+	const categories = getPromptCategories();
+
+	const filteredTemplates = $derived(
+		selectedCategory === 'all'
+			? templates
+			: templates.filter((t) => t.category === selectedCategory)
+	);
+
+	const CAPABILITIES = [
+		{ id: 'code', label: 'Code', description: 'Auto-use with coding models' },
+		{ id: 'vision', label: 'Vision', description: 'Auto-use with vision models' },
+		{ id: 'thinking', label: 'Thinking', description: 'Auto-use with reasoning models' },
+		{ id: 'tools', label: 'Tools', description: 'Auto-use with tool-capable models' }
+	] as const;
+
+	function openCreateEditor(): void {
+		editingPrompt = null;
+		formName = '';
+		formDescription = '';
+		formContent = '';
+		formIsDefault = false;
+		formTargetCapabilities = [];
+		showEditor = true;
+	}
+
+	function openEditEditor(prompt: Prompt): void {
+		editingPrompt = prompt;
+		formName = prompt.name;
+		formDescription = prompt.description;
+		formContent = prompt.content;
+		formIsDefault = prompt.isDefault;
+		formTargetCapabilities = prompt.targetCapabilities ?? [];
+		showEditor = true;
+	}
+
+	function closeEditor(): void {
+		showEditor = false;
+		editingPrompt = null;
+	}
+
+	async function handleSave(): Promise<void> {
+		if (!formName.trim() || !formContent.trim()) return;
+
+		isSaving = true;
+		try {
+			const capabilities = formTargetCapabilities.length > 0 ? formTargetCapabilities : undefined;
+			if (editingPrompt) {
+				await promptsState.update(editingPrompt.id, {
+					name: formName.trim(),
+					description: formDescription.trim(),
+					content: formContent,
+					isDefault: formIsDefault,
+					targetCapabilities: capabilities ?? []
+				});
+			} else {
+				await promptsState.add({
+					name: formName.trim(),
+					description: formDescription.trim(),
+					content: formContent,
+					isDefault: formIsDefault,
+					targetCapabilities: capabilities
+				});
+			}
+			closeEditor();
+		} finally {
+			isSaving = false;
+		}
+	}
+
+	function toggleCapability(capId: string): void {
+		if (formTargetCapabilities.includes(capId)) {
+			formTargetCapabilities = formTargetCapabilities.filter((c) => c !== capId);
+		} else {
+			formTargetCapabilities = [...formTargetCapabilities, capId];
+		}
+	}
+
+	function handleDeleteClick(prompt: Prompt): void {
+		deleteConfirm = { show: true, prompt };
+	}
+
+	async function confirmDelete(): Promise<void> {
+		if (!deleteConfirm.prompt) return;
+		await promptsState.remove(deleteConfirm.prompt.id);
+		deleteConfirm = { show: false, prompt: null };
+	}
+
+	async function handleSetDefault(prompt: Prompt): Promise<void> {
+		if (prompt.isDefault) {
+			await promptsState.clearDefault();
+		} else {
+			await promptsState.setDefault(prompt.id);
+		}
+	}
+
+	function handleSetActive(prompt: Prompt): void {
+		if (promptsState.activePromptId === prompt.id) {
+			promptsState.setActive(null);
+		} else {
+			promptsState.setActive(prompt.id);
+		}
+	}
+
+	async function addTemplateToLibrary(template: PromptTemplate): Promise<void> {
+		addingTemplateId = template.id;
+		try {
+			await promptsState.add({
+				name: template.name,
+				description: template.description,
+				content: template.content,
+				isDefault: false,
+				targetCapabilities: template.targetCapabilities
+			});
+			activeTab = 'my-prompts';
+		} finally {
+			addingTemplateId = null;
+		}
+	}
+
+	function formatDate(date: Date): string {
+		return date.toLocaleDateString('en-US', {
+			month: 'short',
+			day: 'numeric',
+			year: 'numeric'
+		});
+	}
+</script>
+
+<div>
+	<!-- Header -->
+	<div class="mb-6 flex items-center justify-between">
+		<div>
+			<h2 class="text-xl font-bold text-theme-primary">System Prompts</h2>
+			<p class="mt-1 text-sm text-theme-muted">
+				Create and manage system prompt templates for conversations
+			</p>
+		</div>
+
+		{#if activeTab === 'my-prompts'}
+			<button
+				type="button"
+				onclick={openCreateEditor}
+				class="flex items-center gap-2 rounded-lg bg-blue-600 px-4 py-2 text-sm font-medium text-theme-primary transition-colors hover:bg-blue-700"
+			>
+				<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+					<path stroke-linecap="round" stroke-linejoin="round" d="M12 4v16m8-8H4" />
+				</svg>
+				Create Prompt
+			</button>
+		{/if}
+	</div>
+
+	<!-- Tabs -->
+	<div class="mb-6 flex gap-1 rounded-lg bg-theme-tertiary p-1">
+		<button
+			type="button"
+			onclick={() => (activeTab = 'my-prompts')}
+			class="flex-1 rounded-md px-4 py-2 text-sm font-medium transition-colors {activeTab === 'my-prompts'
+				? 'bg-theme-secondary text-theme-primary shadow'
+				: 'text-theme-muted hover:text-theme-secondary'}"
+		>
+			My Prompts
+			{#if promptsState.prompts.length > 0}
+				<span class="ml-1.5 rounded-full bg-theme-tertiary px-2 py-0.5 text-xs {activeTab === 'my-prompts' ? 'bg-blue-500/20 text-blue-400' : ''}">
+					{promptsState.prompts.length}
+				</span>
+			{/if}
+		</button>
+		<button
+			type="button"
+			onclick={() => (activeTab = 'browse-templates')}
+			class="flex-1 rounded-md px-4 py-2 text-sm font-medium transition-colors {activeTab === 'browse-templates'
+				? 'bg-theme-secondary text-theme-primary shadow'
+				: 'text-theme-muted hover:text-theme-secondary'}"
+		>
+			Browse Templates
+			<span class="ml-1.5 rounded-full bg-theme-tertiary px-2 py-0.5 text-xs {activeTab === 'browse-templates' ? 'bg-purple-500/20 text-purple-400' : ''}">
+				{templates.length}
+			</span>
+		</button>
+	</div>
+
+	<!-- My Prompts Tab -->
+	{#if activeTab === 'my-prompts'}
+		{#if promptsState.activePrompt}
+			<div class="mb-6 rounded-lg border border-blue-500/30 bg-blue-500/10 p-4">
+				<div class="flex items-center gap-2 text-sm text-blue-400">
+					<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+						<path stroke-linecap="round" stroke-linejoin="round" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
+					</svg>
+					<span>Active system prompt: <strong class="text-blue-300">{promptsState.activePrompt.name}</strong></span>
+				</div>
+			</div>
+		{/if}
+
+		{#if promptsState.isLoading}
+			<div class="flex items-center justify-center py-12">
+				<div class="h-8 w-8 animate-spin rounded-full border-2 border-theme-subtle border-t-blue-500"></div>
+			</div>
+		{:else if promptsState.prompts.length === 0}
+			<div class="rounded-lg border border-dashed border-theme bg-theme-secondary/50 p-8 text-center">
+				<svg xmlns="http://www.w3.org/2000/svg" class="mx-auto h-12 w-12 text-theme-muted" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="1.5">
+					<path stroke-linecap="round" stroke-linejoin="round" d="M19.5 14.25v-2.625a3.375 3.375 0 00-3.375-3.375h-1.5A1.125 1.125 0 0113.5 7.125v-1.5a3.375 3.375 0 00-3.375-3.375H8.25m0 12.75h7.5m-7.5 3H12M10.5 2.25H5.625c-.621 0-1.125.504-1.125 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125V11.25a9 9 0 00-9-9z" />
+				</svg>
+				<h3 class="mt-4 text-sm font-medium text-theme-muted">No system prompts yet</h3>
+				<p class="mt-1 text-sm text-theme-muted">Create a prompt or browse templates to get started</p>
+				<div class="mt-4 flex justify-center gap-3">
+					<button type="button" onclick={openCreateEditor} class="inline-flex items-center gap-2 rounded-lg bg-theme-tertiary px-4 py-2 text-sm font-medium text-theme-primary hover:bg-theme-tertiary">
+						<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+							<path stroke-linecap="round" stroke-linejoin="round" d="M12 4v16m8-8H4" />
+						</svg>
+						Create from scratch
+					</button>
+					<button type="button" onclick={() => (activeTab = 'browse-templates')} class="inline-flex items-center gap-2 rounded-lg bg-purple-600 px-4 py-2 text-sm font-medium text-theme-primary hover:bg-purple-700">
+						Browse templates
+					</button>
+				</div>
+			</div>
+		{:else}
+			<div class="space-y-3">
+				{#each promptsState.prompts as prompt (prompt.id)}
+					<div class="rounded-lg border bg-theme-secondary p-4 transition-colors {promptsState.activePromptId === prompt.id ? 'border-blue-500/50' : 'border-theme'}">
+						<div class="flex items-start justify-between gap-4">
+							<div class="min-w-0 flex-1">
+								<div class="flex flex-wrap items-center gap-2">
+									<h3 class="font-medium text-theme-primary">{prompt.name}</h3>
+									{#if prompt.isDefault}
+										<span class="rounded bg-blue-900 px-2 py-0.5 text-xs text-blue-300">default</span>
+									{/if}
+									{#if promptsState.activePromptId === prompt.id}
+										<span class="rounded bg-emerald-900 px-2 py-0.5 text-xs text-emerald-300">active</span>
+									{/if}
+									{#if prompt.targetCapabilities && prompt.targetCapabilities.length > 0}
+										{#each prompt.targetCapabilities as cap (cap)}
+											<span class="rounded bg-purple-900/50 px-2 py-0.5 text-xs text-purple-300">{cap}</span>
+										{/each}
+									{/if}
+								</div>
+								{#if prompt.description}
+									<p class="mt-1 text-sm text-theme-muted">{prompt.description}</p>
+								{/if}
+								<p class="mt-2 line-clamp-2 text-sm text-theme-muted">{prompt.content}</p>
+								<p class="mt-2 text-xs text-theme-muted">Updated {formatDate(prompt.updatedAt)}</p>
+							</div>
+
+							<div class="flex items-center gap-2">
+								<button type="button" onclick={() => handleSetActive(prompt)} class="rounded p-1.5 transition-colors {promptsState.activePromptId === prompt.id ? 'bg-emerald-600 text-theme-primary' : 'text-theme-muted hover:bg-theme-tertiary hover:text-theme-primary'}" title={promptsState.activePromptId === prompt.id ? 'Deactivate' : 'Use for new chats'}>
+									<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+										<path stroke-linecap="round" stroke-linejoin="round" d="M5 13l4 4L19 7" />
+									</svg>
+								</button>
+								<button type="button" onclick={() => handleSetDefault(prompt)} class="rounded p-1.5 transition-colors {prompt.isDefault ? 'bg-blue-600 text-theme-primary' : 'text-theme-muted hover:bg-theme-tertiary hover:text-theme-primary'}" title={prompt.isDefault ? 'Remove as default' : 'Set as default'}>
+									<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill={prompt.isDefault ? 'currentColor' : 'none'} viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+										<path stroke-linecap="round" stroke-linejoin="round" d="M11.049 2.927c.3-.921 1.603-.921 1.902 0l1.519 4.674a1 1 0 00.95.69h4.915c.969 0 1.371 1.24.588 1.81l-3.976 2.888a1 1 0 00-.363 1.118l1.518 4.674c.3.922-.755 1.688-1.538 1.118l-3.976-2.888a1 1 0 00-1.176 0l-3.976 2.888c-.783.57-1.838-.197-1.538-1.118l1.518-4.674a1 1 0 00-.363-1.118l-3.976-2.888c-.784-.57-.38-1.81.588-1.81h4.914a1 1 0 00.951-.69l1.519-4.674z" />
+									</svg>
+								</button>
+								<button type="button" onclick={() => openEditEditor(prompt)} class="rounded p-1.5 text-theme-muted hover:bg-theme-tertiary hover:text-theme-primary" title="Edit">
+									<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+										<path stroke-linecap="round" stroke-linejoin="round" d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z" />
+									</svg>
+								</button>
+								<button type="button" onclick={() => handleDeleteClick(prompt)} class="rounded p-1.5 text-theme-muted hover:bg-red-900/30 hover:text-red-400" title="Delete">
+									<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+										<path stroke-linecap="round" stroke-linejoin="round" d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16" />
+									</svg>
+								</button>
+							</div>
+						</div>
+					</div>
+				{/each}
+			</div>
+		{/if}
+	{/if}
+
+	<!-- Browse Templates Tab -->
+	{#if activeTab === 'browse-templates'}
+		<div class="mb-6 flex flex-wrap gap-2">
+			<button type="button" onclick={() => (selectedCategory = 'all')} class="rounded-lg px-3 py-1.5 text-sm font-medium transition-colors {selectedCategory === 'all' ? 'bg-theme-secondary text-theme-primary' : 'bg-theme-tertiary text-theme-muted hover:text-theme-secondary'}">
+				All
+			</button>
+			{#each categories as category (category)}
+				{@const info = categoryInfo[category]}
+				<button type="button" onclick={() => (selectedCategory = category)} class="flex items-center gap-1.5 rounded-lg px-3 py-1.5 text-sm font-medium transition-colors {selectedCategory === category ? info.color : 'bg-theme-tertiary text-theme-muted hover:text-theme-secondary'}">
+					<span>{info.icon}</span>
+					{info.label}
+				</button>
+			{/each}
+		</div>
+
+		<div class="grid gap-4 sm:grid-cols-2">
+			{#each filteredTemplates as template (template.id)}
+				{@const info = categoryInfo[template.category]}
+				<div class="rounded-lg border border-theme bg-theme-secondary p-4">
+					<div class="mb-3 flex items-start justify-between gap-3">
+						<div>
+							<h3 class="font-medium text-theme-primary">{template.name}</h3>
+							<span class="mt-1 inline-flex items-center gap-1 rounded px-2 py-0.5 text-xs {info.color}">
+								<span>{info.icon}</span>
+								{info.label}
+							</span>
+						</div>
+						<button type="button" onclick={() => addTemplateToLibrary(template)} disabled={addingTemplateId === template.id} class="flex items-center gap-1.5 rounded-lg bg-blue-600 px-3 py-1.5 text-sm font-medium text-theme-primary hover:bg-blue-700 disabled:opacity-50">
+							{#if addingTemplateId === template.id}
+								<svg class="h-4 w-4 animate-spin" viewBox="0 0 24 24" fill="none">
+									<circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
+									<path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
+								</svg>
+							{:else}
+								<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+									<path stroke-linecap="round" stroke-linejoin="round" d="M12 4v16m8-8H4" />
+								</svg>
+							{/if}
+							Add
+						</button>
+					</div>
+					<p class="text-sm text-theme-muted">{template.description}</p>
+					<button type="button" onclick={() => (previewTemplate = template)} class="mt-3 text-sm text-blue-400 hover:text-blue-300">
+						Preview prompt
+					</button>
+				</div>
+			{/each}
+		</div>
+	{/if}
+</div>
+
+<!-- Editor Modal -->
+{#if showEditor}
+	<div class="fixed inset-0 z-50 flex items-center justify-center bg-black/50 p-4" onclick={(e) => { if (e.target === e.currentTarget) closeEditor(); }} onkeydown={(e) => { if (e.key === 'Escape') closeEditor(); }} role="dialog" aria-modal="true" tabindex="-1">
+		<div class="w-full max-w-2xl rounded-xl bg-theme-secondary shadow-xl">
+			<div class="flex items-center justify-between border-b border-theme px-6 py-4">
+				<h3 class="text-lg font-semibold text-theme-primary">{editingPrompt ? 'Edit Prompt' : 'Create Prompt'}</h3>
+				<button type="button" onclick={closeEditor} aria-label="Close dialog" class="rounded p-1 text-theme-muted hover:bg-theme-tertiary hover:text-theme-primary">
+					<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+						<path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
+					</svg>
+				</button>
+			</div>
+
+			<form onsubmit={(e) => { e.preventDefault(); handleSave(); }} class="p-6">
+				<div class="space-y-4">
+					<div>
+						<label for="prompt-name" class="mb-1 block text-sm font-medium text-theme-secondary">Name <span class="text-red-400">*</span></label>
+						<input id="prompt-name" type="text" bind:value={formName} placeholder="e.g., Code Reviewer" class="w-full rounded-lg border border-theme-subtle bg-theme-tertiary px-3 py-2 text-theme-primary placeholder-theme-muted focus:border-blue-500 focus:outline-none focus:ring-1 focus:ring-blue-500" required />
+					</div>
+
+					<div>
+						<label for="prompt-description" class="mb-1 block text-sm font-medium text-theme-secondary">Description</label>
+						<input id="prompt-description" type="text" bind:value={formDescription} placeholder="Brief description" class="w-full rounded-lg border border-theme-subtle bg-theme-tertiary px-3 py-2 text-theme-primary placeholder-theme-muted focus:border-blue-500 focus:outline-none focus:ring-1 focus:ring-blue-500" />
+					</div>
+
+					<div>
+						<label for="prompt-content" class="mb-1 block text-sm font-medium text-theme-secondary">System Prompt <span class="text-red-400">*</span></label>
+						<textarea id="prompt-content" bind:value={formContent} placeholder="You are a helpful assistant that..." rows="8" class="w-full resize-none rounded-lg border border-theme-subtle bg-theme-tertiary px-3 py-2 font-mono text-sm text-theme-primary placeholder-theme-muted focus:border-blue-500 focus:outline-none focus:ring-1 focus:ring-blue-500" required></textarea>
+						<p class="mt-1 text-xs text-theme-muted">{formContent.length} characters</p>
+					</div>
+
+					<div class="flex items-center gap-2">
+						<input id="prompt-default" type="checkbox" bind:checked={formIsDefault} class="h-4 w-4 rounded border-theme-subtle bg-theme-tertiary text-blue-600 focus:ring-blue-500 focus:ring-offset-theme" />
+						<label for="prompt-default" class="text-sm text-theme-secondary">Set as default for new chats</label>
+					</div>
+
+					<fieldset>
+						<legend class="mb-2 block text-sm font-medium text-theme-secondary">Auto-use for model types</legend>
+						<div class="flex flex-wrap gap-2">
+							{#each CAPABILITIES as cap (cap.id)}
+								<button type="button" onclick={() => toggleCapability(cap.id)} class="rounded-lg border px-3 py-1.5 text-sm transition-colors {formTargetCapabilities.includes(cap.id) ? 'border-blue-500 bg-blue-500/20 text-blue-300' : 'border-theme-subtle bg-theme-tertiary text-theme-muted hover:border-theme hover:text-theme-secondary'}" title={cap.description}>
+									{cap.label}
+								</button>
+							{/each}
+						</div>
+					</fieldset>
+				</div>
+
+				<div class="mt-6 flex justify-end gap-3">
+					<button type="button" onclick={closeEditor} class="rounded-lg px-4 py-2 text-sm font-medium text-theme-secondary hover:bg-theme-tertiary">Cancel</button>
+					<button type="submit" disabled={isSaving || !formName.trim() || !formContent.trim()} class="rounded-lg bg-blue-600 px-4 py-2 text-sm font-medium text-theme-primary hover:bg-blue-700 disabled:cursor-not-allowed disabled:opacity-50">
+						{isSaving ? 'Saving...' : editingPrompt ? 'Update' : 'Create'}
+					</button>
+				</div>
+			</form>
+		</div>
+	</div>
+{/if}
+
+<!-- Template Preview Modal -->
+{#if previewTemplate}
+	{@const info = categoryInfo[previewTemplate.category]}
+	<div class="fixed inset-0 z-50 flex items-center justify-center bg-black/50 p-4" onclick={(e) => { if (e.target === e.currentTarget) previewTemplate = null; }} onkeydown={(e) => { if (e.key === 'Escape') previewTemplate = null; }} role="dialog" aria-modal="true" tabindex="-1">
+		<div class="w-full max-w-2xl max-h-[80vh] flex flex-col rounded-xl bg-theme-secondary shadow-xl">
+			<div class="flex items-center justify-between border-b border-theme px-6 py-4">
+				<div>
+					<h3 class="text-lg font-semibold text-theme-primary">{previewTemplate.name}</h3>
+					<span class="mt-1 inline-flex items-center gap-1 rounded px-2 py-0.5 text-xs {info.color}">
+						<span>{info.icon}</span>
+						{info.label}
+					</span>
+				</div>
+				<button type="button" onclick={() => (previewTemplate = null)} aria-label="Close dialog" class="rounded p-1 text-theme-muted hover:bg-theme-tertiary hover:text-theme-primary">
+					<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+						<path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
+					</svg>
+				</button>
+			</div>
+			<div class="flex-1 overflow-y-auto p-6">
+				<p class="mb-4 text-sm text-theme-muted">{previewTemplate.description}</p>
+				<pre class="whitespace-pre-wrap rounded-lg bg-theme-tertiary p-4 font-mono text-sm text-theme-primary">{previewTemplate.content}</pre>
+			</div>
+			<div class="flex justify-end gap-3 border-t border-theme px-6 py-4">
+				<button type="button" onclick={() => (previewTemplate = null)} class="rounded-lg px-4 py-2 text-sm font-medium text-theme-secondary hover:bg-theme-tertiary">Close</button>
+				<button type="button" onclick={() => { if (previewTemplate) { addTemplateToLibrary(previewTemplate); previewTemplate = null; } }} class="flex items-center gap-2 rounded-lg bg-blue-600 px-4 py-2 text-sm font-medium text-theme-primary hover:bg-blue-700">
+					<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+						<path stroke-linecap="round" stroke-linejoin="round" d="M12 4v16m8-8H4" />
+					</svg>
+					Add to Library
+				</button>
+			</div>
+		</div>
+	</div>
+{/if}
+
+<ConfirmDialog
+	isOpen={deleteConfirm.show}
+	title="Delete Prompt"
+	message={`Delete "${deleteConfirm.prompt?.name}"? This cannot be undone.`}
+	confirmText="Delete"
+	variant="danger"
+	onConfirm={confirmDelete}
+	onCancel={() => (deleteConfirm = { show: false, prompt: null })}
+/>

frontend/src/lib/components/settings/SettingsTabs.svelte

@@ -0,0 +1,84 @@
+<script lang="ts" module>
+	/**
+	 * SettingsTabs - Horizontal tab navigation for Settings Hub
+	 */
+	export type SettingsTab = 'general' | 'ai' | 'prompts' | 'tools' | 'agents' | 'knowledge' | 'memory' | 'about';
+</script>
+
+<script lang="ts">
+	import { page } from '$app/stores';
+
+	interface Tab {
+		id: SettingsTab;
+		label: string;
+		icon: string;
+	}
+
+	const tabs: Tab[] = [
+		{ id: 'general', label: 'General', icon: 'settings' },
+		{ id: 'ai', label: 'AI Providers', icon: 'server' },
+		{ id: 'prompts', label: 'Prompts', icon: 'message' },
+		{ id: 'tools', label: 'Tools', icon: 'wrench' },
+		{ id: 'agents', label: 'Agents', icon: 'robot' },
+		{ id: 'knowledge', label: 'Knowledge', icon: 'book' },
+		{ id: 'memory', label: 'Memory', icon: 'brain' },
+		{ id: 'about', label: 'About', icon: 'info' }
+	];
+
+	// Get active tab from URL, default to 'general'
+	let activeTab = $derived<SettingsTab>(
+		($page.url.searchParams.get('tab') as SettingsTab) || 'general'
+	);
+</script>
+
+<nav class="flex gap-1 overflow-x-auto">
+	{#each tabs as tab}
+		<a
+			href="/settings?tab={tab.id}"
+			class="flex items-center gap-2 whitespace-nowrap border-b-2 px-4 py-3 text-sm font-medium transition-colors
+				{activeTab === tab.id
+				? 'border-violet-500 text-violet-400'
+				: 'border-transparent text-theme-muted hover:border-theme hover:text-theme-primary'}"
+		>
+			{#if tab.icon === 'settings'}
+				<svg class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+					<path stroke-linecap="round" stroke-linejoin="round" d="M10.343 3.94c.09-.542.56-.94 1.11-.94h1.093c.55 0 1.02.398 1.11.94l.149.894c.07.424.384.764.78.93.398.164.855.142 1.205-.108l.737-.527a1.125 1.125 0 0 1 1.45.12l.773.774c.39.389.44 1.002.12 1.45l-.527.737c-.25.35-.272.806-.107 1.204.165.397.505.71.93.78l.893.15c.543.09.94.559.94 1.109v1.094c0 .55-.397 1.02-.94 1.11l-.894.149c-.424.07-.764.383-.929.78-.165.398-.143.854.107 1.204l.527.738c.32.447.269 1.06-.12 1.45l-.774.773a1.125 1.125 0 0 1-1.449.12l-.738-.527c-.35-.25-.806-.272-1.203-.107-.398.165-.71.505-.781.929l-.149.894c-.09.542-.56.94-1.11.94h-1.094c-.55 0-1.019-.398-1.11-.94l-.148-.894c-.071-.424-.384-.764-.781-.93-.398-.164-.854-.142-1.204.108l-.738.527c-.447.32-1.06.269-1.45-.12l-.773-.774a1.125 1.125 0 0 1-.12-1.45l.527-.737c.25-.35.272-.806.108-1.204-.165-.397-.506-.71-.93-.78l-.894-.15c-.542-.09-.94-.56-.94-1.109v-1.094c0-.55.398-1.02.94-1.11l.894-.149c.424-.07.765-.383.93-.78.165-.398.143-.854-.108-1.204l-.526-.738a1.125 1.125 0 0 1 .12-1.45l.773-.773a1.125 1.125 0 0 1 1.45-.12l.737.527c.35.25.807.272 1.204.107.397-.165.71-.505.78-.929l.15-.894Z" />
+					<path stroke-linecap="round" stroke-linejoin="round" d="M15 12a3 3 0 1 1-6 0 3 3 0 0 1 6 0Z" />
+				</svg>
+			{:else if tab.icon === 'server'}
+			<svg class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+				<path stroke-linecap="round" stroke-linejoin="round" d="M5 12h14M5 12a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2v4a2 2 0 0 1-2 2M5 12a2 2 0 0 0-2 2v4a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-4a2 2 0 0 0-2-2m-2-4h.01M17 16h.01" />
+			</svg>
+		{:else if tab.icon === 'cpu'}
+				<svg class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+					<path stroke-linecap="round" stroke-linejoin="round" d="M8.25 3v1.5M4.5 8.25H3m18 0h-1.5M4.5 12H3m18 0h-1.5m-15 3.75H3m18 0h-1.5M8.25 19.5V21M12 3v1.5m0 15V21m3.75-18v1.5m0 15V21m-9-1.5h10.5a2.25 2.25 0 0 0 2.25-2.25V6.75a2.25 2.25 0 0 0-2.25-2.25H6.75A2.25 2.25 0 0 0 4.5 6.75v10.5a2.25 2.25 0 0 0 2.25 2.25Zm.75-12h9v9h-9v-9Z" />
+				</svg>
+			{:else if tab.icon === 'message'}
+				<svg class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+					<path stroke-linecap="round" stroke-linejoin="round" d="M7.5 8.25h9m-9 3H12m-9.75 1.51c0 1.6 1.123 2.994 2.707 3.227 1.129.166 2.27.293 3.423.379.35.026.67.21.865.501L12 21l2.755-4.133a1.14 1.14 0 0 1 .865-.501 48.172 48.172 0 0 0 3.423-.379c1.584-.233 2.707-1.626 2.707-3.228V6.741c0-1.602-1.123-2.995-2.707-3.228A48.394 48.394 0 0 0 12 3c-2.392 0-4.744.175-7.043.513C3.373 3.746 2.25 5.14 2.25 6.741v6.018Z" />
+				</svg>
+			{:else if tab.icon === 'wrench'}
+				<svg class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+					<path stroke-linecap="round" stroke-linejoin="round" d="M11.42 15.17 17.25 21A2.652 2.652 0 0 0 21 17.25l-5.877-5.877M11.42 15.17l2.496-3.03c.317-.384.74-.626 1.208-.766M11.42 15.17l-4.655 5.653a2.548 2.548 0 1 1-3.586-3.586l6.837-5.63m5.108-.233c.55-.164 1.163-.188 1.743-.14a4.5 4.5 0 0 0 4.486-6.336l-3.276 3.277a3.004 3.004 0 0 1-2.25-2.25l3.276-3.276a4.5 4.5 0 0 0-6.336 4.486c.091 1.076-.071 2.264-.904 2.95l-.102.085m-1.745 1.437L5.909 7.5H4.5L2.25 3.75l1.5-1.5L7.5 4.5v1.409l4.26 4.26m-1.745 1.437 1.745-1.437m6.615 8.206L15.75 15.75M4.867 19.125h.008v.008h-.008v-.008Z" />
+				</svg>
+			{:else if tab.icon === 'book'}
+				<svg class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+					<path stroke-linecap="round" stroke-linejoin="round" d="M12 6.042A8.967 8.967 0 0 0 6 3.75c-1.052 0-2.062.18-3 .512v14.25A8.987 8.987 0 0 1 6 18c2.305 0 4.408.867 6 2.292m0-14.25a8.966 8.966 0 0 1 6-2.292c1.052 0 2.062.18 3 .512v14.25A8.987 8.987 0 0 0 18 18a8.967 8.967 0 0 0-6 2.292m0-14.25v14.25" />
+				</svg>
+			{:else if tab.icon === 'robot'}
+				<svg class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+					<path stroke-linecap="round" stroke-linejoin="round" d="M15.75 6a3.75 3.75 0 1 1-7.5 0 3.75 3.75 0 0 1 7.5 0ZM4.501 20.118a7.5 7.5 0 0 1 14.998 0A17.933 17.933 0 0 1 12 21.75c-2.676 0-5.216-.584-7.499-1.632Z" />
+				</svg>
+			{:else if tab.icon === 'brain'}
+				<svg class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+					<path stroke-linecap="round" stroke-linejoin="round" d="M9.813 15.904 9 18.75l-.813-2.846a4.5 4.5 0 0 0-3.09-3.09L2.25 12l2.846-.813a4.5 4.5 0 0 0 3.09-3.09L9 5.25l.813 2.846a4.5 4.5 0 0 0 3.09 3.09L15.75 12l-2.846.813a4.5 4.5 0 0 0-3.09 3.09ZM18.259 8.715 18 9.75l-.259-1.035a3.375 3.375 0 0 0-2.455-2.456L14.25 6l1.036-.259a3.375 3.375 0 0 0 2.455-2.456L18 2.25l.259 1.035a3.375 3.375 0 0 0 2.456 2.456L21.75 6l-1.035.259a3.375 3.375 0 0 0-2.456 2.456ZM16.894 20.567 16.5 21.75l-.394-1.183a2.25 2.25 0 0 0-1.423-1.423L13.5 18.75l1.183-.394a2.25 2.25 0 0 0 1.423-1.423l.394-1.183.394 1.183a2.25 2.25 0 0 0 1.423 1.423l1.183.394-1.183.394a2.25 2.25 0 0 0-1.423 1.423Z" />
+				</svg>
+			{:else if tab.icon === 'info'}
+				<svg class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+					<path stroke-linecap="round" stroke-linejoin="round" d="m11.25 11.25.041-.02a.75.75 0 0 1 1.063.852l-.708 2.836a.75.75 0 0 0 1.063.853l.041-.021M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Zm-9-3.75h.008v.008H12V8.25Z" />
+				</svg>
+			{/if}
+			{tab.label}
+		</a>
+	{/each}
+</nav>

frontend/src/lib/components/settings/ToolsTab.svelte

@@ -0,0 +1,532 @@
+<script lang="ts">
+	/**
+	 * ToolsTab - Enhanced tools management with better visuals
+	 */
+	import { toolsState } from '$lib/stores';
+	import type { ToolDefinition, CustomTool } from '$lib/tools';
+	import { ToolEditor } from '$lib/components/tools';
+	import { ConfirmDialog } from '$lib/components/shared';
+
+	let showEditor = $state(false);
+	let editingTool = $state<CustomTool | null>(null);
+	let searchQuery = $state('');
+	let expandedDescriptions = $state<Set<string>>(new Set());
+	let deleteConfirm = $state<{ show: boolean; tool: CustomTool | null }>({ show: false, tool: null });
+
+	function openCreateEditor(): void {
+		editingTool = null;
+		showEditor = true;
+	}
+
+	function openEditEditor(tool: CustomTool): void {
+		editingTool = tool;
+		showEditor = true;
+	}
+
+	function handleSaveTool(tool: CustomTool): void {
+		if (editingTool) {
+			toolsState.updateCustomTool(tool.id, tool);
+		} else {
+			toolsState.addCustomTool(tool);
+		}
+		showEditor = false;
+		editingTool = null;
+	}
+
+	function handleDeleteTool(tool: CustomTool): void {
+		deleteConfirm = { show: true, tool };
+	}
+
+	function confirmDeleteTool(): void {
+		if (deleteConfirm.tool) {
+			toolsState.removeCustomTool(deleteConfirm.tool.id);
+		}
+		deleteConfirm = { show: false, tool: null };
+	}
+
+	const allTools = $derived(toolsState.getAllToolsWithState());
+	const builtinTools = $derived(allTools.filter(t => t.isBuiltin));
+
+	// Stats
+	const stats = $derived({
+		total: builtinTools.length + toolsState.customTools.length,
+		enabled: builtinTools.filter(t => t.enabled).length + toolsState.customTools.filter(t => t.enabled).length,
+		builtin: builtinTools.length,
+		custom: toolsState.customTools.length
+	});
+
+	// Filtered tools based on search
+	const filteredBuiltinTools = $derived(
+		searchQuery.trim()
+			? builtinTools.filter(t =>
+				t.definition.function.name.toLowerCase().includes(searchQuery.toLowerCase()) ||
+				t.definition.function.description.toLowerCase().includes(searchQuery.toLowerCase())
+			)
+			: builtinTools
+	);
+
+	const filteredCustomTools = $derived(
+		searchQuery.trim()
+			? toolsState.customTools.filter(t =>
+				t.name.toLowerCase().includes(searchQuery.toLowerCase()) ||
+				t.description.toLowerCase().includes(searchQuery.toLowerCase())
+			)
+			: toolsState.customTools
+	);
+
+	function toggleTool(name: string): void {
+		toolsState.toggleTool(name);
+	}
+
+	function toggleGlobalTools(): void {
+		toolsState.toggleToolsEnabled();
+	}
+
+	function toggleDescription(toolName: string): void {
+		const newSet = new Set(expandedDescriptions);
+		if (newSet.has(toolName)) {
+			newSet.delete(toolName);
+		} else {
+			newSet.add(toolName);
+		}
+		expandedDescriptions = newSet;
+	}
+
+	// Get icon for built-in tool based on name
+	function getToolIcon(name: string): { icon: string; color: string } {
+		const icons: Record<string, { icon: string; color: string }> = {
+			'get_current_time': { icon: 'clock', color: 'text-amber-400' },
+			'calculate': { icon: 'calculator', color: 'text-blue-400' },
+			'fetch_url': { icon: 'globe', color: 'text-cyan-400' },
+			'get_location': { icon: 'location', color: 'text-rose-400' },
+			'web_search': { icon: 'search', color: 'text-emerald-400' }
+		};
+		return icons[name] || { icon: 'tool', color: 'text-gray-400' };
+	}
+
+	// Get implementation icon
+	function getImplementationIcon(impl: string): { icon: string; color: string; bg: string } {
+		const icons: Record<string, { icon: string; color: string; bg: string }> = {
+			'javascript': { icon: 'js', color: 'text-yellow-300', bg: 'bg-yellow-900/30' },
+			'python': { icon: 'py', color: 'text-blue-300', bg: 'bg-blue-900/30' },
+			'http': { icon: 'http', color: 'text-purple-300', bg: 'bg-purple-900/30' }
+		};
+		return icons[impl] || { icon: '?', color: 'text-gray-300', bg: 'bg-gray-900/30' };
+	}
+
+	// Format parameters with type info
+	function getParameters(def: ToolDefinition): Array<{ name: string; type: string; required: boolean; description?: string }> {
+		const params = def.function.parameters;
+		if (!params.properties) return [];
+
+		return Object.entries(params.properties).map(([name, prop]) => ({
+			name,
+			type: prop.type,
+			required: params.required?.includes(name) ?? false,
+			description: prop.description
+		}));
+	}
+
+	// Check if description is long
+	function isLongDescription(text: string): boolean {
+		return text.length > 150;
+	}
+</script>
+
+<div>
+	<!-- Header -->
+	<div class="mb-6 flex items-center justify-between">
+		<div>
+			<h2 class="text-xl font-bold text-theme-primary">Tools</h2>
+			<p class="mt-1 text-sm text-theme-muted">
+				Extend AI capabilities with built-in and custom tools
+			</p>
+		</div>
+
+		<div class="flex items-center gap-3">
+			<span class="text-sm text-theme-muted">Tools enabled</span>
+			<button
+				type="button"
+				onclick={toggleGlobalTools}
+				class="relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-violet-500 focus:ring-offset-2 focus:ring-offset-theme-primary {toolsState.toolsEnabled ? 'bg-violet-600' : 'bg-theme-tertiary'}"
+				role="switch"
+				aria-checked={toolsState.toolsEnabled}
+				aria-label="Toggle all tools"
+			>
+				<span class="pointer-events-none inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out {toolsState.toolsEnabled ? 'translate-x-5' : 'translate-x-0'}"></span>
+			</button>
+		</div>
+	</div>
+
+	<!-- Stats -->
+	<div class="mb-6 grid grid-cols-4 gap-4">
+		<div class="rounded-lg border border-theme bg-theme-secondary p-4">
+			<p class="text-sm text-theme-muted">Total Tools</p>
+			<p class="mt-1 text-2xl font-semibold text-theme-primary">{stats.total}</p>
+		</div>
+		<div class="rounded-lg border border-theme bg-theme-secondary p-4">
+			<p class="text-sm text-theme-muted">Enabled</p>
+			<p class="mt-1 text-2xl font-semibold text-emerald-400">{stats.enabled}</p>
+		</div>
+		<div class="rounded-lg border border-theme bg-theme-secondary p-4">
+			<p class="text-sm text-theme-muted">Built-in</p>
+			<p class="mt-1 text-2xl font-semibold text-blue-400">{stats.builtin}</p>
+		</div>
+		<div class="rounded-lg border border-theme bg-theme-secondary p-4">
+			<p class="text-sm text-theme-muted">Custom</p>
+			<p class="mt-1 text-2xl font-semibold text-violet-400">{stats.custom}</p>
+		</div>
+	</div>
+
+	<!-- Search -->
+	<div class="mb-6">
+		<div class="relative">
+			<svg class="absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2 text-theme-muted" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+				<path stroke-linecap="round" stroke-linejoin="round" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" />
+			</svg>
+			<input
+				type="text"
+				bind:value={searchQuery}
+				placeholder="Search tools..."
+				class="w-full rounded-lg border border-theme bg-theme-secondary py-2 pl-10 pr-4 text-sm text-theme-primary placeholder:text-theme-muted focus:border-violet-500 focus:outline-none focus:ring-1 focus:ring-violet-500"
+			/>
+			{#if searchQuery}
+				<button
+					type="button"
+					onclick={() => searchQuery = ''}
+					class="absolute right-3 top-1/2 -translate-y-1/2 text-theme-muted hover:text-theme-primary"
+					aria-label="Clear search"
+				>
+					<svg class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+						<path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
+					</svg>
+				</button>
+			{/if}
+		</div>
+	</div>
+
+	<!-- Built-in Tools -->
+	<section class="mb-8">
+		<h3 class="mb-4 flex items-center gap-2 text-lg font-semibold text-theme-primary">
+			<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-blue-400" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+				<path stroke-linecap="round" stroke-linejoin="round" d="M10.325 4.317c.426-1.756 2.924-1.756 3.35 0a1.724 1.724 0 002.573 1.066c1.543-.94 3.31.826 2.37 2.37a1.724 1.724 0 001.065 2.572c1.756.426 1.756 2.924 0 3.35a1.724 1.724 0 00-1.066 2.573c.94 1.543-.826 3.31-2.37 2.37a1.724 1.724 0 00-2.572 1.065c-.426 1.756-2.924 1.756-3.35 0a1.724 1.724 0 00-2.573-1.066c-1.543.94-3.31-.826-2.37-2.37a1.724 1.724 0 00-1.065-2.572c-1.756-.426-1.756-2.924 0-3.35a1.724 1.724 0 001.066-2.573c-.94-1.543.826-3.31 2.37-2.37.996.608 2.296.07 2.572-1.065z" />
+				<path stroke-linecap="round" stroke-linejoin="round" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />
+			</svg>
+			Built-in Tools
+			<span class="text-sm font-normal text-theme-muted">({filteredBuiltinTools.length})</span>
+		</h3>
+
+		{#if filteredBuiltinTools.length === 0}
+			<div class="rounded-lg border border-dashed border-theme bg-theme-secondary/50 p-8 text-center">
+				<p class="text-sm text-theme-muted">No tools match your search</p>
+			</div>
+		{:else}
+			<div class="space-y-3">
+				{#each filteredBuiltinTools as tool (tool.definition.function.name)}
+					{@const toolIcon = getToolIcon(tool.definition.function.name)}
+					{@const params = getParameters(tool.definition)}
+					{@const isLong = isLongDescription(tool.definition.function.description)}
+					{@const isExpanded = expandedDescriptions.has(tool.definition.function.name)}
+					<div class="rounded-lg border border-theme bg-theme-secondary transition-all {tool.enabled ? '' : 'opacity-50'}">
+						<div class="p-4">
+							<div class="flex items-start gap-4">
+								<!-- Tool Icon -->
+								<div class="flex h-10 w-10 flex-shrink-0 items-center justify-center rounded-lg bg-theme-tertiary {toolIcon.color}">
+									{#if toolIcon.icon === 'clock'}
+										<svg class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+											<path stroke-linecap="round" stroke-linejoin="round" d="M12 6v6h4.5m4.5 0a9 9 0 11-18 0 9 9 0 0118 0z" />
+										</svg>
+									{:else if toolIcon.icon === 'calculator'}
+										<svg class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+											<path stroke-linecap="round" stroke-linejoin="round" d="M15.75 15.75V18m-7.5-6.75h.008v.008H8.25v-.008zm0 2.25h.008v.008H8.25V13.5zm0 2.25h.008v.008H8.25v-.008zm0 2.25h.008v.008H8.25V18zm2.498-6.75h.007v.008h-.007v-.008zm0 2.25h.007v.008h-.007V13.5zm0 2.25h.007v.008h-.007v-.008zm0 2.25h.007v.008h-.007V18zm2.504-6.75h.008v.008h-.008v-.008zm0 2.25h.008v.008h-.008V13.5zm0 2.25h.008v.008h-.008v-.008zm0 2.25h.008v.008h-.008V18zm2.498-6.75h.008v.008h-.008v-.008zm0 2.25h.008v.008h-.008V13.5zM8.25 6h7.5v2.25h-7.5V6zM12 2.25c-1.892 0-3.758.11-5.593.322C5.307 2.7 4.5 3.65 4.5 4.757V19.5a2.25 2.25 0 002.25 2.25h10.5a2.25 2.25 0 002.25-2.25V4.757c0-1.108-.806-2.057-1.907-2.185A48.507 48.507 0 0012 2.25z" />
+										</svg>
+									{:else if toolIcon.icon === 'globe'}
+										<svg class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+											<path stroke-linecap="round" stroke-linejoin="round" d="M12 21a9.004 9.004 0 008.716-6.747M12 21a9.004 9.004 0 01-8.716-6.747M12 21c2.485 0 4.5-4.03 4.5-9S14.485 3 12 3m0 18c-2.485 0-4.5-4.03-4.5-9S9.515 3 12 3m0 0a8.997 8.997 0 017.843 4.582M12 3a8.997 8.997 0 00-7.843 4.582m15.686 0A11.953 11.953 0 0112 10.5c-2.998 0-5.74-1.1-7.843-2.918m15.686 0A8.959 8.959 0 0121 12c0 .778-.099 1.533-.284 2.253m0 0A17.919 17.919 0 0112 16.5c-3.162 0-6.133-.815-8.716-2.247m0 0A9.015 9.015 0 013 12c0-1.605.42-3.113 1.157-4.418" />
+										</svg>
+									{:else if toolIcon.icon === 'location'}
+										<svg class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+											<path stroke-linecap="round" stroke-linejoin="round" d="M15 10.5a3 3 0 11-6 0 3 3 0 016 0z" />
+											<path stroke-linecap="round" stroke-linejoin="round" d="M19.5 10.5c0 7.142-7.5 11.25-7.5 11.25S4.5 17.642 4.5 10.5a7.5 7.5 0 1115 0z" />
+										</svg>
+									{:else if toolIcon.icon === 'search'}
+										<svg class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+											<path stroke-linecap="round" stroke-linejoin="round" d="M21 21l-5.197-5.197m0 0A7.5 7.5 0 105.196 5.196a7.5 7.5 0 0010.607 10.607z" />
+										</svg>
+									{:else}
+										<svg class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+											<path stroke-linecap="round" stroke-linejoin="round" d="M11.42 15.17L17.25 21A2.652 2.652 0 0021 17.25l-5.877-5.877M11.42 15.17l2.496-3.03c.317-.384.74-.626 1.208-.766M11.42 15.17l-4.655 5.653a2.548 2.548 0 11-3.586-3.586l6.837-5.63m5.108-.233c.55-.164 1.163-.188 1.743-.14a4.5 4.5 0 004.486-6.336l-3.276 3.277a3.004 3.004 0 01-2.25-2.25l3.276-3.276a4.5 4.5 0 00-6.336 4.486c.091 1.076-.071 2.264-.904 2.95l-.102.085m-1.745 1.437L5.909 7.5H4.5L2.25 3.75l1.5-1.5L7.5 4.5v1.409l4.26 4.26m-1.745 1.437l1.745-1.437m6.615 8.206L15.75 15.75M4.867 19.125h.008v.008h-.008v-.008z" />
+										</svg>
+									{/if}
+								</div>
+
+								<!-- Content -->
+								<div class="min-w-0 flex-1">
+									<div class="flex items-center gap-2">
+										<h4 class="font-mono text-sm font-semibold text-theme-primary">{tool.definition.function.name}</h4>
+										<span class="rounded-full bg-blue-900/40 px-2 py-0.5 text-xs font-medium text-blue-300">built-in</span>
+									</div>
+
+									<!-- Description -->
+									<div class="mt-2">
+										<p class="text-sm text-theme-muted {isLong && !isExpanded ? 'line-clamp-2' : ''}">
+											{tool.definition.function.description}
+										</p>
+										{#if isLong}
+											<button
+												type="button"
+												onclick={() => toggleDescription(tool.definition.function.name)}
+												class="mt-1 text-xs text-violet-400 hover:text-violet-300"
+											>
+												{isExpanded ? 'Show less' : 'Show more'}
+											</button>
+										{/if}
+									</div>
+								</div>
+
+								<!-- Toggle -->
+								<button
+									type="button"
+									onclick={() => toggleTool(tool.definition.function.name)}
+									class="relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-2 focus:ring-offset-theme {tool.enabled ? 'bg-blue-600' : 'bg-theme-tertiary'}"
+									role="switch"
+									aria-checked={tool.enabled}
+									aria-label="Toggle {tool.definition.function.name} tool"
+									disabled={!toolsState.toolsEnabled}
+								>
+									<span class="pointer-events-none inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out {tool.enabled ? 'translate-x-5' : 'translate-x-0'}"></span>
+								</button>
+							</div>
+
+							<!-- Parameters -->
+							{#if params.length > 0}
+								<div class="mt-3 flex flex-wrap gap-2 border-t border-theme pt-3">
+									{#each params as param}
+										<div class="flex items-center gap-1 rounded-md bg-theme-tertiary px-2 py-1" title={param.description || ''}>
+											<span class="font-mono text-xs text-theme-primary">{param.name}</span>
+											{#if param.required}
+												<span class="text-xs text-rose-400">*</span>
+											{/if}
+											<span class="text-xs text-theme-muted">:</span>
+											<span class="rounded bg-theme-hover px-1 text-xs text-cyan-400">{param.type}</span>
+										</div>
+									{/each}
+								</div>
+							{/if}
+						</div>
+					</div>
+				{/each}
+			</div>
+		{/if}
+	</section>
+
+	<!-- Custom Tools -->
+	<section>
+		<div class="mb-4 flex items-center justify-between">
+			<h3 class="flex items-center gap-2 text-lg font-semibold text-theme-primary">
+				<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-violet-400" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+					<path stroke-linecap="round" stroke-linejoin="round" d="M9.813 15.904L9 18.75l-.813-2.846a4.5 4.5 0 00-3.09-3.09L2.25 12l2.846-.813a4.5 4.5 0 003.09-3.09L9 5.25l.813 2.846a4.5 4.5 0 003.09 3.09L15.75 12l-2.846.813a4.5 4.5 0 00-3.09 3.09zM18.259 8.715L18 9.75l-.259-1.035a3.375 3.375 0 00-2.455-2.456L14.25 6l1.036-.259a3.375 3.375 0 002.455-2.456L18 2.25l.259 1.035a3.375 3.375 0 002.456 2.456L21.75 6l-1.035.259a3.375 3.375 0 00-2.456 2.456zM16.894 20.567L16.5 21.75l-.394-1.183a2.25 2.25 0 00-1.423-1.423L13.5 18.75l1.183-.394a2.25 2.25 0 001.423-1.423l.394-1.183.394 1.183a2.25 2.25 0 001.423 1.423l1.183.394-1.183.394a2.25 2.25 0 00-1.423 1.423z" />
+				</svg>
+				Custom Tools
+				<span class="text-sm font-normal text-theme-muted">({filteredCustomTools.length})</span>
+			</h3>
+
+			<button
+				type="button"
+				onclick={openCreateEditor}
+				class="flex items-center gap-2 rounded-lg bg-violet-600 px-4 py-2 text-sm font-medium text-white transition-colors hover:bg-violet-700"
+			>
+				<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+					<path stroke-linecap="round" stroke-linejoin="round" d="M12 4v16m8-8H4" />
+				</svg>
+				Create Tool
+			</button>
+		</div>
+
+		{#if filteredCustomTools.length === 0 && toolsState.customTools.length === 0}
+			<div class="rounded-lg border border-dashed border-theme bg-theme-secondary/50 p-8 text-center">
+				<svg xmlns="http://www.w3.org/2000/svg" class="mx-auto h-12 w-12 text-theme-muted" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="1.5">
+					<path stroke-linecap="round" stroke-linejoin="round" d="M9.813 15.904L9 18.75l-.813-2.846a4.5 4.5 0 00-3.09-3.09L2.25 12l2.846-.813a4.5 4.5 0 003.09-3.09L9 5.25l.813 2.846a4.5 4.5 0 003.09 3.09L15.75 12l-2.846.813a4.5 4.5 0 00-3.09 3.09zM18.259 8.715L18 9.75l-.259-1.035a3.375 3.375 0 00-2.455-2.456L14.25 6l1.036-.259a3.375 3.375 0 002.455-2.456L18 2.25l.259 1.035a3.375 3.375 0 002.456 2.456L21.75 6l-1.035.259a3.375 3.375 0 00-2.456 2.456zM16.894 20.567L16.5 21.75l-.394-1.183a2.25 2.25 0 00-1.423-1.423L13.5 18.75l1.183-.394a2.25 2.25 0 001.423-1.423l.394-1.183.394 1.183a2.25 2.25 0 001.423 1.423l1.183.394-1.183.394a2.25 2.25 0 00-1.423 1.423z" />
+				</svg>
+				<h4 class="mt-4 text-sm font-medium text-theme-secondary">No custom tools yet</h4>
+				<p class="mt-1 text-sm text-theme-muted">Create JavaScript, Python, or HTTP tools to extend AI capabilities</p>
+				<button
+					type="button"
+					onclick={openCreateEditor}
+					class="mt-4 inline-flex items-center gap-2 rounded-lg border border-violet-500 px-4 py-2 text-sm font-medium text-violet-400 transition-colors hover:bg-violet-900/30"
+				>
+					<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+						<path stroke-linecap="round" stroke-linejoin="round" d="M12 4v16m8-8H4" />
+					</svg>
+					Create Your First Tool
+				</button>
+			</div>
+		{:else if filteredCustomTools.length === 0}
+			<div class="rounded-lg border border-dashed border-theme bg-theme-secondary/50 p-8 text-center">
+				<p class="text-sm text-theme-muted">No custom tools match your search</p>
+			</div>
+		{:else}
+			<div class="space-y-3">
+				{#each filteredCustomTools as tool (tool.id)}
+					{@const implIcon = getImplementationIcon(tool.implementation)}
+					{@const customParams = Object.entries(tool.parameters.properties ?? {})}
+					{@const isLong = isLongDescription(tool.description)}
+					{@const isExpanded = expandedDescriptions.has(tool.id)}
+					<div class="rounded-lg border border-theme bg-theme-secondary transition-all {tool.enabled ? '' : 'opacity-50'}">
+						<div class="p-4">
+							<div class="flex items-start gap-4">
+								<!-- Implementation Icon -->
+								<div class="flex h-10 w-10 flex-shrink-0 items-center justify-center rounded-lg {implIcon.bg}">
+									{#if tool.implementation === 'javascript'}
+										<span class="font-mono text-sm font-bold {implIcon.color}">JS</span>
+									{:else if tool.implementation === 'python'}
+										<span class="font-mono text-sm font-bold {implIcon.color}">PY</span>
+									{:else}
+										<svg class="h-5 w-5 {implIcon.color}" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+											<path stroke-linecap="round" stroke-linejoin="round" d="M13.19 8.688a4.5 4.5 0 011.242 7.244l-4.5 4.5a4.5 4.5 0 01-6.364-6.364l1.757-1.757m13.35-.622l1.757-1.757a4.5 4.5 0 00-6.364-6.364l-4.5 4.5a4.5 4.5 0 001.242 7.244" />
+										</svg>
+									{/if}
+								</div>
+
+								<!-- Content -->
+								<div class="min-w-0 flex-1">
+									<div class="flex items-center gap-2">
+										<h4 class="font-mono text-sm font-semibold text-theme-primary">{tool.name}</h4>
+										<span class="rounded-full bg-violet-900/40 px-2 py-0.5 text-xs font-medium text-violet-300">custom</span>
+										<span class="rounded-full {implIcon.bg} px-2 py-0.5 text-xs font-medium {implIcon.color}">{tool.implementation}</span>
+									</div>
+
+									<!-- Description -->
+									<div class="mt-2">
+										<p class="text-sm text-theme-muted {isLong && !isExpanded ? 'line-clamp-2' : ''}">
+											{tool.description}
+										</p>
+										{#if isLong}
+											<button
+												type="button"
+												onclick={() => toggleDescription(tool.id)}
+												class="mt-1 text-xs text-violet-400 hover:text-violet-300"
+											>
+												{isExpanded ? 'Show less' : 'Show more'}
+											</button>
+										{/if}
+									</div>
+								</div>
+
+								<!-- Actions -->
+								<div class="flex items-center gap-2">
+									<button
+										type="button"
+										onclick={() => openEditEditor(tool)}
+										class="rounded-lg p-2 text-theme-muted transition-colors hover:bg-theme-tertiary hover:text-theme-primary"
+										aria-label="Edit tool"
+									>
+										<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+											<path stroke-linecap="round" stroke-linejoin="round" d="M16.862 4.487l1.687-1.688a1.875 1.875 0 112.652 2.652L10.582 16.07a4.5 4.5 0 01-1.897 1.13L6 18l.8-2.685a4.5 4.5 0 011.13-1.897l8.932-8.931zm0 0L19.5 7.125M18 14v4.75A2.25 2.25 0 0115.75 21H5.25A2.25 2.25 0 013 18.75V8.25A2.25 2.25 0 015.25 6H10" />
+										</svg>
+									</button>
+									<button
+										type="button"
+										onclick={() => handleDeleteTool(tool)}
+										class="rounded-lg p-2 text-theme-muted transition-colors hover:bg-red-900/30 hover:text-red-400"
+										aria-label="Delete tool"
+									>
+										<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+											<path stroke-linecap="round" stroke-linejoin="round" d="M14.74 9l-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 01-2.244 2.077H8.084a2.25 2.25 0 01-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 00-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 013.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 00-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 00-7.5 0" />
+										</svg>
+									</button>
+									<button
+										type="button"
+										onclick={() => toggleTool(tool.name)}
+										class="relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-violet-500 focus:ring-offset-2 focus:ring-offset-theme {tool.enabled ? 'bg-violet-600' : 'bg-theme-tertiary'}"
+										role="switch"
+										aria-checked={tool.enabled}
+										aria-label="Toggle {tool.name} tool"
+										disabled={!toolsState.toolsEnabled}
+									>
+										<span class="pointer-events-none inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out {tool.enabled ? 'translate-x-5' : 'translate-x-0'}"></span>
+									</button>
+								</div>
+							</div>
+
+							<!-- Parameters -->
+							{#if customParams.length > 0}
+								<div class="mt-3 flex flex-wrap gap-2 border-t border-theme pt-3">
+									{#each customParams as [name, prop]}
+										<div class="flex items-center gap-1 rounded-md bg-theme-tertiary px-2 py-1" title={prop.description || ''}>
+											<span class="font-mono text-xs text-theme-primary">{name}</span>
+											{#if tool.parameters.required?.includes(name)}
+												<span class="text-xs text-rose-400">*</span>
+											{/if}
+											<span class="text-xs text-theme-muted">:</span>
+											<span class="rounded bg-theme-hover px-1 text-xs text-cyan-400">{prop.type}</span>
+										</div>
+									{/each}
+								</div>
+							{/if}
+						</div>
+					</div>
+				{/each}
+			</div>
+		{/if}
+	</section>
+
+	<!-- Info Section -->
+	<section class="mt-8 rounded-lg border border-theme bg-gradient-to-br from-theme-secondary/80 to-theme-secondary/40 p-5">
+		<h4 class="flex items-center gap-2 text-sm font-semibold text-theme-primary">
+			<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-violet-400" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+				<path stroke-linecap="round" stroke-linejoin="round" d="M9.663 17h4.673M12 3v1m6.364 1.636l-.707.707M21 12h-1M4 12H3m3.343-5.657l-.707-.707m2.828 9.9a5 5 0 117.072 0l-.548.547A3.374 3.374 0 0014 18.469V19a2 2 0 11-4 0v-.531c0-.895-.356-1.754-.988-2.386l-.548-.547z" />
+			</svg>
+			How Tools Work
+		</h4>
+		<p class="mt-3 text-sm text-theme-muted leading-relaxed">
+			Tools extend the AI's capabilities by allowing it to perform actions beyond text generation.
+			When you ask a question that could benefit from a tool, the AI will automatically select and use the appropriate one.
+		</p>
+		<div class="mt-4 grid gap-3 sm:grid-cols-3">
+			<div class="rounded-lg bg-theme-tertiary/50 p-3">
+				<div class="flex items-center gap-2 text-xs font-medium text-yellow-400">
+					<span class="font-mono">JS</span>
+					JavaScript
+				</div>
+				<p class="mt-1 text-xs text-theme-muted">Runs in browser, instant execution</p>
+			</div>
+			<div class="rounded-lg bg-theme-tertiary/50 p-3">
+				<div class="flex items-center gap-2 text-xs font-medium text-blue-400">
+					<span class="font-mono">PY</span>
+					Python
+				</div>
+				<p class="mt-1 text-xs text-theme-muted">Runs on backend server</p>
+			</div>
+			<div class="rounded-lg bg-theme-tertiary/50 p-3">
+				<div class="flex items-center gap-2 text-xs font-medium text-purple-400">
+					<svg class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+						<path stroke-linecap="round" stroke-linejoin="round" d="M13.19 8.688a4.5 4.5 0 011.242 7.244l-4.5 4.5a4.5 4.5 0 01-6.364-6.364l1.757-1.757m13.35-.622l1.757-1.757a4.5 4.5 0 00-6.364-6.364l-4.5 4.5a4.5 4.5 0 001.242 7.244" />
+					</svg>
+					HTTP
+				</div>
+				<p class="mt-1 text-xs text-theme-muted">Calls external APIs</p>
+			</div>
+		</div>
+		<p class="mt-4 text-xs text-theme-muted">
+			<strong class="text-theme-secondary">Note:</strong> Not all models support tool calling. Models like Llama 3.1+, Mistral 7B+, and Qwen have built-in tool support.
+		</p>
+	</section>
+</div>
+
+<ToolEditor
+	isOpen={showEditor}
+	editingTool={editingTool}
+	onClose={() => { showEditor = false; editingTool = null; }}
+	onSave={handleSaveTool}
+/>
+
+<ConfirmDialog
+	isOpen={deleteConfirm.show}
+	title="Delete Tool"
+	message={`Delete "${deleteConfirm.tool?.name}"? This cannot be undone.`}
+	confirmText="Delete"
+	variant="danger"
+	onConfirm={confirmDeleteTool}
+	onCancel={() => (deleteConfirm = { show: false, tool: null })}
+/>

frontend/src/lib/components/settings/index.ts

@@ -0,0 +1,15 @@
+/**
+ * Settings components barrel export
+ */
+export { default as SettingsTabs } from './SettingsTabs.svelte';
+export { default as GeneralTab } from './GeneralTab.svelte';
+export { default as AIProvidersTab } from './AIProvidersTab.svelte';
+export { default as PromptsTab } from './PromptsTab.svelte';
+export { default as ToolsTab } from './ToolsTab.svelte';
+export { default as AgentsTab } from './AgentsTab.svelte';
+export { default as KnowledgeTab } from './KnowledgeTab.svelte';
+export { default as MemoryTab } from './MemoryTab.svelte';
+export { default as AboutTab } from './AboutTab.svelte';
+export { default as ModelParametersPanel } from './ModelParametersPanel.svelte';
+
+export type { SettingsTab } from './SettingsTabs.svelte';

frontend/src/lib/components/shared/ConfirmDialog.test.ts

@@ -0,0 +1,156 @@
+/**
+ * ConfirmDialog component tests
+ *
+ * Tests the confirmation dialog component
+ */
+
+import { describe, it, expect, vi } from 'vitest';
+import { render, screen, fireEvent } from '@testing-library/svelte';
+import ConfirmDialog from './ConfirmDialog.svelte';
+
+describe('ConfirmDialog', () => {
+	const defaultProps = {
+		isOpen: true,
+		title: 'Confirm Action',
+		message: 'Are you sure you want to proceed?',
+		onConfirm: vi.fn(),
+		onCancel: vi.fn()
+	};
+
+	it('does not render when closed', () => {
+		render(ConfirmDialog, {
+			props: {
+				...defaultProps,
+				isOpen: false
+			}
+		});
+
+		expect(screen.queryByRole('dialog')).toBeNull();
+	});
+
+	it('renders when open', () => {
+		render(ConfirmDialog, { props: defaultProps });
+
+		const dialog = screen.getByRole('dialog');
+		expect(dialog).toBeDefined();
+		expect(dialog.getAttribute('aria-modal')).toBe('true');
+	});
+
+	it('displays title and message', () => {
+		render(ConfirmDialog, { props: defaultProps });
+
+		expect(screen.getByText('Confirm Action')).toBeDefined();
+		expect(screen.getByText('Are you sure you want to proceed?')).toBeDefined();
+	});
+
+	it('uses default button text', () => {
+		render(ConfirmDialog, { props: defaultProps });
+
+		expect(screen.getByText('Confirm')).toBeDefined();
+		expect(screen.getByText('Cancel')).toBeDefined();
+	});
+
+	it('uses custom button text', () => {
+		render(ConfirmDialog, {
+			props: {
+				...defaultProps,
+				confirmText: 'Delete',
+				cancelText: 'Keep'
+			}
+		});
+
+		expect(screen.getByText('Delete')).toBeDefined();
+		expect(screen.getByText('Keep')).toBeDefined();
+	});
+
+	it('calls onConfirm when confirm button clicked', async () => {
+		const onConfirm = vi.fn();
+		render(ConfirmDialog, {
+			props: {
+				...defaultProps,
+				onConfirm
+			}
+		});
+
+		const confirmButton = screen.getByText('Confirm');
+		await fireEvent.click(confirmButton);
+
+		expect(onConfirm).toHaveBeenCalledOnce();
+	});
+
+	it('calls onCancel when cancel button clicked', async () => {
+		const onCancel = vi.fn();
+		render(ConfirmDialog, {
+			props: {
+				...defaultProps,
+				onCancel
+			}
+		});
+
+		const cancelButton = screen.getByText('Cancel');
+		await fireEvent.click(cancelButton);
+
+		expect(onCancel).toHaveBeenCalledOnce();
+	});
+
+	it('calls onCancel when Escape key pressed', async () => {
+		const onCancel = vi.fn();
+		render(ConfirmDialog, {
+			props: {
+				...defaultProps,
+				onCancel
+			}
+		});
+
+		const dialog = screen.getByRole('dialog');
+		await fireEvent.keyDown(dialog, { key: 'Escape' });
+
+		expect(onCancel).toHaveBeenCalledOnce();
+	});
+
+	it('has proper aria attributes', () => {
+		render(ConfirmDialog, { props: defaultProps });
+
+		const dialog = screen.getByRole('dialog');
+		expect(dialog.getAttribute('aria-labelledby')).toBe('confirm-dialog-title');
+		expect(dialog.getAttribute('aria-describedby')).toBe('confirm-dialog-description');
+	});
+
+	describe('variants', () => {
+		it('renders danger variant with red styling', () => {
+			render(ConfirmDialog, {
+				props: {
+					...defaultProps,
+					variant: 'danger'
+				}
+			});
+
+			const confirmButton = screen.getByText('Confirm');
+			expect(confirmButton.className).toContain('bg-red-600');
+		});
+
+		it('renders warning variant with amber styling', () => {
+			render(ConfirmDialog, {
+				props: {
+					...defaultProps,
+					variant: 'warning'
+				}
+			});
+
+			const confirmButton = screen.getByText('Confirm');
+			expect(confirmButton.className).toContain('bg-amber-600');
+		});
+
+		it('renders info variant with emerald styling', () => {
+			render(ConfirmDialog, {
+				props: {
+					...defaultProps,
+					variant: 'info'
+				}
+			});
+
+			const confirmButton = screen.getByText('Confirm');
+			expect(confirmButton.className).toContain('bg-emerald-600');
+		});
+	});
+});

frontend/src/lib/components/shared/ImportDialog.svelte

@@ -20,7 +20,7 @@
 
 	let { isOpen, onClose }: Props = $props();
 
-	let fileInput: HTMLInputElement;
+	let fileInput = $state<HTMLInputElement | null>(null);
 	let isDragOver = $state(false);
 	let selectedFile = $state<File | null>(null);
 	let validationResult = $state<ValidationResult | null>(null);
@@ -168,9 +168,11 @@
 	<div
 		class="fixed inset-0 z-50 flex items-center justify-center bg-black/60 backdrop-blur-sm"
 		onclick={handleBackdropClick}
+		onkeydown={handleKeydown}
 		role="dialog"
 		aria-modal="true"
 		aria-labelledby="import-dialog-title"
+		tabindex="-1"
 	>
 		<!-- Dialog -->
 		<div class="mx-4 w-full max-w-lg rounded-xl border border-theme bg-theme-primary shadow-2xl">

frontend/src/lib/components/shared/SearchModal.svelte

@@ -1,12 +1,13 @@
 <script lang="ts">
 	/**
 	 * SearchModal - Global search modal for conversations and messages
-	 * Supports searching both conversation titles and message content
+	 * Supports searching conversation titles, message content, and semantic search
 	 */
 	import { goto } from '$app/navigation';
 	import { searchConversations, searchMessages, type MessageSearchResult } from '$lib/storage';
 	import { conversationsState } from '$lib/stores';
 	import type { Conversation } from '$lib/types/conversation';
+	import { searchAllChatHistory, type ChatSearchResult } from '$lib/services/chat-indexer.js';
 
 	interface Props {
 		isOpen: boolean;
@@ -17,12 +18,13 @@
 
 	// Search state
 	let searchQuery = $state('');
-	let activeTab = $state<'titles' | 'messages'>('titles');
+	let activeTab = $state<'titles' | 'messages' | 'semantic'>('titles');
 	let isSearching = $state(false);
 
 	// Results
 	let titleResults = $state<Conversation[]>([]);
 	let messageResults = $state<MessageSearchResult[]>([]);
+	let semanticResults = $state<ChatSearchResult[]>([]);
 
 	// Debounce timer
 	let debounceTimer: ReturnType<typeof setTimeout> | null = null;
@@ -41,6 +43,7 @@
 		if (!searchQuery.trim()) {
 			titleResults = [];
 			messageResults = [];
+			semanticResults = [];
 			return;
 		}
 
@@ -48,10 +51,11 @@
 			isSearching = true;
 
 			try {
-				// Search both in parallel
-				const [titlesResult, messagesResult] = await Promise.all([
+				// Search all three in parallel
+				const [titlesResult, messagesResult, semanticSearchResults] = await Promise.all([
 					searchConversations(searchQuery),
-					searchMessages(searchQuery, { limit: 30 })
+					searchMessages(searchQuery, { limit: 30 }),
+					searchAllChatHistory(searchQuery, undefined, 30, 0.15)
 				]);
 
 				if (titlesResult.success) {
@@ -61,6 +65,10 @@
 				if (messagesResult.success) {
 					messageResults = messagesResult.data;
 				}
+
+				semanticResults = semanticSearchResults;
+			} catch (error) {
+				console.error('[SearchModal] Search error:', error);
 			} finally {
 				isSearching = false;
 			}
@@ -125,6 +133,7 @@
 		searchQuery = '';
 		titleResults = [];
 		messageResults = [];
+		semanticResults = [];
 		activeTab = 'titles';
 		onClose();
 	}
@@ -142,6 +151,7 @@
 			searchQuery = '';
 			titleResults = [];
 			messageResults = [];
+			semanticResults = [];
 		}
 	});
 </script>
@@ -153,9 +163,11 @@
 	<div
 		class="fixed inset-0 z-50 flex items-start justify-center bg-black/60 pt-[15vh] backdrop-blur-sm"
 		onclick={handleBackdropClick}
+		onkeydown={handleKeydown}
 		role="dialog"
 		aria-modal="true"
 		aria-labelledby="search-dialog-title"
+		tabindex="-1"
 	>
 		<!-- Dialog -->
 		<div class="mx-4 w-full max-w-2xl rounded-xl border border-theme bg-theme-primary shadow-2xl">
@@ -255,6 +267,20 @@
 						>
 					{/if}
 				</button>
+				<button
+					type="button"
+					onclick={() => (activeTab = 'semantic')}
+					class="flex-1 px-4 py-2 text-sm font-medium transition-colors {activeTab === 'semantic'
+						? 'border-b-2 border-emerald-500 text-emerald-400'
+						: 'text-theme-muted hover:text-theme-secondary'}"
+				>
+					Semantic
+					{#if semanticResults.length > 0}
+						<span class="ml-1.5 rounded-full bg-theme-secondary px-1.5 py-0.5 text-xs"
+							>{semanticResults.length}</span
+						>
+					{/if}
+				</button>
 			</div>
 
 			<!-- Results -->
@@ -312,7 +338,7 @@
 							{/each}
 						</div>
 					{/if}
-				{:else}
+				{:else if activeTab === 'messages'}
 					{#if messageResults.length === 0 && !isSearching}
 						<div class="py-8 text-center text-sm text-theme-muted">
 							No messages found matching "{searchQuery}"
@@ -345,6 +371,35 @@
 							{/each}
 						</div>
 					{/if}
+				{:else if activeTab === 'semantic'}
+					{#if semanticResults.length === 0 && !isSearching}
+						<div class="py-8 text-center text-sm text-theme-muted">
+							<p>No semantic matches found for "{searchQuery}"</p>
+							<p class="mt-1 text-xs">Semantic search uses AI embeddings to find similar content</p>
+						</div>
+					{:else}
+						<div class="divide-y divide-theme-secondary">
+							{#each semanticResults as result}
+								<button
+									type="button"
+									onclick={() => navigateToConversation(result.conversationId)}
+									class="flex w-full flex-col gap-1 px-4 py-3 text-left transition-colors hover:bg-theme-secondary"
+								>
+									<div class="flex items-center gap-2">
+										<span class="rounded bg-emerald-500/20 px-1.5 py-0.5 text-[10px] font-medium text-emerald-400">
+											{Math.round(result.similarity * 100)}% match
+										</span>
+										<span class="truncate text-xs text-theme-muted">
+											{result.conversationTitle}
+										</span>
+									</div>
+									<p class="line-clamp-2 text-sm text-theme-secondary">
+										{result.content.slice(0, 200)}{result.content.length > 200 ? '...' : ''}
+									</p>
+								</button>
+							{/each}
+						</div>
+					{/if}
 				{/if}
 			</div>
 

frontend/src/lib/components/shared/SettingsModal.svelte

@@ -1,203 +0,0 @@
-<script lang="ts">
-	/**
-	 * SettingsModal - Application settings dialog
-	 * Handles theme, model defaults, and other preferences
-	 */
-
-	import { modelsState, uiState } from '$lib/stores';
-	import { getPrimaryModifierDisplay } from '$lib/utils';
-
-	interface Props {
-		isOpen: boolean;
-		onClose: () => void;
-	}
-
-	const { isOpen, onClose }: Props = $props();
-
-	// Settings state (mirrors global state for editing)
-	let defaultModel = $state<string | null>(null);
-
-	// Sync with global state when modal opens
-	$effect(() => {
-		if (isOpen) {
-			defaultModel = modelsState.selectedId;
-		}
-	});
-
-	/**
-	 * Save settings and close modal
-	 */
-	function handleSave(): void {
-		if (defaultModel) {
-			modelsState.select(defaultModel);
-		}
-		onClose();
-	}
-
-	/**
-	 * Handle backdrop click
-	 */
-	function handleBackdropClick(event: MouseEvent): void {
-		if (event.target === event.currentTarget) {
-			onClose();
-		}
-	}
-
-	/**
-	 * Handle escape key
-	 */
-	function handleKeydown(event: KeyboardEvent): void {
-		if (event.key === 'Escape') {
-			onClose();
-		}
-	}
-
-	const modifierKey = getPrimaryModifierDisplay();
-</script>
-
-{#if isOpen}
-	<!-- Backdrop -->
-	<!-- svelte-ignore a11y_no_static_element_interactions -->
-	<div
-		class="fixed inset-0 z-50 flex items-center justify-center bg-black/60 backdrop-blur-sm"
-		onclick={handleBackdropClick}
-		onkeydown={handleKeydown}
-	>
-		<!-- Modal -->
-		<div
-			class="w-full max-w-lg rounded-xl bg-theme-secondary shadow-2xl"
-			role="dialog"
-			aria-modal="true"
-			aria-labelledby="settings-title"
-		>
-			<!-- Header -->
-			<div class="flex items-center justify-between border-b border-theme px-6 py-4">
-				<h2 id="settings-title" class="text-lg font-semibold text-theme-primary">Settings</h2>
-				<button
-					type="button"
-					onclick={onClose}
-					class="rounded-lg p-1.5 text-theme-muted hover:bg-theme-tertiary hover:text-theme-secondary"
-					aria-label="Close settings"
-				>
-					<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor">
-						<path fill-rule="evenodd" d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z" clip-rule="evenodd" />
-					</svg>
-				</button>
-			</div>
-
-			<!-- Content -->
-			<div class="space-y-6 p-6">
-				<!-- Appearance Section -->
-				<section>
-					<h3 class="mb-3 text-sm font-medium uppercase tracking-wide text-theme-muted">Appearance</h3>
-					<div class="space-y-4">
-						<div class="flex items-center justify-between">
-							<div>
-								<p class="text-sm font-medium text-theme-secondary">Dark Mode</p>
-								<p class="text-xs text-theme-muted">Toggle between light and dark theme</p>
-							</div>
-							<button
-								type="button"
-								onclick={() => uiState.toggleDarkMode()}
-								class="relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-emerald-500 focus:ring-offset-2 focus:ring-offset-theme {uiState.darkMode ? 'bg-emerald-600' : 'bg-theme-tertiary'}"
-								role="switch"
-								aria-checked={uiState.darkMode}
-							>
-								<span
-									class="pointer-events-none inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out {uiState.darkMode ? 'translate-x-5' : 'translate-x-0'}"
-								></span>
-							</button>
-						</div>
-						<div class="flex items-center justify-between">
-							<div>
-								<p class="text-sm font-medium text-theme-secondary">Use System Theme</p>
-								<p class="text-xs text-theme-muted">Match your OS light/dark preference</p>
-							</div>
-							<button
-								type="button"
-								onclick={() => uiState.useSystemTheme()}
-								class="rounded-lg bg-theme-tertiary px-3 py-1.5 text-xs font-medium text-theme-secondary transition-colors hover:bg-theme-tertiary"
-							>
-								Sync with System
-							</button>
-						</div>
-					</div>
-				</section>
-
-				<!-- Model Section -->
-				<section>
-					<h3 class="mb-3 text-sm font-medium uppercase tracking-wide text-theme-muted">Default Model</h3>
-					<div class="space-y-4">
-						<div>
-							<select
-								bind:value={defaultModel}
-								class="w-full rounded-lg border border-theme-subtle bg-theme-tertiary px-3 py-2 text-theme-secondary focus:border-emerald-500 focus:outline-none focus:ring-1 focus:ring-emerald-500"
-							>
-								{#each modelsState.chatModels as model}
-									<option value={model.name}>{model.name}</option>
-								{/each}
-							</select>
-							<p class="mt-1 text-sm text-theme-muted">Model used for new conversations</p>
-						</div>
-					</div>
-				</section>
-
-				<!-- Keyboard Shortcuts Section -->
-				<section>
-					<h3 class="mb-3 text-sm font-medium uppercase tracking-wide text-theme-muted">Keyboard Shortcuts</h3>
-					<div class="space-y-2 text-sm">
-						<div class="flex justify-between text-theme-secondary">
-							<span>New Chat</span>
-							<kbd class="rounded bg-theme-tertiary px-2 py-0.5 font-mono text-theme-muted">{modifierKey}+N</kbd>
-						</div>
-						<div class="flex justify-between text-theme-secondary">
-							<span>Search</span>
-							<kbd class="rounded bg-theme-tertiary px-2 py-0.5 font-mono text-theme-muted">{modifierKey}+K</kbd>
-						</div>
-						<div class="flex justify-between text-theme-secondary">
-							<span>Toggle Sidebar</span>
-							<kbd class="rounded bg-theme-tertiary px-2 py-0.5 font-mono text-theme-muted">{modifierKey}+B</kbd>
-						</div>
-						<div class="flex justify-between text-theme-secondary">
-							<span>Send Message</span>
-							<kbd class="rounded bg-theme-tertiary px-2 py-0.5 font-mono text-theme-muted">Enter</kbd>
-						</div>
-						<div class="flex justify-between text-theme-secondary">
-							<span>New Line</span>
-							<kbd class="rounded bg-theme-tertiary px-2 py-0.5 font-mono text-theme-muted">Shift+Enter</kbd>
-						</div>
-					</div>
-				</section>
-
-				<!-- About Section -->
-				<section>
-					<h3 class="mb-3 text-sm font-medium uppercase tracking-wide text-theme-muted">About</h3>
-					<div class="rounded-lg bg-theme-tertiary/50 p-4">
-						<p class="font-medium text-theme-secondary">Vessel</p>
-						<p class="mt-1 text-sm text-theme-muted">
-							A modern interface for local AI with chat, tools, and memory management.
-						</p>
-					</div>
-				</section>
-			</div>
-
-			<!-- Footer -->
-			<div class="flex justify-end gap-3 border-t border-theme px-6 py-4">
-				<button
-					type="button"
-					onclick={onClose}
-					class="rounded-lg px-4 py-2 text-sm font-medium text-theme-secondary hover:bg-theme-tertiary"
-				>
-					Cancel
-				</button>
-				<button
-					type="button"
-					onclick={handleSave}
-					class="rounded-lg bg-emerald-600 px-4 py-2 text-sm font-medium text-white hover:bg-emerald-500"
-				>
-					Save Changes
-				</button>
-			</div>
-		</div>
-	</div>
-{/if}

frontend/src/lib/components/shared/ShortcutsModal.svelte

@@ -61,9 +61,11 @@
 	<div
 		class="fixed inset-0 z-50 flex items-center justify-center bg-black/60 backdrop-blur-sm"
 		onclick={handleBackdropClick}
+		onkeydown={handleKeydown}
 		role="dialog"
 		aria-modal="true"
 		aria-labelledby="shortcuts-dialog-title"
+		tabindex="-1"
 	>
 		<!-- Dialog -->
 		<div class="mx-4 w-full max-w-md rounded-xl border border-theme bg-theme-primary shadow-2xl">

frontend/src/lib/components/shared/Skeleton.test.ts

@@ -0,0 +1,67 @@
+/**
+ * Skeleton component tests
+ *
+ * Tests the loading placeholder component
+ */
+
+import { describe, it, expect } from 'vitest';
+import { render, screen } from '@testing-library/svelte';
+import Skeleton from './Skeleton.svelte';
+
+describe('Skeleton', () => {
+	it('renders with default props', () => {
+		render(Skeleton);
+		const skeleton = screen.getByRole('status');
+		expect(skeleton).toBeDefined();
+		expect(skeleton.getAttribute('aria-label')).toBe('Loading...');
+	});
+
+	it('renders with custom width and height', () => {
+		render(Skeleton, { props: { width: '200px', height: '50px' } });
+		const skeleton = screen.getByRole('status');
+		expect(skeleton.style.width).toBe('200px');
+		expect(skeleton.style.height).toBe('50px');
+	});
+
+	it('renders circular variant', () => {
+		render(Skeleton, { props: { variant: 'circular' } });
+		const skeleton = screen.getByRole('status');
+		expect(skeleton.className).toContain('rounded-full');
+	});
+
+	it('renders rectangular variant', () => {
+		render(Skeleton, { props: { variant: 'rectangular' } });
+		const skeleton = screen.getByRole('status');
+		expect(skeleton.className).toContain('rounded-none');
+	});
+
+	it('renders rounded variant', () => {
+		render(Skeleton, { props: { variant: 'rounded' } });
+		const skeleton = screen.getByRole('status');
+		expect(skeleton.className).toContain('rounded-lg');
+	});
+
+	it('renders text variant by default', () => {
+		render(Skeleton, { props: { variant: 'text' } });
+		const skeleton = screen.getByRole('status');
+		expect(skeleton.className).toContain('rounded');
+	});
+
+	it('renders multiple lines for text variant', () => {
+		render(Skeleton, { props: { variant: 'text', lines: 3 } });
+		const skeletons = screen.getAllByRole('status');
+		expect(skeletons).toHaveLength(3);
+	});
+
+	it('applies custom class', () => {
+		render(Skeleton, { props: { class: 'my-custom-class' } });
+		const skeleton = screen.getByRole('status');
+		expect(skeleton.className).toContain('my-custom-class');
+	});
+
+	it('has animate-pulse class for loading effect', () => {
+		render(Skeleton);
+		const skeleton = screen.getByRole('status');
+		expect(skeleton.className).toContain('animate-pulse');
+	});
+});

frontend/src/lib/components/shared/SyncWarningBanner.svelte

@@ -0,0 +1,154 @@
+<script lang="ts">
+	/**
+	 * SyncWarningBanner.svelte - Warning banner for sync failures
+	 * Shows when backend is disconnected for >30 seconds continuously
+	 */
+	import { syncState } from '$lib/backend';
+	import { onMount } from 'svelte';
+
+	/** Threshold before showing banner (30 seconds) */
+	const FAILURE_THRESHOLD_MS = 30_000;
+
+	/** Track when failure started */
+	let failureStartTime = $state<number | null>(null);
+
+	/** Whether banner has been dismissed for this failure period */
+	let isDismissed = $state(false);
+
+	/** Whether enough time has passed to show banner */
+	let thresholdReached = $state(false);
+
+	/** Interval for checking threshold */
+	let checkInterval: ReturnType<typeof setInterval> | null = null;
+
+	/** Check if we're in a failure state */
+	let isInFailureState = $derived(
+		syncState.status === 'error' || syncState.status === 'offline' || !syncState.isOnline
+	);
+
+	/** Should show the banner */
+	let shouldShow = $derived(isInFailureState && thresholdReached && !isDismissed);
+
+	/** Watch for failure state changes */
+	$effect(() => {
+		if (isInFailureState) {
+			// Start tracking failure time if not already
+			if (failureStartTime === null) {
+				failureStartTime = Date.now();
+				isDismissed = false;
+				thresholdReached = false;
+
+				// Start interval to check threshold
+				if (checkInterval) clearInterval(checkInterval);
+				checkInterval = setInterval(() => {
+					if (failureStartTime && Date.now() - failureStartTime >= FAILURE_THRESHOLD_MS) {
+						thresholdReached = true;
+						if (checkInterval) {
+							clearInterval(checkInterval);
+							checkInterval = null;
+						}
+					}
+				}, 1000);
+			}
+		} else {
+			// Reset on recovery
+			failureStartTime = null;
+			isDismissed = false;
+			thresholdReached = false;
+			if (checkInterval) {
+				clearInterval(checkInterval);
+				checkInterval = null;
+			}
+		}
+	});
+
+	onMount(() => {
+		return () => {
+			if (checkInterval) {
+				clearInterval(checkInterval);
+			}
+		};
+	});
+
+	/** Dismiss the banner */
+	function handleDismiss() {
+		isDismissed = true;
+	}
+</script>
+
+{#if shouldShow}
+	<div
+		class="fixed left-0 right-0 top-12 z-50 flex items-center justify-center px-4 animate-in"
+		role="alert"
+	>
+		<div
+			class="flex items-center gap-3 rounded-lg border border-red-500/30 bg-red-500/10 px-4 py-2 text-red-400 shadow-lg backdrop-blur-sm"
+		>
+			<!-- Warning icon -->
+			<svg
+				xmlns="http://www.w3.org/2000/svg"
+				class="h-5 w-5 flex-shrink-0"
+				fill="none"
+				viewBox="0 0 24 24"
+				stroke="currentColor"
+				stroke-width="1.5"
+			>
+				<path
+					stroke-linecap="round"
+					stroke-linejoin="round"
+					d="M12 9v3.75m-9.303 3.376c-.866 1.5.217 3.374 1.948 3.374h14.71c1.73 0 2.813-1.874 1.948-3.374L13.949 3.378c-.866-1.5-3.032-1.5-3.898 0L2.697 16.126ZM12 15.75h.007v.008H12v-.008Z"
+				/>
+			</svg>
+
+			<!-- Message -->
+			<span class="text-sm font-medium">
+				Backend not connected. Your data is only stored in this browser.
+			</span>
+
+			<!-- Pending count if any -->
+			{#if syncState.pendingCount > 0}
+				<span
+					class="rounded-full bg-red-500/20 px-2 py-0.5 text-xs font-medium"
+				>
+					{syncState.pendingCount} pending
+				</span>
+			{/if}
+
+			<!-- Dismiss button -->
+			<button
+				type="button"
+				onclick={handleDismiss}
+				class="ml-1 flex-shrink-0 rounded p-0.5 opacity-70 transition-opacity hover:opacity-100"
+				aria-label="Dismiss sync warning"
+			>
+				<svg
+					xmlns="http://www.w3.org/2000/svg"
+					class="h-4 w-4"
+					fill="none"
+					viewBox="0 0 24 24"
+					stroke="currentColor"
+					stroke-width="2"
+				>
+					<path stroke-linecap="round" stroke-linejoin="round" d="M6 18 18 6M6 6l12 12" />
+				</svg>
+			</button>
+		</div>
+	</div>
+{/if}
+
+<style>
+	@keyframes slide-in-from-top {
+		from {
+			transform: translateY(-100%);
+			opacity: 0;
+		}
+		to {
+			transform: translateY(0);
+			opacity: 1;
+		}
+	}
+
+	.animate-in {
+		animation: slide-in-from-top 0.3s ease-out;
+	}
+</style>

frontend/src/lib/components/shared/index.ts

@@ -10,6 +10,5 @@ export { default as ToastContainer } from './ToastContainer.svelte';
 export { default as Skeleton } from './Skeleton.svelte';
 export { default as MessageSkeleton } from './MessageSkeleton.svelte';
 export { default as ErrorBoundary } from './ErrorBoundary.svelte';
-export { default as SettingsModal } from './SettingsModal.svelte';
 export { default as ShortcutsModal } from './ShortcutsModal.svelte';
 export { default as SearchModal } from './SearchModal.svelte';

frontend/src/lib/components/tools/ToolEditor.svelte

@@ -248,6 +248,7 @@ print(json.dumps(result))`;
 					type="button"
 					onclick={onClose}
 					class="rounded-lg p-1.5 text-theme-muted hover:bg-theme-tertiary hover:text-theme-primary"
+					aria-label="Close dialog"
 				>
 					<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor">
 						<path fill-rule="evenodd" d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z" clip-rule="evenodd" />
@@ -290,7 +291,7 @@ print(json.dumps(result))`;
 				<!-- Parameters -->
 				<div>
 					<div class="flex items-center justify-between">
-						<label class="block text-sm font-medium text-theme-secondary">Parameters</label>
+						<span class="block text-sm font-medium text-theme-secondary">Parameters</span>
 						<button
 							type="button"
 							onclick={addParameter}
@@ -335,6 +336,7 @@ print(json.dumps(result))`;
 										type="button"
 										onclick={() => removeParameter(index)}
 										class="text-theme-muted hover:text-red-400"
+										aria-label="Remove parameter"
 									>
 										<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor">
 											<path fill-rule="evenodd" d="M9 2a1 1 0 00-.894.553L7.382 4H4a1 1 0 000 2v10a2 2 0 002 2h8a2 2 0 002-2V6a1 1 0 100-2h-3.382l-.724-1.447A1 1 0 0011 2H9zM7 8a1 1 0 012 0v6a1 1 0 11-2 0V8zm5-1a1 1 0 00-1 1v6a1 1 0 102 0V8a1 1 0 00-1-1z" clip-rule="evenodd" />
@@ -352,8 +354,8 @@ print(json.dumps(result))`;
 				</div>
 
 				<!-- Implementation Type -->
-				<div>
-					<label class="block text-sm font-medium text-theme-secondary">Implementation</label>
+				<fieldset>
+					<legend class="block text-sm font-medium text-theme-secondary">Implementation</legend>
 					<div class="mt-2 flex flex-wrap gap-4">
 						<label class="flex items-center gap-2 text-theme-secondary">
 							<input
@@ -383,15 +385,15 @@ print(json.dumps(result))`;
 							HTTP Endpoint
 						</label>
 					</div>
-				</div>
+				</fieldset>
 
 				<!-- Code Editor (JavaScript or Python) -->
 				{#if implementation === 'javascript' || implementation === 'python'}
 					<div>
 						<div class="flex items-center justify-between mb-1">
-							<label class="block text-sm font-medium text-theme-secondary">
+							<span class="block text-sm font-medium text-theme-secondary">
 								{implementation === 'javascript' ? 'JavaScript' : 'Python'} Code
-							</label>
+							</span>
 							<div class="flex items-center gap-2">
 								<!-- Templates dropdown -->
 								<div class="relative">
@@ -500,8 +502,8 @@ print(json.dumps(result))`;
 								<p class="mt-1 text-sm text-red-400">{errors.endpoint}</p>
 							{/if}
 						</div>
-						<div>
-							<label class="block text-sm font-medium text-theme-secondary">HTTP Method</label>
+						<fieldset>
+							<legend class="block text-sm font-medium text-theme-secondary">HTTP Method</legend>
 							<div class="mt-2 flex gap-4">
 								<label class="flex items-center gap-2 text-theme-secondary">
 									<input type="radio" bind:group={httpMethod} value="GET" />
@@ -512,7 +514,30 @@ print(json.dumps(result))`;
 									POST
 								</label>
 							</div>
-						</div>
+						</fieldset>
+
+						<!-- Test button for HTTP -->
+						<button
+							type="button"
+							onclick={() => showTest = !showTest}
+							class="flex items-center gap-2 text-sm {showTest ? 'text-emerald-400' : 'text-theme-muted hover:text-theme-secondary'}"
+						>
+							<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" viewBox="0 0 20 20" fill="currentColor">
+								<path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zM9.555 7.168A1 1 0 008 8v4a1 1 0 001.555.832l3-2a1 1 0 000-1.664l-3-2z" clip-rule="evenodd" />
+							</svg>
+							{showTest ? 'Hide Test Panel' : 'Test Tool'}
+						</button>
+
+						<!-- Tool tester for HTTP -->
+						<ToolTester
+							{implementation}
+							code=""
+							{endpoint}
+							{httpMethod}
+							parameters={buildParameterSchema()}
+							isOpen={showTest}
+							onclose={() => showTest = false}
+						/>
 					</div>
 				{/if}
 
@@ -525,6 +550,7 @@ print(json.dumps(result))`;
 						class="relative inline-flex h-6 w-11 cursor-pointer rounded-full transition-colors {enabled ? 'bg-blue-600' : 'bg-theme-tertiary'}"
 						role="switch"
 						aria-checked={enabled}
+						aria-label="Enable tool"
 					>
 						<span
 							class="pointer-events-none inline-block h-5 w-5 transform rounded-full bg-white shadow transition {enabled ? 'translate-x-5' : 'translate-x-0'}"

frontend/src/lib/components/tools/ToolTester.svelte

@@ -10,11 +10,13 @@
 		implementation: ToolImplementation;
 		code: string;
 		parameters: JSONSchema;
+		endpoint?: string;
+		httpMethod?: 'GET' | 'POST';
 		isOpen?: boolean;
 		onclose?: () => void;
 	}
 
-	const { implementation, code, parameters, isOpen = false, onclose }: Props = $props();
+	const { implementation, code, parameters, endpoint = '', httpMethod = 'POST', isOpen = false, onclose }: Props = $props();
 
 	let testInput = $state('{}');
 	let testResult = $state<{ success: boolean; result?: unknown; error?: string } | null>(null);
@@ -116,8 +118,54 @@
 						error: error instanceof Error ? error.message : String(error)
 					};
 				}
+			} else if (implementation === 'http') {
+				// HTTP endpoint execution
+				if (!endpoint.trim()) {
+					testResult = { success: false, error: 'HTTP endpoint URL is required' };
+					isRunning = false;
+					return;
+				}
+
+				try {
+					const url = new URL(endpoint);
+					const options: RequestInit = {
+						method: httpMethod,
+						headers: {
+							'Content-Type': 'application/json'
+						}
+					};
+
+					if (httpMethod === 'GET') {
+						// Add args as query parameters
+						for (const [key, value] of Object.entries(args)) {
+							url.searchParams.set(key, String(value));
+						}
+					} else {
+						options.body = JSON.stringify(args);
+					}
+
+					const response = await fetch(url.toString(), options);
+
+					if (!response.ok) {
+						testResult = {
+							success: false,
+							error: `HTTP ${response.status}: ${response.statusText}`
+						};
+					} else {
+						const contentType = response.headers.get('content-type');
+						const result = contentType?.includes('application/json')
+							? await response.json()
+							: await response.text();
+						testResult = { success: true, result };
+					}
+				} catch (error) {
+					testResult = {
+						success: false,
+						error: error instanceof Error ? error.message : String(error)
+					};
+				}
 			} else {
-				testResult = { success: false, error: 'HTTP tools cannot be tested in the editor' };
+				testResult = { success: false, error: 'Unknown implementation type' };
 			}
 		} finally {
 			isRunning = false;
@@ -161,7 +209,7 @@
 		<div class="space-y-4">
 			<!-- Input -->
 			<div>
-				<label class="block text-xs font-medium text-theme-secondary mb-1">Input Arguments (JSON)</label>
+				<span class="block text-xs font-medium text-theme-secondary mb-1">Input Arguments (JSON)</span>
 				<CodeEditor bind:value={testInput} language="json" minHeight="80px" />
 			</div>
 
@@ -169,7 +217,7 @@
 			<button
 				type="button"
 				onclick={runTest}
-				disabled={isRunning || !code.trim()}
+				disabled={isRunning || (implementation === 'http' ? !endpoint.trim() : !code.trim())}
 				class="flex items-center gap-2 px-3 py-1.5 text-sm font-medium rounded-lg bg-emerald-600 text-white hover:bg-emerald-500 disabled:opacity-50 disabled:cursor-not-allowed"
 			>
 				{#if isRunning}
@@ -189,7 +237,7 @@
 			<!-- Result -->
 			{#if testResult}
 				<div>
-					<label class="block text-xs font-medium text-theme-secondary mb-1">Result</label>
+					<span class="block text-xs font-medium text-theme-secondary mb-1">Result</span>
 					<div
 						class="rounded-lg p-3 text-sm font-mono overflow-x-auto {testResult.success
 							? 'bg-emerald-900/30 border border-emerald-500/30'

frontend/src/lib/llm/client.test.ts

@@ -0,0 +1,225 @@
+/**
+ * Tests for Unified LLM Client
+ */
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+
+// Types matching the backend response
+interface ChatChunk {
+	model: string;
+	message?: {
+		role: string;
+		content: string;
+	};
+	done: boolean;
+	done_reason?: string;
+	total_duration?: number;
+	load_duration?: number;
+	prompt_eval_count?: number;
+	eval_count?: number;
+}
+
+interface Model {
+	name: string;
+	size: number;
+	digest: string;
+	modified_at: string;
+}
+
+describe('UnifiedLLMClient', () => {
+	let UnifiedLLMClient: typeof import('./client.js').UnifiedLLMClient;
+	let client: InstanceType<typeof UnifiedLLMClient>;
+
+	beforeEach(async () => {
+		vi.resetModules();
+
+		// Mock fetch
+		global.fetch = vi.fn();
+
+		const module = await import('./client.js');
+		UnifiedLLMClient = module.UnifiedLLMClient;
+		client = new UnifiedLLMClient();
+	});
+
+	afterEach(() => {
+		vi.restoreAllMocks();
+	});
+
+	describe('listModels', () => {
+		it('fetches models from unified API', async () => {
+			const mockModels: Model[] = [
+				{
+					name: 'llama3.2:8b',
+					size: 4500000000,
+					digest: 'abc123',
+					modified_at: '2024-01-15T10:00:00Z'
+				}
+			];
+
+			(global.fetch as ReturnType<typeof vi.fn>).mockResolvedValueOnce({
+				ok: true,
+				json: async () => ({ models: mockModels, backend: 'ollama' })
+			});
+
+			const result = await client.listModels();
+
+			expect(result.models).toEqual(mockModels);
+			expect(result.backend).toBe('ollama');
+			expect(global.fetch).toHaveBeenCalledWith(
+				expect.stringContaining('/api/v1/ai/models'),
+				expect.objectContaining({ method: 'GET' })
+			);
+		});
+
+		it('throws on API error', async () => {
+			(global.fetch as ReturnType<typeof vi.fn>).mockResolvedValueOnce({
+				ok: false,
+				status: 503,
+				statusText: 'Service Unavailable',
+				json: async () => ({ error: 'no active backend' })
+			});
+
+			await expect(client.listModels()).rejects.toThrow('no active backend');
+		});
+	});
+
+	describe('chat', () => {
+		it('sends chat request to unified API', async () => {
+			const mockResponse: ChatChunk = {
+				model: 'llama3.2:8b',
+				message: { role: 'assistant', content: 'Hello!' },
+				done: true,
+				total_duration: 1000000000,
+				eval_count: 10
+			};
+
+			(global.fetch as ReturnType<typeof vi.fn>).mockResolvedValueOnce({
+				ok: true,
+				json: async () => mockResponse
+			});
+
+			const result = await client.chat({
+				model: 'llama3.2:8b',
+				messages: [{ role: 'user', content: 'Hi' }]
+			});
+
+			expect(result.message?.content).toBe('Hello!');
+			expect(global.fetch).toHaveBeenCalledWith(
+				expect.stringContaining('/api/v1/ai/chat'),
+				expect.objectContaining({
+					method: 'POST',
+					body: expect.stringContaining('"model":"llama3.2:8b"')
+				})
+			);
+		});
+	});
+
+	describe('streamChat', () => {
+		it('streams chat responses as NDJSON', async () => {
+			const chunks: ChatChunk[] = [
+				{ model: 'llama3.2:8b', message: { role: 'assistant', content: 'Hello' }, done: false },
+				{ model: 'llama3.2:8b', message: { role: 'assistant', content: ' there' }, done: false },
+				{ model: 'llama3.2:8b', message: { role: 'assistant', content: '!' }, done: true }
+			];
+
+			// Create a mock readable stream
+			const mockBody = new ReadableStream({
+				start(controller) {
+					for (const chunk of chunks) {
+						controller.enqueue(new TextEncoder().encode(JSON.stringify(chunk) + '\n'));
+					}
+					controller.close();
+				}
+			});
+
+			(global.fetch as ReturnType<typeof vi.fn>).mockResolvedValueOnce({
+				ok: true,
+				body: mockBody
+			});
+
+			const receivedChunks: ChatChunk[] = [];
+			for await (const chunk of client.streamChat({
+				model: 'llama3.2:8b',
+				messages: [{ role: 'user', content: 'Hi' }]
+			})) {
+				receivedChunks.push(chunk);
+			}
+
+			expect(receivedChunks).toHaveLength(3);
+			expect(receivedChunks[0].message?.content).toBe('Hello');
+			expect(receivedChunks[2].done).toBe(true);
+		});
+
+		it('handles stream errors', async () => {
+			(global.fetch as ReturnType<typeof vi.fn>).mockResolvedValueOnce({
+				ok: false,
+				status: 500,
+				json: async () => ({ error: 'Internal Server Error' })
+			});
+
+			const generator = client.streamChat({
+				model: 'llama3.2:8b',
+				messages: [{ role: 'user', content: 'Hi' }]
+			});
+
+			await expect(generator.next()).rejects.toThrow('Internal Server Error');
+		});
+	});
+
+	describe('healthCheck', () => {
+		it('returns true when backend is healthy', async () => {
+			(global.fetch as ReturnType<typeof vi.fn>).mockResolvedValueOnce({
+				ok: true,
+				json: async () => ({ status: 'healthy' })
+			});
+
+			const result = await client.healthCheck('ollama');
+
+			expect(result).toBe(true);
+			expect(global.fetch).toHaveBeenCalledWith(
+				expect.stringContaining('/api/v1/ai/backends/ollama/health'),
+				expect.any(Object)
+			);
+		});
+
+		it('returns false when backend is unhealthy', async () => {
+			(global.fetch as ReturnType<typeof vi.fn>).mockResolvedValueOnce({
+				ok: false,
+				status: 503,
+				json: async () => ({ status: 'unhealthy', error: 'Connection refused' })
+			});
+
+			const result = await client.healthCheck('ollama');
+
+			expect(result).toBe(false);
+		});
+	});
+
+	describe('configuration', () => {
+		it('uses custom base URL', async () => {
+			const customClient = new UnifiedLLMClient({ baseUrl: 'http://custom:9090' });
+
+			(global.fetch as ReturnType<typeof vi.fn>).mockResolvedValueOnce({
+				ok: true,
+				json: async () => ({ models: [], backend: 'ollama' })
+			});
+
+			await customClient.listModels();
+
+			expect(global.fetch).toHaveBeenCalledWith(
+				'http://custom:9090/api/v1/ai/models',
+				expect.any(Object)
+			);
+		});
+
+		it('respects abort signal', async () => {
+			const controller = new AbortController();
+			controller.abort();
+
+			(global.fetch as ReturnType<typeof vi.fn>).mockRejectedValueOnce(
+				new DOMException('The user aborted a request.', 'AbortError')
+			);
+
+			await expect(client.listModels(controller.signal)).rejects.toThrow('aborted');
+		});
+	});
+});

frontend/src/lib/llm/client.ts

@@ -0,0 +1,340 @@
+/**
+ * Unified LLM Client
+ * Routes chat requests through the unified /api/v1/ai/* endpoints
+ * Supports Ollama, llama.cpp, and LM Studio backends transparently
+ */
+
+import type { BackendType } from '../stores/backends.svelte.js';
+
+/** Message format (compatible with Ollama and OpenAI) */
+export interface ChatMessage {
+	role: 'system' | 'user' | 'assistant' | 'tool';
+	content: string;
+	images?: string[];
+	tool_calls?: ToolCall[];
+}
+
+/** Tool call in assistant message */
+export interface ToolCall {
+	function: {
+		name: string;
+		arguments: Record<string, unknown>;
+	};
+}
+
+/** Tool definition */
+export interface ToolDefinition {
+	type: 'function';
+	function: {
+		name: string;
+		description: string;
+		parameters: {
+			type: 'object';
+			properties: Record<string, unknown>;
+			required?: string[];
+		};
+	};
+}
+
+/** Chat request options */
+export interface ChatRequest {
+	model: string;
+	messages: ChatMessage[];
+	stream?: boolean;
+	format?: 'json' | object;
+	tools?: ToolDefinition[];
+	options?: ModelOptions;
+	keep_alive?: string;
+}
+
+/** Model-specific options */
+export interface ModelOptions {
+	temperature?: number;
+	top_p?: number;
+	top_k?: number;
+	num_ctx?: number;
+	num_predict?: number;
+	stop?: string[];
+	seed?: number;
+}
+
+/** Chat response chunk (NDJSON streaming format) */
+export interface ChatChunk {
+	model: string;
+	message?: ChatMessage;
+	done: boolean;
+	done_reason?: string;
+	total_duration?: number;
+	load_duration?: number;
+	prompt_eval_count?: number;
+	prompt_eval_duration?: number;
+	eval_count?: number;
+	eval_duration?: number;
+	error?: string;
+}
+
+/** Model information */
+export interface Model {
+	name: string;
+	size: number;
+	digest: string;
+	modified_at: string;
+	details?: {
+		family?: string;
+		parameter_size?: string;
+		quantization_level?: string;
+	};
+}
+
+/** Models list response */
+export interface ModelsResponse {
+	models: Model[];
+	backend: string;
+}
+
+/** Client configuration */
+export interface UnifiedLLMClientConfig {
+	baseUrl?: string;
+	defaultTimeoutMs?: number;
+	fetchFn?: typeof fetch;
+}
+
+const DEFAULT_CONFIG = {
+	baseUrl: '',
+	defaultTimeoutMs: 120000
+};
+
+/**
+ * Unified LLM client that routes requests through the multi-backend API
+ */
+export class UnifiedLLMClient {
+	private readonly config: Required<Omit<UnifiedLLMClientConfig, 'fetchFn'>>;
+	private readonly fetchFn: typeof fetch;
+
+	constructor(config: UnifiedLLMClientConfig = {}) {
+		this.config = {
+			...DEFAULT_CONFIG,
+			...config
+		};
+		this.fetchFn = config.fetchFn ?? fetch;
+	}
+
+	/**
+	 * Lists models from the active backend
+	 */
+	async listModels(signal?: AbortSignal): Promise<ModelsResponse> {
+		return this.request<ModelsResponse>('/api/v1/ai/models', {
+			method: 'GET',
+			signal
+		});
+	}
+
+	/**
+	 * Non-streaming chat completion
+	 */
+	async chat(request: ChatRequest, signal?: AbortSignal): Promise<ChatChunk> {
+		return this.request<ChatChunk>('/api/v1/ai/chat', {
+			method: 'POST',
+			body: JSON.stringify({ ...request, stream: false }),
+			signal
+		});
+	}
+
+	/**
+	 * Streaming chat completion (async generator)
+	 * Yields NDJSON chunks as they arrive
+	 */
+	async *streamChat(
+		request: ChatRequest,
+		signal?: AbortSignal
+	): AsyncGenerator<ChatChunk, void, unknown> {
+		const url = `${this.config.baseUrl}/api/v1/ai/chat`;
+
+		const response = await this.fetchFn(url, {
+			method: 'POST',
+			headers: { 'Content-Type': 'application/json' },
+			body: JSON.stringify({ ...request, stream: true }),
+			signal
+		});
+
+		if (!response.ok) {
+			const errorData = await response.json().catch(() => ({}));
+			throw new Error(errorData.error || `HTTP ${response.status}: ${response.statusText}`);
+		}
+
+		if (!response.body) {
+			throw new Error('No response body for streaming');
+		}
+
+		const reader = response.body.getReader();
+		const decoder = new TextDecoder();
+		let buffer = '';
+
+		try {
+			while (true) {
+				const { done, value } = await reader.read();
+
+				if (done) break;
+
+				buffer += decoder.decode(value, { stream: true });
+
+				// Process complete NDJSON lines
+				let newlineIndex: number;
+				while ((newlineIndex = buffer.indexOf('\n')) !== -1) {
+					const line = buffer.slice(0, newlineIndex).trim();
+					buffer = buffer.slice(newlineIndex + 1);
+
+					if (!line) continue;
+
+					try {
+						const chunk = JSON.parse(line) as ChatChunk;
+
+						// Check for error in chunk
+						if (chunk.error) {
+							throw new Error(chunk.error);
+						}
+
+						yield chunk;
+
+						// Stop if done
+						if (chunk.done) {
+							return;
+						}
+					} catch (e) {
+						if (e instanceof SyntaxError) {
+							console.warn('[UnifiedLLM] Failed to parse chunk:', line);
+						} else {
+							throw e;
+						}
+					}
+				}
+			}
+		} finally {
+			reader.releaseLock();
+		}
+	}
+
+	/**
+	 * Streaming chat with callbacks (more ergonomic for UI)
+	 */
+	async streamChatWithCallbacks(
+		request: ChatRequest,
+		callbacks: {
+			onChunk?: (chunk: ChatChunk) => void;
+			onToken?: (token: string) => void;
+			onComplete?: (fullResponse: ChatChunk) => void;
+			onError?: (error: Error) => void;
+		},
+		signal?: AbortSignal
+	): Promise<string> {
+		let accumulatedContent = '';
+		let lastChunk: ChatChunk | null = null;
+
+		try {
+			for await (const chunk of this.streamChat(request, signal)) {
+				lastChunk = chunk;
+				callbacks.onChunk?.(chunk);
+
+				if (chunk.message?.content) {
+					accumulatedContent += chunk.message.content;
+					callbacks.onToken?.(chunk.message.content);
+				}
+
+				if (chunk.done && callbacks.onComplete) {
+					callbacks.onComplete(chunk);
+				}
+			}
+		} catch (error) {
+			if (callbacks.onError && error instanceof Error) {
+				callbacks.onError(error);
+			}
+			throw error;
+		}
+
+		return accumulatedContent;
+	}
+
+	/**
+	 * Check health of a specific backend
+	 */
+	async healthCheck(type: BackendType, signal?: AbortSignal): Promise<boolean> {
+		try {
+			await this.request<{ status: string }>(`/api/v1/ai/backends/${type}/health`, {
+				method: 'GET',
+				signal,
+				timeoutMs: 5000
+			});
+			return true;
+		} catch {
+			return false;
+		}
+	}
+
+	/**
+	 * Make an HTTP request to the unified API
+	 */
+	private async request<T>(
+		endpoint: string,
+		options: {
+			method: 'GET' | 'POST';
+			body?: string;
+			signal?: AbortSignal;
+			timeoutMs?: number;
+		}
+	): Promise<T> {
+		const { method, body, signal, timeoutMs = this.config.defaultTimeoutMs } = options;
+		const url = `${this.config.baseUrl}${endpoint}`;
+
+		// Create timeout controller
+		const controller = new AbortController();
+		const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
+
+		// Combine with external signal
+		const combinedSignal = signal ? this.combineSignals(signal, controller.signal) : controller.signal;
+
+		try {
+			const response = await this.fetchFn(url, {
+				method,
+				headers: body ? { 'Content-Type': 'application/json' } : undefined,
+				body,
+				signal: combinedSignal
+			});
+
+			clearTimeout(timeoutId);
+
+			if (!response.ok) {
+				const errorData = await response.json().catch(() => ({}));
+				throw new Error(errorData.error || `HTTP ${response.status}: ${response.statusText}`);
+			}
+
+			return (await response.json()) as T;
+		} catch (error) {
+			clearTimeout(timeoutId);
+			throw error;
+		}
+	}
+
+	/**
+	 * Combines multiple AbortSignals into one
+	 */
+	private combineSignals(...signals: AbortSignal[]): AbortSignal {
+		const controller = new AbortController();
+
+		for (const signal of signals) {
+			if (signal.aborted) {
+				controller.abort(signal.reason);
+				break;
+			}
+
+			signal.addEventListener('abort', () => controller.abort(signal.reason), {
+				once: true,
+				signal: controller.signal
+			});
+		}
+
+		return controller.signal;
+	}
+}
+
+/** Default client instance */
+export const unifiedLLMClient = new UnifiedLLMClient();

frontend/src/lib/llm/index.ts

@@ -0,0 +1,15 @@
+/**
+ * Unified LLM Client exports
+ */
+export { UnifiedLLMClient, unifiedLLMClient } from './client.js';
+export type {
+	ChatMessage,
+	ChatRequest,
+	ChatChunk,
+	Model,
+	ModelsResponse,
+	ModelOptions,
+	ToolCall,
+	ToolDefinition,
+	UnifiedLLMClientConfig
+} from './client.js';

frontend/src/lib/memory/chunker.test.ts

@@ -0,0 +1,243 @@
+/**
+ * Chunker tests
+ *
+ * Tests the text chunking utilities for RAG
+ */
+
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import {
+	chunkText,
+	splitByParagraphs,
+	splitBySentences,
+	estimateChunkTokens,
+	mergeSmallChunks
+} from './chunker';
+import type { DocumentChunk } from './types';
+
+// Mock crypto.randomUUID for deterministic tests
+let uuidCounter = 0;
+beforeEach(() => {
+	uuidCounter = 0;
+	vi.spyOn(crypto, 'randomUUID').mockImplementation(() => `00000000-0000-0000-0000-00000000000${++uuidCounter}` as `${string}-${string}-${string}-${string}-${string}`);
+});
+
+afterEach(() => {
+	vi.restoreAllMocks();
+});
+
+describe('splitByParagraphs', () => {
+	it('splits text by double newlines', () => {
+		const text = 'First paragraph.\n\nSecond paragraph.\n\nThird paragraph.';
+		const result = splitByParagraphs(text);
+
+		expect(result).toEqual([
+			'First paragraph.',
+			'Second paragraph.',
+			'Third paragraph.'
+		]);
+	});
+
+	it('handles extra whitespace between paragraphs', () => {
+		const text = 'First.\n\n\n\nSecond.\n  \n  \nThird.';
+		const result = splitByParagraphs(text);
+
+		expect(result).toEqual(['First.', 'Second.', 'Third.']);
+	});
+
+	it('returns empty array for empty input', () => {
+		expect(splitByParagraphs('')).toEqual([]);
+		expect(splitByParagraphs('   ')).toEqual([]);
+	});
+
+	it('returns single element for text without paragraph breaks', () => {
+		const text = 'Single paragraph with no breaks.';
+		const result = splitByParagraphs(text);
+
+		expect(result).toEqual(['Single paragraph with no breaks.']);
+	});
+});
+
+describe('splitBySentences', () => {
+	it('splits by periods', () => {
+		const text = 'First sentence. Second sentence. Third sentence.';
+		const result = splitBySentences(text);
+
+		expect(result).toEqual([
+			'First sentence.',
+			'Second sentence.',
+			'Third sentence.'
+		]);
+	});
+
+	it('splits by exclamation marks', () => {
+		const text = 'Wow! That is amazing! Really!';
+		const result = splitBySentences(text);
+
+		expect(result).toEqual(['Wow!', 'That is amazing!', 'Really!']);
+	});
+
+	it('splits by question marks', () => {
+		const text = 'Is this working? Are you sure? Yes.';
+		const result = splitBySentences(text);
+
+		expect(result).toEqual(['Is this working?', 'Are you sure?', 'Yes.']);
+	});
+
+	it('handles mixed punctuation', () => {
+		const text = 'Hello. How are you? Great! Thanks.';
+		const result = splitBySentences(text);
+
+		expect(result).toEqual(['Hello.', 'How are you?', 'Great!', 'Thanks.']);
+	});
+
+	it('returns empty array for empty input', () => {
+		expect(splitBySentences('')).toEqual([]);
+	});
+});
+
+describe('estimateChunkTokens', () => {
+	it('estimates roughly 4 characters per token', () => {
+		// 100 characters should be ~25 tokens
+		const text = 'a'.repeat(100);
+		expect(estimateChunkTokens(text)).toBe(25);
+	});
+
+	it('rounds up for partial tokens', () => {
+		// 10 characters = 2.5 tokens, rounds to 3
+		const text = 'a'.repeat(10);
+		expect(estimateChunkTokens(text)).toBe(3);
+	});
+
+	it('returns 0 for empty string', () => {
+		expect(estimateChunkTokens('')).toBe(0);
+	});
+});
+
+describe('chunkText', () => {
+	const DOC_ID = 'test-doc';
+
+	it('returns empty array for empty text', () => {
+		expect(chunkText('', DOC_ID)).toEqual([]);
+	});
+
+	it('returns single chunk for short text', () => {
+		const text = 'Short text that fits in one chunk.';
+		const result = chunkText(text, DOC_ID, { chunkSize: 512 });
+
+		expect(result).toHaveLength(1);
+		expect(result[0].content).toBe(text);
+		expect(result[0].documentId).toBe(DOC_ID);
+		expect(result[0].startIndex).toBe(0);
+		expect(result[0].endIndex).toBe(text.length);
+	});
+
+	it('splits long text into multiple chunks', () => {
+		// Create text longer than chunk size
+		const text = 'This is sentence one. '.repeat(50);
+		const result = chunkText(text, DOC_ID, { chunkSize: 200, overlap: 20 });
+
+		expect(result.length).toBeGreaterThan(1);
+
+		// Each chunk should be roughly chunk size (allowing for break points)
+		for (const chunk of result) {
+			expect(chunk.content.length).toBeLessThanOrEqual(250); // Some flexibility for break points
+			expect(chunk.documentId).toBe(DOC_ID);
+		}
+	});
+
+	it('respects sentence boundaries when enabled', () => {
+		const text = 'First sentence here. Second sentence here. Third sentence here. Fourth sentence here.';
+		const result = chunkText(text, DOC_ID, {
+			chunkSize: 50,
+			overlap: 10,
+			respectSentences: true
+		});
+
+		// Chunks should not split mid-sentence
+		for (const chunk of result) {
+			// Each chunk should end with punctuation or be the last chunk
+			const endsWithPunctuation = /[.!?]$/.test(chunk.content);
+			const isLastChunk = chunk === result[result.length - 1];
+			expect(endsWithPunctuation || isLastChunk).toBe(true);
+		}
+	});
+
+	it('creates chunks with correct indices', () => {
+		const text = 'A'.repeat(100) + ' ' + 'B'.repeat(100);
+		const result = chunkText(text, DOC_ID, { chunkSize: 100, overlap: 10 });
+
+		// Verify indices are valid
+		for (const chunk of result) {
+			expect(chunk.startIndex).toBeGreaterThanOrEqual(0);
+			expect(chunk.endIndex).toBeLessThanOrEqual(text.length);
+			expect(chunk.startIndex).toBeLessThan(chunk.endIndex);
+		}
+	});
+
+	it('generates unique IDs for each chunk', () => {
+		const text = 'Sentence one. Sentence two. Sentence three. Sentence four. Sentence five.';
+		const result = chunkText(text, DOC_ID, { chunkSize: 30, overlap: 5 });
+
+		const ids = result.map(c => c.id);
+		const uniqueIds = new Set(ids);
+
+		expect(uniqueIds.size).toBe(ids.length);
+	});
+});
+
+describe('mergeSmallChunks', () => {
+	function makeChunk(content: string, startIndex: number = 0): DocumentChunk {
+		return {
+			id: `chunk-${content.slice(0, 10)}`,
+			documentId: 'doc-1',
+			content,
+			startIndex,
+			endIndex: startIndex + content.length
+		};
+	}
+
+	it('returns empty array for empty input', () => {
+		expect(mergeSmallChunks([])).toEqual([]);
+	});
+
+	it('returns single chunk unchanged', () => {
+		const chunks = [makeChunk('Single chunk content.')];
+		const result = mergeSmallChunks(chunks);
+
+		expect(result).toHaveLength(1);
+		expect(result[0].content).toBe('Single chunk content.');
+	});
+
+	it('merges adjacent small chunks', () => {
+		const chunks = [
+			makeChunk('Small.', 0),
+			makeChunk('Also small.', 10)
+		];
+		const result = mergeSmallChunks(chunks, 200);
+
+		expect(result).toHaveLength(1);
+		expect(result[0].content).toBe('Small.\n\nAlso small.');
+	});
+
+	it('does not merge chunks that exceed minSize together', () => {
+		const chunks = [
+			makeChunk('A'.repeat(100), 0),
+			makeChunk('B'.repeat(100), 100)
+		];
+		const result = mergeSmallChunks(chunks, 150);
+
+		expect(result).toHaveLength(2);
+	});
+
+	it('preserves startIndex from first chunk and endIndex from last when merging', () => {
+		const chunks = [
+			makeChunk('First chunk.', 0),
+			makeChunk('Second chunk.', 15)
+		];
+		const result = mergeSmallChunks(chunks, 200);
+
+		expect(result).toHaveLength(1);
+		expect(result[0].startIndex).toBe(0);
+		expect(result[0].endIndex).toBe(15 + 'Second chunk.'.length);
+	});
+});