Add artifacts table migration

Generated with aerich against a fresh Postgres after applying 1-16.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

.env.example

@@ -10,6 +10,12 @@ POSTGRES_DB=raggr
 # JWT Configuration
 JWT_SECRET_KEY=your-secret-key-here
 
+# Metrics Configuration
+# Bearer token for the /metrics endpoint (Prometheus scrape + app token gate).
+# Generate with: openssl rand -hex 32
+# Leave empty to keep /metrics returning 403 (fail-closed).
+METRICS_TOKEN=
+
 # Paperless Configuration
 PAPERLESS_TOKEN=your-paperless-token
 BASE_URL=192.168.1.5:8000
@@ -18,6 +24,13 @@ BASE_URL=192.168.1.5:8000
 # If set, uses llama-server as the primary LLM backend with OpenAI as fallback
 LLAMA_SERVER_URL=http://192.168.1.213:8080/v1
 LLAMA_MODEL_NAME=llama-3.1-8b-instruct
+TTFT_TIMEOUT_SECONDS=30
+
+# Embedding Server Configuration
+# If set, uses a custom OpenAI-compatible embedding server (e.g. llama-server)
+# Falls back to OpenAI embeddings if not set
+EMBEDDING_SERVER_URL=http://192.168.1.7:8086/v1
+EMBEDDING_MODEL_NAME=all-minilm
 
 # OpenAI Configuration
 OPENAI_API_KEY=your-openai-api-key
@@ -87,9 +100,61 @@ EMAIL_HMAC_SECRET=
 # Set to false to disable Mailgun signature validation in development
 MAILGUN_SIGNATURE_VALIDATION=true
 
+# SendBlue Configuration (iMessage)
+SENDBLUE_API_KEY=your-sendblue-api-key
+SENDBLUE_API_SECRET=your-sendblue-api-secret
+SENDBLUE_FROM_NUMBER=+1XXXXXXXXXX
+SENDBLUE_WEBHOOK_SECRET=your-sendblue-webhook-secret
+# Set to false to disable SendBlue signature validation in development
+SENDBLUE_SIGNATURE_VALIDATION=true
+# Comma-separated list of iMessage numbers allowed to use the service (E.164 format)
+# Use * to allow any number
+ALLOWED_IMESSAGE_NUMBERS=
+# Rate limiting: max messages per window (default: 10 messages per 60 seconds)
+# IMESSAGE_RATE_LIMIT_MAX=10
+# IMESSAGE_RATE_LIMIT_WINDOW=60
+
+# Google Calendar + Gmail Configuration (Python SDK)
+# Run scripts/google_auth.py to generate token.json from your OAuth2 credentials:
+#   python scripts/google_auth.py --credentials credentials.json --token token.json
+# Then mount token.json into the container (see docker-compose.yml).
+# If GOOGLE_TOKEN_FILE points to a valid token, both Calendar and Gmail are enabled.
+GOOGLE_TOKEN_FILE=/app/config/google-token.json
+
+# Cronicle Integration
+# Shared secret for Cronicle to authenticate cron job trigger requests.
+# Generate with: openssl rand -hex 32
+CRON_SECRET=
+# Cronicle server URL and API key (from Cronicle Admin → API Keys)
+# Used to auto-register scheduled jobs on startup.
+CRONICLE_URL=http://cronicle:3012
+CRONICLE_API_KEY=
+
+# SimbaKit / PetKit Configuration
+# PetKit account credentials (used by SimbaKit to poll device data)
+PETKIT_USERNAME=your-petkit-email
+PETKIT_PASSWORD=your-petkit-password
+PETKIT_REGION=US
+PETKIT_TIMEZONE=America/New_York
+# Internal URL for SimbaKit service (Docker network)
+SIMBAKIT_URL=http://simbakit:8585
+
+# Homebox inventory (admin-only agent tools via homebox-mcp, needs Homebox >= 0.26)
+# API key from Homebox Profile -> API Keys (starts with hb_). Leave empty to disable.
+HOMEBOX_URL=https://homebox.example.com
+HOMEBOX_TOKEN=
+
+# BookStack wiki (admin-only agent tools via bookstack-mcp: read, create, update; no deletes)
+# API token from BookStack Profile -> API Tokens (user needs the "Access System API" permission).
+# Leave empty to disable.
+BOOKSTACK_BASE_URL=https://bookstack.example.com
+BOOKSTACK_TOKEN_ID=
+BOOKSTACK_TOKEN_SECRET=
+
 # Obsidian Configuration (headless sync)
-# Auth token from Obsidian account (Settings → Account → API token)
-OBSIDIAN_AUTH_TOKEN=your-obsidian-auth-token
+# Obsidian account credentials (used for `ob login` on container startup)
+OBSIDIAN_EMAIL=your-obsidian-email
+OBSIDIAN_PASSWORD=your-obsidian-password
 # Vault ID to sync (found in Obsidian sync settings)
 OBSIDIAN_VAULT_ID=your-vault-id
 # End-to-end encryption password (if vault uses E2E encryption)
@@ -100,3 +165,11 @@ OBSIDIAN_DEVICE_NAME=simbarag
 OBSIDIAN_CONTINUOUS_SYNC=false
 # Local path to Obsidian vault (where files are synced)
 OBSIDIAN_VAULT_PATH=/app/data/obsidian
+
+# LangGraph checkpoint store (SQLite). Must be on a persistent volume.
+# Both blue and green containers share this volume via docker-compose.
+CHECKPOINT_DB_PATH=/app/checkpoints/checkpoints.db
+
+# Beli restaurant recommendations
+# Beli account credentials for each profile are stored encrypted in the database.
+# No additional env vars needed — auth is done via the Beli API at login time.

.gitignore

@@ -11,6 +11,8 @@ wheels/
 
 # Environment files
 .env
+credentials.json
+token.json
 
 # Database files
 database/

CLAUDE.md

@@ -4,33 +4,39 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 
 ## Project Overview
 
-SimbaRAG is a RAG (Retrieval-Augmented Generation) conversational AI system for querying information about Simba (a cat). It ingests documents from Paperless-NGX, stores embeddings in PostgreSQL via pgvector, and uses LLMs (Ollama or OpenAI) to answer questions.
+SimbaRAG is a RAG (Retrieval-Augmented Generation) conversational AI system for querying information about Simba (a cat) and the household. It ingests documents from Paperless-NGX, Obsidian, and Immich, stores embeddings in PostgreSQL via pgvector (Chroma client), uses LLMs (Ollama or OpenAI) to answer questions with a tool-using LangChain agent, and exposes chat over web, iMessage, and WhatsApp.
 
 ## Commands
 
 ### Development
 
 ```bash
-# Start environment
-docker compose up --build
+# Start environment (raggr runs as raggr-blue/raggr-green behind compose profiles)
+docker compose --profile blue up --build
 
-# View logs
-docker compose logs -f raggr
+# View logs (Makefile resolves the active color)
+make logs
+
+# Reindex vector store (all sources / Obsidian only)
+make reindex
+make reindex-obsidian
 ```
 
 ### Database Migrations (Aerich/Tortoise ORM)
 
 ```bash
 # Generate migration (must run in Docker with DB access)
-docker compose exec raggr aerich migrate --name describe_change
+make migrate-new
 
 # Apply migrations (auto-runs on startup, manual if needed)
-docker compose exec raggr aerich upgrade
+make migrate
 
 # View migration history
-docker compose exec raggr aerich history
+make migrate-history
 ```
 
+Migrations must be backward-compatible: blue-green deploys run `aerich upgrade` in the new container while the old code still serves.
+
 ### Frontend
 
 ```bash
@@ -42,9 +48,10 @@ yarn dev        # Dev server (rarely needed, backend serves frontend)
 
 ### Production
 
+Zero-downtime blue-green deploy: `raggr-blue` (port 8080) and `raggr-green` (port 8081) alternate behind Caddy health checks. See `docs/deployment.md`.
+
 ```bash
-docker compose build raggr
-docker compose up -d
+make redeploy    # git pull + scripts/deploy.sh (build new color, wait healthy, stop old)
 ```
 
 ## Architecture
@@ -53,9 +60,11 @@ docker compose up -d
 ┌─────────────────────────────────────────────────────────────┐
 │                     Docker Compose                          │
 ├─────────────────────────────────────────────────────────────┤
-│  raggr (port 8080)              │  postgres (port 5432)    │
+│  raggr-blue/green (8080/8081)   │  postgres (port 5432)    │
 │  ├── Quart backend              │  PostgreSQL 16 + pgvector│
-│  └── React frontend (served)    │                          │
+│  ├── React frontend (served)    │                          │
+│  └── Twilio webhooks (iMessage/ │                          │
+│      WhatsApp)                  │                          │
 └─────────────────────────────────────────────────────────────┘
 ```
 
@@ -63,33 +72,52 @@ docker compose up -d
 - `app.py` - Quart application entry, serves API and static frontend
 - `main.py` - RAG logic, document indexing, LLM interaction, LangChain agent
 - `llm.py` - LLM client with Ollama primary, OpenAI fallback
-- `aerich_config.py` - Database migration configuration
 - `blueprints/` - API routes organized as Quart blueprints
   - `users/` - OIDC auth, JWT tokens, RBAC with LDAP groups
-  - `conversation/` - Chat conversations and message history
-  - `rag/` - Document indexing endpoints (admin-only)
+  - `conversation/` - Chat conversations, message history, streamed answers
+  - `rag/` - Document indexing endpoints (admin-only); logic in `rag/logic.py`
+  - `email/` - Email integration (Mailgun webhooks, Fernet encryption, IMAP, parsing)
+  - `imessage/` - Twilio webhook receiver for iMessage (HMAC-validated, number allowlist)
+  - `whatsapp/` - Twilio webhook receiver for WhatsApp (TWIML replies, SendBlue send support)
+  - `scheduled_messages/` - Scheduled message delivery with background scheduler
 - `config/` - Configuration modules
+  - `db.py` - Database setup
   - `oidc_config.py` - OIDC authentication configuration
-- `utils/` - Reusable utilities
+- `utils/` - Reusable utilities and household integrations
   - `chunker.py` - Document chunking for embeddings
   - `cleaner.py` - PDF cleaning and summarization
   - `image_process.py` - Image description with LLM
   - `request.py` - Paperless-NGX API client
+  - `obsidian_service.py`, `mealie_service.py`, `ynab_service.py`, `s3_client.py`, `simbakit_service.py` - integrations with Obsidian notes, Mealie recipes, YNAB budgets, S3, and SimbaKit
+  - `homebox_mcp.py` - Homebox inventory tools via the `homebox-mcp` stdio MCP server; admin-only (compiled into `app.admin_agent`, picked per user by `get_agent_for`)
+  - `bookstack_mcp.py` - BookStack wiki tools (read/create/update, no deletes) via the `bookstack-mcp` npm stdio server; admin-only like Homebox
+  - `mcp_tools.py` - shared allowlist + admin-gate wrapping for stdio MCP integrations
 - `scripts/` - Administrative and utility scripts
   - `add_user.py` - Create users manually
   - `user_message_stats.py` - User message statistics
-  - `manage_vectorstore.py` - Vector store management CLI
-  - `inspect_vector_store.py` - Inspect ChromaDB contents
-  - `query.py` - Query generation utilities
+  - `manage_vectorstore.py` / `inspect_vector_store.py` - Vector store CLI
+  - `index_immich.py` - Index Immich photos into the vector store
+  - `link_imessage.py` - Link iMessage contacts to users
+  - `deploy.sh` - Blue-green deployment script
 - `migrations/` - Database migration files
+- `tests/` - pytest test suite (`tests/unit/` covers email/crypto, YNAB, Obsidian, SimbaKit, rate limiting, user model)
+
+**simbakit/** (standalone subproject):
+- Self-hosted PetKit device poller + web dashboard for Simba's smart devices (feeder, litter box, fountain, purifier)
+- Own `pyproject.toml`, `uv.lock`, and Dockerfile; Python 3.14 + uv
+- Polls PetKit cloud API every 2 min into SQLite; Chart.js dashboard; docs in `simbakit/docs/`
+- Queried from the main app via `utils/simbakit_service.py`
 
 **Frontend** (`raggr-frontend/`):
 - React 19 with Rsbuild bundler
 - Tailwind CSS for styling
 - Built to `dist/`, served by backend at `/`
+- Key components: `ChatScreen`, `ConversationsPage`, `LoginScreen`, `AdminPanel`, `ScheduledMessagesPanel`, `ToolBubble` (agent tool-call display)
 
 **Auth Flow**: LLDAP → Authelia (OIDC) → Backend JWT → Frontend localStorage
 
+**Data Sources**: Paperless-NGX documents, Obsidian vault, Immich photos (indexed via `scripts/index_immich.py` / `make reindex`)
+
 ## Testing
 
 Always run `make test` before pushing code to ensure all tests pass.
@@ -99,12 +127,23 @@ make test       # Run tests
 make test-cov   # Run tests with coverage
 ```
 
+Note: `make test` may fail locally (no pytest on PATH); use `.venv/bin/pytest tests/ -q` instead.
+
+## Git Workflow
+
+- The host runs **Gitea** (`git.torrtle.co`), not GitHub, despite the remote name. Use the **`tea` CLI** for PRs (Gitea flavor: `tea pr create`, `tea pr list`, etc. — no `tea create`).
+- Typical flow: commit locally, `git push -u origin <branch>`, then `tea pr create -t "title" -d "body"`.
+- "kermit" is the user's slang for **commit** (e.g. "kermit and push" = commit and push). There is no kermit tool.
+- Keep one logical change per branch/PR; don't ride along on stale feature branches.
+- Don't commit `.DS_Store`, `chroma_db/`, `chromadb/`, `.planning/` (local artifacts).
+
 ## Key Patterns
 
 - All endpoints are async (`async def`)
 - Use `@jwt_refresh_token_required` for authenticated endpoints
 - Use `@admin_required` for admin-only endpoints (checks `lldap_admin` group)
 - Tortoise ORM models in `blueprints/*/models.py`
+- External integrations are service classes in `utils/*_service.py`
 - Frontend API services in `raggr-frontend/src/api/`
 
 ## Environment Variables
@@ -112,6 +151,15 @@ make test-cov   # Run tests with coverage
 See `.env.example`. Key ones:
 - `DATABASE_URL` - PostgreSQL connection
 - `OIDC_*` - Authelia OIDC configuration
-- `OLLAMA_URL` - Local LLM server
-- `OPENAI_API_KEY` - Fallback LLM
+- `LLAMA_SERVER_URL` / `LLAMA_MODEL_NAME` - Local Llama/Ollama LLM server
+- `EMBEDDING_SERVER_URL` / `EMBEDDING_MODEL_NAME` - Embedding model
+- `OPENAI_API_KEY` - Fallback LLM; `TAVILY_API_KEY` - web search tool
 - `PAPERLESS_TOKEN` / `BASE_URL` - Document source
+- `TWILIO_*`, `ALLOWED_IMESSAGE_NUMBERS`, `ALLOWED_WHATSAPP_NUMBERS` - iMessage/WhatsApp webhooks
+- `MAILGUN_*`, `EMAIL_HMAC_SECRET`, `FERNET_KEY` - email integration
+- `SENDBLUE_*` - SMS sending for scheduled messages
+- `YNAB_*`, `MEALIE_*`, `OBSIDIAN_*`, `IMMICH_*`, `SIMBAKIT_URL`, `HOMEBOX_URL`/`HOMEBOX_TOKEN`, `BOOKSTACK_BASE_URL`/`BOOKSTACK_TOKEN_ID`/`BOOKSTACK_TOKEN_SECRET` - household integrations
+
+## Documentation
+
+Project docs live in `docs/` (mkdocs): `deployment.md`, `development.md`, `authentication.md`, `MIGRATIONS.md`, `VECTORSTORE.md`, `TASKS.md`, `ynab_integration/`.

Dockerfile

@@ -8,13 +8,19 @@ RUN apt-get update && apt-get install -y \
     curl \
     && curl -fsSL https://deb.nodesource.com/setup_22.x | bash - \
     && apt-get install -y nodejs \
-    && npm install -g yarn obsidian-headless \
+    && npm install -g yarn obsidian-headless @googleworkspace/cli \
     && rm -rf /var/lib/apt/lists/* \
     && curl -LsSf https://astral.sh/uv/install.sh | sh
 
 # Add uv to PATH
 ENV PATH="/root/.local/bin:$PATH"
 
+# Homebox MCP server (stdio), pinned so the tool surface can't drift
+RUN uv tool install homebox-mcp==1.1.0
+
+# BookStack MCP server (stdio), pinned for the same reason
+RUN npm install -g bookstack-mcp@5.6.0
+
 # Copy dependency files
 COPY pyproject.toml ./
 

Makefile

@@ -1,36 +1,64 @@
-.PHONY: deploy redeploy build up down restart logs migrate migrate-new frontend test
+.PHONY: deploy redeploy build up down restart logs migrate migrate-new migrate-history frontend desktop desktop-dev test test-cov reindex reindex-obsidian
+
+# Blue-green: detect the running color (default blue when nothing is running)
+ACTIVE_COLOR := $(shell docker compose ps --status running --services 2>/dev/null | grep -oE 'raggr-(blue|green)' | head -1 | cut -d- -f2)
+ifeq ($(ACTIVE_COLOR),)
+ACTIVE_COLOR := blue
+endif
+RAGGR := raggr-$(ACTIVE_COLOR)
+# Both profiles enabled for commands that only touch existing containers
+# (never use this with `up`, which would start both colors)
+COMPOSE := docker compose --profile blue --profile green
 
 # Build and deploy
 deploy: build up
 
+# Zero-downtime blue-green swap (see scripts/deploy.sh)
 redeploy:
-	git pull && $(MAKE) down && $(MAKE) up
+	git pull && ./scripts/deploy.sh
 
 build:
-	docker compose build raggr
+	docker compose --profile $(ACTIVE_COLOR) build $(RAGGR)
 
 up:
-	docker compose up -d
+	docker compose --profile $(ACTIVE_COLOR) up -d
 
 down:
-	docker compose down
+	$(COMPOSE) down
 
 restart:
-	docker compose restart raggr
+	$(COMPOSE) restart $(RAGGR)
 
 logs:
-	docker compose logs -f raggr
+	$(COMPOSE) logs -f $(RAGGR)
+
+# Vector store reindexing
+reindex:
+	$(COMPOSE) exec $(RAGGR) python -c "\
+		import asyncio; \
+		from blueprints.rag.logic import delete_all_documents, index_documents, index_obsidian_documents; \
+		delete_all_documents(); \
+		asyncio.run(index_documents()); \
+		asyncio.run(index_obsidian_documents()); \
+		print('Reindex complete')"
+
+reindex-obsidian:
+	$(COMPOSE) exec $(RAGGR) python -c "\
+		import asyncio; \
+		from blueprints.rag.logic import delete_documents_by_metadata, index_obsidian_documents; \
+		delete_documents_by_metadata('source', 'obsidian'); \
+		asyncio.run(index_obsidian_documents()); \
+		print('Obsidian reindex complete')"
 
 # Database migrations
 migrate:
-	docker compose exec raggr aerich upgrade
+	$(COMPOSE) exec $(RAGGR) aerich upgrade
 
 migrate-new:
-	@read -p "Migration name: " name; \
-	docker compose exec raggr aerich migrate --name $$name
+	@./scripts/migrate-new.sh
 
 migrate-history:
-	docker compose exec raggr aerich history
+	$(COMPOSE) exec $(RAGGR) aerich history
 
 # Tests
 test:
@@ -42,3 +70,14 @@ test-cov:
 # Frontend
 frontend:
 	cd raggr-frontend && yarn install && yarn build
+
+# Desktop app (Tauri). Point it at the server with SIMBA_URL, e.g.
+#   make desktop-dev SIMBA_URL=https://simba.example.com
+# SIMBA_URL is read at runtime and baked in at build time as the default.
+desktop-dev:
+	cd desktop && npm install && SIMBA_URL=$(SIMBA_URL) npx tauri dev
+
+desktop:
+	cd desktop && npm install && SIMBA_URL=$(SIMBA_URL) npx tauri build --bundles app
+	rm -rf /Applications/Simba.app
+	cp -R desktop/src-tauri/target/release/bundle/macos/Simba.app /Applications/

README.md

@@ -127,8 +127,8 @@ cp .env.example .env
 # Development (local PostgreSQL only)
 docker compose -f docker-compose.dev.yml up -d
 
-# Or full Docker deployment
-docker compose up -d
+# Or full Docker deployment (app runs as raggr-blue; see docs/deployment.md)
+docker compose --profile blue up -d
 ```
 
 4. **Access the application**

STREAMING_IMPLEMENTATION.md

@@ -0,0 +1,79 @@
+# Streaming Implementation Summary
+
+## Overview
+The `/stream-query` endpoint uses Server-Sent Events (SSE) to give real-time feedback
+during AI query processing: tool-execution status **and** token-by-token streaming of the
+assistant's answer.
+
+## Backend (`blueprints/conversation/__init__.py`)
+
+### `POST /api/conversation/stream-query`
+Streams SSE frames (`data: {json}\n\n`) by iterating `main_agent.astream_events(..., version="v2")`.
+Event types emitted to the client:
+
+- `tool_start` — a tool began (`{ "type": "tool_start", "tool": <name> }`), from `on_tool_start`.
+- `tool_end` — a tool finished, from `on_tool_end`.
+- `content` — an incremental answer chunk (`{ "type": "content", "delta": <text> }`), from
+  `on_chat_model_stream`. Chunks are accumulated server-side into `streamed`.
+- `response` — the final, authoritative message (`{ "type": "response", "message": <full text> }`).
+  Sourced from `on_chain_end` (falling back to the accumulated `streamed` tokens). This is the
+  text that is persisted to the DB via `add_message_to_conversation(..., speaker="simba")`.
+- `error` — an error message.
+- The stream terminates with `data: [DONE]`.
+
+The user's message is persisted before streaming begins; the assistant message is persisted once
+the stream completes.
+
+### `POST /api/conversation/query` (legacy, non-streaming)
+Backwards-compatible endpoint that returns the complete response in one JSON payload
+(`{ "response": <text> }`). Kept for compatibility; the frontend uses `/stream-query`.
+
+## Frontend
+
+### API service (`src/api/conversationService.ts`)
+- `streamQuery(query, conversation_id, onEvent, signal?, imageKey?)` — POSTs to `/stream-query`
+  and drives the response through `_readSSEStream()`.
+- `_readSSEStream()` — reads the `ReadableStream`, splits on `\n\n`, parses `data:` frames into
+  `SSEEvent` objects, and stops on `[DONE]`.
+- `SSEEvent` union: `tool_start | tool_end | content | response | error`.
+
+### Chat state (`src/hooks/useChat.ts`)
+`sendMessage()` consumes the stream and maintains a unified `messages` array:
+
+- `tool_start` → appends a `tool` bubble (mapped to a friendly label via `TOOL_MESSAGES`) and
+  resets the streaming pointer so any text after a tool call starts a fresh bubble.
+- `content` → on the first delta, appends a new `simba` bubble and flips `streamingActiveRef` /
+  `streaming`; subsequent deltas append to that bubble's text.
+- `response` → overwrites the live `simba` bubble with the authoritative message (guaranteeing
+  parity with what was persisted), or appends it if nothing streamed (e.g. an instant answer).
+- `error` → surfaces a user-facing error.
+
+A `streaming` boolean is exposed so the UI can hide the redundant loading indicator once tokens
+start arriving.
+
+### Components
+- `ChatScreen.tsx` — renders `messages` (`ToolBubble` / `AnswerBubble` / `QuestionBubble`) and
+  shows the standalone loading-dots `AnswerBubble` only before the first token
+  (`(isLoading && !streaming) || messagesLoading`).
+- `AnswerBubble.tsx` — renders the assistant message as markdown, or animated loading dots when
+  `loading` is set.
+- `ToolBubble.tsx` — renders tool-status messages as inline badges.
+
+## User Experience
+1. User sends a message.
+2. Loading dots appear.
+3. Tool status bubbles appear as tools run (e.g. "Searching Simba's records...").
+4. The answer streams in word-by-word into a single assistant bubble.
+5. On completion the bubble is reconciled with the persisted final text.
+
+## Testing
+```bash
+# Backend
+make test                       # or: .venv/bin/python -m pytest tests/
+
+# Frontend
+cd raggr-frontend && yarn build
+
+# Full stack (manual)
+docker compose up --build
+```

app.py

@@ -1,20 +1,39 @@
+import asyncio
+import hmac
 import logging
 import os
 from datetime import timedelta
 
 from dotenv import load_dotenv
-from quart import Quart, jsonify, render_template, send_from_directory
-from quart_jwt_extended import JWTManager, get_jwt_identity, jwt_refresh_token_required
+from quart import (
+    Quart,
+    Response,
+    jsonify,
+    render_template,
+    request,
+    send_from_directory,
+)
+from quart_jwt_extended import JWTManager, get_jwt_identity
 from tortoise import Tortoise
 
+import blueprints.artifacts
 import blueprints.conversation
 import blueprints.conversation.logic
 import blueprints.email
 import blueprints.rag
 import blueprints.users
 import blueprints.whatsapp
+import blueprints.imessage
+import blueprints.scheduled_messages
+import blueprints.cron
+import blueprints.beli
 import blueprints.users.models
+from blueprints.users.decorators import jwt_access_required
 from config.db import TORTOISE_CONFIG
+from metrics import render_metrics
+from blueprints.conversation.agents import build_agent
+from utils.bookstack_mcp import load_bookstack_tools
+from utils.homebox_mcp import load_homebox_tools
 
 # Load environment variables
 load_dotenv()
@@ -49,6 +68,32 @@ app.register_blueprint(blueprints.conversation.conversation_blueprint)
 app.register_blueprint(blueprints.email.email_blueprint)
 app.register_blueprint(blueprints.rag.rag_blueprint)
 app.register_blueprint(blueprints.whatsapp.whatsapp_blueprint)
+app.register_blueprint(blueprints.imessage.imessage_blueprint)
+app.register_blueprint(blueprints.scheduled_messages.scheduled_messages_blueprint)
+app.register_blueprint(blueprints.cron.cron_blueprint)
+app.register_blueprint(blueprints.beli.beli_blueprint)
+app.register_blueprint(blueprints.artifacts.artifacts_blueprint)
+
+
+async def _obsidian_sync_loop():
+    """Background task that incrementally syncs Obsidian documents to pgvector."""
+    from blueprints.rag.logic import sync_obsidian_documents
+
+    interval = int(os.getenv("OBSIDIAN_SYNC_INTERVAL", "60"))
+    logger = logging.getLogger("obsidian_sync")
+    logger.info(f"Obsidian sync watcher started (interval={interval}s)")
+
+    while True:
+        try:
+            result = await sync_obsidian_documents()
+            if result["added"] or result["updated"] or result["deleted"]:
+                logger.info(
+                    f"Obsidian sync: {result['added']} added, "
+                    f"{result['updated']} updated, {result['deleted']} deleted"
+                )
+        except Exception:
+            logger.exception("Obsidian sync error")
+        await asyncio.sleep(interval)
 
 
 # Initialize Tortoise ORM with lifecycle hooks
@@ -57,7 +102,34 @@ async def lifespan():
     logging.info("Initializing Tortoise ORM...")
     await Tortoise.init(config=TORTOISE_CONFIG)
     logging.info("Tortoise ORM initialized successfully")
-    yield
+
+    import aiosqlite
+    from langgraph.checkpoint.sqlite.aio import AsyncSqliteSaver
+
+    checkpoint_path = os.getenv("CHECKPOINT_DB_PATH", "/app/checkpoints/checkpoints.db")
+    async with aiosqlite.connect(checkpoint_path) as conn:
+        checkpointer = AsyncSqliteSaver(conn)
+        await checkpointer.setup()
+        app.main_agent = build_agent(checkpointer)
+        admin_tools = await load_homebox_tools() + await load_bookstack_tools()
+        app.admin_agent = (
+            build_agent(checkpointer, admin_tools) if admin_tools else app.main_agent
+        )
+        logging.info(f"Agent checkpointer ready at {checkpoint_path}")
+
+        from utils.cronicle import ensure_beli_nightly_event
+
+        await ensure_beli_nightly_event()
+
+        watcher_task = None
+        if os.getenv("OBSIDIAN_CONTINUOUS_SYNC") == "true":
+            watcher_task = asyncio.create_task(_obsidian_sync_loop())
+
+        yield
+
+        if watcher_task is not None:
+            watcher_task.cancel()
+
     logging.info("Closing Tortoise ORM connections...")
     await Tortoise.close_connections()
 
@@ -68,17 +140,75 @@ async def static_files(filename):
     return await send_from_directory(app.static_folder, filename)
 
 
+# Allowed file extensions for static frontend assets
+ALLOWED_STATIC_EXTENSIONS = {
+    ".html",
+    ".css",
+    ".js",
+    ".svg",
+    ".png",
+    ".ico",
+    ".jpg",
+    ".jpeg",
+    ".webp",
+    ".woff",
+    ".woff2",
+    ".ttf",
+    ".txt",
+}
+
+# JSON files explicitly allowed to be served (e.g. PWA manifest)
+ALLOWED_JSON_FILES = {"manifest.json"}
+
+
+# Prometheus metrics endpoint. Fail-closed: 403 unless a valid bearer token
+# matching METRICS_TOKEN is presented. Registered before the catch-all SPA
+# route so it is never shadowed.
+@app.get("/metrics")
+async def metrics_endpoint():
+    expected = os.environ.get("METRICS_TOKEN", "")
+    if not expected:
+        return "unauthorized", 403
+    auth = request.headers.get("Authorization", "")
+    if not auth.startswith("Bearer "):
+        return "unauthorized", 403
+    provided = auth[len("Bearer ") :].strip()
+    if not hmac.compare_digest(provided.encode(), expected.encode()):
+        return "unauthorized", 403
+    return Response(
+        render_metrics(),
+        status=200,
+        content_type="text/plain; version=0.0.4",
+    )
+
+
 # Serve the React app for all routes (catch-all)
 @app.route("/", defaults={"path": ""})
 @app.route("/<path:path>")
 async def serve_react_app(path):
-    if path and os.path.exists(os.path.join(app.template_folder, path)):
-        return await send_from_directory(app.template_folder, path)
+    if path:
+        ext = os.path.splitext(path)[1].lower()
+        basename = os.path.basename(path)
+        allowed = ext in ALLOWED_STATIC_EXTENSIONS or (
+            ext == ".json" and basename in ALLOWED_JSON_FILES
+        )
+        if allowed and os.path.exists(os.path.join(app.template_folder, path)):
+            return await send_from_directory(app.template_folder, path)
     return await render_template("index.html")
 
 
+# Health check used by the Docker healthcheck and Caddy's active health checks
+@app.route("/api/health", methods=["GET"])
+async def health():
+    try:
+        await Tortoise.get_connection("default").execute_query("SELECT 1")
+    except Exception:
+        return jsonify({"status": "unhealthy"}), 503
+    return jsonify({"status": "ok"})
+
+
 @app.route("/api/messages", methods=["GET"])
-@jwt_refresh_token_required
+@jwt_access_required
 async def get_messages():
     current_user_uuid = get_jwt_identity()
     user = await blueprints.users.models.User.get(id=current_user_uuid)

blueprints/artifacts/__init__.py

@@ -0,0 +1,56 @@
+import uuid
+
+from quart import Blueprint, jsonify, request
+from quart_jwt_extended import get_jwt_identity
+
+from blueprints.conversation.models import Conversation
+from blueprints.users.decorators import jwt_access_required
+
+from .logic import artifact_full, artifact_summary
+from .models import Artifact
+
+artifacts_blueprint = Blueprint("artifacts_api", __name__, url_prefix="/api/artifacts")
+
+
+def _parse_uuid(value: str) -> uuid.UUID | None:
+    """Validate ids before querying: asyncpg raises OperationalError on bad UUIDs."""
+    try:
+        return uuid.UUID(value)
+    except (ValueError, AttributeError, TypeError):
+        return None
+
+
+@artifacts_blueprint.get("")
+@jwt_access_required
+async def list_artifacts():
+    user_uuid = get_jwt_identity()
+    raw_conversation_id = request.args.get("conversation_id", "").strip()
+    if not raw_conversation_id:
+        return jsonify({"error": "conversation_id is required"}), 400
+    conversation_id = _parse_uuid(raw_conversation_id)
+    if conversation_id is None:
+        return jsonify({"error": "conversation_id must be a UUID"}), 400
+
+    conversation = await Conversation.get_or_none(id=conversation_id, user_id=user_uuid)
+    if conversation is None:
+        return jsonify({"error": "conversation not found"}), 404
+
+    artifacts = await Artifact.filter(
+        conversation_id=conversation.id, user_id=user_uuid
+    ).order_by("created_at")
+    return jsonify([artifact_summary(a) for a in artifacts])
+
+
+@artifacts_blueprint.get("/<artifact_id>")
+@jwt_access_required
+async def get_artifact(artifact_id: str):
+    user_uuid = get_jwt_identity()
+    parsed_id = _parse_uuid(artifact_id)
+    artifact = (
+        await Artifact.get_or_none(id=parsed_id, user_id=user_uuid)
+        if parsed_id is not None
+        else None
+    )
+    if artifact is None:
+        return jsonify({"error": "artifact not found"}), 404
+    return jsonify(artifact_full(artifact))

blueprints/artifacts/logic.py

@@ -0,0 +1,78 @@
+import json
+import logging
+
+from .models import Artifact
+
+logger = logging.getLogger(__name__)
+
+# Artifacts whose serialised `data` exceeds this are dropped (the tool text still persists).
+ARTIFACT_MAX_BYTES = 256 * 1024
+
+
+def artifact_ref(artifact: Artifact) -> dict:
+    """The lightweight reference sent in SSE events and the conversation payload."""
+    return {"id": str(artifact.id), "kind": artifact.kind, "title": artifact.title}
+
+
+def artifact_summary(artifact: Artifact) -> dict:
+    """ArtifactRef plus listing metadata, without `data`."""
+    return {
+        **artifact_ref(artifact),
+        "tool": artifact.tool,
+        "message_id": str(artifact.message_id) if artifact.message_id else None,
+        "created_at": artifact.created_at.isoformat(),
+    }
+
+
+def artifact_full(artifact: Artifact) -> dict:
+    return {
+        **artifact_summary(artifact),
+        "data": artifact.data,
+        "source_ref": artifact.source_ref,
+        "conversation_id": str(artifact.conversation_id),
+    }
+
+
+async def create_artifact_from_output(
+    *, output, tool: str, user, conversation, message=None
+) -> Artifact | None:
+    """Persist `output.artifact` if it is a ToolArtifact dict; otherwise return None.
+
+    Tools opt in via `@tool(response_format="content_and_artifact")`. Artifacts
+    without a `kind` (e.g. simba_search's raw Documents) are ignored, as are
+    ones whose `data` is not JSON-serialisable or over ARTIFACT_MAX_BYTES.
+    """
+    raw = getattr(output, "artifact", None)
+    if not isinstance(raw, dict) or not raw.get("kind"):
+        return None
+
+    data = raw.get("data") or {}
+    source_ref = raw.get("source_ref")
+    try:
+        size = len(json.dumps(data).encode("utf-8"))
+        json.dumps(source_ref)
+    except (TypeError, ValueError) as e:
+        logger.warning(
+            "Dropping %s artifact from %s: not serialisable (%s)", raw["kind"], tool, e
+        )
+        return None
+    if size > ARTIFACT_MAX_BYTES:
+        logger.warning(
+            "Dropping %s artifact from %s: %d bytes exceeds %d",
+            raw["kind"],
+            tool,
+            size,
+            ARTIFACT_MAX_BYTES,
+        )
+        return None
+
+    return await Artifact.create(
+        user=user,
+        conversation=conversation,
+        message=message,
+        tool=tool,
+        kind=str(raw["kind"])[:64],
+        title=str(raw.get("title") or "")[:255],
+        data=data,
+        source_ref=source_ref,
+    )

blueprints/artifacts/models.py

@@ -0,0 +1,29 @@
+from tortoise import fields
+from tortoise.models import Model
+
+
+class Artifact(Model):
+    """A structured tool result (recipe, budget, note…) rendered in the artifact panel."""
+
+    id = fields.UUIDField(primary_key=True)
+    user = fields.ForeignKeyField("models.User", related_name="artifacts")
+    conversation = fields.ForeignKeyField(
+        "models.Conversation", related_name="artifacts", on_delete=fields.CASCADE
+    )
+    message = fields.ForeignKeyField(
+        "models.ConversationMessage",
+        related_name="artifacts",
+        null=True,
+        on_delete=fields.SET_NULL,
+    )
+    tool = fields.CharField(max_length=255)
+    kind = fields.CharField(max_length=64)
+    title = fields.CharField(max_length=255)
+    data = fields.JSONField()
+    source_ref = fields.JSONField(null=True)
+    version = fields.IntField(default=1)
+    created_at = fields.DatetimeField(auto_now_add=True)
+    updated_at = fields.DatetimeField(auto_now=True)
+
+    class Meta:
+        table = "artifacts"

blueprints/beli/__init__.py

@@ -0,0 +1,187 @@
+import hmac
+import logging
+import os
+
+from quart import Blueprint, jsonify, request
+from quart_jwt_extended import get_jwt_identity
+
+from blueprints.users.decorators import jwt_access_required
+
+from .logic import (
+    MAX_PROFILES_PER_USER,
+    _get_access_token,
+    _refresh_friend_sample,
+    refresh_profile,
+    schedule_nightly_refresh,
+)
+from .models import BeliProfile, BeliRestaurant, BeliStatus
+
+beli_blueprint = Blueprint("beli", __name__, url_prefix="/api/beli")
+logger = logging.getLogger(__name__)
+
+
+def _check_cron_secret() -> bool:
+    expected = os.environ.get("CRON_SECRET", "")
+    if not expected:
+        return False
+    provided = request.headers.get("X-Cron-Secret", "")
+    return hmac.compare_digest(provided.encode(), expected.encode())
+
+
+def _serialize_profile(profile: BeliProfile) -> dict:
+    return {
+        "id": str(profile.id),
+        "beli_email": profile.beli_email,
+        "beli_user_id": profile.beli_user_id,
+        "enabled": profile.enabled,
+        "last_refreshed_at": (
+            profile.last_refreshed_at.isoformat() if profile.last_refreshed_at else None
+        ),
+        "last_error": profile.last_error,
+        "created_at": profile.created_at.isoformat(),
+    }
+
+
+def _serialize_restaurant(r: BeliRestaurant) -> dict:
+    return {
+        "id": str(r.id),
+        "profile_id": str(r.profile_id),
+        "beli_business_id": r.beli_business_id,
+        "name": r.name,
+        "city": r.city,
+        "neighborhood": r.neighborhood,
+        "cuisine": r.cuisine,
+        "price_range": r.price_range,
+        "status": r.status.value,
+        "rank_index": r.rank_index,
+        "score": float(r.score) if r.score is not None else None,
+        "notes": r.notes,
+        "tags": r.tags,
+        "fetched_at": r.fetched_at.isoformat(),
+    }
+
+
+@beli_blueprint.route("/profiles", methods=["GET"])
+@jwt_access_required
+async def list_profiles():
+    user_id = get_jwt_identity()
+    profiles = await BeliProfile.filter(user_id=user_id).order_by("created_at").all()
+    return jsonify([_serialize_profile(p) for p in profiles])
+
+
+@beli_blueprint.route("/profiles", methods=["POST"])
+@jwt_access_required
+async def create_profile():
+    user_id = get_jwt_identity()
+
+    count = await BeliProfile.filter(user_id=user_id).count()
+    if count >= MAX_PROFILES_PER_USER:
+        return (
+            jsonify(
+                {"error": f"Maximum {MAX_PROFILES_PER_USER} Beli profiles per user"}
+            ),
+            400,
+        )
+
+    data = await request.get_json()
+    if not data:
+        return jsonify({"error": "Invalid payload"}), 400
+
+    email = (data.get("beli_email") or "").strip()
+    password = (data.get("beli_password") or "").strip()
+    if not email or not password:
+        return jsonify({"error": "beli_email and beli_password are required"}), 400
+
+    if await BeliProfile.exists(user_id=user_id, beli_email=email):
+        return jsonify({"error": "A profile with this email already exists"}), 409
+
+    from utils.beli_service import authenticate
+
+    try:
+        session = await authenticate(email, password)
+    except Exception as e:
+        return jsonify({"error": f"Beli authentication failed: {e}"}), 400
+
+    profile = await BeliProfile.create(
+        user_id=user_id,
+        beli_email=email,
+        beli_password=password,
+        beli_user_id=session["user_id"],
+        beli_refresh_token=session["refresh_token"],
+        enabled=True,
+    )
+    return jsonify(_serialize_profile(profile)), 201
+
+
+@beli_blueprint.route("/profiles/<profile_id>", methods=["DELETE"])
+@jwt_access_required
+async def delete_profile(profile_id: str):
+    user_id = get_jwt_identity()
+    profile = await BeliProfile.get_or_none(id=profile_id, user_id=user_id)
+    if not profile:
+        return jsonify({"error": "Not found"}), 404
+
+    await BeliRestaurant.filter(profile=profile).delete()
+    await profile.delete()
+    return jsonify({"status": "deleted"})
+
+
+@beli_blueprint.route("/profiles/<profile_id>/refresh", methods=["POST"])
+@jwt_access_required
+async def refresh_profile_endpoint(profile_id: str):
+    user_id = get_jwt_identity()
+    profile = await BeliProfile.get_or_none(id=profile_id, user_id=user_id)
+    if not profile:
+        return jsonify({"error": "Not found"}), 404
+
+    result = await refresh_profile(str(profile.id))
+    return jsonify(result)
+
+
+@beli_blueprint.route("/restaurants", methods=["GET"])
+@jwt_access_required
+async def list_restaurants():
+    user_id = get_jwt_identity()
+    profile_ids = [
+        p.id for p in await BeliProfile.filter(user_id=user_id).only("id").all()
+    ]
+
+    qs = BeliRestaurant.filter(profile_id__in=profile_ids)
+
+    status_filter = request.args.get("status")
+    city_filter = request.args.get("city")
+    if status_filter:
+        try:
+            qs = qs.filter(status=BeliStatus(status_filter))
+        except ValueError:
+            return jsonify({"error": f"Invalid status: {status_filter}"}), 400
+    if city_filter:
+        qs = qs.filter(city__icontains=city_filter)
+
+    restaurants = await qs.order_by("rank_index", "name").all()
+    return jsonify([_serialize_restaurant(r) for r in restaurants])
+
+
+@beli_blueprint.route("/profiles/<profile_id>/refresh-friends", methods=["POST"])
+@jwt_access_required
+async def refresh_friends_endpoint(profile_id: str):
+    user_id = get_jwt_identity()
+    profile = await BeliProfile.get_or_none(id=profile_id, user_id=user_id)
+    if not profile:
+        return jsonify({"error": "Not found"}), 404
+
+    try:
+        access_token = await _get_access_token(profile)
+        upserted = await _refresh_friend_sample(profile, access_token)
+        return jsonify({"ok": True, "upserted": upserted})
+    except Exception as e:
+        return jsonify({"error": str(e)}), 500
+
+
+@beli_blueprint.route("/cron/refresh", methods=["POST"])
+async def cron_nightly_refresh():
+    if not _check_cron_secret():
+        return jsonify({"error": "Unauthorized"}), 401
+
+    result = await schedule_nightly_refresh()
+    return jsonify(result)

blueprints/beli/logic.py

@@ -0,0 +1,252 @@
+import asyncio
+import logging
+import random
+from datetime import datetime, timezone
+
+from utils.beli_service import (
+    RANKING_CATEGORIES,
+    REQUEST_SPACING,
+    authenticate,
+    extract_business,
+    fetch_bookmarks,
+    fetch_following,
+    fetch_user_rankings,
+    is_token_expired,
+    refresh_access_token,
+)
+
+from tortoise.functions import Max
+
+from .models import BeliProfile, BeliRestaurant, BeliStatus
+
+logger = logging.getLogger(__name__)
+
+MAX_PROFILES_PER_USER = 3
+NIGHTLY_BATCH_SIZE = 3
+NIGHTLY_WINDOW_SECONDS = 4 * 3600  # spread refreshes across a 4-hour window
+FRIEND_SAMPLE_SIZE = 5  # friends to randomly refresh per profile per night
+
+
+async def _get_access_token(profile: BeliProfile) -> str:
+    """Return a live access token, refreshing or re-authenticating as needed."""
+    if profile.beli_refresh_token and not is_token_expired(profile.beli_refresh_token):
+        try:
+            token = await refresh_access_token(profile.beli_refresh_token)
+            return token
+        except Exception:
+            logger.warning(
+                "Refresh token failed for profile %s, falling back to password",
+                profile.id,
+            )
+
+    session = await authenticate(profile.beli_email, profile.beli_password)
+    profile.beli_user_id = session["user_id"]
+    profile.beli_refresh_token = session["refresh_token"]
+    await profile.save()
+    return session["access_token"]
+
+
+async def _refresh_friend_sample(profile: BeliProfile, access_token: str) -> int:
+    """Fetch rankings for a random sample of followed users and upsert them."""
+    try:
+        following = await fetch_following(access_token, profile.beli_user_id)
+    except Exception as e:
+        logger.debug("Beli following fetch skipped for profile %s: %s", profile.id, e)
+        return 0
+
+    if not following:
+        return 0
+
+    # Pick the FRIEND_SAMPLE_SIZE stalest friends — never-fetched first, then oldest
+    fetched_rows = (
+        await BeliRestaurant.filter(profile=profile)
+        .exclude(friend_beli_user_id="")
+        .group_by("friend_beli_user_id")
+        .annotate(last_fetched=Max("fetched_at"))
+        .values("friend_beli_user_id", "last_fetched")
+    )
+    last_fetched: dict[str, datetime] = {
+        r["friend_beli_user_id"]: r["last_fetched"] for r in fetched_rows
+    }
+    _epoch = datetime.fromtimestamp(0, tz=timezone.utc)
+    sample = sorted(
+        following,
+        key=lambda f: last_fetched.get(str(f.get("id") or ""), _epoch),
+    )[:FRIEND_SAMPLE_SIZE]
+    upserted = 0
+
+    for friend in sample:
+        friend_id = str(friend.get("id") or "")
+        friend_name = friend.get("full_name") or friend.get("username") or friend_id
+        if not friend_id:
+            continue
+
+        for category in RANKING_CATEGORIES:
+            await asyncio.sleep(REQUEST_SPACING)
+            try:
+                results = await fetch_user_rankings(access_token, friend_id, category)
+            except Exception as e:
+                # 405 = private profile; log quietly and skip
+                logger.debug(
+                    "Beli friend ranking skipped (%s/%s): %s", friend_id, category, e
+                )
+                continue
+
+            for idx, item in enumerate(results):
+                biz = extract_business(item, rank_index=idx + 1)
+                if not biz:
+                    continue
+                await BeliRestaurant.update_or_create(
+                    profile=profile,
+                    beli_business_id=biz["beli_business_id"],
+                    status=BeliStatus.BEEN,
+                    friend_beli_user_id=friend_id,
+                    beli_category=category,
+                    defaults={
+                        "friend_name": friend_name,
+                        "name": biz["name"],
+                        "city": biz["city"],
+                        "neighborhood": biz["neighborhood"],
+                        "cuisine": biz["cuisine"],
+                        "price_range": biz["price_range"],
+                        "rank_index": biz["rank_index"],
+                        "score": biz["score"],
+                        "notes": None,
+                        "tags": biz["tags"],
+                    },
+                )
+                upserted += 1
+
+    if upserted:
+        logger.info(
+            "Beli profile %s: %d friend restaurants upserted from %d friends",
+            profile.id,
+            upserted,
+            len(sample),
+        )
+    return upserted
+
+
+async def refresh_profile(profile_id: str) -> dict:
+    """Fetch the latest rankings and bookmarks for a profile and upsert them."""
+    profile = await BeliProfile.get_or_none(id=profile_id)
+    if not profile or not profile.enabled:
+        return {"skipped": True}
+
+    try:
+        access_token = await _get_access_token(profile)
+
+        upserted = 0
+
+        # Fetch all ranking categories (restaurants the user has been to and ranked)
+        for category in RANKING_CATEGORIES:
+            await asyncio.sleep(REQUEST_SPACING)
+            results = await fetch_user_rankings(
+                access_token, profile.beli_user_id, category
+            )
+            for idx, item in enumerate(results):
+                biz = extract_business(item, rank_index=idx + 1)
+                if not biz:
+                    continue
+                await BeliRestaurant.update_or_create(
+                    profile=profile,
+                    beli_business_id=biz["beli_business_id"],
+                    status=BeliStatus.BEEN,
+                    friend_beli_user_id="",
+                    beli_category=category,
+                    defaults={
+                        "name": biz["name"],
+                        "city": biz["city"],
+                        "neighborhood": biz["neighborhood"],
+                        "cuisine": biz["cuisine"],
+                        "price_range": biz["price_range"],
+                        "rank_index": biz["rank_index"],
+                        "score": biz["score"],
+                        "notes": biz["notes"],
+                        "tags": biz["tags"],
+                    },
+                )
+                upserted += 1
+
+        # Fetch bookmarks (want-to-try list) — non-fatal if unavailable
+        await asyncio.sleep(REQUEST_SPACING)
+        try:
+            bookmarks = await fetch_bookmarks(access_token)
+        except Exception as e:
+            logger.warning(
+                "Beli bookmarks fetch failed for profile %s: %s", profile_id, e
+            )
+            bookmarks = []
+        for item in bookmarks:
+            biz = extract_business(item)
+            if not biz:
+                continue
+            await BeliRestaurant.update_or_create(
+                profile=profile,
+                beli_business_id=biz["beli_business_id"],
+                status=BeliStatus.WANT_TO_TRY,
+                friend_beli_user_id="",
+                beli_category="",
+                defaults={
+                    "name": biz["name"],
+                    "city": biz["city"],
+                    "neighborhood": biz["neighborhood"],
+                    "cuisine": biz["cuisine"],
+                    "price_range": biz["price_range"],
+                    "rank_index": None,
+                    "score": None,
+                    "notes": biz["notes"],
+                    "tags": biz["tags"],
+                },
+            )
+            upserted += 1
+
+        profile.last_refreshed_at = datetime.now(timezone.utc)
+        profile.last_error = None
+        await profile.save()
+
+        logger.info(
+            "Beli profile %s refreshed: %d restaurants upserted", profile_id, upserted
+        )
+        return {"ok": True, "upserted": upserted}
+
+    except Exception as e:
+        profile.last_error = str(e)
+        await profile.save()
+        logger.error("Failed to refresh Beli profile %s: %s", profile_id, e)
+        return {"error": str(e)}
+
+
+async def _refresh_after_delay(profile_id: str, delay: float) -> None:
+    await asyncio.sleep(delay)
+    profile = await BeliProfile.get_or_none(id=profile_id)
+    if not profile:
+        return
+    await refresh_profile(profile_id)
+    # Friend sampling only runs during nightly scheduled refreshes, not manual ones
+    try:
+        access_token = await _get_access_token(profile)
+        await _refresh_friend_sample(profile, access_token)
+    except Exception as e:
+        logger.warning("Friend sample failed for profile %s: %s", profile_id, e)
+
+
+async def schedule_nightly_refresh() -> dict:
+    """Pick the NIGHTLY_BATCH_SIZE stalest profiles and schedule them with random delays."""
+    profiles = (
+        await BeliProfile.filter(enabled=True)
+        .order_by("last_refreshed_at")
+        .limit(NIGHTLY_BATCH_SIZE)
+        .all()
+    )
+
+    if not profiles:
+        logger.info("No enabled Beli profiles to refresh")
+        return {"scheduled": 0}
+
+    for profile in profiles:
+        delay = random.uniform(0, NIGHTLY_WINDOW_SECONDS)
+        asyncio.create_task(_refresh_after_delay(str(profile.id), delay))
+        logger.info("Scheduled Beli refresh for profile %s in %.0fs", profile.id, delay)
+
+    return {"scheduled": len(profiles)}

blueprints/beli/models.py

@@ -0,0 +1,66 @@
+import enum
+import uuid
+
+from tortoise import fields
+from tortoise.models import Model
+
+from blueprints.email.crypto_service import EncryptedTextField
+
+
+class BeliStatus(str, enum.Enum):
+    BEEN = "been"
+    WANT_TO_TRY = "want_to_try"
+
+
+class BeliProfile(Model):
+    id = fields.UUIDField(primary_key=True, default=uuid.uuid4)
+    user = fields.ForeignKeyField("models.User", related_name="beli_profiles")
+    beli_email = fields.CharField(max_length=255)
+    beli_password = EncryptedTextField()
+    beli_user_id = fields.CharField(max_length=255, null=True)
+    # refresh token lasts 7 days; we store it encrypted to avoid re-authenticating each run
+    beli_refresh_token = EncryptedTextField(null=True)
+    last_refreshed_at = fields.DatetimeField(null=True)
+    last_error = fields.TextField(null=True)
+    enabled = fields.BooleanField(default=True)
+    created_at = fields.DatetimeField(auto_now_add=True)
+    updated_at = fields.DatetimeField(auto_now=True)
+
+    class Meta:
+        table = "beli_profiles"
+        unique_together = (("user", "beli_email"),)
+
+
+class BeliRestaurant(Model):
+    id = fields.UUIDField(primary_key=True, default=uuid.uuid4)
+    profile = fields.ForeignKeyField("models.BeliProfile", related_name="restaurants")
+    beli_business_id = fields.CharField(max_length=255)
+    # Empty string = profile owner's own ranking; UUID string = a followed user's ranking
+    friend_beli_user_id = fields.CharField(max_length=255, default="")
+    friend_name = fields.CharField(max_length=255, null=True)
+    # Beli category code: RES / DES / BAR / BAK; empty for bookmarks
+    beli_category = fields.CharField(max_length=10, default="")
+    name = fields.CharField(max_length=500)
+    city = fields.CharField(max_length=255, null=True)
+    neighborhood = fields.CharField(max_length=255, null=True)
+    cuisine = fields.JSONField(default=list)
+    price_range = fields.CharField(max_length=10, null=True)
+    status = fields.CharEnumField(enum_type=BeliStatus, max_length=20)
+    rank_index = fields.IntField(null=True)
+    score = fields.DecimalField(max_digits=5, decimal_places=2, null=True)
+    notes = fields.TextField(null=True)
+    tags = fields.JSONField(default=list)
+    fetched_at = fields.DatetimeField(auto_now=True)
+    created_at = fields.DatetimeField(auto_now_add=True)
+
+    class Meta:
+        table = "beli_restaurants"
+        unique_together = (
+            (
+                "profile",
+                "beli_business_id",
+                "status",
+                "friend_beli_user_id",
+                "beli_category",
+            ),
+        )

blueprints/conversation/__init__.py

@@ -1,89 +1,143 @@
+import asyncio
 import json
 import logging
+import os
+import re
+import time
 import uuid
 
 from quart import Blueprint, jsonify, make_response, request
-from quart_jwt_extended import (
-    get_jwt_identity,
-    jwt_refresh_token_required,
-)
+from quart_jwt_extended import get_jwt_identity
 
 import blueprints.users.models
-from utils.image_process import analyze_user_image
+from blueprints.artifacts.logic import artifact_ref, create_artifact_from_output
+from blueprints.artifacts.models import Artifact
+from blueprints.users.decorators import jwt_access_required
+from metrics import count_result, observe_response, time_response
+from utils.image_process import image_content_block
+from utils.strip_markdown import extract_agent_text
 from utils.image_upload import ImageValidationError, process_image
 from utils.s3_client import generate_presigned_url as s3_presigned_url
 from utils.s3_client import get_image as s3_get_image
 from utils.s3_client import upload_image as s3_upload_image
 
-from .agents import main_agent
 from .logic import (
     add_message_to_conversation,
-    get_conversation_by_id,
+    get_agent_for,
+    persist_agent_tool_messages,
+    tool_result_text,
 )
-from .memory import get_memories_for_user
+from .memory import build_system_prompt_with_memories
 from .models import (
     Conversation,
     PydConversation,
     PydListConversation,
+    Speaker,
 )
-from .prompts import SIMBA_SYSTEM_PROMPT
+from .tool_events import tool_end_payload, tool_name_from_message, tool_start_payload
+from .tool_labels import tool_label
+
+TTFT_TIMEOUT = float(os.getenv("TTFT_TIMEOUT_SECONDS", "30"))
+
+_THINK_OPEN = "<think>"
+_THINK_CLOSE = "</think>"
+_THINK_RE = re.compile(r"<think>.*?</think>", re.DOTALL)
+
+
+def _route_content(
+    buf: str, text: str, in_thinking: bool
+) -> tuple[str, str, bool, str]:
+    """Split a streaming content chunk into (thinking_text, content_text).
+
+    Handles tags split across chunk boundaries by keeping a small trailing
+    buffer. Returns the updated in_thinking state and any leftover buffer.
+    """
+    combined = buf + text
+    thinking_parts: list[str] = []
+    content_parts: list[str] = []
+
+    while combined:
+        tag, hold = (
+            (_THINK_CLOSE, len(_THINK_CLOSE) - 1)
+            if in_thinking
+            else (_THINK_OPEN, len(_THINK_OPEN) - 1)
+        )
+        idx = combined.find(tag)
+        if idx == -1:
+            # Tag not yet complete — hold back enough bytes to catch a split.
+            if len(combined) <= hold:
+                return (
+                    "".join(thinking_parts),
+                    "".join(content_parts),
+                    in_thinking,
+                    combined,
+                )
+            safe, leftover = combined[:-hold], combined[-hold:]
+            (thinking_parts if in_thinking else content_parts).append(safe)
+            return (
+                "".join(thinking_parts),
+                "".join(content_parts),
+                in_thinking,
+                leftover,
+            )
+        (thinking_parts if in_thinking else content_parts).append(combined[:idx])
+        combined = combined[idx + len(tag) :]
+        in_thinking = not in_thinking
+
+    return "".join(thinking_parts), "".join(content_parts), in_thinking, ""
+
 
 conversation_blueprint = Blueprint(
     "conversation_api", __name__, url_prefix="/api/conversation"
 )
 
-_SYSTEM_PROMPT = SIMBA_SYSTEM_PROMPT
+# Detached persistence tasks. A strong reference keeps them from being garbage
+# collected mid-flight when the SSE stream is cancelled by a client disconnect.
+_persist_tasks: set[asyncio.Task] = set()
 
 
-async def _build_system_prompt_with_memories(user_id: str) -> str:
-    """Append user memories to the base system prompt."""
-    memories = await get_memories_for_user(user_id)
-    if not memories:
-        return _SYSTEM_PROMPT
-    memory_block = "\n".join(f"- {m}" for m in memories)
-    return f"{_SYSTEM_PROMPT}\n\nUSER MEMORIES (facts the user has asked you to remember):\n{memory_block}"
+def _persist_in_background(coro) -> asyncio.Task:
+    task = asyncio.create_task(coro)
+    _persist_tasks.add(task)
+    task.add_done_callback(_persist_tasks.discard)
+    return task
 
 
-def _build_messages_payload(
-    conversation,
+async def _get_owned_conversation(conversation_id, user_id) -> Conversation | None:
+    """Fetch a conversation only if it belongs to the given user."""
+    return await Conversation.get_or_none(id=conversation_id, user_id=user_id)
+
+
+def _build_user_message(
     query_text: str,
-    image_description: str | None = None,
-    system_prompt: str | None = None,
-) -> list:
-    recent_messages = (
-        conversation.messages[-10:]
-        if len(conversation.messages) > 10
-        else conversation.messages
-    )
-    messages_payload = [{"role": "system", "content": system_prompt or _SYSTEM_PROMPT}]
-    for msg in recent_messages[:-1]:  # Exclude the message we just added
-        role = "user" if msg.speaker == "user" else "assistant"
-        text = msg.text
-        if msg.image_key and role == "user":
-            text = f"[User sent an image]\n{text}"
-        messages_payload.append({"role": role, "content": text})
+    image_block: dict | None = None,
+) -> dict:
+    """Build the single new user message for this turn.
 
-    # Build the current user message with optional image description
-    if image_description:
-        content = f"[Image analysis: {image_description}]"
-        if query_text:
-            content = f"{query_text}\n\n{content}"
+    History is restored by the LangGraph checkpointer; only the current
+    message is passed to avoid duplicating prior turns in checkpoint state.
+    """
+    if image_block:
+        content = [
+            {"type": "text", "text": query_text or "The user sent this image."},
+            image_block,
+        ]
     else:
         content = query_text
-    messages_payload.append({"role": "user", "content": content})
-    return messages_payload
+    return {"role": "user", "content": content}
 
 
 @conversation_blueprint.post("/query")
-@jwt_refresh_token_required
+@jwt_access_required
 async def query():
     current_user_uuid = get_jwt_identity()
     user = await blueprints.users.models.User.get(id=current_user_uuid)
     data = await request.get_json()
     query = data.get("query")
     conversation_id = data.get("conversation_id")
-    conversation = await get_conversation_by_id(conversation_id)
-    await conversation.fetch_related("messages")
+    conversation = await _get_owned_conversation(conversation_id, current_user_uuid)
+    if conversation is None:
+        return jsonify({"error": "conversation not found"}), 404
     await add_message_to_conversation(
         conversation=conversation,
         message=query,
@@ -91,26 +145,34 @@ async def query():
         user=user,
     )
 
-    system_prompt = await _build_system_prompt_with_memories(str(user.id))
-    messages_payload = _build_messages_payload(
-        conversation, query, system_prompt=system_prompt
-    )
-    payload = {"messages": messages_payload}
-    agent_config = {"configurable": {"user_id": str(user.id)}}
+    with time_response(stream=False):
+        system_prompt = await build_system_prompt_with_memories(str(user.id))
+        payload = {"messages": [_build_user_message(query)]}
+        agent_config = {
+            "configurable": {
+                "user_id": str(user.id),
+                "is_admin": user.is_admin(),
+                "thread_id": str(conversation.id),
+                "system_prompt": system_prompt,
+            }
+        }
 
-    response = await main_agent.ainvoke(payload, config=agent_config)
-    message = response.get("messages", [])[-1].content
-    await add_message_to_conversation(
-        conversation=conversation,
-        message=message,
-        speaker="simba",
-        user=user,
-    )
-    return jsonify({"response": message})
+        response = await get_agent_for(user).ainvoke(payload, config=agent_config)
+        message = extract_agent_text(response.get("messages", [])[-1].content)
+        await persist_agent_tool_messages(
+            conversation, user, response.get("messages", [])
+        )
+        await add_message_to_conversation(
+            conversation=conversation,
+            message=message,
+            speaker="simba",
+            user=user,
+        )
+        return jsonify({"response": message})
 
 
 @conversation_blueprint.post("/upload-image")
-@jwt_refresh_token_required
+@jwt_access_required
 async def upload_image():
     current_user_uuid = get_jwt_identity()
     await blueprints.users.models.User.get(id=current_user_uuid)
@@ -142,14 +204,14 @@ async def upload_image():
 
 
 @conversation_blueprint.get("/image/<path:image_key>")
-@jwt_refresh_token_required
+@jwt_access_required
 async def serve_image(image_key: str):
     url = await s3_presigned_url(image_key)
     return jsonify({"url": url})
 
 
 @conversation_blueprint.post("/stream-query")
-@jwt_refresh_token_required
+@jwt_access_required
 async def stream_query():
     current_user_uuid = get_jwt_identity()
     user = await blueprints.users.models.User.get(id=current_user_uuid)
@@ -157,8 +219,9 @@ async def stream_query():
     query_text = data.get("query")
     conversation_id = data.get("conversation_id")
     image_key = data.get("image_key")
-    conversation = await get_conversation_by_id(conversation_id)
-    await conversation.fetch_related("messages")
+    conversation = await _get_owned_conversation(conversation_id, current_user_uuid)
+    if conversation is None:
+        return jsonify({"error": "conversation not found"}), 404
     await add_message_to_conversation(
         conversation=conversation,
         message=query_text or "",
@@ -167,37 +230,194 @@ async def stream_query():
         image_key=image_key,
     )
 
-    # If an image was uploaded, analyze it with the vision model
-    image_description = None
+    # If an image was uploaded, attach it to the agent request directly
+    image_block = None
     if image_key:
         try:
             image_bytes, _ = await s3_get_image(image_key)
-            image_description = await analyze_user_image(image_bytes)
-            logging.info(f"Image analysis complete for {image_key}")
+            image_block = image_content_block(image_bytes)
         except Exception as e:
-            logging.error(f"Failed to analyze image: {e}")
-            image_description = "[Image could not be analyzed]"
+            logging.error(f"Failed to load image {image_key}: {e}")
+            query_text = f"{query_text or ''}\n\n[An image was sent but could not be loaded.]".strip()
 
-    system_prompt = await _build_system_prompt_with_memories(str(user.id))
-    messages_payload = _build_messages_payload(
-        conversation, query_text or "", image_description, system_prompt=system_prompt
-    )
-    payload = {"messages": messages_payload}
-    agent_config = {"configurable": {"user_id": str(user.id)}}
+    system_prompt = await build_system_prompt_with_memories(str(user.id))
+    payload = {"messages": [_build_user_message(query_text or "", image_block)]}
+    agent_config = {
+        "configurable": {
+            "user_id": str(user.id),
+            "is_admin": user.is_admin(),
+            "thread_id": str(conversation.id),
+            "system_prompt": system_prompt,
+        }
+    }
+    # Capture the agent reference while the request/app context is still active.
+    # Quart exits the app context before iterating the SSE response body, so
+    # current_app cannot be accessed inside event_generator().
+    main_agent = get_agent_for(user)
 
     async def event_generator():
         final_message = None
+        streamed = ""
+        # Tag-routing state for <think>…</think> blocks.
+        in_thinking = False
+        tag_buf = ""
+        # Fallback heartbeat for models that emit empty chunks before thinking text.
+        last_thinking = 0.0
+        turn_has_content = False
+
+        # Timing / observability
+        t0 = time.monotonic()
+        llm_start_at: float | None = None
+        first_content_at: float | None = None
+        tool_timers: dict[str, float] = {}  # run_id -> start time
+        tool_spans: list[dict] = []
+        n_tokens = 0
+        model_name: str | None = None
+        cancelled = False
+
+        async def persist(text: str) -> None:
+            await add_message_to_conversation(
+                conversation=conversation,
+                message=text,
+                speaker="simba",
+                user=user,
+            )
+
+        def _log_summary(*, error: str | None = None) -> None:
+            now = time.monotonic()
+            thinking_ms = (
+                round((first_content_at - llm_start_at) * 1000)
+                if llm_start_at and first_content_at
+                else None
+            )
+            ttft_ms = (
+                round((first_content_at - t0) * 1000) if first_content_at else None
+            )
+            logging.info(
+                json.dumps(
+                    {
+                        "event": "stream_request",
+                        "conv": str(conversation.id),
+                        "user": user.username,
+                        "total_ms": round((now - t0) * 1000),
+                        "thinking_ms": thinking_ms,
+                        "ttft_ms": ttft_ms,
+                        "tokens": n_tokens,
+                        "tools": tool_spans,
+                        "model": model_name,
+                        "cancelled": cancelled,
+                        **({"error": error} if error else {}),
+                    }
+                )
+            )
+
         try:
-            async for event in main_agent.astream_events(
+            aiter = main_agent.astream_events(
                 payload, version="v2", config=agent_config
-            ):
+            ).__aiter__()
+            while True:
+                # Apply a short TTFT timeout only during the window between
+                # on_chat_model_start and the first content token. Before the
+                # LLM call starts (tool phase) and after the first token, let
+                # the httpx read timeout handle stalls instead.
+                if llm_start_at is not None and first_content_at is None:
+                    ttft_wait = TTFT_TIMEOUT - (time.monotonic() - llm_start_at)
+                    timeout = max(ttft_wait, 1.0)
+                else:
+                    timeout = None
+
+                try:
+                    if timeout is not None:
+                        event = await asyncio.wait_for(
+                            aiter.__anext__(), timeout=timeout
+                        )
+                    else:
+                        event = await aiter.__anext__()
+                except StopAsyncIteration:
+                    break
+                except asyncio.TimeoutError:
+                    _log_summary(error=f"TTFT timeout after {TTFT_TIMEOUT:.0f}s")
+                    yield f"data: {json.dumps({'type': 'error', 'message': 'Simba took too long to respond. Please try again.', 'stalled': True})}\n\n"
+                    return
+
                 event_type = event.get("event")
 
                 if event_type == "on_tool_start":
-                    yield f"data: {json.dumps({'type': 'tool_start', 'tool': event['name']})}\n\n"
+                    tool_timers[event["run_id"]] = time.monotonic()
+                    yield f"data: {json.dumps(tool_start_payload(event))}\n\n"
 
-                elif event_type == "on_tool_end":
-                    yield f"data: {json.dumps({'type': 'tool_end', 'tool': event['name']})}\n\n"
+                elif event_type in ("on_tool_end", "on_tool_error"):
+                    now = time.monotonic()
+                    start = tool_timers.pop(event["run_id"], None)
+                    tool_spans.append(
+                        {
+                            "tool": event["name"],
+                            "ms": round((now - start) * 1000) if start else None,
+                        }
+                    )
+                    ref = None
+                    # Persist tool output so later turns keep the fetched context
+                    output = event.get("data", {}).get("output")
+                    if event_type == "on_tool_end" and output is not None:
+                        tool_message = await add_message_to_conversation(
+                            conversation=conversation,
+                            message=tool_result_text(event["name"], output),
+                            speaker="tool",
+                            user=user,
+                        )
+                        try:
+                            artifact = await create_artifact_from_output(
+                                output=output,
+                                tool=event["name"],
+                                user=user,
+                                conversation=conversation,
+                                message=tool_message,
+                            )
+                        except Exception as e:
+                            logging.error(
+                                f"Failed to save artifact from {event['name']}: {e}"
+                            )
+                            artifact = None
+                        if artifact is not None:
+                            ref = artifact_ref(artifact)
+                    status = "error" if event_type == "on_tool_error" else "ok"
+                    end_payload = tool_end_payload(
+                        event, start, ref, now=now, status=status
+                    )
+                    yield f"data: {json.dumps(end_payload)}\n\n"
+
+                elif event_type == "on_chat_model_start":
+                    turn_has_content = False
+                    if llm_start_at is None:
+                        llm_start_at = time.monotonic()
+                    if model_name is None:
+                        model_name = event.get("metadata", {}).get(
+                            "ls_model_name"
+                        ) or event.get("name")
+
+                elif event_type == "on_chat_model_stream":
+                    chunk = event.get("data", {}).get("chunk")
+                    raw = getattr(chunk, "content", None)
+                    if isinstance(raw, str) and raw:
+                        think_text, content_text, in_thinking, tag_buf = _route_content(
+                            tag_buf, raw, in_thinking
+                        )
+                        if think_text:
+                            yield f"data: {json.dumps({'type': 'thinking_delta', 'delta': think_text})}\n\n"
+                        if content_text:
+                            if first_content_at is None:
+                                first_content_at = time.monotonic()
+                            turn_has_content = True
+                            n_tokens += 1
+                            streamed += content_text
+                            yield f"data: {json.dumps({'type': 'content', 'delta': content_text})}\n\n"
+                    elif not turn_has_content:
+                        # Empty chunk before any content — heartbeat for models
+                        # that don't emit <think> tags at all.
+                        now = time.monotonic()
+                        if now - last_thinking >= 1.0:
+                            last_thinking = now
+                            yield f"data: {json.dumps({'type': 'thinking'})}\n\n"
 
                 elif event_type == "on_chain_end":
                     output = event.get("data", {}).get("output")
@@ -207,22 +427,34 @@ async def stream_query():
                             last_msg = msgs[-1]
                             content = getattr(last_msg, "content", None)
                             if isinstance(content, str) and content:
-                                final_message = content
+                                final_message = _THINK_RE.sub("", content).strip()
 
+        except asyncio.CancelledError:
+            cancelled = True
+            _log_summary()
+            text = final_message or streamed
+            if text:
+                _persist_in_background(persist(text))
+            raise
         except Exception as e:
+            count_result(stream=True, result="error")
+            _log_summary(error=str(e))
             yield f"data: {json.dumps({'type': 'error', 'message': str(e)})}\n\n"
+            return
 
+        final_message = final_message or streamed
         if final_message:
-            await add_message_to_conversation(
-                conversation=conversation,
-                message=final_message,
-                speaker="simba",
-                user=user,
-            )
+            # Persist via a detached, shielded task so a disconnect at this
+            # point (after generation completes) still commits the answer.
+            task = _persist_in_background(persist(final_message))
+            await asyncio.shield(task)
             yield f"data: {json.dumps({'type': 'response', 'message': final_message})}\n\n"
         else:
             yield f"data: {json.dumps({'type': 'error', 'message': 'No response generated'})}\n\n"
 
+        observe_response(stream=True, seconds=time.monotonic() - t0)
+        count_result(stream=True, result="success")
+        _log_summary()
         yield "data: [DONE]\n\n"
 
     return await make_response(
@@ -237,23 +469,41 @@ async def stream_query():
 
 
 @conversation_blueprint.route("/<conversation_id>")
-@jwt_refresh_token_required
+@jwt_access_required
 async def get_conversation(conversation_id: str):
-    conversation = await Conversation.get(id=conversation_id)
+    user_uuid = get_jwt_identity()
+    conversation = await _get_owned_conversation(conversation_id, user_uuid)
+    if conversation is None:
+        return jsonify({"error": "conversation not found"}), 404
     await conversation.fetch_related("messages")
+    # Keyed by str so the match doesn't depend on the driver's UUID types.
+    artifacts_by_message = {
+        str(a.message_id): a
+        for a in await Artifact.filter(
+            conversation_id=conversation.id, message_id__isnull=False
+        ).order_by("created_at")
+    }
 
     # Manually serialize the conversation with messages
     messages = []
     for msg in conversation.messages:
-        messages.append(
-            {
-                "id": str(msg.id),
-                "text": msg.text,
-                "speaker": msg.speaker.value,
-                "created_at": msg.created_at.isoformat(),
-                "image_key": msg.image_key,
-            }
-        )
+        item = {
+            "id": str(msg.id),
+            "text": msg.text,
+            "speaker": msg.speaker.value,
+            "created_at": msg.created_at.isoformat(),
+            "image_key": msg.image_key,
+        }
+        if msg.speaker == Speaker.TOOL:
+            # Tool messages hold raw fetched context for the LLM; only surface
+            # their header line (e.g. "[web_search result]") in the UI.
+            item["text"] = msg.text.split("\n", 1)[0]
+            tool = tool_name_from_message(msg.text)
+            artifact = artifacts_by_message.get(str(msg.id))
+            item["tool"] = tool
+            item["label"] = tool_label(tool)
+            item["artifact"] = artifact_ref(artifact) if artifact else None
+        messages.append(item)
     return jsonify(
         {
             "id": str(conversation.id),
@@ -266,7 +516,7 @@ async def get_conversation(conversation_id: str):
 
 
 @conversation_blueprint.post("/")
-@jwt_refresh_token_required
+@jwt_access_required
 async def create_conversation():
     user_uuid = get_jwt_identity()
     user = await blueprints.users.models.User.get(id=user_uuid)
@@ -280,11 +530,58 @@ async def create_conversation():
 
 
 @conversation_blueprint.get("/")
-@jwt_refresh_token_required
+@jwt_access_required
 async def get_all_conversations():
     user_uuid = get_jwt_identity()
     user = await blueprints.users.models.User.get(id=user_uuid)
-    conversations = Conversation.filter(user=user).order_by("-updated_at")
-    serialized_conversations = await PydListConversation.from_queryset(conversations)
+
+    query = Conversation.filter(user=user)
+
+    search = request.args.get("search", "").strip()
+    if search:
+        query = query.filter(name__icontains=search)
+
+    query = query.order_by("-updated_at")
+
+    # `limit` is optional: when omitted we return the full list (backward
+    # compatible with any non-frontend callers). `offset` only applies with it.
+    limit = request.args.get("limit", type=int)
+    if limit is not None:
+        offset = request.args.get("offset", default=0, type=int)
+        query = query.offset(offset).limit(limit)
+
+    serialized_conversations = await PydListConversation.from_queryset(query)
 
     return jsonify(serialized_conversations.model_dump())
+
+
+@conversation_blueprint.patch("/<conversation_id>")
+@jwt_access_required
+async def rename_conversation(conversation_id: str):
+    user_uuid = get_jwt_identity()
+    body = await request.get_json()
+    name = (body or {}).get("name", "").strip()
+    if not name:
+        return jsonify({"error": "name is required"}), 400
+
+    conversation = await _get_owned_conversation(conversation_id, user_uuid)
+    if conversation is None:
+        return jsonify({"error": "conversation not found"}), 404
+
+    conversation.name = name[:255]
+    await conversation.save()
+
+    serialized_conversation = await PydConversation.from_tortoise_orm(conversation)
+    return jsonify(serialized_conversation.model_dump())
+
+
+@conversation_blueprint.delete("/<conversation_id>")
+@jwt_access_required
+async def delete_conversation(conversation_id: str):
+    user_uuid = get_jwt_identity()
+    conversation = await _get_owned_conversation(conversation_id, user_uuid)
+    if conversation is None:
+        return jsonify({"error": "conversation not found"}), 404
+
+    await conversation.delete()
+    return jsonify({"success": True})

blueprints/conversation/logic.py

@@ -1,9 +1,55 @@
+from datetime import datetime, timezone
+
 import tortoise.exceptions
+from langchain_core.messages import ToolMessage
+from quart import current_app
 
 import blueprints.users.models
 
 from .models import Conversation, ConversationMessage
 
+# Cap persisted tool output so replayed history stays within the LLM context
+# budget (llama-server slots are 32k tokens; base prompt + tools already use ~6k).
+TOOL_RESULT_MAX_CHARS = 4000
+
+
+def tool_result_text(tool_name: str, output) -> str:
+    """Format a tool's output for persistence as a conversation message."""
+    content = getattr(output, "content", output)
+    if isinstance(content, (list, tuple)):
+        content = "\n".join(str(item) for item in content)
+    text = str(content)
+    if len(text) > TOOL_RESULT_MAX_CHARS:
+        text = text[:TOOL_RESULT_MAX_CHARS] + "\n[truncated]"
+    return f"[{tool_name} result]\n{text}"
+
+
+def get_agent_for(user: blueprints.users.models.User):
+    """Admins get the agent with admin-only tools (Homebox, BookStack); everyone else the main one."""
+    if user.is_admin():
+        return getattr(current_app, "admin_agent", current_app.main_agent)
+    return current_app.main_agent
+
+
+async def persist_agent_tool_messages(
+    conversation: Conversation,
+    user: blueprints.users.models.User,
+    response_messages: list,
+) -> None:
+    """Persist ToolMessages from an agent response as 'tool' conversation messages.
+
+    Keeps fetched context (web searches, RAG chunks, etc.) available to later
+    turns, which otherwise only see the final text answers.
+    """
+    for msg in response_messages:
+        if isinstance(msg, ToolMessage):
+            await add_message_to_conversation(
+                conversation=conversation,
+                message=tool_result_text(msg.name or "tool", msg),
+                speaker="tool",
+                user=user,
+            )
+
 
 async def create_conversation(name: str = "") -> Conversation:
     conversation = await Conversation.create(name=name)
@@ -16,19 +62,26 @@ async def add_message_to_conversation(
     speaker: str,
     user: blueprints.users.models.User,
     image_key: str | None = None,
+    message_handle: str | None = None,
 ) -> ConversationMessage:
-    print(conversation, message, speaker)
+    # Bump updated_at on every message so conversations sort by last activity.
+    # `update_fields` bypasses the auto_now recompute, so set it explicitly.
+    update_fields = ["updated_at"]
+    conversation.updated_at = datetime.now(timezone.utc)
 
     # Name the conversation after the first user message
     if speaker == "user" and not await conversation.messages.all().exists():
         conversation.name = message[:100]
-        await conversation.save()
+        update_fields.append("name")
+
+    await conversation.save(update_fields=update_fields)
 
     message = await ConversationMessage.create(
         text=message,
         speaker=speaker,
         conversation=conversation,
         image_key=image_key,
+        message_handle=message_handle,
     )
 
     return message
@@ -47,11 +100,29 @@ async def get_the_only_conversation() -> Conversation:
 
 async def get_conversation_for_user(user: blueprints.users.models.User) -> Conversation:
     try:
-        return await Conversation.get(user=user)
+        conversation = await Conversation.get(user=user)
+    except tortoise.exceptions.MultipleObjectsReturned:
+        conversation = (
+            await Conversation.filter(user=user).order_by("created_at").first()
+        )
     except tortoise.exceptions.DoesNotExist:
-        await Conversation.get_or_create(name=f"{user.username}'s chat", user=user)
+        conversation = await Conversation.create(
+            name=f"{user.username}'s chat", user=user
+        )
+    return conversation
 
-        return await Conversation.get(user=user)
+
+async def get_conversation_for_channel(
+    user: blueprints.users.models.User, channel: str
+) -> Conversation:
+    conversation = await (
+        Conversation.filter(user=user, channel=channel).order_by("-updated_at").first()
+    )
+    if conversation is None:
+        conversation = await Conversation.create(
+            name=f"{user.username}'s {channel} chat", user=user, channel=channel
+        )
+    return conversation
 
 
 async def get_conversation_by_id(id: str) -> Conversation:

blueprints/conversation/memory.py

@@ -1,4 +1,5 @@
 from .models import UserMemory
+from .prompts import SIMBA_SYSTEM_PROMPT
 
 
 async def get_memories_for_user(user_id: str) -> list[str]:
@@ -7,6 +8,14 @@ async def get_memories_for_user(user_id: str) -> list[str]:
     return [m.content for m in memories]
 
 
+async def build_system_prompt_with_memories(user_id: str) -> str:
+    memories = await get_memories_for_user(user_id)
+    if not memories:
+        return SIMBA_SYSTEM_PROMPT
+    block = "\n".join(f"- {m}" for m in memories)
+    return f"{SIMBA_SYSTEM_PROMPT}\n\nUSER MEMORIES (facts the user has asked you to remember):\n{block}"
+
+
 async def save_memory(user_id: str, content: str) -> str:
     """Save a new memory or touch an existing one (exact-match dedup)."""
     existing = await UserMemory.filter(user_id=user_id, content=content).first()

blueprints/conversation/models.py

@@ -11,6 +11,7 @@ from tortoise.models import Model
 class Speaker(enum.Enum):
     USER = "user"
     SIMBA = "simba"
+    TOOL = "tool"
 
 
 class Conversation(Model):
@@ -21,6 +22,7 @@ class Conversation(Model):
     user: fields.ForeignKeyRelation = fields.ForeignKeyField(
         "models.User", related_name="conversations", null=True
     )
+    channel = fields.CharField(max_length=20, default="web", null=True)
 
     class Meta:
         table = "conversations"
@@ -35,6 +37,7 @@ class ConversationMessage(Model):
     created_at = fields.DatetimeField(auto_now_add=True)
     speaker = fields.CharEnumField(enum_type=Speaker, max_length=10)
     image_key = fields.CharField(max_length=512, null=True, default=None)
+    message_handle = fields.CharField(max_length=255, null=True, default=None)
 
     class Meta:
         table = "conversation_messages"

blueprints/conversation/prompts.py

@@ -1,4 +1,4 @@
-SIMBA_SYSTEM_PROMPT = """You are a helpful cat assistant named Simba that understands veterinary terms. When there are questions to you specifically, they are referring to Simba the cat. Answer the user in as if you were a cat named Simba. Don't act too catlike. Be assertive.
+SIMBA_SYSTEM_PROMPT = """You are Simba, Ryan's helpful personal assistant. You're named after his orange cat. You have a warm, friendly personality with a light cat-themed touch, but your priority is always being genuinely useful — give thorough, detailed answers and think things through carefully. When asked about Simba the cat, you speak as him in first person. For everything else, you're just a great assistant who happens to have a cat's name.
 
 SIMBA FACTS (as of January 2026):
 - Name: Simba
@@ -40,6 +40,21 @@ You have access to Ryan's budget data through YNAB (You Need A Budget). When use
 - Use ynab_insights to provide spending trends, patterns, and recommendations
 Always use these tools when asked about budgets, spending, transactions, or financial health.
 
+MEAL PLANNING (Mealie Integration):
+You have access to Ryan's meal plans, recipes, and shopping lists through Mealie. When users ask about food or meal planning, use the appropriate Mealie tools:
+- Use mealie_todays_meals to check what's planned for today
+- Use mealie_meal_plans to see the week's meal schedule or a custom date range
+- Use mealie_get_recipe to get full recipe details (ingredients, instructions)
+- Use mealie_shopping_lists to check what groceries are needed
+- Use mealie_create_meal_plan to add meals to the plan
+Always use these tools when asked about meals, recipes, what's for dinner, or shopping lists.
+
+HOME INVENTORY (Homebox Integration):
+If homebox_* tools are available, use them for questions about household items: where something is stored, what's in a location, warranties, and maintenance. Search before creating items to avoid duplicates, and use homebox_set_item to edit an existing item (name, description, notes, quantity, purchase info, custom fields) instead of creating a new one.
+
+WIKI (BookStack Integration):
+If bookstack_* tools are available, use them to look up and write household documentation in the BookStack wiki. Search before creating books, chapters, or pages to avoid duplicates, and prefer updating an existing page over creating a near-copy. Write page content as markdown.
+
 NOTES & RESEARCH (Obsidian Integration):
 You have access to Ryan's Obsidian vault through the Obsidian integration. When users ask about research, personal notes, or information that might be stored in markdown files, use the appropriate Obsidian tools:
 - Use obsidian_search_notes to search through your vault for relevant information
@@ -49,7 +64,7 @@ You have access to Ryan's Obsidian vault through the Obsidian integration. When
 Always use these tools when users ask about notes, research, ideas, tasks, or when you want to save information for future reference.
 
 DAILY JOURNAL (Task Tracking):
-You have access to Ryan's daily journal notes. Each note lives at journal/YYYY/YYYY-MM-DD.md and has two sections: tasks and log.
+You have access to Ryan's daily journal notes. Each note lives at 50 - Journal/YYYY/MM/YYYY-MM-DD.md and has two sections: tasks and log.
 - Use journal_get_today to read today's full daily note (tasks + log)
 - Use journal_get_tasks to list tasks (done/pending) for today or a specific date
 - Use journal_add_task to add a new task to today's (or a given date's) note

blueprints/conversation/tool_events.py

@@ -0,0 +1,77 @@
+"""Pure shaping of LangChain tool events into SSE `tool_start` / `tool_end` payloads."""
+
+import json
+import re
+
+from .tool_labels import tool_label
+
+INPUT_VALUE_MAX_CHARS = 200
+# Injected by LangChain rather than chosen by the model; never shown to the client.
+_HIDDEN_INPUT_KEYS = frozenset({"config", "callbacks", "run_manager"})
+
+_TOOL_HEADER_RE = re.compile(r"^\[(\S+) result\]")
+
+
+def _truncate(text: str) -> str:
+    if len(text) > INPUT_VALUE_MAX_CHARS:
+        return text[: INPUT_VALUE_MAX_CHARS - 1] + "…"
+    return text
+
+
+def summarize_tool_input(raw) -> dict[str, str | int | float | bool]:
+    """Reduce a tool's input to flat, display-safe scalars."""
+    if raw is None:
+        return {}
+    if not isinstance(raw, dict):
+        return {"input": _truncate(str(raw))}
+    summary: dict[str, str | int | float | bool] = {}
+    for key, value in raw.items():
+        if key in _HIDDEN_INPUT_KEYS or value is None:
+            continue
+        if isinstance(value, (bool, int, float)):
+            summary[key] = value
+        elif isinstance(value, str):
+            summary[key] = _truncate(value)
+        else:
+            try:
+                summary[key] = _truncate(json.dumps(value, default=str))
+            except (TypeError, ValueError):
+                summary[key] = _truncate(str(value))
+    return summary
+
+
+def tool_start_payload(event: dict) -> dict:
+    name = event["name"]
+    return {
+        "type": "tool_start",
+        "run_id": event["run_id"],
+        "tool": name,
+        "label": tool_label(name),
+        "input": summarize_tool_input(event.get("data", {}).get("input")),
+    }
+
+
+def tool_end_payload(
+    event: dict,
+    started_at: float | None,
+    artifact_ref: dict | None,
+    *,
+    now: float,
+    status: str = "ok",
+) -> dict:
+    name = event["name"]
+    return {
+        "type": "tool_end",
+        "run_id": event["run_id"],
+        "tool": name,
+        "label": tool_label(name),
+        "status": status,
+        "ms": round((now - started_at) * 1000) if started_at is not None else 0,
+        "artifact": artifact_ref,
+    }
+
+
+def tool_name_from_message(text: str) -> str:
+    """Recover the tool name from a persisted `[tool_name result]` header."""
+    match = _TOOL_HEADER_RE.match(text)
+    return match.group(1) if match else "tool"

blueprints/conversation/tool_labels.py

@@ -0,0 +1,64 @@
+"""Friendly, user-facing labels for agent tool calls (shown in the activity timeline)."""
+
+TOOL_LABELS: dict[str, str] = {
+    "get_current_date": "Checking the date…",
+    "web_search": "Searching the web…",
+    "simba_search": "Searching household documents…",
+    "save_user_memory": "Saving to memory…",
+    # YNAB (current names)
+    "ynab_budget_summary": "Checking budget…",
+    "ynab_search_transactions": "Searching transactions…",
+    "ynab_category_spending": "Reviewing category spending…",
+    "ynab_category_allocations": "Reviewing category budgets…",
+    "ynab_insights": "Analyzing spending trends…",
+    # YNAB (names after the #55 mirror)
+    "ynab_account_balances": "Checking account balances…",
+    "ynab_spending_report": "Building spending report…",
+    "ynab_category_budget": "Reviewing category budgets…",
+    "ynab_recent_changes": "Checking recent budget changes…",
+    "ynab_sql": "Querying budget data…",
+    # Mealie
+    "mealie_todays_meals": "Checking today's meals…",
+    "mealie_meal_plans": "Checking the meal plan…",
+    "mealie_get_recipe": "Fetching recipe…",
+    "mealie_shopping_lists": "Checking shopping lists…",
+    "mealie_create_meal_plan": "Adding to the meal plan…",
+    # Obsidian / journal
+    "obsidian_search_notes": "Searching notes…",
+    "obsidian_read_note": "Reading note…",
+    "obsidian_create_note": "Creating note…",
+    "obsidian_create_task": "Creating task…",
+    "journal_get_today": "Reading today's journal…",
+    "journal_get_tasks": "Checking tasks…",
+    "journal_add_task": "Adding task…",
+    "journal_complete_task": "Completing task…",
+    # Google
+    "get_calendar_events": "Checking calendar…",
+    "create_calendar_event": "Creating calendar event…",
+    "gmail_search_emails": "Searching email…",
+    "gmail_get_email": "Reading email…",
+    # SimbaKit
+    "simbakit_device_status": "Checking Simba's devices…",
+    "simbakit_weight_history": "Checking Simba's weight…",
+    "simbakit_litter_activity": "Checking litter box activity…",
+    "simbakit_drinking_activity": "Checking water fountain activity…",
+    # Beli
+    "beli_search_restaurants": "Searching restaurants…",
+}
+
+# MCP tools are discovered at runtime, so they match by name prefix.
+TOOL_PREFIX_LABELS: tuple[tuple[str, str], ...] = (
+    ("homebox_", "Checking home inventory…"),
+    ("bookstack_", "Checking the wiki…"),
+)
+
+
+def tool_label(tool_name: str) -> str:
+    """Return the friendly label for a tool, falling back to "Using <tool>…"."""
+    label = TOOL_LABELS.get(tool_name)
+    if label:
+        return label
+    for prefix, prefix_label in TOOL_PREFIX_LABELS:
+        if tool_name.startswith(prefix):
+            return prefix_label
+    return f"Using {tool_name}…"

blueprints/cron/__init__.py

@@ -0,0 +1,176 @@
+import hmac
+import logging
+import os
+from datetime import datetime, timezone
+
+from quart import Blueprint, current_app, jsonify, request
+
+from blueprints.users.decorators import admin_required
+from blueprints.scheduled_messages.models import MessageChannel
+from .models import CronJob
+
+cron_blueprint = Blueprint("cron_api", __name__, url_prefix="/api/cron")
+
+logger = logging.getLogger(__name__)
+
+
+def _serialize(job: CronJob) -> dict:
+    return {
+        "id": str(job.id),
+        "name": job.name,
+        "description": job.description,
+        "prompt": job.prompt,
+        "recipient": job.recipient,
+        "channel": job.channel.value,
+        "enabled": job.enabled,
+        "last_run_at": job.last_run_at.isoformat() if job.last_run_at else None,
+        "last_status": job.last_status,
+        "last_error": job.last_error,
+        "created_at": job.created_at.isoformat(),
+        "updated_at": job.updated_at.isoformat(),
+    }
+
+
+def _check_cron_secret() -> bool:
+    expected = os.environ.get("CRON_SECRET", "")
+    if not expected:
+        return False
+    provided = request.headers.get("X-Cron-Secret", "")
+    return hmac.compare_digest(provided.encode(), expected.encode())
+
+
+@cron_blueprint.route("/", methods=["GET"])
+@admin_required
+async def list_jobs():
+    jobs = await CronJob.all().order_by("name")
+    return jsonify([_serialize(j) for j in jobs])
+
+
+@cron_blueprint.route("/", methods=["POST"])
+@admin_required
+async def create_job():
+    data = await request.get_json()
+    if not data:
+        return jsonify({"error": "Invalid payload"}), 400
+
+    name = (data.get("name") or "").strip()
+    prompt = (data.get("prompt") or "").strip()
+    recipient = (data.get("recipient") or "").strip()
+    channel_str = data.get("channel")
+    description = (data.get("description") or "").strip() or None
+
+    if not name or not prompt or not recipient or not channel_str:
+        return jsonify(
+            {"error": "name, prompt, recipient, and channel are required"}
+        ), 400
+
+    try:
+        channel = MessageChannel(channel_str)
+    except ValueError:
+        return jsonify(
+            {"error": f"Invalid channel: {channel_str}. Must be 'imessage' or 'email'"}
+        ), 400
+
+    job = await CronJob.create(
+        name=name,
+        description=description,
+        prompt=prompt,
+        recipient=recipient,
+        channel=channel,
+        enabled=bool(data.get("enabled", True)),
+    )
+    return jsonify(_serialize(job)), 201
+
+
+@cron_blueprint.route("/<job_id>", methods=["PUT"])
+@admin_required
+async def update_job(job_id: str):
+    job = await CronJob.get_or_none(id=job_id)
+    if not job:
+        return jsonify({"error": "Not found"}), 404
+
+    data = await request.get_json()
+    if not data:
+        return jsonify({"error": "Invalid payload"}), 400
+
+    if "name" in data:
+        job.name = data["name"].strip()
+    if "description" in data:
+        job.description = (data["description"] or "").strip() or None
+    if "prompt" in data:
+        job.prompt = data["prompt"].strip()
+    if "recipient" in data:
+        job.recipient = data["recipient"].strip()
+    if "channel" in data:
+        try:
+            job.channel = MessageChannel(data["channel"])
+        except ValueError:
+            return jsonify({"error": f"Invalid channel: {data['channel']}"}), 400
+    if "enabled" in data:
+        job.enabled = bool(data["enabled"])
+
+    await job.save()
+    return jsonify(_serialize(job))
+
+
+@cron_blueprint.route("/<job_id>", methods=["DELETE"])
+@admin_required
+async def delete_job(job_id: str):
+    job = await CronJob.get_or_none(id=job_id)
+    if not job:
+        return jsonify({"error": "Not found"}), 404
+
+    await job.delete()
+    return jsonify({"status": "deleted"})
+
+
+@cron_blueprint.route("/<job_id>/trigger", methods=["POST"])
+async def trigger_job(job_id: str):
+    if not _check_cron_secret():
+        return jsonify({"error": "Unauthorized"}), 401
+
+    job = await CronJob.get_or_none(id=job_id)
+    if not job:
+        return jsonify({"error": "Not found"}), 404
+
+    if not job.enabled:
+        return jsonify({"skipped": True}), 200
+
+    try:
+        import uuid
+
+        response = await current_app.main_agent.ainvoke(
+            {"messages": [{"role": "user", "content": job.prompt}]},
+            config={"configurable": {"thread_id": f"cron-{uuid.uuid4()}"}},
+        )
+        result = response.get("messages", [])[-1].content
+
+        if job.channel == MessageChannel.IMESSAGE:
+            from blueprints.imessage import send_imessage
+            from utils.strip_markdown import strip_markdown
+
+            await send_imessage(job.recipient, strip_markdown(result))
+
+        elif job.channel == MessageChannel.EMAIL:
+            from blueprints.email import send_email_reply
+
+            await send_email_reply(
+                to=job.recipient,
+                subject=job.name,
+                body=result,
+            )
+
+        job.last_run_at = datetime.now(timezone.utc)
+        job.last_status = "success"
+        job.last_error = None
+        await job.save()
+        logger.info(f"Cron job {job.id} ({job.name}) executed successfully")
+        return jsonify({"ok": True})
+
+    except Exception as e:
+        job.last_run_at = datetime.now(timezone.utc)
+        job.last_status = "failed"
+        job.last_error = str(e)
+        await job.save()
+        logger.error(f"Cron job {job.id} ({job.name}) failed: {e}")
+        return jsonify({"error": str(e)}), 500

blueprints/cron/models.py

@@ -0,0 +1,22 @@
+from tortoise import fields
+from tortoise.models import Model
+
+from blueprints.scheduled_messages.models import MessageChannel
+
+
+class CronJob(Model):
+    id = fields.UUIDField(primary_key=True)
+    name = fields.CharField(max_length=255)
+    description = fields.TextField(null=True)
+    prompt = fields.TextField()
+    recipient = fields.CharField(max_length=255)
+    channel = fields.CharEnumField(enum_type=MessageChannel, max_length=20)
+    enabled = fields.BooleanField(default=True)
+    last_run_at = fields.DatetimeField(null=True)
+    last_status = fields.CharField(max_length=50, null=True)
+    last_error = fields.TextField(null=True)
+    created_at = fields.DatetimeField(auto_now_add=True)
+    updated_at = fields.DatetimeField(auto_now=True)
+
+    class Meta:
+        table = "cron_jobs"

blueprints/email/__init__.py

@@ -7,14 +7,15 @@ import time
 from collections import defaultdict
 
 import httpx
-from quart import Blueprint, request
+from quart import Blueprint, current_app, request
 
 from blueprints.users.models import User
 from blueprints.conversation.logic import (
-    get_conversation_for_user,
+    get_conversation_for_channel,
     add_message_to_conversation,
+    persist_agent_tool_messages,
 )
-from blueprints.conversation.agents import main_agent
+from blueprints.conversation.models import Speaker
 from blueprints.conversation.prompts import SIMBA_SYSTEM_PROMPT
 from . import models  # noqa: F401 — register Tortoise ORM models
 from .helpers import generate_email_token, get_user_email_address  # noqa: F401
@@ -176,7 +177,7 @@ async def webhook():
 
     # Get or create conversation
     try:
-        conversation = await get_conversation_for_user(user=user)
+        conversation = await get_conversation_for_channel(user=user, channel="email")
         await conversation.fetch_related("messages")
     except Exception as e:
         logger.error(f"Failed to get conversation for user {user.username}: {e}")
@@ -193,17 +194,20 @@ async def webhook():
     # Build messages payload
     try:
         messages = await conversation.messages.all()
-        recent_messages = list(messages)[-10:]
+        recent_messages = list(messages)[-20:]
 
         messages_payload = [{"role": "system", "content": SIMBA_SYSTEM_PROMPT}]
         for msg in recent_messages[:-1]:
-            role = "user" if msg.speaker == "user" else "assistant"
+            role = "user" if msg.speaker == Speaker.USER else "assistant"
             messages_payload.append({"role": role, "content": msg.text})
         messages_payload.append({"role": "user", "content": body})
 
         logger.info(f"Invoking LangChain agent with {len(messages_payload)} messages")
-        response = await main_agent.ainvoke({"messages": messages_payload})
+        response = await current_app.main_agent.ainvoke({"messages": messages_payload})
         response_text = response.get("messages", [])[-1].content
+        await persist_agent_tool_messages(
+            conversation, user, response.get("messages", [])
+        )
     except Exception as e:
         logger.error(f"Error invoking agent for email: {e}")
         response_text = "Sorry, I'm having trouble thinking right now."

blueprints/email/crypto_service.py

@@ -4,11 +4,27 @@ Encryption service for email credentials.
 Provides transparent Fernet encryption for sensitive fields in the database.
 """
 
+import base64
 import os
 from cryptography.fernet import Fernet
 from tortoise import fields
 
 
+def _is_fernet_token(value: str) -> bool:
+    """Return True if value looks like a Fernet token.
+
+    Fernet tokens are URL-safe base64 and decode to at least 73 bytes
+    (1 version + 8 timestamp + 16 IV + 16 min-ciphertext + 32 HMAC).
+    The first decoded byte is always 0x80 (the Fernet version byte).
+    """
+    try:
+        padded = value + "=" * (-len(value) % 4)
+        raw = base64.urlsafe_b64decode(padded.encode())
+        return len(raw) >= 73 and raw[0] == 0x80
+    except Exception:
+        return False
+
+
 class EncryptedTextField(fields.TextField):
     """
     Custom Tortoise ORM field that transparently encrypts/decrypts text values.
@@ -38,10 +54,16 @@ class EncryptedTextField(fields.TextField):
         return self.fernet.encrypt(value.encode()).decode()
 
     def to_python_value(self, value: str) -> str:
-        """Decrypt value when loading from database."""
+        """Decrypt value when loading from database.
+
+        Plaintext values (e.g. freshly-set before the first DB round-trip) are
+        returned as-is. Values that look like Fernet tokens are decrypted — a
+        wrong key still raises InvalidToken, preserving the security guarantee.
+        """
         if value is None:
             return None
-        # Decrypt Fernet token
+        if not _is_fernet_token(value):
+            return value
         return self.fernet.decrypt(value.encode()).decode()
 
 

blueprints/imessage/__init__.py

@@ -0,0 +1,389 @@
+import asyncio
+import os
+import hmac
+import logging
+import functools
+import time
+from collections import defaultdict
+
+import httpx
+from quart import Blueprint, request, jsonify
+
+from blueprints.users.models import User
+from blueprints.conversation.logic import (
+    get_agent_for,
+    get_conversation_for_channel,
+    add_message_to_conversation,
+    persist_agent_tool_messages,
+)
+from blueprints.conversation.models import Conversation, ConversationMessage
+from blueprints.conversation.memory import build_system_prompt_with_memories
+from utils.strip_markdown import extract_agent_text, strip_markdown
+
+imessage_blueprint = Blueprint("imessage_api", __name__, url_prefix="/api/imessage")
+
+logger = logging.getLogger(__name__)
+
+# Rate limiting: per-number message timestamps
+_rate_limit_store: dict[str, list[float]] = defaultdict(list)
+
+RATE_LIMIT_MAX = int(os.getenv("IMESSAGE_RATE_LIMIT_MAX", "10"))
+RATE_LIMIT_WINDOW = int(os.getenv("IMESSAGE_RATE_LIMIT_WINDOW", "60"))
+
+MAX_MESSAGE_LENGTH = 2000
+
+SENDBLUE_API_BASE = "https://api.sendblue.co"
+
+
+def _get_sendblue_headers() -> dict[str, str]:
+    return {
+        "sb-api-key-id": os.getenv("SENDBLUE_API_KEY", ""),
+        "sb-api-secret-key": os.getenv("SENDBLUE_API_SECRET", ""),
+        "Content-Type": "application/json",
+    }
+
+
+def _check_rate_limit(phone_number: str) -> bool:
+    """Check if a phone number has exceeded the rate limit.
+
+    Returns True if the request is allowed, False if rate-limited.
+    """
+    now = time.monotonic()
+    cutoff = now - RATE_LIMIT_WINDOW
+
+    timestamps = _rate_limit_store[phone_number]
+    _rate_limit_store[phone_number] = [t for t in timestamps if t > cutoff]
+
+    if len(_rate_limit_store[phone_number]) >= RATE_LIMIT_MAX:
+        return False
+
+    _rate_limit_store[phone_number].append(now)
+    return True
+
+
+async def send_imessage(
+    to_number: str,
+    content: str,
+    reply_to_handle: str | None = None,
+) -> dict:
+    """Send an iMessage via SendBlue API."""
+    from_number = os.getenv("SENDBLUE_FROM_NUMBER", "")
+
+    payload: dict = {
+        "number": to_number,
+        "from_number": from_number,
+        "content": content,
+    }
+    if reply_to_handle:
+        payload["reply_to"] = {"message_handle": reply_to_handle}
+
+    async with httpx.AsyncClient() as client:
+        resp = await client.post(
+            f"{SENDBLUE_API_BASE}/api/send-message",
+            headers=_get_sendblue_headers(),
+            json=payload,
+            timeout=30,
+        )
+        resp.raise_for_status()
+        return resp.json()
+
+
+async def send_typing_indicator(
+    to_number: str,
+    state: str = "start",
+    max_duration_ms: int | None = None,
+) -> None:
+    """Send or stop a typing indicator. Errors are logged and swallowed."""
+    from_number = os.getenv("SENDBLUE_FROM_NUMBER", "")
+    payload: dict = {
+        "number": to_number,
+        "from_number": from_number,
+        "state": state,
+    }
+    if max_duration_ms is not None:
+        payload["max_duration_ms"] = max_duration_ms
+
+    try:
+        async with httpx.AsyncClient() as client:
+            await client.post(
+                f"{SENDBLUE_API_BASE}/api/send-typing-indicator",
+                headers=_get_sendblue_headers(),
+                json=payload,
+                timeout=10,
+            )
+    except Exception as e:
+        logger.warning(f"Failed to send typing indicator ({state}): {e}")
+
+
+def validate_sendblue_signature(f):
+    """Decorator to validate the SendBlue webhook signing secret."""
+
+    @functools.wraps(f)
+    async def decorated_function(*args, **kwargs):
+        if os.getenv("SENDBLUE_SIGNATURE_VALIDATION", "true").lower() == "false":
+            return await f(*args, **kwargs)
+
+        secret = os.getenv("SENDBLUE_WEBHOOK_SECRET")
+        if not secret:
+            logger.error("SENDBLUE_WEBHOOK_SECRET not set — rejecting request")
+            return jsonify({"error": "Server misconfigured"}), 500
+
+        sig = request.headers.get("sb-signing-secret", "")
+        if not hmac.compare_digest(sig, secret):
+            logger.warning("Invalid SendBlue signing secret")
+            return jsonify({"error": "Unauthorized"}), 403
+
+        return await f(*args, **kwargs)
+
+    return decorated_function
+
+
+@imessage_blueprint.route("/webhook", methods=["POST"])
+@validate_sendblue_signature
+async def webhook():
+    """Handle incoming iMessages from SendBlue."""
+    data = await request.get_json()
+    if not data:
+        return jsonify({"error": "Invalid payload"}), 400
+
+    from_number = data.get("from_number")
+    content = data.get("content") or ""
+    media_url = data.get("media_url")
+    is_outbound = data.get("is_outbound", False)
+
+    # Threading fields from SendBlue
+    inbound_handle = data.get("message_handle")
+    reply_to_handle = (data.get("reply_to") or {}).get("message_handle")
+    originator_handle = (data.get("thread_originator") or {}).get("message_handle")
+
+    # Ignore outbound messages (our own replies echoed back)
+    if is_outbound:
+        return jsonify({"status": "ignored"}), 200
+
+    if not from_number:
+        return jsonify({"error": "Missing from_number"}), 400
+
+    if not content and not media_url:
+        return jsonify({"error": "Missing content and media_url"}), 400
+
+    content = content.strip()
+    if not content and not media_url:
+        await send_imessage(
+            from_number,
+            "I received an empty message. Please send some text or an image!",
+        )
+        return jsonify({"status": "ok"}), 200
+
+    # Rate limiting
+    if not _check_rate_limit(from_number):
+        logger.warning(f"Rate limit exceeded for {from_number}")
+        await send_imessage(
+            from_number,
+            "You're sending messages too quickly. Please wait a moment and try again.",
+        )
+        return jsonify({"status": "rate_limited"}), 200
+
+    # Truncate overly long messages
+    if len(content) > MAX_MESSAGE_LENGTH:
+        content = content[:MAX_MESSAGE_LENGTH]
+        logger.info(
+            f"Truncated long message from {from_number} to {MAX_MESSAGE_LENGTH} chars"
+        )
+
+    logger.info(f"Received iMessage from {from_number}: {content[:100]}")
+
+    # Identify or create user
+    user = await User.filter(imessage_number=from_number).first()
+
+    if not user:
+        allowed_numbers = os.getenv("ALLOWED_IMESSAGE_NUMBERS", "").split(",")
+        if from_number not in allowed_numbers and "*" not in allowed_numbers:
+            await send_imessage(
+                from_number, "Sorry, you are not authorized to use this service."
+            )
+            return jsonify({"status": "unauthorized"}), 200
+
+        username = f"im_{from_number.lstrip('+')}"
+        try:
+            user = await User.create(
+                username=username,
+                email=f"{username}@imessage.simbarag.local",
+                imessage_number=from_number,
+                auth_provider="imessage",
+            )
+            logger.info(f"Created new user for iMessage: {username}")
+        except Exception as e:
+            logger.error(f"Failed to create user for {from_number}: {e}")
+            await send_imessage(
+                from_number, "Sorry, something went wrong setting up your account."
+            )
+            return jsonify({"status": "error"}), 200
+
+    # iMessage is restricted to admins
+    if not user.is_admin():
+        logger.warning(f"Non-admin user {user.username} attempted iMessage access")
+        await send_imessage(from_number, "Sorry, this feature is restricted to admins.")
+        return jsonify({"status": "forbidden"}), 200
+
+    # /threads command — list recent iMessage conversations
+    if content.strip().lower() == "/threads":
+        threads = (
+            await Conversation.filter(user=user, channel="imessage")
+            .order_by("-updated_at")
+            .limit(5)
+        )
+        if not threads:
+            await send_imessage(from_number, "No threads found.")
+        else:
+            lines = ["Your recent threads (most recent first):"]
+            for i, t in enumerate(threads, 1):
+                updated = t.updated_at.strftime("%b %-d")
+                lines.append(f"{i}. {t.name} ({updated})")
+            lines.append("\nReply to any message to continue its thread.")
+            await send_imessage(from_number, "\n".join(lines))
+        return jsonify({"status": "ok"}), 200
+
+    # Determine conversation based on iMessage reply threading:
+    # - Reply to an existing message → continue that conversation
+    # - New standalone message → start a fresh conversation
+    try:
+        if reply_to_handle:
+            lookup_handle = originator_handle or reply_to_handle
+            parent_msg = await ConversationMessage.get_or_none(
+                message_handle=lookup_handle,
+                conversation__user=user,
+                conversation__channel="imessage",
+            )
+            if parent_msg:
+                conversation = await Conversation.get(id=parent_msg.conversation_id)
+                logger.info(
+                    f"Continuing conversation {conversation.id} via reply to {lookup_handle!r}"
+                )
+            else:
+                # Handle not found (pre-migration messages) — fall back to most recent
+                logger.warning(
+                    f"Reply handle {lookup_handle!r} not in DB; falling back to most recent conversation"
+                )
+                conversation = await get_conversation_for_channel(
+                    user=user, channel="imessage"
+                )
+        else:
+            conversation = await Conversation.create(
+                name="New iMessage",
+                user=user,
+                channel="imessage",
+            )
+            logger.info(
+                f"New iMessage conversation {conversation.id} for {user.username}"
+            )
+
+    except Exception as e:
+        logger.error(f"Failed to get/create conversation for {user.username}: {e}")
+        await send_imessage(
+            from_number, "Sorry, something went wrong. Please try again later."
+        )
+        return jsonify({"status": "error"}), 200
+
+    # Save the inbound message now so it's persisted before we ack
+    await add_message_to_conversation(
+        conversation=conversation,
+        message=content,
+        speaker="user",
+        user=user,
+        message_handle=inbound_handle,
+    )
+
+    # Fire LLM processing in the background so we can ack SendBlue immediately.
+    # SendBlue retries if it doesn't receive a 200 within its timeout (~5s).
+    asyncio.ensure_future(
+        _process_and_reply(
+            from_number=from_number,
+            inbound_handle=inbound_handle,
+            conversation=conversation,
+            user=user,
+            content=content,
+            media_url=media_url,
+        )
+    )
+
+    return jsonify({"status": "ok"}), 200
+
+
+async def _process_and_reply(
+    from_number: str,
+    inbound_handle: str | None,
+    conversation: Conversation,
+    user,
+    content: str,
+    media_url: str | None,
+) -> None:
+    """Run the LLM agent and send the reply. Called as a background task."""
+    # Attach image if present
+    image_block = None
+    if media_url:
+        try:
+            from utils.image_process import image_content_block
+
+            async with httpx.AsyncClient() as client:
+                resp = await client.get(media_url, timeout=30)
+                resp.raise_for_status()
+            image_block = image_content_block(resp.content)
+        except Exception as e:
+            logger.error(f"Failed to load iMessage image: {e}")
+            content = f"{content or ''}\n\n[An image was sent but could not be loaded.]".strip()
+
+    await send_typing_indicator(from_number, state="start", max_duration_ms=120_000)
+
+    response_text = "Sorry, I'm having trouble thinking right now."
+    try:
+        if image_block:
+            user_content = [
+                {"type": "text", "text": content or "The user sent this image."},
+                image_block,
+            ]
+        else:
+            user_content = content
+
+        system_prompt = await build_system_prompt_with_memories(str(user.id))
+        system_prompt += (
+            "\n\nIMPORTANT: You are replying via iMessage. Use plain text only. "
+            "Do not use markdown tables, headers, bullet points, bold, italics, "
+            "or any other markdown formatting. Write in natural prose."
+        )
+        agent_config = {
+            "configurable": {
+                "user_id": str(user.id),
+                "is_admin": user.is_admin(),
+                "thread_id": str(conversation.id),
+                "system_prompt": system_prompt,
+            }
+        }
+        logger.info(f"Invoking LangChain agent for conversation {conversation.id}")
+        response = await get_agent_for(user).ainvoke(
+            {"messages": [{"role": "user", "content": user_content}]},
+            config=agent_config,
+        )
+        response_text = extract_agent_text(response.get("messages", [])[-1].content)
+        await persist_agent_tool_messages(
+            conversation, user, response.get("messages", [])
+        )
+
+    except Exception as e:
+        logger.error(f"Error invoking agent: {e}")
+    finally:
+        await send_typing_indicator(from_number, state="stop")
+
+    send_resp = await send_imessage(
+        from_number,
+        strip_markdown(response_text),
+        reply_to_handle=inbound_handle,
+    )
+    outbound_handle = (send_resp or {}).get("message_handle")
+
+    await add_message_to_conversation(
+        conversation=conversation,
+        message=response_text,
+        speaker="simba",
+        user=user,
+        message_handle=outbound_handle,
+    )

blueprints/rag/__init__.py

@@ -1,19 +1,18 @@
 from quart import Blueprint, jsonify
-from quart_jwt_extended import jwt_refresh_token_required
 
 from .logic import (
     delete_all_documents,
     get_vector_store_stats,
     index_documents,
-    index_obsidian_documents,
+    sync_obsidian_documents,
 )
-from blueprints.users.decorators import admin_required
+from blueprints.users.decorators import admin_required, jwt_access_required
 
 rag_blueprint = Blueprint("rag_api", __name__, url_prefix="/api/rag")
 
 
 @rag_blueprint.get("/stats")
-@jwt_refresh_token_required
+@jwt_access_required
 async def get_stats():
     """Get vector store statistics."""
     stats = get_vector_store_stats()
@@ -48,9 +47,9 @@ async def trigger_reindex():
 @rag_blueprint.post("/index-obsidian")
 @admin_required
 async def trigger_obsidian_index():
-    """Index all Obsidian markdown documents into vector store. Admin only."""
+    """Incrementally sync Obsidian documents into vector store. Admin only."""
     try:
-        result = await index_obsidian_documents()
+        result = await sync_obsidian_documents()
         stats = get_vector_store_stats()
         return jsonify({"status": "success", "result": result, "stats": stats})
     except Exception as e:

blueprints/rag/logic.py

@@ -1,12 +1,18 @@
 import datetime
 import logging
 import os
+import re
+import time
+from pathlib import Path
 
 from dotenv import load_dotenv
 from langchain_core.documents import Document
 from langchain_openai import OpenAIEmbeddings
 from langchain_postgres import PGVector
-from langchain_text_splitters import RecursiveCharacterTextSplitter
+from langchain_text_splitters import (
+    MarkdownHeaderTextSplitter,
+    RecursiveCharacterTextSplitter,
+)
 from sqlalchemy import create_engine, text
 
 from .fetchers import PaperlessNGXService
@@ -17,7 +23,18 @@ load_dotenv()
 
 logger = logging.getLogger(__name__)
 
-embeddings = OpenAIEmbeddings(model="text-embedding-3-small")
+_embedding_server_url = os.getenv("EMBEDDING_SERVER_URL")
+_embedding_model = os.getenv("EMBEDDING_MODEL_NAME", "text-embedding-3-small")
+
+if _embedding_server_url:
+    embeddings = OpenAIEmbeddings(
+        model=_embedding_model,
+        base_url=_embedding_server_url,
+        api_key="not-needed",
+        check_embedding_ctx_length=False,
+    )
+else:
+    embeddings = OpenAIEmbeddings(model=_embedding_model)
 
 # Convert Tortoise-style postgres:// URL to SQLAlchemy-style postgresql+psycopg://
 _db_url = os.getenv(
@@ -56,6 +73,46 @@ text_splitter = RecursiveCharacterTextSplitter(
     add_start_index=True,  # track index in original document
 )
 
+md_header_splitter = MarkdownHeaderTextSplitter(
+    headers_to_split_on=[("#", "h1"), ("##", "h2"), ("###", "h3")],
+    strip_headers=False,
+)
+
+md_chunk_splitter = RecursiveCharacterTextSplitter(
+    chunk_size=1000,
+    chunk_overlap=200,
+    add_start_index=True,
+)
+
+
+def _split_markdown_document(doc: Document) -> list[Document]:
+    """Split a markdown document by headers first, then by size.
+
+    Prepends the note filename to each chunk so chunks are self-contained.
+    """
+    note_name = (
+        Path(doc.metadata.get("filepath", "")).stem
+        if doc.metadata.get("filepath")
+        else ""
+    )
+
+    # Split by markdown headers
+    header_splits = md_header_splitter.split_text(doc.page_content)
+
+    # Carry over original document metadata to each header split
+    for split in header_splits:
+        split.metadata.update(doc.metadata)
+
+    # Then apply size-based splitting on large sections
+    sized_splits = md_chunk_splitter.split_documents(header_splits)
+
+    # Prepend note name for self-contained context
+    if note_name:
+        for split in sized_splits:
+            split.page_content = f"[Note: {note_name}]\n{split.page_content}"
+
+    return sized_splits
+
 
 def _get_collection_id():
     """Get the UUID of our collection from the langchain_pg_collection table."""
@@ -94,6 +151,7 @@ async def fetch_documents_from_paperless_ngx() -> list[Document]:
     documents = []
     for doc in data:
         metadata = {
+            "source": "paperless",
             "created_date": date_to_epoch(doc["created_date"]),
             "filename": doc["original_file_name"],
             "document_type": doctypes.get(doc["document_type"], ""),
@@ -103,13 +161,54 @@ async def fetch_documents_from_paperless_ngx() -> list[Document]:
     return documents
 
 
+def _make_serializable(value):
+    """Convert a value to a JSON-serializable type."""
+    if isinstance(value, (str, int, float, bool, type(None))):
+        return value
+    if isinstance(value, (list, tuple)):
+        return [_make_serializable(v) for v in value]
+    if isinstance(value, dict):
+        return {k: _make_serializable(v) for k, v in value.items()}
+    return str(value)
+
+
+def _sanitize_text(text_content: str) -> str:
+    """Strip non-printable and invalid characters that break embedding tokenizers."""
+    # Remove null bytes and control characters (keep newlines and tabs)
+    text_content = re.sub(r"[\x00-\x08\x0b\x0c\x0e-\x1f\x7f-\x9f]", "", text_content)
+    # Remove Unicode surrogates and other problematic Unicode
+    text_content = re.sub(r"[\ud800-\udfff\ufffe\uffff]", "", text_content)
+    # Remove replacement character clusters
+    text_content = text_content.replace("\ufffd", "")
+    # Collapse excessive whitespace
+    text_content = re.sub(r" {3,}", "  ", text_content)
+    return text_content.strip()
+
+
+def _sanitize_documents(documents: list[Document]) -> list[Document]:
+    """Sanitize page_content of all documents for embedding compatibility."""
+    for doc in documents:
+        doc.page_content = _sanitize_text(doc.page_content)
+    return [doc for doc in documents if doc.page_content]
+
+
 async def index_documents():
     """Index Paperless-NGX documents into vector store."""
     documents = await fetch_documents_from_paperless_ngx()
 
     splits = text_splitter.split_documents(documents)
+    splits = _sanitize_documents(splits)
+    logger.info(f"Indexing {len(splits)} chunks from {len(documents)} documents")
     vector_store = _get_vector_store()
-    await vector_store.aadd_documents(documents=splits)
+    for i, split in enumerate(splits):
+        try:
+            await vector_store.aadd_documents(documents=[split])
+        except Exception as e:
+            logger.error(
+                f"Failed to embed chunk {i} from {split.metadata.get('filename', 'unknown')}: {e}"
+            )
+            logger.debug(f"Chunk content preview: {split.page_content[:200]!r}")
+            raise
 
 
 async def fetch_obsidian_documents() -> list[Document]:
@@ -131,19 +230,24 @@ async def fetch_obsidian_documents() -> list[Document]:
             parsed = obsidian_service.parse_markdown(content, md_path)
 
             # Create LangChain Document with obsidian source
+            metadata = {
+                "source": "obsidian",
+                "filepath": parsed["filepath"],
+                "folder": str(Path(parsed["filepath"]).parent)
+                if parsed["filepath"]
+                else "",
+                "tags": parsed["tags"],
+                "created_at": parsed["metadata"].get("created_at"),
+                "indexed_at": time.time(),
+                **{
+                    k: v
+                    for k, v in parsed["metadata"].items()
+                    if k not in ["created_at", "created_by"]
+                },
+            }
             document = Document(
                 page_content=parsed["content"],
-                metadata={
-                    "source": "obsidian",
-                    "filepath": parsed["filepath"],
-                    "tags": parsed["tags"],
-                    "created_at": parsed["metadata"].get("created_at"),
-                    **{
-                        k: v
-                        for k, v in parsed["metadata"].items()
-                        if k not in ["created_at", "created_by"]
-                    },
-                },
+                metadata=_make_serializable(metadata),
             )
             documents.append(document)
 
@@ -168,17 +272,159 @@ async def index_obsidian_documents():
     # Delete existing obsidian chunks
     delete_documents_by_metadata("source", "obsidian")
 
-    # Split and index documents
-    splits = text_splitter.split_documents(documents)
+    # Split using markdown-aware chunking, sanitize, and index
+    splits = []
+    for doc in documents:
+        splits.extend(_split_markdown_document(doc))
+    splits = _sanitize_documents(splits)
     vector_store = _get_vector_store()
     await vector_store.aadd_documents(documents=splits)
 
     return {"indexed": len(documents)}
 
 
-async def query_vector_store(query: str):
+# In-memory cache of indexed obsidian files: {filepath: indexed_at}
+_obsidian_index_cache: dict[str, float] = {}
+
+
+def _load_obsidian_index_cache() -> dict[str, float]:
+    """Load indexed obsidian files from DB into cache (cold start only)."""
+    collection_id = _get_collection_id()
+    if not collection_id:
+        return {}
+    engine = _get_engine()
+    with engine.connect() as conn:
+        result = conn.execute(
+            text(
+                "SELECT DISTINCT cmetadata->>'filepath' AS filepath, "
+                "MAX((cmetadata->>'indexed_at')::float) AS indexed_at "
+                "FROM langchain_pg_embedding "
+                "WHERE collection_id = :cid AND cmetadata->>'source' = 'obsidian' "
+                "GROUP BY cmetadata->>'filepath'"
+            ),
+            {"cid": collection_id},
+        )
+        return {row[0]: row[1] for row in result if row[0] is not None}
+
+
+async def sync_obsidian_documents() -> dict[str, int]:
+    """Incrementally sync Obsidian documents to pgvector.
+
+    Compares file mtimes against stored indexed_at timestamps to only
+    re-index changed/new files and remove deleted ones.
+
+    Returns:
+        Dict with counts of added, updated, and deleted files.
+    """
+    global _obsidian_index_cache
+
+    obsidian_service = ObsidianService()
+
+    # Load cache from DB on first run
+    if not _obsidian_index_cache:
+        _obsidian_index_cache = _load_obsidian_index_cache()
+
+    # Build map of current vault files -> mtime
+    vault_files: dict[str, float] = {}
+    for md_path in obsidian_service.walk_vault():
+        vault_files[str(md_path)] = md_path.stat().st_mtime
+
+    added = 0
+    updated = 0
+    deleted = 0
+
+    # Find files to add or update
+    files_to_index: list[str] = []
+    for filepath, mtime in vault_files.items():
+        indexed_at = _obsidian_index_cache.get(filepath)
+        if indexed_at is None:
+            files_to_index.append(filepath)
+            added += 1
+        elif mtime > indexed_at:
+            # Delete old chunks first
+            delete_documents_by_metadata("filepath", filepath)
+            files_to_index.append(filepath)
+            updated += 1
+
+    # Find deleted files (in cache but not on disk)
+    for filepath in list(_obsidian_index_cache):
+        if filepath not in vault_files:
+            delete_documents_by_metadata("filepath", filepath)
+            del _obsidian_index_cache[filepath]
+            deleted += 1
+
+    # Index new/changed files
+    if files_to_index:
+        now = time.time()
+        documents = []
+        for filepath in files_to_index:
+            try:
+                with open(filepath, "r", encoding="utf-8") as f:
+                    content = f.read()
+                parsed = obsidian_service.parse_markdown(content, filepath)
+                metadata = {
+                    "source": "obsidian",
+                    "filepath": parsed["filepath"],
+                    "folder": str(Path(parsed["filepath"]).parent)
+                    if parsed["filepath"]
+                    else "",
+                    "tags": parsed["tags"],
+                    "created_at": parsed["metadata"].get("created_at"),
+                    "indexed_at": now,
+                    **{
+                        k: v
+                        for k, v in parsed["metadata"].items()
+                        if k not in ["created_at", "created_by"]
+                    },
+                }
+                document = Document(
+                    page_content=parsed["content"],
+                    metadata=_make_serializable(metadata),
+                )
+                documents.append(document)
+            except Exception as e:
+                logger.warning(f"Error reading {filepath}: {e}")
+                continue
+
+        if documents:
+            splits = []
+            for doc in documents:
+                splits.extend(_split_markdown_document(doc))
+            splits = _sanitize_documents(splits)
+            if splits:
+                vector_store = _get_vector_store()
+                await vector_store.aadd_documents(documents=splits)
+
+        # Update cache for successfully processed files
+        for filepath in files_to_index:
+            _obsidian_index_cache[filepath] = now
+
+    logger.info(
+        f"Obsidian sync complete: {added} added, {updated} updated, {deleted} deleted"
+    )
+    return {"added": added, "updated": updated, "deleted": deleted}
+
+
+async def query_vector_store(
+    query: str,
+    source: str | None = None,
+    k: int = 8,
+):
+    """Query the vector store with optional source filtering and MMR.
+
+    Args:
+        query: Search query text
+        source: Filter by source metadata (e.g., "obsidian", "paperless")
+        k: Number of results to return
+    """
     vector_store = _get_vector_store()
-    retrieved_docs = await vector_store.asimilarity_search(query, k=2)
+    filter_dict = {"source": source} if source else None
+    retrieved_docs = await vector_store.amax_marginal_relevance_search(
+        query,
+        k=k,
+        fetch_k=k * 3,
+        filter=filter_dict,
+    )
     serialized = "\n\n".join(
         (f"Source: {doc.metadata}\nContent: {doc.page_content}")
         for doc in retrieved_docs

blueprints/scheduled_messages/__init__.py

@@ -0,0 +1,208 @@
+import hmac
+import logging
+import os
+from datetime import datetime, timezone
+
+from quart import Blueprint, request, jsonify
+
+from blueprints.users.decorators import admin_required
+from .models import ScheduledMessage, MessageChannel, MessageStatus, Recurrence
+
+scheduled_messages_blueprint = Blueprint(
+    "scheduled_messages_api", __name__, url_prefix="/api/scheduled-messages"
+)
+
+logger = logging.getLogger(__name__)
+
+
+def _serialize(msg: ScheduledMessage) -> dict:
+    return {
+        "id": str(msg.id),
+        "recipient": msg.recipient,
+        "channel": msg.channel.value,
+        "content": msg.content,
+        "subject": msg.subject,
+        "scheduled_at": msg.scheduled_at.isoformat(),
+        "status": msg.status.value,
+        "recurrence": msg.recurrence.value,
+        "use_agent": msg.use_agent,
+        "error_message": msg.error_message,
+        "created_at": msg.created_at.isoformat(),
+        "updated_at": msg.updated_at.isoformat(),
+    }
+
+
+@scheduled_messages_blueprint.route("/", methods=["GET"])
+@admin_required
+async def list_messages():
+    messages = await ScheduledMessage.all().order_by("-scheduled_at")
+    return jsonify([_serialize(m) for m in messages])
+
+
+@scheduled_messages_blueprint.route("/", methods=["POST"])
+@admin_required
+async def create_message():
+    data = await request.get_json()
+    if not data:
+        return jsonify({"error": "Invalid payload"}), 400
+
+    recipient = (data.get("recipient") or "").strip()
+    channel = data.get("channel")
+    content = (data.get("content") or "").strip()
+    subject = (data.get("subject") or "").strip() or None
+    scheduled_at_str = data.get("scheduled_at")
+
+    recurrence_str = data.get("recurrence", "none")
+
+    if not recipient or not channel or not content or not scheduled_at_str:
+        return jsonify(
+            {"error": "recipient, channel, content, and scheduled_at are required"}
+        ), 400
+
+    try:
+        channel_enum = MessageChannel(channel)
+    except ValueError:
+        return jsonify(
+            {"error": f"Invalid channel: {channel}. Must be 'imessage' or 'email'"}
+        ), 400
+
+    try:
+        recurrence_enum = Recurrence(recurrence_str)
+    except ValueError:
+        return jsonify(
+            {
+                "error": f"Invalid recurrence: {recurrence_str}. Must be 'none', 'daily', 'weekly', or 'monthly'"
+            }
+        ), 400
+
+    if channel_enum == MessageChannel.EMAIL and not subject:
+        return jsonify({"error": "subject is required for email messages"}), 400
+
+    try:
+        scheduled_at = datetime.fromisoformat(scheduled_at_str)
+        if scheduled_at.tzinfo is None:
+            scheduled_at = scheduled_at.replace(tzinfo=timezone.utc)
+    except ValueError:
+        return jsonify({"error": "Invalid scheduled_at format"}), 400
+
+    if scheduled_at <= datetime.now(timezone.utc):
+        return jsonify({"error": "scheduled_at must be in the future"}), 400
+
+    from quart_jwt_extended import get_jwt_identity
+
+    user_id = get_jwt_identity()
+
+    use_agent = bool(data.get("use_agent", False))
+
+    msg = await ScheduledMessage.create(
+        recipient=recipient,
+        channel=channel_enum,
+        content=content,
+        subject=subject,
+        scheduled_at=scheduled_at,
+        recurrence=recurrence_enum,
+        use_agent=use_agent,
+        created_by_id=user_id,
+    )
+
+    from utils.cronicle import create_message_event
+
+    await create_message_event(str(msg.id), msg.scheduled_at, recurrence_enum.value)
+
+    return jsonify(_serialize(msg)), 201
+
+
+@scheduled_messages_blueprint.route("/<msg_id>", methods=["PUT"])
+@admin_required
+async def update_message(msg_id: str):
+    msg = await ScheduledMessage.get_or_none(id=msg_id)
+    if not msg:
+        return jsonify({"error": "Not found"}), 404
+
+    if msg.status not in (MessageStatus.PENDING, MessageStatus.FAILED):
+        return jsonify({"error": "Can only update pending or failed messages"}), 400
+
+    data = await request.get_json()
+    if not data:
+        return jsonify({"error": "Invalid payload"}), 400
+
+    rescheduled = False
+    if "recipient" in data:
+        msg.recipient = data["recipient"].strip()
+    if "channel" in data:
+        try:
+            msg.channel = MessageChannel(data["channel"])
+        except ValueError:
+            return jsonify({"error": f"Invalid channel: {data['channel']}"}), 400
+    if "content" in data:
+        msg.content = data["content"].strip()
+    if "subject" in data:
+        msg.subject = data["subject"].strip() or None
+    if "recurrence" in data:
+        try:
+            msg.recurrence = Recurrence(data["recurrence"])
+        except ValueError:
+            return jsonify({"error": f"Invalid recurrence: {data['recurrence']}"}), 400
+    if "use_agent" in data:
+        msg.use_agent = bool(data["use_agent"])
+    if "scheduled_at" in data:
+        try:
+            scheduled_at = datetime.fromisoformat(data["scheduled_at"])
+            if scheduled_at.tzinfo is None:
+                scheduled_at = scheduled_at.replace(tzinfo=timezone.utc)
+            if scheduled_at <= datetime.now(timezone.utc):
+                return jsonify({"error": "scheduled_at must be in the future"}), 400
+            msg.scheduled_at = scheduled_at
+            rescheduled = True
+        except ValueError:
+            return jsonify({"error": "Invalid scheduled_at format"}), 400
+    if "status" in data and data["status"] == "cancelled":
+        msg.status = MessageStatus.CANCELLED
+    elif rescheduled:
+        msg.status = MessageStatus.PENDING
+        msg.error_message = None
+
+    if msg.channel == MessageChannel.EMAIL and not msg.subject:
+        return jsonify({"error": "subject is required for email messages"}), 400
+
+    await msg.save()
+
+    if rescheduled and msg.status == MessageStatus.PENDING:
+        from utils.cronicle import create_message_event
+
+        await create_message_event(str(msg.id), msg.scheduled_at, msg.recurrence.value)
+
+    return jsonify(_serialize(msg))
+
+
+def _check_cron_secret() -> bool:
+    expected = os.environ.get("CRON_SECRET", "")
+    if not expected:
+        return False
+    provided = request.headers.get("X-Cron-Secret", "")
+    return hmac.compare_digest(provided.encode(), expected.encode())
+
+
+@scheduled_messages_blueprint.route("/trigger", methods=["POST"])
+async def trigger_due_messages():
+    if not _check_cron_secret():
+        return jsonify({"error": "Unauthorized"}), 401
+
+    from .scheduler import process_due_messages
+
+    result = await process_due_messages()
+    return jsonify(result)
+
+
+@scheduled_messages_blueprint.route("/<msg_id>", methods=["DELETE"])
+@admin_required
+async def delete_message(msg_id: str):
+    msg = await ScheduledMessage.get_or_none(id=msg_id)
+    if not msg:
+        return jsonify({"error": "Not found"}), 404
+
+    if msg.status not in (MessageStatus.PENDING, MessageStatus.CANCELLED):
+        return jsonify({"error": "Can only delete pending or cancelled messages"}), 400
+
+    await msg.delete()
+    return jsonify({"status": "deleted"})

blueprints/scheduled_messages/models.py

@@ -0,0 +1,48 @@
+import enum
+
+from tortoise import fields
+from tortoise.models import Model
+
+
+class MessageChannel(enum.Enum):
+    IMESSAGE = "imessage"
+    EMAIL = "email"
+
+
+class MessageStatus(enum.Enum):
+    PENDING = "pending"
+    SENT = "sent"
+    FAILED = "failed"
+    CANCELLED = "cancelled"
+
+
+class Recurrence(enum.Enum):
+    NONE = "none"
+    DAILY = "daily"
+    WEEKLY = "weekly"
+    MONTHLY = "monthly"
+
+
+class ScheduledMessage(Model):
+    id = fields.UUIDField(primary_key=True)
+    recipient = fields.CharField(max_length=255)
+    channel = fields.CharEnumField(enum_type=MessageChannel, max_length=20)
+    content = fields.TextField()
+    subject = fields.CharField(max_length=255, null=True)
+    scheduled_at = fields.DatetimeField()
+    status = fields.CharEnumField(
+        enum_type=MessageStatus, max_length=20, default=MessageStatus.PENDING
+    )
+    recurrence = fields.CharEnumField(
+        enum_type=Recurrence, max_length=20, default=Recurrence.NONE
+    )
+    use_agent = fields.BooleanField(default=False)
+    error_message = fields.TextField(null=True)
+    created_by = fields.ForeignKeyField(
+        "models.User", related_name="scheduled_messages"
+    )
+    created_at = fields.DatetimeField(auto_now_add=True)
+    updated_at = fields.DatetimeField(auto_now=True)
+
+    class Meta:
+        table = "scheduled_messages"

blueprints/scheduled_messages/scheduler.py

@@ -0,0 +1,102 @@
+import logging
+import uuid
+from datetime import datetime, timezone
+from dateutil.relativedelta import relativedelta
+from quart import current_app
+
+from .models import ScheduledMessage, MessageChannel, MessageStatus, Recurrence
+
+logger = logging.getLogger(__name__)
+
+RECURRENCE_DELTAS = {
+    Recurrence.DAILY: relativedelta(days=1),
+    Recurrence.WEEKLY: relativedelta(weeks=1),
+    Recurrence.MONTHLY: relativedelta(months=1),
+}
+
+
+async def _run_agent(prompt: str, thread_id: str) -> str:
+    response = await current_app.main_agent.ainvoke(
+        {"messages": [{"role": "user", "content": prompt}]},
+        config={"configurable": {"thread_id": thread_id}},
+    )
+    return response.get("messages", [])[-1].content
+
+
+async def _schedule_next_occurrence(msg: ScheduledMessage):
+    delta = RECURRENCE_DELTAS.get(msg.recurrence)
+    if not delta:
+        return
+
+    next_at = msg.scheduled_at + delta
+    now = datetime.now(timezone.utc)
+    while next_at <= now:
+        next_at += delta
+
+    await ScheduledMessage.create(
+        recipient=msg.recipient,
+        channel=msg.channel,
+        content=msg.content,
+        subject=msg.subject,
+        scheduled_at=next_at,
+        recurrence=msg.recurrence,
+        use_agent=msg.use_agent,
+        created_by_id=msg.created_by_id,
+    )
+    logger.info(
+        f"Scheduled next {msg.recurrence.value} occurrence for {msg.id} at {next_at.isoformat()}"
+    )
+
+
+async def process_due_messages() -> dict:
+    """Process all currently due pending messages. Returns a result summary."""
+    now = datetime.now(timezone.utc)
+    due = await ScheduledMessage.filter(
+        status=MessageStatus.PENDING,
+        scheduled_at__lte=now,
+    ).all()
+
+    sent, failed = 0, 0
+    for msg in due:
+        try:
+            send_content = msg.content
+
+            if msg.use_agent:
+                send_content = await _run_agent(
+                    msg.content, f"scheduled-{uuid.uuid4()}"
+                )
+
+            if msg.channel == MessageChannel.IMESSAGE:
+                from blueprints.imessage import send_imessage
+                from utils.strip_markdown import strip_markdown
+
+                await send_imessage(msg.recipient, strip_markdown(send_content))
+
+            elif msg.channel == MessageChannel.EMAIL:
+                from blueprints.email import send_email_reply
+
+                await send_email_reply(
+                    to=msg.recipient,
+                    subject=msg.subject or "(no subject)",
+                    body=send_content,
+                )
+
+            msg.status = MessageStatus.SENT
+            msg.error_message = None
+            await msg.save()
+            logger.info(
+                f"Sent scheduled {msg.channel.value} message {msg.id} to {msg.recipient}"
+            )
+            sent += 1
+
+            if msg.recurrence != Recurrence.NONE:
+                await _schedule_next_occurrence(msg)
+
+        except Exception as e:
+            msg.status = MessageStatus.FAILED
+            msg.error_message = str(e)
+            await msg.save()
+            logger.error(f"Failed to send scheduled message {msg.id}: {e}")
+            failed += 1
+
+    return {"sent": sent, "failed": failed}

blueprints/users/__init__.py

@@ -7,7 +7,8 @@ from quart_jwt_extended import (
 )
 from .models import User
 from .oidc_service import OIDCUserService
-from .decorators import admin_required
+from .oidc_state import consume_oidc_state, save_oidc_state
+from .decorators import admin_required, jwt_access_required
 from config.oidc_config import oidc_config
 import os
 import secrets
@@ -19,10 +20,6 @@ import base64
 
 user_blueprint = Blueprint("user_api", __name__, url_prefix="/api/user")
 
-# In-memory storage for OIDC state/PKCE (production: use Redis or database)
-# Format: {state: {"pkce_verifier": str, "redirect_after_login": str}}
-_oidc_sessions = {}
-
 
 @user_blueprint.route("/oidc/login", methods=["GET"])
 async def oidc_login():
@@ -47,11 +44,8 @@ async def oidc_login():
         # Generate state for CSRF protection
         state = secrets.token_urlsafe(32)
 
-        # Store PKCE verifier and state for callback validation
-        _oidc_sessions[state] = {
-            "pkce_verifier": code_verifier,
-            "redirect_after_login": request.args.get("redirect", "/"),
-        }
+        # Persist PKCE verifier keyed by state for callback validation
+        await save_oidc_state(state, code_verifier)
 
         # Get authorization endpoint from discovery
         discovery = await oidc_config.get_discovery_document()
@@ -93,12 +87,10 @@ async def oidc_callback():
         return jsonify({"error": "Missing code or state"}), 400
 
     # Validate state and retrieve PKCE verifier
-    session = _oidc_sessions.pop(state, None)
-    if not session:
+    pkce_verifier = await consume_oidc_state(state)
+    if not pkce_verifier:
         return jsonify({"error": "Invalid or expired state"}), 400
 
-    pkce_verifier = session["pkce_verifier"]
-
     # Exchange authorization code for tokens
     discovery = await oidc_config.get_discovery_document()
     token_endpoint = discovery.get("token_endpoint")
@@ -206,38 +198,48 @@ async def login():
 
 
 @user_blueprint.route("/me", methods=["GET"])
-@jwt_refresh_token_required
+@jwt_access_required
 async def me():
     user_id = get_jwt_identity()
     user = await User.get_or_none(id=user_id)
     if not user:
         return jsonify({"error": "User not found"}), 404
-    return jsonify({
-        "id": str(user.id),
-        "username": user.username,
-        "email": user.email,
-        "is_admin": user.is_admin(),
-    })
+    return jsonify(
+        {
+            "id": str(user.id),
+            "username": user.username,
+            "email": user.email,
+            "is_admin": user.is_admin(),
+        }
+    )
 
 
 @user_blueprint.route("/admin/users", methods=["GET"])
 @admin_required
 async def list_users():
     from blueprints.email.helpers import get_user_email_address
+
     users = await User.all().order_by("username")
     mailgun_domain = os.getenv("MAILGUN_DOMAIN", "")
-    return jsonify([
-        {
-            "id": str(u.id),
-            "username": u.username,
-            "email": u.email,
-            "whatsapp_number": u.whatsapp_number,
-            "auth_provider": u.auth_provider,
-            "email_enabled": u.email_enabled,
-            "email_address": get_user_email_address(u.email_hmac_token, mailgun_domain) if u.email_hmac_token and u.email_enabled else None,
-        }
-        for u in users
-    ])
+    return jsonify(
+        [
+            {
+                "id": str(u.id),
+                "username": u.username,
+                "email": u.email,
+                "whatsapp_number": u.whatsapp_number,
+                "imessage_number": u.imessage_number,
+                "auth_provider": u.auth_provider,
+                "email_enabled": u.email_enabled,
+                "email_address": get_user_email_address(
+                    u.email_hmac_token, mailgun_domain
+                )
+                if u.email_hmac_token and u.email_enabled
+                else None,
+            }
+            for u in users
+        ]
+    )
 
 
 @user_blueprint.route("/admin/users/<user_id>/whatsapp", methods=["PUT"])
@@ -254,17 +256,21 @@ async def set_whatsapp(user_id):
 
     conflict = await User.filter(whatsapp_number=number).exclude(id=user_id).first()
     if conflict:
-        return jsonify({"error": "That WhatsApp number is already linked to another account"}), 409
+        return jsonify(
+            {"error": "That WhatsApp number is already linked to another account"}
+        ), 409
 
     user.whatsapp_number = number
     await user.save()
-    return jsonify({
-        "id": str(user.id),
-        "username": user.username,
-        "email": user.email,
-        "whatsapp_number": user.whatsapp_number,
-        "auth_provider": user.auth_provider,
-    })
+    return jsonify(
+        {
+            "id": str(user.id),
+            "username": user.username,
+            "email": user.email,
+            "whatsapp_number": user.whatsapp_number,
+            "auth_provider": user.auth_provider,
+        }
+    )
 
 
 @user_blueprint.route("/admin/users/<user_id>/whatsapp", methods=["DELETE"])
@@ -279,11 +285,55 @@ async def unlink_whatsapp(user_id):
     return jsonify({"ok": True})
 
 
+@user_blueprint.route("/admin/users/<user_id>/imessage", methods=["PUT"])
+@admin_required
+async def set_imessage(user_id):
+    data = await request.get_json()
+    number = (data or {}).get("imessage_number", "").strip()
+    if not number:
+        return jsonify({"error": "imessage_number is required"}), 400
+
+    user = await User.get_or_none(id=user_id)
+    if not user:
+        return jsonify({"error": "User not found"}), 404
+
+    conflict = await User.filter(imessage_number=number).exclude(id=user_id).first()
+    if conflict:
+        return jsonify(
+            {"error": "That iMessage number is already linked to another account"}
+        ), 409
+
+    user.imessage_number = number
+    await user.save()
+    return jsonify(
+        {
+            "id": str(user.id),
+            "username": user.username,
+            "email": user.email,
+            "imessage_number": user.imessage_number,
+            "auth_provider": user.auth_provider,
+        }
+    )
+
+
+@user_blueprint.route("/admin/users/<user_id>/imessage", methods=["DELETE"])
+@admin_required
+async def unlink_imessage(user_id):
+    user = await User.get_or_none(id=user_id)
+    if not user:
+        return jsonify({"error": "User not found"}), 404
+
+    user.imessage_number = None
+    await user.save()
+    return jsonify({"ok": True})
+
+
 @user_blueprint.route("/admin/users/<user_id>/email", methods=["PUT"])
 @admin_required
 async def toggle_email(user_id):
     """Enable email channel for a user, generating an HMAC token."""
     from blueprints.email.helpers import generate_email_token, get_user_email_address
+
     user = await User.get_or_none(id=user_id)
     if not user:
         return jsonify({"error": "User not found"}), 404
@@ -299,15 +349,19 @@ async def toggle_email(user_id):
     user.email_enabled = True
     await user.save()
 
-    return jsonify({
-        "id": str(user.id),
-        "username": user.username,
-        "email": user.email,
-        "whatsapp_number": user.whatsapp_number,
-        "auth_provider": user.auth_provider,
-        "email_enabled": user.email_enabled,
-        "email_address": get_user_email_address(user.email_hmac_token, mailgun_domain),
-    })
+    return jsonify(
+        {
+            "id": str(user.id),
+            "username": user.username,
+            "email": user.email,
+            "whatsapp_number": user.whatsapp_number,
+            "auth_provider": user.auth_provider,
+            "email_enabled": user.email_enabled,
+            "email_address": get_user_email_address(
+                user.email_hmac_token, mailgun_domain
+            ),
+        }
+    )
 
 
 @user_blueprint.route("/admin/users/<user_id>/email", methods=["DELETE"])

blueprints/users/decorators.py

@@ -4,10 +4,47 @@ Authentication decorators for role-based access control.
 
 from functools import wraps
 from quart import jsonify
-from quart_jwt_extended import jwt_refresh_token_required, get_jwt_identity
+from quart_jwt_extended import get_jwt_identity
+from quart_jwt_extended.exceptions import WrongTokenError
+from quart_jwt_extended.view_decorators import (
+    verify_jwt_in_request,
+    verify_jwt_refresh_token_in_request,
+)
 from .models import User
 
 
+def jwt_access_required(fn):
+    """
+    Protect an endpoint with the (1h) access token.
+
+    TRANSITIONAL: this also accepts the refresh token, so an old frontend
+    (which sends the refresh token on every call) keeps working against this
+    backend, including tabs that stay open across deploys.
+
+    It does NOT make a new frontend work against an older backend: routes
+    still on `@jwt_refresh_token_required` answer an access token with 422,
+    which the frontend does not retry. So this backend must be live on both
+    colors before the access-token frontend ships (deploy in two releases).
+
+    TODO: once the access-token frontend has been live for a while, replace
+    the body with `await verify_jwt_in_request()` (i.e. plain `@jwt_required`)
+    and map WrongTokenError to 401, so a stale tab still sending the refresh
+    token refreshes and retries instead of failing with 422.
+    """
+
+    @wraps(fn)
+    async def wrapper(*args, **kwargs):
+        try:
+            await verify_jwt_in_request()
+        except WrongTokenError:
+            # Legacy client sent the refresh token. Expired/invalid tokens
+            # still raise from verify_jwt_in_request and are not retried here.
+            await verify_jwt_refresh_token_in_request()
+        return await fn(*args, **kwargs)
+
+    return wrapper
+
+
 def admin_required(fn):
     """
     Decorator that requires the user to be an admin (member of lldap_admin group).
@@ -15,7 +52,7 @@ def admin_required(fn):
     """
 
     @wraps(fn)
-    @jwt_refresh_token_required
+    @jwt_access_required
     async def wrapper(*args, **kwargs):
         user_id = get_jwt_identity()
         user = await User.get_or_none(id=user_id)

blueprints/users/models.py

@@ -10,11 +10,18 @@ class User(Model):
     username = fields.CharField(max_length=255)
     password = fields.BinaryField(null=True)  # Hashed - nullable for OIDC users
     email = fields.CharField(max_length=100, unique=True)
-    whatsapp_number = fields.CharField(max_length=30, unique=True, null=True, index=True)
+    whatsapp_number = fields.CharField(
+        max_length=30, unique=True, null=True, index=True
+    )
+    imessage_number = fields.CharField(
+        max_length=30, unique=True, null=True, index=True
+    )
 
     # Email channel fields
     email_enabled = fields.BooleanField(default=False)
-    email_hmac_token = fields.CharField(max_length=16, unique=True, null=True, index=True)
+    email_hmac_token = fields.CharField(
+        max_length=16, unique=True, null=True, index=True
+    )
 
     # OIDC fields
     oidc_subject = fields.CharField(
@@ -49,3 +56,19 @@ class User(Model):
         if not self.password:
             return False
         return bcrypt.checkpw(plain_password.encode("utf-8"), self.password)
+
+
+class OIDCState(Model):
+    """Pending OIDC login: maps the `state` param to its PKCE verifier.
+
+    Stored in Postgres (not process memory) so a login that starts on one
+    blue/green color and finishes on the other still validates.
+    """
+
+    state = fields.CharField(max_length=128, primary_key=True)
+    pkce_verifier = fields.CharField(max_length=128)
+    expires_at = fields.DatetimeField(index=True)
+    created_at = fields.DatetimeField(auto_now_add=True)
+
+    class Meta:
+        table = "oidc_states"

blueprints/users/oidc_state.py

@@ -0,0 +1,36 @@
+"""
+Persistent, single-use store for pending OIDC logins (state -> PKCE verifier).
+
+Lives in Postgres so a login started on one blue/green color can finish on
+the other.
+"""
+
+from datetime import datetime, timedelta, timezone
+
+from .models import OIDCState
+
+OIDC_STATE_TTL = timedelta(minutes=10)
+
+
+async def save_oidc_state(
+    state: str, pkce_verifier: str, ttl: timedelta = OIDC_STATE_TTL
+) -> None:
+    now = datetime.now(timezone.utc)
+    # Opportunistic cleanup of abandoned logins
+    await OIDCState.filter(expires_at__lte=now).delete()
+    await OIDCState.create(
+        state=state, pkce_verifier=pkce_verifier, expires_at=now + ttl
+    )
+
+
+async def consume_oidc_state(state: str) -> str | None:
+    """Return the PKCE verifier for `state` and delete it, or None if the
+    state is unknown, expired, or was already consumed."""
+    row = await OIDCState.get_or_none(state=state)
+    if row is None:
+        return None
+    # The delete is the single-use guard: only one concurrent caller wins.
+    deleted = await OIDCState.filter(state=state).delete()
+    if not deleted or row.expires_at <= datetime.now(timezone.utc):
+        return None
+    return row.pkce_verifier

blueprints/whatsapp/__init__.py

@@ -1,21 +1,20 @@
 import os
 import logging
-import asyncio
 import functools
 import time
 from collections import defaultdict
-from quart import Blueprint, request, jsonify, abort
+from quart import Blueprint, request, abort
 from twilio.request_validator import RequestValidator
 from twilio.twiml.messaging_response import MessagingResponse
 
 from blueprints.users.models import User
 from blueprints.conversation.logic import (
-    get_conversation_for_user,
+    get_agent_for,
+    get_conversation_for_channel,
     add_message_to_conversation,
-    get_conversation_transcript,
+    persist_agent_tool_messages,
 )
-from blueprints.conversation.agents import main_agent
-from blueprints.conversation.prompts import SIMBA_SYSTEM_PROMPT
+from utils.strip_markdown import extract_agent_text
 
 whatsapp_blueprint = Blueprint("whatsapp_api", __name__, url_prefix="/api/whatsapp")
 
@@ -69,6 +68,7 @@ def validate_twilio_request(f):
     so the validated URL matches what Twilio signed against.
     Set TWILIO_SIGNATURE_VALIDATION=false to disable in development.
     """
+
     @functools.wraps(f)
     async def decorated_function(*args, **kwargs):
         if os.getenv("TWILIO_SIGNATURE_VALIDATION", "true").lower() == "false":
@@ -94,6 +94,7 @@ def validate_twilio_request(f):
             abort(403)
 
         return await f(*args, **kwargs)
+
     return decorated_function
 
 
@@ -104,11 +105,15 @@ async def webhook():
     Handle incoming WhatsApp messages from Twilio.
     """
     form_data = await request.form
-    from_number = form_data.get("From") # e.g., "whatsapp:+1234567890"
+    from_number = form_data.get("From")  # e.g., "whatsapp:+1234567890"
     body = form_data.get("Body")
 
     if not from_number or not body:
-        return _twiml_response("Invalid message received.") if from_number else ("Missing From or Body", 400)
+        return (
+            _twiml_response("Invalid message received.")
+            if from_number
+            else ("Missing From or Body", 400)
+        )
 
     # Strip whitespace and check for empty body
     body = body.strip()
@@ -118,12 +123,16 @@ async def webhook():
     # Rate limiting
     if not _check_rate_limit(from_number):
         logger.warning(f"Rate limit exceeded for {from_number}")
-        return _twiml_response("You're sending messages too quickly. Please wait a moment and try again.")
+        return _twiml_response(
+            "You're sending messages too quickly. Please wait a moment and try again."
+        )
 
     # Truncate overly long messages
     if len(body) > MAX_MESSAGE_LENGTH:
         body = body[:MAX_MESSAGE_LENGTH]
-        logger.info(f"Truncated long message from {from_number} to {MAX_MESSAGE_LENGTH} chars")
+        logger.info(
+            f"Truncated long message from {from_number} to {MAX_MESSAGE_LENGTH} chars"
+        )
 
     logger.info(f"Received WhatsApp message from {from_number}: {body[:100]}")
 
@@ -143,17 +152,18 @@ async def webhook():
                 username=username,
                 email=f"{username}@whatsapp.simbarag.local",
                 whatsapp_number=from_number,
-                auth_provider="whatsapp"
+                auth_provider="whatsapp",
             )
             logger.info(f"Created new user for WhatsApp: {username}")
         except Exception as e:
             logger.error(f"Failed to create user for {from_number}: {e}")
-            return _twiml_response("Sorry, something went wrong setting up your account. Please try again later.")
+            return _twiml_response(
+                "Sorry, something went wrong setting up your account. Please try again later."
+            )
 
     # Get or create a conversation for this user
     try:
-        conversation = await get_conversation_for_user(user=user)
-        await conversation.fetch_related("messages")
+        conversation = await get_conversation_for_channel(user=user, channel="whatsapp")
     except Exception as e:
         logger.error(f"Failed to get conversation for user {user.username}: {e}")
         return _twiml_response("Sorry, something went wrong. Please try again later.")
@@ -166,30 +176,23 @@ async def webhook():
         user=user,
     )
 
-    # Get transcript for context
-    transcript = await get_conversation_transcript(user=user, conversation=conversation)
-
-    # Build messages payload for LangChain agent with system prompt and conversation history
     try:
-        # Get last 10 messages for conversation history
-        messages = await conversation.messages.all()
-        recent_messages = list(messages)[-10:]
-
-        # Build messages payload
-        messages_payload = [{"role": "system", "content": SIMBA_SYSTEM_PROMPT}]
-
-        # Add recent conversation history (exclude the message we just added)
-        for msg in recent_messages[:-1]:
-            role = "user" if msg.speaker == "user" else "assistant"
-            messages_payload.append({"role": role, "content": msg.text})
-
-        # Add current query
-        messages_payload.append({"role": "user", "content": body})
-
-        # Invoke LangChain agent
-        logger.info(f"Invoking LangChain agent with {len(messages_payload)} messages")
-        response = await main_agent.ainvoke({"messages": messages_payload})
-        response_text = response.get("messages", [])[-1].content
+        agent_config = {
+            "configurable": {
+                "user_id": str(user.id),
+                "is_admin": user.is_admin(),
+                "thread_id": str(conversation.id),
+            }
+        }
+        logger.info(f"Invoking LangChain agent for conversation {conversation.id}")
+        response = await get_agent_for(user).ainvoke(
+            {"messages": [{"role": "user", "content": body}]},
+            config=agent_config,
+        )
+        response_text = extract_agent_text(response.get("messages", [])[-1].content)
+        await persist_agent_tool_messages(
+            conversation, user, response.get("messages", [])
+        )
 
         # Log YNAB availability
         if os.getenv("YNAB_ACCESS_TOKEN"):

config/db.py

@@ -16,6 +16,10 @@ TORTOISE_CONFIG = {
                 "blueprints.conversation.models",
                 "blueprints.users.models",
                 "blueprints.email.models",
+                "blueprints.scheduled_messages.models",
+                "blueprints.cron.models",
+                "blueprints.beli.models",
+                "blueprints.artifacts.models",
                 "aerich.models",
             ],
             "default_connection": "default",

desktop/.gitignore

@@ -0,0 +1,3 @@
+node_modules/
+src-tauri/target/
+src-tauri/gen/

desktop/package-lock.json

@@ -0,0 +1,232 @@
+{
+  "name": "simba-desktop",
+  "version": "0.1.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "simba-desktop",
+      "version": "0.1.0",
+      "devDependencies": {
+        "@tauri-apps/cli": "^2.12.2"
+      }
+    },
+    "node_modules/@tauri-apps/cli": {
+      "version": "2.12.2",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli/-/cli-2.12.2.tgz",
+      "integrity": "sha512-PMSppzAnlT+BvZtRKuidxjRSm2r5t8kDpJ/czmmQUa0AtDNTwrjLE8vApK3phCWGg7isfnYL46Dl1jB4ArI0hA==",
+      "dev": true,
+      "license": "Apache-2.0 OR MIT",
+      "bin": {
+        "tauri": "tauri.js"
+      },
+      "engines": {
+        "node": ">= 10"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/tauri"
+      },
+      "optionalDependencies": {
+        "@tauri-apps/cli-darwin-arm64": "2.12.2",
+        "@tauri-apps/cli-darwin-x64": "2.12.2",
+        "@tauri-apps/cli-linux-arm-gnueabihf": "2.12.2",
+        "@tauri-apps/cli-linux-arm64-gnu": "2.12.2",
+        "@tauri-apps/cli-linux-arm64-musl": "2.12.2",
+        "@tauri-apps/cli-linux-riscv64-gnu": "2.12.2",
+        "@tauri-apps/cli-linux-x64-gnu": "2.12.2",
+        "@tauri-apps/cli-linux-x64-musl": "2.12.2",
+        "@tauri-apps/cli-win32-arm64-msvc": "2.12.2",
+        "@tauri-apps/cli-win32-ia32-msvc": "2.12.2",
+        "@tauri-apps/cli-win32-x64-msvc": "2.12.2"
+      }
+    },
+    "node_modules/@tauri-apps/cli-darwin-arm64": {
+      "version": "2.12.2",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-2.12.2.tgz",
+      "integrity": "sha512-Lk3zaBTfzNvA7670Al5PNgo2M/95uaDPe1yp+ILJeDOmol87XiYuK5E5+FUbK5e6U6OORx9qpZdOo2U+5tETtQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 OR MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tauri-apps/cli-darwin-x64": {
+      "version": "2.12.2",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-2.12.2.tgz",
+      "integrity": "sha512-2CyYjJ833JB3sKRz4B0W/Tv4oOVC16ws1bxdSCWj1XvrmanWwvZi99e5tNIoCHwHhcOm0jh+sh0PCGQyls6Z+w==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 OR MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tauri-apps/cli-linux-arm-gnueabihf": {
+      "version": "2.12.2",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-2.12.2.tgz",
+      "integrity": "sha512-uvt2xbone4JftKarelssi86Kqnl7JiG1Smh5+Ae+nZmtM+JUhTGmqkcqfUPXRW8Ygwog92POZvd4oGDN9j8eXQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 OR MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tauri-apps/cli-linux-arm64-gnu": {
+      "version": "2.12.2",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-2.12.2.tgz",
+      "integrity": "sha512-DZlDJ24u3tlocKOYqzR+b2M+Qr+5WFcoMBZ7EfdhHN5j3ZXwBBpms4G4gyNvPCrak5vMzmdZ65ecBXPJcC+5sA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 OR MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tauri-apps/cli-linux-arm64-musl": {
+      "version": "2.12.2",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.12.2.tgz",
+      "integrity": "sha512-pb+RTZUYH/p0gR4j4ecCCq+FNfz3W3eKuUQvVEBn7MQZx6DzfLO7FaYzt2NyDKWpdNN3lP10mdzOvw3R5P5aAQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 OR MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tauri-apps/cli-linux-riscv64-gnu": {
+      "version": "2.12.2",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-riscv64-gnu/-/cli-linux-riscv64-gnu-2.12.2.tgz",
+      "integrity": "sha512-nidEvDUJyHYNbIv9MUk6KiEix8IXfRh4Wj2G2SA5g8nFmgbBCwazUNWYiG/LhNeNbfZpBMLerRBUtoQ5K0GidA==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 OR MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tauri-apps/cli-linux-x64-gnu": {
+      "version": "2.12.2",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-2.12.2.tgz",
+      "integrity": "sha512-gkXyYn3w+Xfc8nz/DleEbkm1M7bBuU2cejqUXNmI98cA2P5kp+oPmS4ALTorb1FaNWjpsKoYZBWsbS9BXxYFkQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 OR MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tauri-apps/cli-linux-x64-musl": {
+      "version": "2.12.2",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-2.12.2.tgz",
+      "integrity": "sha512-MrjgoZ09s8Hsn99XvxSNvK8NQTZxi7XiyK3FxxytzfHgz2jb3qUT69CZtsokRkN/zdi9rCgrMtq+w9XNICjcfQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 OR MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tauri-apps/cli-win32-arm64-msvc": {
+      "version": "2.12.2",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-arm64-msvc/-/cli-win32-arm64-msvc-2.12.2.tgz",
+      "integrity": "sha512-BR+CYM7iF3lkfyTtVkwMQU/s9hwegLpj3UqDjaxKCPmixQCa1csBBPy3C75V+FhLtOjIXNna4Gt6Vm9oxbV+qA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 OR MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tauri-apps/cli-win32-ia32-msvc": {
+      "version": "2.12.2",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-2.12.2.tgz",
+      "integrity": "sha512-zODJo9l3TbNBM+GrO/yPqGeELNMK5cjIc+QHh1WQc3l8tD+jDZGTQyYuAxViCsM6Uh5uWJ//RnCZG9LXrvsXww==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 OR MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tauri-apps/cli-win32-x64-msvc": {
+      "version": "2.12.2",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-2.12.2.tgz",
+      "integrity": "sha512-cQXI2ZaZmwBDt0XATCqASVanYizxkEE3ceQVlVHXaQ51HzsQUWA04c9Nz7LrrY2lgAu3jFMyat+8Yz3Z2R2qBA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 OR MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    }
+  }
+}

desktop/package.json

@@ -0,0 +1,13 @@
+{
+  "name": "simba-desktop",
+  "version": "0.1.0",
+  "private": true,
+  "scripts": {
+    "tauri": "tauri",
+    "dev": "tauri dev",
+    "build": "tauri build --bundles app"
+  },
+  "devDependencies": {
+    "@tauri-apps/cli": "^2.12.2"
+  }
+}

desktop/src-tauri/Cargo.toml

@@ -0,0 +1,17 @@
+[package]
+name = "simba-desktop"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+name = "simba_desktop_lib"
+crate-type = ["staticlib", "cdylib", "rlib"]
+
+[build-dependencies]
+tauri-build = { version = "2", features = [] }
+
+[dependencies]
+tauri = { version = "2", features = ["tray-icon", "image-png"] }
+tauri-plugin-global-shortcut = "2"
+tauri-plugin-single-instance = "2"
+url = "2"

desktop/src-tauri/build.rs

@@ -0,0 +1,3 @@
+fn main() {
+    tauri_build::build()
+}

desktop/src-tauri/capabilities/default.json

@@ -0,0 +1,7 @@
+{
+  "$schema": "../gen/schemas/desktop-schema.json",
+  "identifier": "default",
+  "description": "Bundled pages only (offline/connect screen). The remote SimbaRAG origin gets no IPC.",
+  "windows": ["main"],
+  "permissions": ["core:default"]
+}

desktop/src-tauri/rust-toolchain.toml

@@ -0,0 +1,3 @@
+[toolchain]
+channel = "1.90.0"
+profile = "minimal"

desktop/src-tauri/src/lib.rs

@@ -0,0 +1,171 @@
+//! Simba desktop shell.
+//!
+//! A thin native wrapper around the deployed SimbaRAG web app: the main window
+//! starts on a bundled connect page (`ui/index.html`) that checks the server is
+//! reachable and then navigates to it. The Rust side owns everything the web
+//! app can't do: the menu-bar icon, the global hotkey, and keeping the app
+//! alive when the window is closed.
+
+use tauri::{
+    menu::{Menu, MenuItem, PredefinedMenuItem},
+    tray::{MouseButton, MouseButtonState, TrayIconBuilder, TrayIconEvent},
+    AppHandle, Manager, RunEvent, WebviewUrl, WebviewWindow, WebviewWindowBuilder, WindowEvent,
+};
+use tauri_plugin_global_shortcut::{Code, GlobalShortcutExt, Modifiers, Shortcut, ShortcutState};
+
+const MAIN: &str = "main";
+const DEFAULT_SERVER_URL: &str = "http://localhost:8080";
+
+/// Server URL: `SIMBA_URL` at runtime, else at build time, else localhost.
+fn server_url() -> String {
+    std::env::var("SIMBA_URL")
+        .ok()
+        .or_else(|| option_env!("SIMBA_URL").map(str::to_owned))
+        .unwrap_or_else(|| DEFAULT_SERVER_URL.to_owned())
+        .trim_end_matches('/')
+        .to_owned()
+}
+
+/// Bundled connect page, told which server to probe and open.
+fn connect_url() -> WebviewUrl {
+    let mut url = url::Url::parse("tauri://localhost/index.html").expect("static url");
+    url.query_pairs_mut().append_pair("server", &server_url());
+    WebviewUrl::App(format!("index.html?{}", url.query().unwrap_or_default()).into())
+}
+
+fn main_window(app: &AppHandle) -> Option<WebviewWindow> {
+    app.get_webview_window(MAIN)
+}
+
+fn show(app: &AppHandle) {
+    if let Some(window) = main_window(app) {
+        let _ = window.unminimize();
+        let _ = window.show();
+        let _ = window.set_focus();
+    }
+}
+
+fn toggle(app: &AppHandle) {
+    let Some(window) = main_window(app) else { return };
+    let focused = window.is_visible().unwrap_or(false) && window.is_focused().unwrap_or(false);
+    if focused {
+        let _ = window.hide();
+    } else {
+        show(app);
+    }
+}
+
+/// Re-run the connect page (server probe + redirect), e.g. after an outage.
+fn reconnect(app: &AppHandle) {
+    if let Some(window) = main_window(app) {
+        let WebviewUrl::App(path) = connect_url() else { return };
+        if let Ok(url) = url::Url::parse(&format!("tauri://localhost/{}", path.display())) {
+            let _ = window.navigate(url);
+        }
+        show(app);
+    }
+}
+
+fn new_chat(app: &AppHandle) {
+    if let Some(window) = main_window(app) {
+        if let Ok(url) = url::Url::parse(&format!("{}/", server_url())) {
+            let _ = window.navigate(url);
+        }
+        show(app);
+    }
+}
+
+fn build_tray(app: &AppHandle) -> tauri::Result<()> {
+    let show_item = MenuItem::with_id(app, "show", "Show Simba", true, Some("Alt+Space"))?;
+    let new_chat_item = MenuItem::with_id(app, "new_chat", "New Chat", true, None::<&str>)?;
+    let reconnect_item = MenuItem::with_id(app, "reconnect", "Reconnect", true, None::<&str>)?;
+    let quit_item = MenuItem::with_id(app, "quit", "Quit Simba", true, Some("Cmd+Q"))?;
+    let menu = Menu::with_items(
+        app,
+        &[
+            &show_item,
+            &new_chat_item,
+            &PredefinedMenuItem::separator(app)?,
+            &reconnect_item,
+            &PredefinedMenuItem::separator(app)?,
+            &quit_item,
+        ],
+    )?;
+
+    let mut tray = TrayIconBuilder::with_id("simba")
+        .tooltip("Simba")
+        .menu(&menu)
+        .show_menu_on_left_click(false)
+        .on_menu_event(|app, event| match event.id.as_ref() {
+            "show" => show(app),
+            "new_chat" => new_chat(app),
+            "reconnect" => reconnect(app),
+            "quit" => app.exit(0),
+            _ => {}
+        })
+        .on_tray_icon_event(|tray, event| {
+            if let TrayIconEvent::Click {
+                button: MouseButton::Left,
+                button_state: MouseButtonState::Up,
+                ..
+            } = event
+            {
+                toggle(tray.app_handle());
+            }
+        });
+    if let Some(icon) = app.default_window_icon() {
+        tray = tray.icon(icon.clone());
+    }
+    tray.build(app)?;
+    Ok(())
+}
+
+fn register_hotkey(app: &AppHandle) -> tauri::Result<()> {
+    let hotkey = Shortcut::new(Some(Modifiers::ALT), Code::Space);
+    app.plugin(
+        tauri_plugin_global_shortcut::Builder::new()
+            .with_handler(move |app, shortcut, event| {
+                if shortcut == &hotkey && event.state() == ShortcutState::Pressed {
+                    toggle(app);
+                }
+            })
+            .build(),
+    )?;
+    // Another app may already own ⌥Space; the tray still works without it.
+    if let Err(e) = app.global_shortcut().register(hotkey) {
+        eprintln!("simba: could not register Alt+Space: {e}");
+    }
+    Ok(())
+}
+
+pub fn run() {
+    tauri::Builder::default()
+        .plugin(tauri_plugin_single_instance::init(|app, _args, _cwd| show(app)))
+        .setup(|app| {
+            WebviewWindowBuilder::new(app, MAIN, connect_url())
+                .title("Simba")
+                .inner_size(1200.0, 820.0)
+                .min_inner_size(420.0, 520.0)
+                .build()?;
+            build_tray(app.handle())?;
+            register_hotkey(app.handle())?;
+            Ok(())
+        })
+        .on_window_event(|window, event| {
+            // Closing the window hides it; Simba lives on in the menu bar.
+            if let WindowEvent::CloseRequested { api, .. } = event {
+                if window.label() == MAIN {
+                    api.prevent_close();
+                    let _ = window.hide();
+                }
+            }
+        })
+        .build(tauri::generate_context!())
+        .expect("error while building Simba")
+        .run(|app, event| {
+            // Clicking the Dock icon brings the hidden window back.
+            if let RunEvent::Reopen { .. } = event {
+                show(app);
+            }
+        });
+}

desktop/src-tauri/src/main.rs

@@ -0,0 +1,6 @@
+// Prevents an extra console window on Windows in release builds.
+#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
+
+fn main() {
+    simba_desktop_lib::run()
+}

desktop/src-tauri/tauri.conf.json

@@ -0,0 +1,26 @@
+{
+  "$schema": "https://schema.tauri.app/config/2",
+  "productName": "Simba",
+  "version": "0.1.0",
+  "identifier": "co.torrtle.simba",
+  "build": {
+    "frontendDist": "../ui"
+  },
+  "app": {
+    "windows": [],
+    "security": {
+      "csp": null
+    }
+  },
+  "bundle": {
+    "active": true,
+    "targets": ["app"],
+    "icon": [
+      "icons/32x32.png",
+      "icons/128x128.png",
+      "icons/128x128@2x.png",
+      "icons/icon.icns",
+      "icons/icon.png"
+    ]
+  }
+}

desktop/ui/index.html

@@ -0,0 +1,88 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <title>Simba</title>
+  <style>
+    :root {
+      --cream: #FAF8F2;
+      --leaf: #2A4D38;
+      --muted: #7a7266;
+      --card: #ffffff;
+      --border: #e6e0d4;
+    }
+    @media (prefers-color-scheme: dark) {
+      :root { --cream: #1b1d1a; --leaf: #8fc4a1; --muted: #a39d92; --card: #24271f; --border: #34382f; }
+    }
+    * { box-sizing: border-box; }
+    body {
+      margin: 0; min-height: 100vh; display: grid; place-items: center;
+      background: var(--cream); color: var(--leaf);
+      font: 15px/1.5 -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;
+      -webkit-user-select: none; user-select: none;
+    }
+    main { text-align: center; padding: 16px; max-width: 360px; }
+    .cat { font-size: 48px; display: inline-block; animation: bob 1.2s ease-in-out infinite; }
+    .offline .cat { animation: none; filter: grayscale(1); }
+    @keyframes bob { 50% { transform: translateY(-6px); } }
+    h1 { font-size: 17px; margin: 12px 0 4px; }
+    p { margin: 0; color: var(--muted); font-size: 13px; }
+    code { font-size: 12px; background: var(--card); border: 1px solid var(--border); border-radius: 6px; padding: 1px 6px; }
+    button {
+      margin-top: 16px; padding: 6px 16px; border-radius: 999px; cursor: pointer;
+      border: 1px solid var(--border); background: var(--card); color: var(--leaf); font: inherit;
+    }
+    .online-only { display: block; }
+    .offline-only { display: none; }
+    .offline .online-only { display: none; }
+    .offline .offline-only { display: block; }
+  </style>
+</head>
+<body>
+  <main id="root">
+    <div class="cat">🐈</div>
+    <div class="online-only">
+      <h1>waking up simba…</h1>
+      <p>connecting to <code id="server-a"></code></p>
+    </div>
+    <div class="offline-only">
+      <h1>Can't reach Simba</h1>
+      <p><code id="server-b"></code> isn't responding. Retrying every few seconds.</p>
+      <button id="retry" type="button">Try now</button>
+    </div>
+  </main>
+  <script>
+    // The Rust shell passes the server in ?server=. Probe it, then hand the
+    // whole window over to the real web app.
+    const server = (new URLSearchParams(location.search).get("server") || "http://localhost:8080").replace(/\/+$/, "");
+    const root = document.getElementById("root");
+    document.getElementById("server-a").textContent = server;
+    document.getElementById("server-b").textContent = server;
+
+    let timer = null;
+
+    async function probe() {
+      clearTimeout(timer);
+      const ctrl = new AbortController();
+      const abort = setTimeout(() => ctrl.abort(), 5000);
+      try {
+        // no-cors: we only care that the server answered, not what it said.
+        await fetch(`${server}/api/health`, { mode: "no-cors", cache: "no-store", signal: ctrl.signal });
+        location.replace(`${server}/`);
+      } catch {
+        root.classList.add("offline");
+        timer = setTimeout(probe, 5000);
+      } finally {
+        clearTimeout(abort);
+      }
+    }
+
+    document.getElementById("retry").addEventListener("click", () => {
+      root.classList.remove("offline");
+      probe();
+    });
+    probe();
+  </script>
+</body>
+</html>

docker-compose.yml

@@ -1,5 +1,88 @@
 version: "3.8"
 
+x-raggr-common: &raggr-common
+  build:
+    context: .
+    dockerfile: Dockerfile
+  image: torrtle/simbarag:latest
+  environment:
+    - PAPERLESS_TOKEN=${PAPERLESS_TOKEN}
+    - BASE_URL=${BASE_URL}
+    - OLLAMA_URL=${OLLAMA_URL:-http://localhost:11434}
+    - OPENAI_API_KEY=${OPENAI_API_KEY}
+    - EMBEDDING_SERVER_URL=${EMBEDDING_SERVER_URL}
+    - EMBEDDING_MODEL_NAME=${EMBEDDING_MODEL_NAME}
+    - JWT_SECRET_KEY=${JWT_SECRET_KEY}
+    - LLAMA_SERVER_URL=${LLAMA_SERVER_URL}
+    - LLAMA_MODEL_NAME=${LLAMA_MODEL_NAME}
+    - OIDC_ISSUER=${OIDC_ISSUER}
+    - OIDC_CLIENT_ID=${OIDC_CLIENT_ID}
+    - OIDC_CLIENT_SECRET=${OIDC_CLIENT_SECRET}
+    - OIDC_REDIRECT_URI=${OIDC_REDIRECT_URI}
+    - OIDC_USE_DISCOVERY=${OIDC_USE_DISCOVERY:-true}
+    - DATABASE_URL=${DATABASE_URL:-postgres://raggr:changeme@postgres:5432/raggr}
+    - TAVILY_API_KEY=${TAVILIY_API_KEY}
+    - YNAB_ACCESS_TOKEN=${YNAB_ACCESS_TOKEN}
+    - YNAB_BUDGET_ID=${YNAB_BUDGET_ID}
+    - MEALIE_BASE_URL=${MEALIE_BASE_URL}
+    - MEALIE_API_TOKEN=${MEALIE_API_TOKEN}
+    - TWILIO_ACCOUNT_SID=${TWILIO_ACCOUNT_SID}
+    - TWILIO_AUTH_TOKEN=${TWILIO_AUTH_TOKEN}
+    - TWILIO_WHATSAPP_NUMBER=${TWILIO_WHATSAPP_NUMBER}
+    - ALLOWED_WHATSAPP_NUMBERS=${ALLOWED_WHATSAPP_NUMBERS}
+    - TWILIO_SIGNATURE_VALIDATION=${TWILIO_SIGNATURE_VALIDATION:-true}
+    - TWILIO_WEBHOOK_URL=${TWILIO_WEBHOOK_URL:-}
+    - OBSIDIAN_EMAIL=${OBSIDIAN_EMAIL}
+    - OBSIDIAN_PASSWORD=${OBSIDIAN_PASSWORD}
+    - OBSIDIAN_VAULT_ID=${OBSIDIAN_VAULT_ID}
+    - OBSIDIAN_E2E_PASSWORD=${OBSIDIAN_E2E_PASSWORD}
+    - OBSIDIAN_DEVICE_NAME=${OBSIDIAN_DEVICE_NAME}
+    - OBSIDIAN_CONTINUOUS_SYNC=${OBSIDIAN_CONTINUOUS_SYNC:-false}
+    - OBSIDIAN_VAULT_PATH=${OBSIDIAN_VAULT_PATH:-/app/data/obsidian}
+    - S3_ENDPOINT_URL=${S3_ENDPOINT_URL}
+    - S3_ACCESS_KEY_ID=${S3_ACCESS_KEY_ID}
+    - S3_SECRET_ACCESS_KEY=${S3_SECRET_ACCESS_KEY}
+    - S3_BUCKET_NAME=${S3_BUCKET_NAME:-asksimba-images}
+    - S3_REGION=${S3_REGION:-garage}
+    - OLLAMA_HOST=${OLLAMA_HOST:-http://localhost:11434}
+    - FERNET_KEY=${FERNET_KEY}
+    - GOOGLE_TOKEN_FILE=${GOOGLE_TOKEN_FILE:-/app/config/google-token.json}
+    - MAILGUN_API_KEY=${MAILGUN_API_KEY}
+    - MAILGUN_DOMAIN=${MAILGUN_DOMAIN}
+    - MAILGUN_WEBHOOK_SIGNING_KEY=${MAILGUN_WEBHOOK_SIGNING_KEY}
+    - MAILGUN_SIGNATURE_VALIDATION=${MAILGUN_SIGNATURE_VALIDATION:-true}
+    - EMAIL_RATE_LIMIT_MAX=${EMAIL_RATE_LIMIT_MAX:-5}
+    - EMAIL_RATE_LIMIT_WINDOW=${EMAIL_RATE_LIMIT_WINDOW:-300}
+    - SENDBLUE_API_KEY=${SENDBLUE_API_KEY}
+    - SENDBLUE_API_SECRET=${SENDBLUE_API_SECRET}
+    - SENDBLUE_FROM_NUMBER=${SENDBLUE_FROM_NUMBER}
+    - SENDBLUE_WEBHOOK_SECRET=${SENDBLUE_WEBHOOK_SECRET}
+    - SENDBLUE_SIGNATURE_VALIDATION=${SENDBLUE_SIGNATURE_VALIDATION:-true}
+    - ALLOWED_IMESSAGE_NUMBERS=${ALLOWED_IMESSAGE_NUMBERS}
+    - SIMBAKIT_URL=${SIMBAKIT_URL:-http://simbakit:8585}
+    - CRON_SECRET=${CRON_SECRET}
+    - CRONICLE_URL=${CRONICLE_URL:-http://cronicle:3012}
+    - CRONICLE_API_KEY=${CRONICLE_API_KEY}
+    - HOMEBOX_URL=${HOMEBOX_URL}
+    - HOMEBOX_TOKEN=${HOMEBOX_TOKEN}
+    - BOOKSTACK_BASE_URL=${BOOKSTACK_BASE_URL}
+    - BOOKSTACK_TOKEN_ID=${BOOKSTACK_TOKEN_ID}
+    - BOOKSTACK_TOKEN_SECRET=${BOOKSTACK_TOKEN_SECRET}
+  depends_on:
+    postgres:
+      condition: service_healthy
+  volumes:
+    - ./obvault:/app/data/obsidian
+    - ./token.json:/app/config/google-token.json:ro
+    - raggr-checkpoints:/app/checkpoints
+  healthcheck:
+    test: ["CMD", "curl", "-f", "http://localhost:8080/api/health"]
+    interval: 5s
+    timeout: 5s
+    retries: 3
+    start_period: 60s
+  restart: unless-stopped
+
 services:
   postgres:
     image: pgvector/pgvector:pg16
@@ -19,55 +102,34 @@ services:
       retries: 5
     restart: unless-stopped
 
-  raggr:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    image: torrtle/simbarag:latest
+  # Blue-green deployment: exactly one of raggr-blue/raggr-green serves at a
+  # time; Caddy health-checks both ports and routes to the healthy one.
+  # Use scripts/deploy.sh (make redeploy) to swap colors with zero downtime.
+  raggr-blue:
+    <<: *raggr-common
+    profiles: ["blue"]
     ports:
       - "8080:8080"
-    environment:
-      - PAPERLESS_TOKEN=${PAPERLESS_TOKEN}
-      - BASE_URL=${BASE_URL}
-      - OLLAMA_URL=${OLLAMA_URL:-http://localhost:11434}
-      - OPENAI_API_KEY=${OPENAI_API_KEY}
-      - JWT_SECRET_KEY=${JWT_SECRET_KEY}
-      - LLAMA_SERVER_URL=${LLAMA_SERVER_URL}
-      - LLAMA_MODEL_NAME=${LLAMA_MODEL_NAME}
-      - OIDC_ISSUER=${OIDC_ISSUER}
-      - OIDC_CLIENT_ID=${OIDC_CLIENT_ID}
-      - OIDC_CLIENT_SECRET=${OIDC_CLIENT_SECRET}
-      - OIDC_REDIRECT_URI=${OIDC_REDIRECT_URI}
-      - OIDC_USE_DISCOVERY=${OIDC_USE_DISCOVERY:-true}
-      - DATABASE_URL=${DATABASE_URL:-postgres://raggr:changeme@postgres:5432/raggr}
-      - TAVILY_API_KEY=${TAVILIY_API_KEY}
-      - YNAB_ACCESS_TOKEN=${YNAB_ACCESS_TOKEN}
-      - YNAB_BUDGET_ID=${YNAB_BUDGET_ID}
-      - TWILIO_ACCOUNT_SID=${TWILIO_ACCOUNT_SID}
-      - TWILIO_AUTH_TOKEN=${TWILIO_AUTH_TOKEN}
-      - TWILIO_WHATSAPP_NUMBER=${TWILIO_WHATSAPP_NUMBER}
-      - ALLOWED_WHATSAPP_NUMBERS=${ALLOWED_WHATSAPP_NUMBERS}
-      - TWILIO_SIGNATURE_VALIDATION=${TWILIO_SIGNATURE_VALIDATION:-true}
-      - TWILIO_WEBHOOK_URL=${TWILIO_WEBHOOK_URL:-}
-      - OBSIDIAN_AUTH_TOKEN=${OBSIDIAN_AUTH_TOKEN}
-      - OBSIDIAN_VAULT_ID=${OBSIDIAN_VAULT_ID}
-      - OBSIDIAN_E2E_PASSWORD=${OBSIDIAN_E2E_PASSWORD}
-      - OBSIDIAN_DEVICE_NAME=${OBSIDIAN_DEVICE_NAME}
-      - OBSIDIAN_CONTINUOUS_SYNC=${OBSIDIAN_CONTINUOUS_SYNC:-false}
-      - OBSIDIAN_VAULT_PATH=${OBSIDIAN_VAULT_PATH:-/app/data/obsidian}
-      - S3_ENDPOINT_URL=${S3_ENDPOINT_URL}
-      - S3_ACCESS_KEY_ID=${S3_ACCESS_KEY_ID}
-      - S3_SECRET_ACCESS_KEY=${S3_SECRET_ACCESS_KEY}
-      - S3_BUCKET_NAME=${S3_BUCKET_NAME:-asksimba-images}
-      - S3_REGION=${S3_REGION:-garage}
-      - OLLAMA_HOST=${OLLAMA_HOST:-http://localhost:11434}
-      - FERNET_KEY=${FERNET_KEY}
-    depends_on:
-      postgres:
-        condition: service_healthy
-    volumes:
-      - ./obvault:/app/data/obsidian
+
+  raggr-green:
+    <<: *raggr-common
+    profiles: ["green"]
+    ports:
+      - "8081:8080"
+
+  simbakit:
+    build:
+      context: ./simbakit
     restart: unless-stopped
+    volumes:
+      - simbakit-data:/app/data
+    environment:
+      - PETKIT_USERNAME=${PETKIT_USERNAME}
+      - PETKIT_PASSWORD=${PETKIT_PASSWORD}
+      - PETKIT_REGION=${PETKIT_REGION:-US}
+      - PETKIT_TIMEZONE=${PETKIT_TIMEZONE:-America/New_York}
 
 volumes:
   postgres_data:
+  simbakit-data:
+  raggr-checkpoints:

docs/cowork-ui-plan.md

@@ -0,0 +1,229 @@
+# Cowork UI (phase 2) plan
+
+Status: **proposal, awaiting approval.** Parent doc: [desktop-client.md](desktop-client.md).
+
+Goal: make the agent's work visible and useful. Tool calls appear as a live
+activity timeline. Results that are more than text (budget breakdowns, recipes,
+notes, documents) open in a side panel. Files can be dropped into the
+conversation. This is all built in `raggr-frontend` and the Quart backend, so
+the web app gets it too; the Tauri shell needs only a one-line drag-drop
+setting.
+
+## Where we are
+
+- `stream-query` SSE sends `tool_start {tool}` and `tool_end {tool}` and nothing
+  else: no id, inputs, duration or result. The UI shows a one-line pill whose
+  label comes from a stale `TOOL_MESSAGES` map in `useChat.ts`.
+- Tools return formatted strings. `on_tool_end` saves them as `speaker="tool"`
+  messages, and `GET /conversation/<id>` returns only their first line
+  (`[tool result]`).
+- Only `simba_search` uses `response_format="content_and_artifact"`, and its
+  artifact is a list of LangChain `Document`s that nothing reads.
+- Auth: the backend accepting access tokens is merged (#57). The frontend
+  half (`fix/access-token-auth`) is waiting on a deploy.
+- **#55 (YNAB mirror) is open.** It replaces every YNAB tool (new
+  `blueprints/ynab/tools.py`: `ynab_budget_summary`, `ynab_account_balances`,
+  `ynab_search_transactions`, `ynab_spending_report`, `ynab_category_budget`,
+  `ynab_recent_changes`). ⚠️ Its migration is numbered `16_…`, which clashes
+  with #57's `16_…_add_oidc_states` already on main, so it must be
+  regenerated before #55 merges.
+
+## Contract
+
+Every task codes against this. It lands on main with this doc before any
+worker starts, so all workers share it.
+
+### SSE events (additive; old clients ignore new fields)
+
+```ts
+// tool_start
+{ type: "tool_start", run_id: string, tool: string, label: string,
+  input: Record<string, string | number | boolean> }   // values truncated to 200 chars, `config` dropped
+// tool_end
+{ type: "tool_end", run_id: string, tool: string, label: string,
+  status: "ok" | "error", ms: number,
+  artifact: ArtifactRef | null }
+// unchanged: thinking, thinking_delta, content, response, error, [DONE]
+```
+
+- `label` comes from a server-side registry
+  (`blueprints/conversation/tool_labels.py`): `{tool_name: "Checking budget…"}`,
+  with the fallback `"Using <tool>…"`. MCP tools match by prefix (`homebox_`,
+  `bookstack_`). `TOOL_MESSAGES` in `useChat.ts` is deleted.
+- `status="error"` comes from `on_tool_error`. Most tools catch exceptions and
+  return an error string, so they report `ok`; that's acceptable.
+- Parallel tool calls are paired by `run_id`.
+
+### Artifacts
+
+A tool opts in by returning `(text, artifact)` with
+`@tool(response_format="content_and_artifact")`. The LLM sees only `text`. The
+artifact is a plain JSON-serialisable dict:
+
+```ts
+type ToolArtifact = {            // what a tool returns
+  kind: ArtifactKind;
+  title: string;                 // "October spending by category"
+  data: object;                  // per-kind shape below; ≤ 256 KB serialised or it is dropped
+  source_ref?: { system: "mealie" | "obsidian" | "paperless" | "ynab" | "web";
+                 id?: string; path?: string; url?: string };
+};
+type ArtifactRef = { id: string; kind: ArtifactKind; title: string };   // in tool_end + conversation payload
+type Artifact = ArtifactRef & { data: object; source_ref: object | null; tool: string;
+                                conversation_id: string; message_id: string | null; created_at: string };
+```
+
+V1 kinds and their `data` shapes:
+
+| kind | produced by | data |
+|---|---|---|
+| `mealie.recipe` | `mealie_get_recipe` | `{slug, name, description, servings, prep_time, cook_time, total_time, ingredients: string[], instructions: {title?, text}[], tags: string[], image_url?}` |
+| `mealie.meal_plan` | `mealie_meal_plans`, `mealie_todays_meals` | `{start_date, end_date, days: {date, meals: {entry_type, name, recipe_slug?, note?}[]}[]}` |
+| `mealie.shopping_lists` | `mealie_shopping_lists` | `{lists: {name, items: {name, quantity, checked}[]}[]}` |
+| `obsidian.note` | `obsidian_read_note`, `journal_get_today` | `{path, title, markdown (≤ 50k chars), tags: string[], frontmatter: object}` |
+| `search.documents` | `simba_search`, `obsidian_search_notes` | `{query, source, results: {title, snippet (≤ 400), filename?, path?, document_type?, date?}[]}` |
+| `ynab.summary` | `ynab_budget_summary` | `{month, ready_to_assign, income, assigned, spent, age_of_money?, net_worth, overspent: {name, available}[]}` |
+| `ynab.transactions` | `ynab_search_transactions` | `{start_date, end_date, count, total, transactions: {date, payee, category, account, memo?, amount}[]}` (≤ 500 rows) |
+| `ynab.spending_report` | `ynab_spending_report` | `{start_date, end_date, group_by, rows: {key, amount, count?}[], total}` |
+| `ynab.category_budget` | `ynab_category_budget` | `{month, groups: {name, categories: {name, assigned, activity, available, goal_target?}[]}[]}` |
+
+YNAB kinds are built against #55's tools, so they wait for #55.
+`source_ref.url` is filled where the backend knows it (Mealie base URL plus the
+recipe path). Obsidian gets `obsidian://open?vault=<OBSIDIAN_VAULT_NAME>&file=<path>`
+only if that env var is set; it's added to `.env`, `.env.example` and
+`docker-compose.yml`.
+
+### Storage and API
+
+- New Tortoise model `Artifact` (`blueprints/artifacts/models.py`, table
+  `artifacts`): `id UUID, user FK, conversation FK (cascade), message FK →
+  conversation_messages (nullable, set null), tool, kind, title, data JSON,
+  source_ref JSON null, version int default 1, created_at, updated_at`.
+  Migration generated with `make migrate-new` / aerich, adds a table only.
+- Created in `stream_query`'s `on_tool_end` when `output.artifact` is a dict
+  with a `kind`, right after the tool message is saved and linked to it.
+  Non-web channels (iMessage, WhatsApp, `/query`) don't create artifacts.
+- `GET /api/artifacts?conversation_id=…` returns `ArtifactRef[]` plus
+  `{tool, message_id, created_at}`, without `data`.
+  `GET /api/artifacts/<id>` returns the full `Artifact`. Both require an access
+  token and are scoped to the owner (404 otherwise).
+- `GET /api/conversation/<id>`: tool messages gain
+  `tool: string, label: string, artifact: ArtifactRef | null`. `text` keeps
+  the header line, for older clients.
+- Write-back (`PATCH`) is **out of scope** for phase 2.
+
+### Uploads
+
+- `POST /api/conversation/upload` (multipart `file`, `conversation_id`):
+  - images go through the existing `process_image` and return
+    `{kind: "image", image_key}`
+  - `application/pdf`, `text/plain`, `text/markdown`, `text/csv` (by MIME type
+    or extension) are stored at `conversations/<id>/files/<uuid>.<ext>` and
+    return `{kind: "file", file_key, name, chars}`. PDF text is extracted with
+    PyMuPDF (`fitz`, already a dependency).
+  - max 10 MB; anything else gets a 415
+  - `upload-image` stays as is
+- `stream-query` accepts an optional `file_key`. The extracted text (capped at
+  12k chars, with a `[truncated]` marker) is appended to the user turn as
+  `<attached file "name">…</attached>`. The saved user message gets
+  `📎 name` appended. Saved user messages get no new column.
+
+## Tasks
+
+Each task has its own branch off main (after the contract lands), its own herdr
+worktree and pane, and its own Claude session started from a brief.
+
+| # | Branch / pane | Scope | Owns (files) | Depends on |
+|---|---|---|---|---|
+| **A** | `feat/cowork-stream` | SSE v2 events + label registry; `Artifact` model, migration, API, creation in `on_tool_end`; conversation payload fields | `blueprints/conversation/__init__.py`, new `tool_labels.py`, new `blueprints/artifacts/`, `config/db.py`, `app.py` (register), a migration | contract on main. **Migration last, after rebasing** (see sequencing) |
+| **B** | `feat/cowork-tool-artifacts` | `content_and_artifact` for the Mealie, Obsidian and search tools; then a second commit for the YNAB tools once #55 merges | `blueprints/conversation/agents.py`, `blueprints/ynab/tools.py` (2nd commit), tests | contract; #55 for the YNAB part |
+| **C** | `feat/cowork-timeline` | Activity timeline replaces `ToolBubble`: grouped "Simba worked · N steps · 4.2 s" block per turn, rows with icon, label, input summary, spinner/✓/✗, duration and an "Open" chip that calls an `onOpenArtifact(ref)` prop; restored from conversation payload on reload | `useChat.ts`, new `ActivityTimeline.tsx`, `ToolBubble.tsx` (delete), `conversationService.ts` types, `ChatScreen.tsx` (message list only) | frontend auth PR merged |
+| **D** | `feat/cowork-artifact-panel` | Right-side artifact panel: tabs for opened artifacts, `artifactService.ts`, a renderer per kind (CSS bars, no chart library), "Open in Mealie/Obsidian", a sheet below `lg`; auto-opens the newest artifact of a turn when the window is ≥ 1280 px wide, otherwise just the chip | new `components/artifacts/*`, `api/artifactService.ts`, `ChatScreen.tsx` (layout + wiring `onOpenArtifact`) | C merged first (wires its prop) |
+| **E** | `feat/cowork-file-drop` | Upload endpoint + `file_key` in `stream-query`; drop overlay over the whole window, attachment chip in `MessageInput`; Tauri `disable_drag_drop_handler()` so HTML5 drops reach the webview | `blueprints/conversation/__init__.py` (new route + small `stream_query` hunk), new `utils/file_extract.py`, `MessageInput.tsx`, `ChatScreen.tsx` (overlay), `useChat.ts` (pending file), `desktop/src-tauri/src/lib.rs` | rebase after A and C (shared files) |
+
+### Parallelism and sequencing
+
+```
+now ──► contract PR (this doc) merged
+        frontend-auth PR merged   (after your deploy)
+            │
+            ├── A  feat/cowork-stream ─────────────┐ (merges 1st)
+            ├── B  feat/cowork-tool-artifacts ─────┤ (Mealie/Obsidian/search: merges anytime; YNAB commit after #55)
+            ├── C  feat/cowork-timeline ───────────┤ (merges after A)
+            ├── D  feat/cowork-artifact-panel ─────┤ (merges after C)
+            └── E  feat/cowork-file-drop ──────────┘ (merges last)
+```
+
+- **All five start in parallel.** A and B are pure backend. C and D build
+  against a mock `/api` server that speaks the contract, so they don't wait for
+  A.
+- **Migration order.** #55's migration needs regenerating (it clashes with
+  #57). A's migration must be generated *after* whatever lands before it. A
+  writes the model and code first, then rebases onto the latest main and runs
+  `make migrate-new` as its final step. If #55 merges while A is in review, A
+  rebases and regenerates.
+- **Shared-file conflicts** (`ChatScreen.tsx`, `useChat.ts`,
+  `conversation/__init__.py`) are resolved by the merge order A → C → D → E. Each
+  later branch rebases onto main before its review.
+- B's Mealie/Obsidian/search commit is safe to merge before A: without A,
+  artifacts ride along in `ToolMessage.artifact` and are ignored.
+
+### Verification per task
+
+- **Backend (A, B, E):** unit tests in `tests/unit/`, run with
+  `TAVILY_API_KEY=dummy .venv/bin/pytest tests/ -q` (create the venv with
+  `uv sync --all-extras`).
+  - A: event shaping becomes pure functions (`tool_start_payload(event)`,
+    `tool_end_payload(event, started_at, artifact_ref)`), which are tested,
+    along with the 256 KB cap and owner scoping.
+  - B: each converted tool, with its service mocked, returns `(str, dict)`
+    matching the kind's shape.
+  - E: extraction and the 415 case.
+- **Migrations:** a throwaway Postgres container + aerich, the same approach
+  the auth fix used.
+- **Frontend (C, D, E):** `yarn build`, plus the mock-server + Playwright recipe
+  (Node `http` mock serving `dist/` and SSE fixtures, Playwright on installed
+  Chrome, `addInitScript` to seed tokens). Screenshots are checked by eye.
+  Fixtures live in `raggr-frontend/test-fixtures/cowork/*.json`, and D owns one
+  per kind. Don't commit the Playwright devDep or a rewritten
+  `package-lock.json`.
+
+## Process
+
+1. Approve this plan. I commit it on `plan/cowork-ui`, open the PR and merge it
+   so the contract is on main.
+2. Wait for the frontend-auth PR to merge after your deploy. A and B can start
+   right away; C, D and E start once it's in, so they use the new fetch helper.
+3. For each task: `herdr worktree create … --base origin/main`, a
+   `.claude-brief.md` with that task's slice of this doc, and
+   `herdr agent start cowork-<x> … -- claude "Read .claude-brief.md…"`.
+   Workers commit locally and never push.
+4. When a worker goes idle with its task done, I review:
+   - **pass 1:** I read the diff against the contract, run the tests and
+     build, and send numbered findings to the worker.
+   - **pass 2:** same again after its fixes.
+   - Then I push the branch and open the PR (`tea pr create`).
+   - I don't merge; you merge, or tell me to.
+5. Before each review, the branch rebases on main per the merge order.
+
+## Decisions I made (say if you disagree)
+
+- **No write-back in phase 2.** Editing a recipe or note in the panel and
+  saving it to Mealie/Obsidian is phase 2.5.
+- **No chart library.** CSS bars and tables are enough for budgets. Revisit if
+  trends need real line charts.
+- **The panel auto-opens on wide windows**, otherwise shows a chip.
+- **One attached file per message** (like images today). Dropped PDFs aren't
+  filed into Paperless yet.
+- **Out of scope for now:** the bridge, notifications, the Keychain, and
+  detached runs. They're phases 3–4 in the parent doc.
+
+## Open questions
+
+1. Is **#55** close to merging? It decides when the YNAB artifacts happen, and
+   its migration needs regenerating against main either way.
+2. What's the **Obsidian vault name** (for `obsidian://` links), or is the
+   link not worth having?
+3. What's the **Mealie recipe URL** format on your instance
+   (`/g/home/r/<slug>` or `/recipe/<slug>`)? Worker B can check against the
+   API otherwise.

docs/deployment.md

@@ -96,20 +96,88 @@ The dev environment:
 - Rebuilds frontend on changes
 - Auto-applies migrations on startup
 
-### Production
+### Production (zero-downtime blue-green)
+
+The app runs as one of two identical compose services: `raggr-blue`
+(host port 8080) or `raggr-green` (host port 8081), gated behind compose
+profiles so only one color runs at a time. Caddy health-checks both ports and
+routes traffic to whichever is healthy.
 
 ```bash
-# Build and deploy
-docker compose build raggr
-docker compose up -d
+# Pull latest and swap colors with zero downtime
+make redeploy
 
-# View logs
-docker compose logs -f raggr
+# Or run the swap directly
+./scripts/deploy.sh
 
-# Verify migrations applied
-docker compose exec raggr aerich history
+# View logs / exec into the active color (Makefile resolves the color)
+make logs
+make migrate-history
 ```
 
+`scripts/deploy.sh` does the following:
+
+1. Detects the running color via `docker compose ps`.
+2. Builds the inactive color.
+3. Starts it with `docker compose up -d --wait`, which blocks until the
+   container healthcheck (`GET /api/health`) passes.
+4. If the new color never becomes healthy, it is stopped and the old color
+   keeps serving (the script exits non-zero).
+5. Otherwise the old color is stopped with a 30s grace period so in-flight
+   SSE streams can finish, then removed.
+
+To target a color manually, enable its profile:
+
+```bash
+docker compose --profile blue up -d raggr-blue
+docker compose --profile blue --profile green ps
+```
+
+#### Caddy configuration
+
+Caddy needs both upstreams with active health checks:
+
+```caddyfile
+ask.torrtle.co {
+  reverse_proxy host.docker.internal:8080 host.docker.internal:8081 {
+    lb_policy first          # prefer blue when both are healthy
+    lb_try_duration 5s       # retry on the other upstream during the swap
+    lb_try_interval 250ms
+    health_uri /api/health
+    health_interval 2s
+    health_timeout 2s
+    fail_duration 10s
+  }
+}
+```
+
+#### One-time cutover from the old `raggr` service
+
+The first deploy after this change lands needs manual steps, because the old
+`raggr` container still holds port 8080 and the deploy script doesn't know
+about it:
+
+```bash
+# 1. Update the Caddy config to the two-upstream block below and reload Caddy
+# 2. On the server:
+git pull
+docker compose --profile green up -d --build --wait raggr-green   # port 8081, no conflict
+docker stop -t 30 $(docker ps -q --filter name=raggr-1)           # old raggr container
+docker rm $(docker ps -aq --filter name=raggr-1)
+# From here on, `make redeploy` handles swaps (green is now the active color)
+```
+
+#### Blue-green caveats
+
+- **Migrations must be backward-compatible.** The new color runs
+  `aerich upgrade` on startup while the old color is still serving the
+  previous code. Additive changes (new tables/columns) are safe; destructive
+  changes (drop/rename a column the old code reads) need a two-step deploy:
+  ship code that stops using the column first, then drop it in a later deploy.
+- **Obsidian sync overlap.** During the ~30s swap window both containers run
+  pull-only `ob sync` against the shared `./obvault` mount. Both are
+  read-only pulls, so this is low risk, but avoid deploying mid-reindex.
+
 ### Fresh Deploy (New Database)
 
 On first deploy with an empty database, `startup-dev.sh` runs `aerich init-db` instead of `aerich upgrade`. This creates all tables from the current models.

docs/desktop-client.md

@@ -0,0 +1,351 @@
+# Desktop Client (exploration)
+
+Status: **proposal**, no app code yet. Branch `explore/desktop-client`.
+
+Goal: a persistent, native-feeling macOS app where Simba works *alongside* the
+user rather than a chat box in a browser tab. "Cowork-like" means:
+
+- visible tool activity and progress while the agent works
+- side panels for artifacts: budget reports, recipes, notes, documents
+- drag files into the agent
+- desktop notifications (scheduled messages, cron jobs, finished runs)
+- a menu-bar icon and a global hotkey to summon the window
+
+## Decisions (2026-10-12)
+
+| Question | Decision | Consequence |
+|---|---|---|
+| Reachable off-LAN? | Yes, publicly via Caddy | Loading the remote origin works anywhere; `offline.html` only covers "no network / server down" |
+| Who uses it? | Just the admin (Ryan) | Every desktop-only endpoint is `@admin_required`; no multi-user notification fan-out, no distribution story |
+| Act on the Mac (local tools)? | **Yes** | Adds a *local tool bridge* (below). Tauri is still the pick: the bridge lives in the Rust core and can spawn local MCP servers as child processes |
+| Artifact storage | Own `artifacts` table | Artifacts can be listed, reopened, edited and written back |
+| Stop sending the refresh token on every request? | Yes, for web too | Becomes phase 0 (see "Auth fix") |
+| Apple Developer account? | No; a local dev build is fine | No notarization or updater. `make desktop` builds an ad-hoc-signed `.app` locally |
+
+## What exists today
+
+| Area | Current state | Desktop implication |
+|---|---|---|
+| Frontend | React 19 + Rsbuild + Tailwind, `BrowserRouter`, all API calls use relative `/api/...` | Reusable as-is if the shell loads it from the server origin; a bundled copy needs an API base URL and CORS |
+| PWA | `manifest.json` + `sw.js` (static cache, network-only `/api`) | "Install app" already works in Chrome / Safari "Add to Dock" |
+| Streaming | `POST /api/conversation/stream-query` → SSE over `fetch` with events `thinking`, `thinking_delta`, `tool_start {tool}`, `tool_end {tool}`, `content`, `response`, `error` | Too thin for Cowork: tool events have no run id, no args, no output, no structured payload |
+| Run lifecycle | The agent runs *inside* the HTTP response generator. A client disconnect cancels it (`CancelledError`, partial answer persisted) | You can't close the window and let Simba keep working |
+| Tool output | Tools return strings; output is persisted as `speaker="tool"` text (capped at 4000 chars) and the UI only shows the first line. `simba_search` already uses `response_format="content_and_artifact"` | Natural hook for structured artifacts |
+| Tool labels | `TOOL_MESSAGES` map in `useChat.ts` is hand-maintained and stale (no Mealie, SimbaKit, Homebox, BookStack, Beli…) | Labels should come from the server |
+| Uploads | `POST /api/conversation/upload-image`: images only, 10 MB, stored in S3, attached as an image block | Need generic file upload (PDF, text, markdown, CSV) |
+| Auth | Backend is the confidential OIDC client. `/oidc/login` returns an Authelia URL; Authelia redirects to `OIDC_REDIRECT_URI` (the web root); the SPA posts `code`+`state` to `/oidc/callback` and stores JWTs in `localStorage` | In-webview login works unchanged if the shell loads the real origin. A system-browser login needs a handoff (see below) |
+| Auth quirks | `_oidc_sessions` is an in-process dict (a login that spans a blue/green flip fails with "Invalid or expired state"); `redirect_after_login` is stored but never used; every API call sends the **30-day refresh token** as the bearer (`@jwt_refresh_token_required` everywhere) | Desktop must keep that token in the Keychain, not plain storage |
+| Notifications | Scheduled messages and cron jobs deliver to iMessage / email only (admin-only APIs) | No in-app notification channel exists |
+| CORS | None configured | Only matters for a bundled frontend |
+
+## Shell options
+
+### A. PWA ("Install app" / "Add to Dock")
+
+- **Reuse:** 100%. Already shipped.
+- **Size:** 0.
+- **macOS integration:** own window and Dock icon; Web Push and the Badging API
+  work for installed PWAs. **No** menu-bar icon, **no** global hotkey, no
+  quick-ask panel, no Keychain, file access only through the picker/drop.
+- **OIDC:** unchanged.
+- **Verdict:** a free baseline and the fallback. It can't deliver the
+  menu-bar or hotkey parts, which are most of what makes it feel like a
+  desktop app.
+
+### B. Tauri v2 (recommended)
+
+- **Reuse:** high. Either load the deployed frontend from the server origin
+  (no fork), or bundle `raggr-frontend/dist` (needs an API base URL plus CORS).
+- **Size:** ~5–15 MB `.app`, low idle memory (system WKWebView). Rust and
+  cargo are already installed on this machine.
+- **macOS integration:** first-party plugins for tray/menu-bar (core
+  `TrayIcon`), `global-shortcut`, `notification`, `deep-link`,
+  `single-instance`, `window-state`, `autostart`, `updater`, `positioner`
+  (anchor the quick-ask panel under the tray icon), keychain storage, and
+  window file drag-drop events with real paths. `ActivationPolicy::Accessory`
+  gives a menu-bar-only mode.
+- **Costs:** Safari/WebKit engine (the PWA already targets Safari, so low
+  risk). Service workers don't run in WKWebView here (the `sw.js` register
+  call already fails soft). Native code is Rust, but the native layer stays
+  small: tray, hotkey, notifications, keychain, deep link.
+- **Security:** remote content can reach Tauri IPC only through an explicit
+  `remote.urls` capability. Grant the remote origin only notification and
+  window commands; register shortcut and tray from Rust, not JS.
+
+### C. Electron
+
+- **Reuse:** same as Tauri.
+- **Size:** ~100 MB+ download, ~200 MB+ on disk, 150–300 MB RAM idle.
+- **macOS integration:** everything Tauri has, more mature (`menubar`
+  package, `globalShortcut`, `Notification`, `safeStorage`), plus Node in the
+  main process. That would matter if the client ran local tools or MCP
+  servers on the user's machine (see open questions).
+- **Verdict:** the better choice only if we want heavy client-side tool
+  execution in JS/Node. For a thin client to a self-hosted agent, the size
+  and memory cost buys nothing. Local tools are wanted, but the bridge design
+  below runs local MCP servers as child processes (Node is already installed),
+  so Electron's in-process Node isn't needed.
+
+### Decision matrix
+
+| | PWA | Tauri v2 | Electron |
+|---|---|---|---|
+| Reuse raggr-frontend | ✅ as-is | ✅ remote or bundled | ✅ remote or bundled |
+| Bundle / RAM | none | ~10 MB / low | ~100 MB+ / high |
+| Menu bar + quick-ask | ❌ | ✅ | ✅ |
+| Global hotkey | ❌ | ✅ | ✅ |
+| Notifications | Web Push (VAPID) | ✅ native | ✅ native |
+| File drag-drop w/ paths | browser `File` only | ✅ | ✅ |
+| Secure token storage | ❌ localStorage | ✅ Keychain | ✅ safeStorage |
+| Auto-update | free (server) | `updater` plugin, or free with a remote UI | `electron-updater` |
+| Local tool execution | ❌ | Rust | Node (easiest) |
+
+## Recommended architecture
+
+**A Tauri v2 shell that loads the deployed SimbaRAG origin, plus a tiny bundled
+"offline/connect" page. Cowork features are built in `raggr-frontend` behind
+feature detection, so the web app gets them too.**
+
+```
+┌──────────────────────── Simba.app (Tauri v2) ─────────────────────────┐
+│ Rust core (small)                                                      │
+│  • tray icon + menu (Ask…, New chat, recent convos, Quit)              │
+│  • global shortcut ⌥Space → show/hide main window                      │
+│  • notifications (plugin-notification)                                 │
+│  • keychain token store, deep-link `simba://`, single-instance         │
+│  • window-state, autostart                                             │
+│                                                                        │
+│  Main window  ──loads──▶  https://<simba-host>/        (full UI)       │
+│  Fallback     ──bundled─▶ offline.html (server unreachable / retry)    │
+└───────────────────────────────┬────────────────────────────────────────┘
+                                │ HTTPS: REST + SSE (same origin, no CORS)
+┌───────────────────────────────▼────────────────────────────────────────┐
+│ Caddy → raggr-blue / raggr-green (Quart)                               │
+│  /api/conversation/*  (+ structured tool/artifact events)              │
+│  /api/runs/*          (detached agent runs, resumable SSE)  [phase 3]  │
+│  /api/files           (generic upload)                                 │
+│  /api/notifications/stream (per-user SSE feed)                         │
+└────────────────────────────────────────────────────────────────────────┘
+```
+
+Why load the remote origin rather than bundle:
+
+- **One codebase, one deploy.** `make redeploy` updates web, PWA and desktop
+  together. No version skew between the desktop UI and the SSE protocol, and
+  no desktop release for UI changes.
+- **No CORS, no API-base refactor, and the current OIDC flow works unchanged**
+  inside the webview (redirect back to the web root on the same origin).
+- The agent needs the server anyway, so offline-first buys little. The bundled
+  `offline.html` covers "server down / not on VPN".
+
+The frontend detects the shell with `window.__TAURI_INTERNALS__` (or a
+`?shell=desktop` query param) and turns on the native bits: notifications
+and drag-drop paths. Everything else renders
+the same in a browser.
+
+### Cowork UI (in raggr-frontend, shared by web and desktop)
+
+- **Three panes:** conversations | chat | **artifact panel** (collapsible, a
+  tab per artifact). On mobile/web the artifact panel becomes a sheet.
+- **Activity timeline** in place of single-line `ToolBubble` pills: one row per
+  tool call with a server-provided label, args summary, a spinner, duration,
+  and an expandable result. Clicking a row with an artifact opens it in the
+  panel.
+- **Artifact renderers:** `budget` (YNAB summary/category table + chart),
+  `transactions` (table), `recipe` (Mealie: ingredients/steps, "add to meal
+  plan"), `note` (Obsidian markdown, "open in Obsidian" via
+  `obsidian://` deep link), `document` (Paperless hit: title, snippet, link to
+  Paperless), `photo` (Immich), `device` (SimbaKit status/weight chart).
+- **Drop zone** over the whole window: images go to the existing vision path;
+  PDFs and text go to the new upload endpoint (below).
+
+### Local tool bridge (Simba acts on the Mac)
+
+The backend can't reach the Mac (it's behind NAT), so the desktop app dials
+out and the backend calls tools back over that connection.
+
+```
+Mac                                              Server
+┌─ Simba.app Rust core ────────────┐   wss    ┌─ Quart ────────────────────────┐
+│ bridge client ───────────────────┼─────────▶│ /api/desktop/bridge (websocket)│
+│   │ JSON-RPC (MCP messages)      │          │   │                            │
+│   ▼                              │          │   ▼                            │
+│ local MCP servers (child procs)  │          │ MCP ClientSession over the ws  │
+│  • filesystem (scoped folders)   │          │  → langchain-mcp-adapters tools│
+│  • later: screenshot, clipboard, │          │  → mcp_tools.select_tools(     │
+│    open app/URL, Shortcuts       │          │      prefix="mac", admin-only) │
+│ confirm dialog for write tools   │          │  → injected per run only while │
+└──────────────────────────────────┘          │    the bridge is connected     │
+                                              └────────────────────────────────┘
+```
+
+- **The protocol is MCP**, so the backend reuses the existing pattern in
+  `utils/mcp_tools.py` (allowlist, `prefix_` rename, admin re-check). Only the
+  transport is new: an MCP `ClientSession` over the websocket's read/write
+  streams instead of stdio.
+- **The bridge runs in Rust, not in the webview.** The webview loads remote
+  content, so giving page JS file access would turn any XSS into local file
+  access. The Rust core owns the socket, the child processes, and the
+  allowlist of exposed folders (picked in a native settings window).
+- **Writes need consent:** tools tagged as writes (save file, move, run a
+  Shortcut) show a native confirm dialog before running. Reads inside the
+  scoped folders are allowed without asking.
+- **Availability:** the agent is compiled once at startup, so `mac_*` tools are
+  added per run, e.g. via `get_agent_for(user)` returning a variant with
+  bridge tools when a bridge session is connected. If the bridge drops
+  mid-call, the tool returns "Mac is offline" rather than hanging.
+- **Auth:** the websocket authenticates with the same JWT, so this depends on
+  the auth fix landing first. A blue/green flip drops the socket and the app
+  reconnects to the new color.
+- **Open spike question:** do the `mcp` Python SDK and `langchain-mcp-adapters`
+  accept a custom transport cleanly? Fallback: a small hand-rolled JSON-RPC
+  tool-call protocol with tools defined server-side.
+
+## Auth fix (web + desktop)
+
+Today the frontend sends the **refresh** token as the bearer on every call,
+and 20 routes use `@jwt_refresh_token_required` (conversation ×9, beli ×6,
+users ×2 incl. `/refresh`, rag ×1, app ×1, plus `admin_required` in
+`blueprints/users/decorators.py`).
+
+Change:
+
+1. Backend: every route except `/api/user/refresh` uses `@jwt_required`
+   (access token, 1h). The same goes for the inner decorator of
+   `admin_required`.
+2. Frontend: collapse `fetchWithRefreshToken` and `fetchWithAuth` into one
+   function that sends the access token and, on 401, refreshes once and
+   retries. `validateToken` keeps using the refresh token.
+3. Desktop: the refresh token lives in the Keychain. The webview keeps only
+   the access token (memory or `localStorage`).
+
+This is blue/green-safe in both directions. An *old* frontend talking to the
+new backend sends the refresh token, gets a 401, calls `/refresh`, and retries
+with an access token, so it works. A *new* frontend talking to the old backend
+sends an access token where a refresh token is required, gets a 401, and the
+retry with a fresh access token also fails. That window lasts only as long as
+the deploy flip. To avoid it, deploy the backend change first: for one release,
+accept either token type on the protected routes (a small custom decorator),
+then flip the frontend.
+
+SSE streams are authenticated once at request start, so a stream running past
+the 1h access-token expiry is fine.
+
+Also in scope: move `_oidc_sessions` into Postgres (or signed, stateless
+`state`) so a login spanning a deploy doesn't fail, and either honour or
+delete the unused `redirect_after_login`.
+
+## Backend changes
+
+Ordered by how much the client depends on them. All are additive, so
+blue/green stays safe: the old frontend ignores the new fields.
+
+1. **Richer SSE events** (`blueprints/conversation/__init__.py`):
+   - `tool_start {run_id, tool, label, input}`: `input` comes from
+     `event["data"]["input"]`, trimmed/redacted; `label` comes from a
+     server-side map that replaces `TOOL_MESSAGES`.
+   - `tool_end {run_id, tool, ms, summary, artifact?}`: `run_id` lets parallel
+     tool calls pair up correctly.
+   - optional `event: id` lines so a client can resume (needed for phase 3).
+2. **Structured artifacts.** Move high-value tools to
+   `response_format="content_and_artifact"` (as `simba_search` already does): the
+   LLM still sees compact text, and the UI gets
+   `{kind, title, data}`. Persist them in an **`artifacts` table**:
+   `id, user_id, conversation_id, message_id (nullable FK to the tool row),
+   kind, title, data JSON, source_ref (e.g. Mealie slug, Obsidian path,
+   Paperless id), version, created_at, updated_at`. Generate the migration with
+   `make migrate-new` (never hand-written); a new table is backward-compatible.
+   Endpoints: `GET /api/artifacts?conversation_id=` and
+   `GET/PATCH /api/artifacts/<id>`. `PATCH` writes back to the source
+   integration where one exists (edit a recipe → Mealie, edit a note →
+   Obsidian) and bumps `version`. `GET /api/conversation/<id>` includes artifact
+   ids on tool messages.
+3. **Generic file upload** `POST /api/conversation/upload` (supersedes
+   `upload-image`, which stays for compatibility): accept images, PDF, md/txt,
+   CSV. Store in S3 under `conversations/<id>/`, extract text (reuse
+   `utils/cleaner.py` for PDFs), and attach it as a document block capped to the
+   context budget (32k slots). Possible extra: a "file it in Paperless" action
+   that pushes the PDF into Paperless so it gets indexed. Revisit
+   `MAX_CONTENT_LENGTH` (10 MB).
+4. **Notifications feed.** A `notifications` table (user, kind, title, body,
+   link, created_at, read_at) written by the scheduler (`process_due_messages`),
+   cron runs, and completed detached runs. Add
+   `GET /api/notifications/stream` (per-user SSE with `Last-Event-ID` replay
+   from the table, so a blue/green flip only causes a reconnect) and
+   `POST /api/notifications/<id>/read`. Also consider a `desktop` value on
+   `MessageChannel` so a scheduled message can target the app instead of
+   iMessage.
+5. **Detached agent runs** (phase 3): `POST /api/runs` starts the agent in a
+   background task and returns `run_id`; `GET /api/runs/<id>/events` streams
+   with replay. This decouples work from the window. Constraint: an in-process
+   run dies on a blue/green stop. Either persist events (Postgres) and mark
+   runs `interrupted` on startup, or have `deploy.sh` drain active runs before
+   stopping the old color.
+6. **Native auth handoff** (phase 3, optional): sign in through the system
+   browser (password manager, passkeys, existing Authelia session) without
+   changing Authelia config:
+   1. The app generates a PKCE verifier and opens
+      `https://<simba-host>/api/user/oidc/login?client=desktop&challenge=…` in
+      the default browser.
+   2. The normal web OIDC round-trip runs against the existing redirect URI.
+   3. The backend sees `client=desktop` on the stored session and, instead of
+      returning JWTs to the page, issues a one-time 60-second handoff code and
+      redirects to `simba://auth?code=…`.
+   4. The app exchanges `code + verifier` at `POST /api/user/desktop/token` for
+      JWTs and stores them in the Keychain.
+
+   This also requires moving `_oidc_sessions` into Postgres or signed state so
+   it survives blue/green. The alternative, registering a loopback or
+   custom-scheme redirect URI in Authelia, depends on Authelia's redirect
+   matching rules (exact match, ports?). That needs checking, and the client
+   secret would have to stay on the server anyway.
+7. **Local tool bridge:** `/api/desktop/bridge` websocket, an MCP-over-websocket
+   client, and per-run injection of `mac_*` tools (see above). Admin-only.
+8. **CORS:** only needed if we ever bundle the frontend (`quart-cors`
+   allowing `tauri://localhost` / `http://tauri.localhost`). Not needed
+   with the recommendation.
+
+## Phased plan
+
+| Phase | Scope | Backend | Exit criteria |
+|---|---|---|---|
+| **0a. Auth fix** (own PR) | access token on every call, single fetch helper, OIDC state in Postgres | auth fix (+ migration if state goes in a table) | Web works through a blue/green flip; the refresh token is only ever sent to `/refresh` |
+| **0b. Spike** (½ day) | `desktop/` Tauri v2 app: one window loading `<simba-host>`, tray icon with Show/Quit, ⌥Space toggles the window, `offline.html` fallback | none | Log in through Authelia inside the webview, stream an answer, survive a `make redeploy` |
+| **1. Native shell** | notifications, window-state, autostart, refresh token in the Keychain (no quick-ask window: dropped 2026-10-12) | none | A scheduled-message notification arrives; the login survives an app restart |
+| **2. Cowork UI** ([plan](cowork-ui-plan.md)) | activity timeline, artifact panel + renderers (budget, recipe, note, document first), whole-window drop zone | items 1–3 (`artifacts` table) | Ask "how's the grocery budget" → YNAB artifact opens in the side panel; drop a PDF → summarised |
+| **3. Local tools** | Rust bridge client, filesystem MCP scoped to chosen folders, write-confirm dialog, folder picker | item 7 | "Summarise the PDFs in ~/Downloads/taxes" works; a write prompts first; quitting the app removes the tools |
+| **4. Background agent** | detached runs, notifications feed, desktop channel for scheduled messages, system-browser auth handoff | items 4–6 | Close the window mid-run → notification when done → reopen shows the full timeline |
+
+**0b status:** scaffolded in `desktop/`. It has a bundled connect page that
+probes `/api/health` and hands off to `$SIMBA_URL`, a menu-bar icon
+(Show / New Chat / Reconnect / Quit), ⌥Space to toggle, close-to-hide,
+single-instance, and Dock-click reopen. The remote origin gets no IPC.
+`desktop/src-tauri/rust-toolchain.toml` pins Rust 1.90, the minimum
+Tauri 2.12 accepts, so the global toolchain is untouched. Run it with
+`make desktop-dev SIMBA_URL=…` or `make desktop`.
+Verified 2026-10-12: Authelia login inside the webview works, and the
+conversation list loads.
+
+Phases 1–3 are independent once 0a/0b land. Phase 2 also improves the web
+UI. There's no distribution phase: `make desktop` runs `tauri build` and
+copies the ad-hoc-signed `.app` to `/Applications`. A locally built app isn't
+quarantined, so Gatekeeper won't complain. Because the UI loads from the
+server, rebuilds are only needed when the Rust shell changes.
+
+## Open questions
+
+1. **Keychain and ad-hoc signing:** the ad-hoc signature changes on every
+   rebuild, so macOS may ask again for Keychain access after each
+   `make desktop`. Acceptable, or use a self-signed local code-signing
+   certificate to keep the identity stable?
+2. **Local tool scope for v1:** filesystem (read + confirmed writes) only, or
+   also screenshot, clipboard, "open URL/app", and running Shortcuts?
+3. **MCP over websocket:** does `langchain-mcp-adapters` take a custom session
+   or transport cleanly? Settle this in a short spike before phase 3;
+   otherwise fall back to a hand-rolled tool-call protocol.
+4. **Engine risk:** does anything in the UI rely on Chromium-only behaviour?
+   The spike should check markdown rendering, streaming `fetch`, and the
+   image picker in WKWebView.
+5. **Artifact write-back conflicts:** if a recipe or note changed in
+   Mealie/Obsidian after the artifact was captured, should we refuse, show a
+   diff, or let the last write win?

llm.py

@@ -1,6 +1,7 @@
 import os
 import logging
 
+import httpx
 from openai import OpenAI
 from dotenv import load_dotenv
 
@@ -13,7 +14,15 @@ class LLMClient:
     def __init__(self):
         llama_url = os.getenv("LLAMA_SERVER_URL")
         if llama_url:
-            self.client = OpenAI(base_url=llama_url, api_key="not-needed")
+            # Tight read timeout so a wedged llama-server fails fast instead
+            # of hanging for the OpenAI client's 600s default.
+            read_timeout = float(os.getenv("LLAMA_TIMEOUT_SECONDS", "120"))
+            self.client = OpenAI(
+                base_url=llama_url,
+                api_key="not-needed",
+                timeout=httpx.Timeout(read_timeout, connect=10.0),
+                max_retries=1,
+            )
             self.model = os.getenv("LLAMA_MODEL_NAME", "llama-3.1-8b-instruct")
             self.PROVIDER = "llama_server"
             logging.info("Using llama_server as LLM backend")

metrics.py

@@ -0,0 +1,55 @@
+import time
+from contextlib import contextmanager
+from prometheus_client import (
+    CollectorRegistry,
+    Counter,
+    Histogram,
+    generate_latest,
+)
+
+REGISTRY = CollectorRegistry(auto_describe=True)
+
+CHAT_RESPONSE_SECONDS = Histogram(
+    "raggr_chat_response_seconds",
+    "End-to-end chat response time in seconds.",
+    labelnames=("stream",),
+    buckets=(0.5, 1, 2, 5, 10, 30, 60, 120, 300),
+    registry=REGISTRY,
+)
+
+CHAT_REQUESTS_TOTAL = Counter(
+    "raggr_chat_requests_total",
+    "Total chat requests by stream mode and result.",
+    labelnames=("stream", "result"),
+    registry=REGISTRY,
+)
+
+
+def _s(stream: bool) -> str:
+    return "true" if stream else "false"
+
+
+@contextmanager
+def time_response(stream: bool):
+    t0 = time.monotonic()
+    result = "success"
+    try:
+        yield
+    except Exception:
+        result = "error"
+        raise
+    finally:
+        CHAT_RESPONSE_SECONDS.labels(stream=_s(stream)).observe(time.monotonic() - t0)
+        CHAT_REQUESTS_TOTAL.labels(stream=_s(stream), result=result).inc()
+
+
+def observe_response(stream: bool, seconds: float) -> None:
+    CHAT_RESPONSE_SECONDS.labels(stream=_s(stream)).observe(seconds)
+
+
+def count_result(stream: bool, result: str) -> None:
+    CHAT_REQUESTS_TOTAL.labels(stream=_s(stream), result=result).inc()
+
+
+def render_metrics() -> bytes:
+    return generate_latest(REGISTRY)

migrations/models/11_20260916031522_add_message_handle_to_conversation_messages.py

@@ -0,0 +1,71 @@
+from tortoise import BaseDBAsyncClient
+
+RUN_IN_TRANSACTION = True
+
+
+async def upgrade(db: BaseDBAsyncClient) -> str:
+    return """
+        ALTER TABLE "conversation_messages" ADD "message_handle" VARCHAR(255);
+        COMMENT ON COLUMN "conversation_messages"."speaker" IS 'USER: user\nSIMBA: simba\nTOOL: tool';"""
+
+
+async def downgrade(db: BaseDBAsyncClient) -> str:
+    return """
+        ALTER TABLE "conversation_messages" DROP COLUMN "message_handle";
+        COMMENT ON COLUMN "conversation_messages"."speaker" IS 'USER: user\nSIMBA: simba';"""
+
+
+MODELS_STATE = (
+    "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"
+)

migrations/models/12_20260916223332_add_cron_jobs.py

@@ -0,0 +1,86 @@
+from tortoise import BaseDBAsyncClient
+
+RUN_IN_TRANSACTION = True
+
+
+async def upgrade(db: BaseDBAsyncClient) -> str:
+    return """
+        CREATE TABLE IF NOT EXISTS "cron_jobs" (
+    "id" UUID NOT NULL PRIMARY KEY,
+    "name" VARCHAR(255) NOT NULL,
+    "description" TEXT,
+    "prompt" TEXT NOT NULL,
+    "recipient" VARCHAR(255) NOT NULL,
+    "channel" VARCHAR(20) NOT NULL,
+    "enabled" BOOL NOT NULL DEFAULT True,
+    "last_run_at" TIMESTAMPTZ,
+    "last_status" VARCHAR(50),
+    "last_error" TEXT,
+    "created_at" TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updated_at" TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+COMMENT ON COLUMN "cron_jobs"."channel" IS 'IMESSAGE: imessage\nEMAIL: email';"""
+
+
+async def downgrade(db: BaseDBAsyncClient) -> str:
+    return """
+        DROP TABLE IF EXISTS "cron_jobs";"""
+
+
+MODELS_STATE = (
+    "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"
+    "XV6+/x9WSMI2"
+)

migrations/models/13_20260917193429_add_beli_profiles_restaurants.py

@@ -0,0 +1,131 @@
+from tortoise import BaseDBAsyncClient
+
+RUN_IN_TRANSACTION = True
+
+
+async def upgrade(db: BaseDBAsyncClient) -> str:
+    return """
+        CREATE TABLE IF NOT EXISTS "cron_jobs" (
+    "id" UUID NOT NULL PRIMARY KEY,
+    "name" VARCHAR(255) NOT NULL,
+    "description" TEXT,
+    "prompt" TEXT NOT NULL,
+    "recipient" VARCHAR(255) NOT NULL,
+    "channel" VARCHAR(20) NOT NULL,
+    "enabled" BOOL NOT NULL DEFAULT True,
+    "last_run_at" TIMESTAMPTZ,
+    "last_status" VARCHAR(50),
+    "last_error" TEXT,
+    "created_at" TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updated_at" TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+COMMENT ON COLUMN "cron_jobs"."channel" IS 'IMESSAGE: imessage\nEMAIL: email';
+        CREATE TABLE IF NOT EXISTS "beli_profiles" (
+    "id" UUID NOT NULL PRIMARY KEY,
+    "beli_email" VARCHAR(255) NOT NULL,
+    "beli_password" TEXT NOT NULL,
+    "beli_user_id" VARCHAR(255),
+    "beli_refresh_token" TEXT,
+    "last_refreshed_at" TIMESTAMPTZ,
+    "last_error" TEXT,
+    "enabled" BOOL NOT NULL DEFAULT True,
+    "created_at" TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updated_at" TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "user_id" UUID NOT NULL REFERENCES "users" ("id") ON DELETE CASCADE,
+    CONSTRAINT "uid_beli_profil_user_id_f4bba0" UNIQUE ("user_id", "beli_email")
+);
+        CREATE TABLE IF NOT EXISTS "beli_restaurants" (
+    "id" UUID NOT NULL PRIMARY KEY,
+    "beli_business_id" VARCHAR(255) NOT NULL,
+    "name" VARCHAR(500) NOT NULL,
+    "city" VARCHAR(255),
+    "neighborhood" VARCHAR(255),
+    "cuisine" JSONB NOT NULL,
+    "price_range" VARCHAR(10),
+    "status" VARCHAR(20) NOT NULL,
+    "rank_index" INT,
+    "score" DECIMAL(5,2),
+    "notes" TEXT,
+    "tags" JSONB NOT NULL,
+    "fetched_at" TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "created_at" TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "profile_id" UUID NOT NULL REFERENCES "beli_profiles" ("id") ON DELETE CASCADE,
+    CONSTRAINT "uid_beli_restau_profile_921fe6" UNIQUE ("profile_id", "beli_business_id", "status")
+);
+COMMENT ON COLUMN "beli_restaurants"."status" IS 'BEEN: been\nWANT_TO_TRY: want_to_try';"""
+
+
+async def downgrade(db: BaseDBAsyncClient) -> str:
+    return """
+        DROP TABLE IF EXISTS "beli_profiles";
+        DROP TABLE IF EXISTS "cron_jobs";
+        DROP TABLE IF EXISTS "beli_restaurants";"""
+
+
+MODELS_STATE = (
+    "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"
+)

migrations/models/14_20260917205441_beli-update.py

@@ -0,0 +1,89 @@
+from tortoise import BaseDBAsyncClient
+
+RUN_IN_TRANSACTION = True
+
+
+async def upgrade(db: BaseDBAsyncClient) -> str:
+    return """
+        ALTER TABLE "beli_restaurants" DROP CONSTRAINT IF EXISTS "uid_beli_restau_profile_921fe6";
+        ALTER TABLE "beli_restaurants" ADD "friend_name" VARCHAR(255);
+        ALTER TABLE "beli_restaurants" ADD "friend_beli_user_id" VARCHAR(255) NOT NULL DEFAULT '';
+        CREATE UNIQUE INDEX IF NOT EXISTS "uid_beli_restau_profile_1e4068" ON "beli_restaurants" ("profile_id", "beli_business_id", "status", "friend_beli_user_id");"""
+
+
+async def downgrade(db: BaseDBAsyncClient) -> str:
+    return """
+        DROP INDEX IF EXISTS "uid_beli_restau_profile_1e4068";
+        ALTER TABLE "beli_restaurants" DROP COLUMN "friend_name";
+        ALTER TABLE "beli_restaurants" DROP COLUMN "friend_beli_user_id";
+        CREATE UNIQUE INDEX IF NOT EXISTS "uid_beli_restau_profile_921fe6" ON "beli_restaurants" ("profile_id", "beli_business_id", "status");"""
+
+
+MODELS_STATE = (
+    "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"
+)

migrations/models/15_20260917220930_beli_add_beli_category_09172026.py

@@ -0,0 +1,87 @@
+from tortoise import BaseDBAsyncClient
+
+RUN_IN_TRANSACTION = True
+
+
+async def upgrade(db: BaseDBAsyncClient) -> str:
+    return """
+        DROP INDEX IF EXISTS "uid_beli_restau_profile_1e4068";
+        ALTER TABLE "beli_restaurants" ADD "beli_category" VARCHAR(10) NOT NULL DEFAULT '';
+        CREATE UNIQUE INDEX IF NOT EXISTS "uid_beli_restau_profile_93dc73" ON "beli_restaurants" ("profile_id", "beli_business_id", "status", "friend_beli_user_id", "beli_category");"""
+
+
+async def downgrade(db: BaseDBAsyncClient) -> str:
+    return """
+        DROP INDEX IF EXISTS "uid_beli_restau_profile_93dc73";
+        ALTER TABLE "beli_restaurants" DROP COLUMN "beli_category";
+        CREATE UNIQUE INDEX IF NOT EXISTS "uid_beli_restau_profile_1e4068" ON "beli_restaurants" ("profile_id", "beli_business_id", "status", "friend_beli_user_id");"""
+
+
+MODELS_STATE = (
+    "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"
+)

migrations/models/16_20261012173826_add_oidc_states.py

@@ -0,0 +1,101 @@
+from tortoise import BaseDBAsyncClient
+
+RUN_IN_TRANSACTION = True
+
+
+async def upgrade(db: BaseDBAsyncClient) -> str:
+    return """
+        CREATE TABLE IF NOT EXISTS "oidc_states" (
+    "state" VARCHAR(128) NOT NULL PRIMARY KEY,
+    "pkce_verifier" VARCHAR(128) NOT NULL,
+    "expires_at" TIMESTAMPTZ NOT NULL,
+    "created_at" TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+CREATE INDEX IF NOT EXISTS "idx_oidc_states_expires_c461d9" ON "oidc_states" ("expires_at");
+COMMENT ON TABLE "oidc_states" IS 'Pending OIDC login: maps the `state` param to its PKCE verifier.';
+        ALTER TABLE "users" ALTER COLUMN "ldap_groups" TYPE JSONB USING "ldap_groups"::JSONB;
+        ALTER TABLE "beli_restaurants" ALTER COLUMN "cuisine" TYPE JSONB USING "cuisine"::JSONB;
+        ALTER TABLE "beli_restaurants" ALTER COLUMN "tags" TYPE JSONB USING "tags"::JSONB;"""
+
+
+async def downgrade(db: BaseDBAsyncClient) -> str:
+    return """
+        ALTER TABLE "users" ALTER COLUMN "ldap_groups" TYPE JSONB USING "ldap_groups"::JSONB;
+        ALTER TABLE "beli_restaurants" ALTER COLUMN "cuisine" TYPE JSONB USING "cuisine"::JSONB;
+        ALTER TABLE "beli_restaurants" ALTER COLUMN "tags" TYPE JSONB USING "tags"::JSONB;
+        DROP TABLE IF EXISTS "oidc_states";"""
+
+
+MODELS_STATE = (
+    "eJztXW1zo7YW/isaf9rOpOk62Wy3mTt3xkm8rbuJnYm9t2/uUBnkWA0IimCznrb//Uoy2C"
+    "AEAb+CVx/arIWOgEcH6ZznHEl/txzXQjY9vXbJJ+RTGGCXtC7B3y0CHcT+obx+AlrQ81ZX"
+    "eUEAJ7YQMBM1xRU4oYEPzYBdnEKbIlZkIWr62ItuRkLb5oWuySpi8rgqCgn+K0RG4D6iYI"
+    "Z8duG331kxJhb6jGj803syphjZVuq5scXvLcqNYO6Jso8fezfvRU1+u4lhunbokFVtbx7M"
+    "XLKsHobYOuUy/NojIsiHAbISr8GfMnrtuGjxxKwg8EO0fFRrVWChKQxtDkbrP9OQmBwDIO"
+    "7E//fmv60K8DCoObSYBByLv/9dvNXqnUVpi9/q+ofOw6vzt1+Jt3Rp8OiLiwKR1r9CEAZw"
+    "ISpwXQEp/magvJ5BXw1lXF8Ckz3oOjDGBSscVzoUAxkDtB5qLQd+NmxEHoMZ+3l2cVEA4/"
+    "86DwJJVktA6TK9Xmh9P7p0trjGIV1BaPqIv7IBgyyQN+xKgB2kBjMtKUFqRaKn8T9qCjB7"
+    "B2tA7Hn0ERTgO+rddYejzt09fxOH0r9sAVFn1OVXzkTpXCp99VbqimUj4Kfe6AfAf4JfB/"
+    "2urPvLeqNfW/yZYBi4BnGfDWglvte4NAYm1bGhZ63ZsWlJ3bEH7djo4RMf7AwSguwqw15C"
+    "ZK2RL3qqSt3XekaTDeYLaeR7XWbge50/7r2Wh72QIt+oNg8nRDaYjNfBcrNPYf2plxsw0y"
+    "flzMvByIL33vURfiQf0FxA2GPPAYmpmnIj0+1j1ExdQVuVrp7Ch89Lmy6pFOzt2DuhYPEx"
+    "dobXnZtuS2A4gebTM/QtIwdMB1EKHxHNAnoVSb7/8IDspYGrxjJpBt8tWqzn2JyHrcDKPX"
+    "MTGKXQy15yzhy5BBL23lZ0b36nAnRe8CUSIJZzKYxkR2rXotGuRYA+KwynEStVQxnXb4pr"
+    "UWQQdX8epWyheCJ9ddf5+auUPXQ76H8fV09MvNe3gyvtZxyjOZr1M6iH4JPKGOD2aJeETs"
+    "YUSPVuQvzAn07r47D7cAn4jD4mw97dVecSUOxM4JiMBoNbhobrChu6qvXaLmO9tvOt13bG"
+    "esUOm2WMJzSv4gWkhPbmB2yTALlon5VAktXKhVJcS2MZzdkG85EsuxKblJVsJKq7oZWSZl"
+    "E1o0Qhuk0LpaEOlymR3Bs6XjJnXlsUX/TAFOpS1RPbpd/BPdw75Lj+vKVwNxJXC70M4WY6"
+    "vCLW3sUReBfsJgEilRyMhIj2MbSP8UX5GDqWcRQdm4llHIyFr9dg2BQavsZW4AY8/C6tv0"
+    "Hv5noYwEDJNa8uFtp+LrZMg/J65Sy/1j0iFsMU8PaB7T5icgkc6FHAzD3wh2jpD+BBHzog"
+    "cAEOKLj/cN0FzIrG7LX8U5nj2LjBMRmTYcCU0gKYgPtIw8Er4gbA812T+dFAGLfzrwB1AV"
+    "zcg7UOA8Ba91mDzJ5zCRqTiR2ib5g0IoCNCa4PmO8NpphgOkOiFn8kl9u1TBLbNvgEbcyH"
+    "dypeawPbl8Y9VZYeWApsx1x72fbdJinQPntXhrQ6e5fPWvFrxVaw92QiI9aSKtBmBJtiEe"
+    "8M5BWo6LOH2de1hq2UltyPrbRlJW6IaRTjUGj0am/mKIzeRcdmbLjDsVEqUyQ2AIsZKM08"
+    "NZ954v1YNW02KdPMmXYnMQ4PUvrs+grNvMIE+vMc2yUhJYE5mUc2fu0iRgXgXXEeLjnwMs"
+    "iuev3Owy9qKi+un9Tbq19G3Y5sxzgQV8pyXAo00t5+XS5IXBQlzoSJn5kDRdmQbpDQmVSz"
+    "sBWiWwlu7hfV8zKgnudjeq6IvEdB3+qQKkQ1pPF3ayDCX081lrqujSAp+OaTsvKIGqVs7G"
+    "J+qmr9VBhSB4Pb1JB61ZOjHx/vrrpsPBAws0p4wXb1+iMluDMHmszsekKK0PELA6ok20CN"
+    "bb8tM7LK/kBiYH0ra+yCkQsnfyJT4ZvlAyrLNRDMnRhSzFuaGZ7vfsJWtSE1I7g/67Rluy"
+    "a0NzDvpdSmMsPqRf6wepEZVm0Lesaj74aeIq/8x+Ggr4ZUEpPJA2wG4B9gYxrsDNjfft+N"
+    "08TfuTjkLEeXJSuVN6BDzkdM0uiQ89F17HJdSUnyTZ1wt8WVOXV277MrctKJsqv0s/WxSG"
+    "e81U/zS0GxsIyhabohF9sIkC5vq7NoqsGQUHOGrJB5YcZ2VrMN4/aauZQtCc0E2ZhbqVNs"
+    "b4rKFWvqftFSwwDZZVRDfEItRVijG1OC+XEN8SmXTKwQzYFIv9nfAHKaXaQgRNmZ2dyJEj"
+    "LL9AjKkygosoB4KCAqPuNgBs5ff23BOfARr88e5hTcYvJEebbF9cx3HXhzNSZT1wefmGfJ"
+    "/lAEfXMGTOjBCbZxgDdPf9ABmC0FYGIWUAXoy2tNlMA2guHeCXOwBgmzKf9y8FjWRalQwU"
+    "VBqOAiGyqYslGEG9FMjxVTVD6aslwzId2JbjIfJBfQgnXEbhPh3Hemv6XMxSv2y2OZZnrk"
+    "DfHAS2U2TVxrblRdYJ8SashCy31/FgKjWeAo4uYvABsLaWDVK4uElc3uyB6touWmEG0IyH"
+    "r3Oc2yrkufNysLWU/W+T0ZsZwVl2mlpfRKrRiQLIaVF2s1lzA+kRZtpZWkTuu2UhjnEYuJ"
+    "PniBX0yFCsryjJEMpwmn+DH0BTUMOMvXu+vc82KCBN1F81jHCi0kOMillI8sTjeyZ1ywkI"
+    "iY/txjigbiHNaTRBuAoiBgt6cnY8LZzbgZvgwqpKdgGHqey5dyOUzFsGejuAYFHvLFtjua"
+    "o6wJRxkpbXU6KCOomcqYscDUs+HcqJp7L8tp3yGxCZZnzFxaif1NCTWFXdsXmHx8zoLZIz"
+    "nEQUpGwhLvzjb57rvzDaAU235+fdZ+8+2bd+dv37xjVcSjLEu+LQA3m18rMFhnTU1GUCuj"
+    "pIy5q2u6sR2Sz2llWmgKuvsmtjBztJk98kmhu4WJ9ym5PSbdLyf+Gufc25AGBvJ9V5HLnK"
+    "+yaamGTPN752E1X3icfKFOtz2KjtU7POkdnuq3w5NEbGwjYbdZWKZzpuZksZ9UuA0ghqy1"
+    "4bKxBkGyc/o4gUweg5wG7yUSWeq4l3nkEbv8RAGX4/ts8UGHisxTsTWVoF1RkijO8siVW+"
+    "A88h2Hmf1HAbdpF8J87mUyjneyKIy2/ULWMjWWjYQRczxlDYY+Avztnvi+Y4EL6II9Bpj5"
+    "fshBrH170TAXEFYzENtws+qaRa4Jiyw8GqG066RrZaW3YNvVy0OqkSlXKhQsuiTORA5V30"
+    "kuV6gS3R9l+HoD03zLhGGMQU40OBfAjNwXiR5vHpkhJ56MaJpQGDG5IOaJf5FYik8yQmH9"
+    "EVpuQA/SBx6kNZNynEyKzsM6sjysXSc1ND8LK7MGWOFHq9YJ5zvS6lXKekvLRvuZPjKxh5"
+    "XHqeTH31NCTYkO7yMjv+h46ZeP89v0qOntgdriM+6w8333EsQ7741J967Tu70Ey60iD38Q"
+    "tT4JaBdx4gOsCz7KHLvVfFndnZBlm+lQNMSBKOUa5gV9Sp7UupTe4y57kVW3CJKc3nf7N7"
+    "3+91kLpBVduQTe4qySMRl2+6NLQNlAOSbv2ajfvbkUkQVkjcl1p3/dvRVFJn9XO9o99PDT"
+    "ATNLQt9HEf7rdFO6hT121cPyxqf9SIGlTuLFDFhxkMsN65JfLoHFemQ+Jj91ux/4z2eEnv"
+    "jvu0F/9AMvcNhcN7Pn9eickCKDKaNqti5MlkvJ6R1qpR1qefAudseqmEEZwYZM2zpnThOC"
+    "OmdOd2wu0xt/dpN51ZOzZUHN9yYw2QLl2/wsuoyK1InvvfZd8qM7aSlo3vjSSRG7a7JKxp"
+    "/uRJO6zSd1q66n0suosktOE09Wwa6WxLRVrbSqPd91vEq07UqiKTq6b0x1IEcHchobyFnz"
+    "AKODHF3UmFWUfkjWcG8lUZ2SVoe84aLgQ1EG+GZRh0NH5XZwro9eXayZUk2oaab0y+vYqo"
+    "f57JKrSp7EoeCrpIM68jmrzOEg2+WtflsuIBY3WtjLv2s2a505ZwM2KwF+BQMoLaV9W+lE"
+    "nU02CMq00BR0920TCaByd3F4QXfzt3Koq8m5L+X10ZSNHrO8Q3nLanCmmYbAvG8tXjACC7"
+    "DWsgOVDWhioQ7EgvaFd/HFaDpzu3Sm5haOwgXV3MKRdqzeuUzvXFbnnct8vn1S6MONzxvm"
+    "zNTDsrFmIbvTTbskYHJIvTR0L/B6Uqdtm9rzVgSjuN0kpJggSiNlS0TcfIyIZcg+ufhtsp"
+    "5/5Mdxa1bwIKyg1GmV+BVJtikc1h5IlhyNL4tujvgeV1NtoKz7g7dqkqYk1hDXe1+c4HIk"
+    "rjoMJAWbqKLtMkkS7fwkiXYmSeLLyh7eyYnQJg4qaWJcX3/USyVkjs5s4voz1600+chyGt"
+    "GlToaYGzxZMH8cDvo5arkSkRkWbAbgH2BjujMvKGGHTkJsB5jQU36/HZmiHIViIljmfCWb"
+    "lTeQTXTHJjKYD6NanZuvxJJYI3V4+/NS83ZgUKdkX3W7/UswQYiMyU+d/sgYDYzRA1/Az3"
+    "xd5qUagV+TNftMA58M8YJZ1HP3CU0LrbU76AF0d8v7g1LT9VV7giITO9BWA7eUkcfahdBp"
+    "JFxL/ArAuele9+46t68uTs6kQE+sk2+yJqgbqPamzQ9LLgUaMlbuOyIZwEcFnvkzf1xfT/"
+    "vrTPtTFJjrpUqkJXVYq15hLR2HPop+zcaho2BAxZBlWkpHLZMxlQ0Dl1IKeG3xezF+mdaR"
+    "Om0Y0UHMy5y1FKG66MpJUYgOrurUZq+I/MN2Sx6ZEXXgZvGzOjgi+WGzT8inyj0N8tmIhE"
+    "gzKd6d0Gn806gAYlS9mQC2S3Hk7QKOvK3gyPM27y3gI3M3792DY7Kz+XZrLshBV3f9+38t"
+    "wS81"
+)

migrations/models/17_20261012175338_add_artifacts.py

@@ -0,0 +1,108 @@
+from tortoise import BaseDBAsyncClient
+
+RUN_IN_TRANSACTION = True
+
+
+async def upgrade(db: BaseDBAsyncClient) -> str:
+    return """
+        CREATE TABLE IF NOT EXISTS "artifacts" (
+    "id" UUID NOT NULL PRIMARY KEY,
+    "tool" VARCHAR(255) NOT NULL,
+    "kind" VARCHAR(64) NOT NULL,
+    "title" VARCHAR(255) NOT NULL,
+    "data" JSONB NOT NULL,
+    "source_ref" JSONB,
+    "version" INT NOT NULL DEFAULT 1,
+    "created_at" TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updated_at" TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "conversation_id" UUID NOT NULL REFERENCES "conversations" ("id") ON DELETE CASCADE,
+    "message_id" UUID REFERENCES "conversation_messages" ("id") ON DELETE SET NULL,
+    "user_id" UUID NOT NULL REFERENCES "users" ("id") ON DELETE CASCADE
+);
+COMMENT ON TABLE "artifacts" IS 'A structured tool result (recipe, budget, note…) rendered in the artifact panel.';"""
+
+
+async def downgrade(db: BaseDBAsyncClient) -> str:
+    return """
+        DROP TABLE IF EXISTS "artifacts";"""
+
+
+MODELS_STATE = (
+    "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"
+    "D1XXXUg="
+)

mkdocs.yml

@@ -23,3 +23,5 @@ nav:
   - Home: index.md
   - Architecture:
       - Authentication: authentication.md
+      - Desktop Client (proposal): desktop-client.md
+      - Cowork UI plan: cowork-ui-plan.md

pyproject.toml

@@ -32,6 +32,8 @@ dependencies = [
     "langchain-openai>=1.1.6",
     "langchain>=1.2.0",
     "langchain-community>=0.4.1",
+    "langgraph-checkpoint-sqlite>=2.0.0",
+    "aiosqlite>=0.20.0",
     "jq>=1.10.0",
     "tavily-python>=0.7.17",
     "ynab>=1.3.0",
@@ -40,6 +42,11 @@ dependencies = [
     "ollama>=0.6.1",
     "twilio>=9.10.2",
     "aioboto3>=13.0.0",
+    "prometheus-client>=0.26.0",
+    "google-api-python-client>=2.0.0",
+    "google-auth-oauthlib>=1.0.0",
+    "google-auth-httplib2>=0.2.0",
+    "langchain-mcp-adapters>=0.3.2",
 ]
 
 [project.optional-dependencies]

raggr-frontend/package.json

@@ -20,6 +20,8 @@
     "react": "^19.1.1",
     "react-dom": "^19.1.1",
     "react-markdown": "^10.1.0",
+    "react-router-dom": "^7.18.3",
+    "remark-gfm": "^4.0.1",
     "tailwind-merge": "^3.5.0",
     "watch": "^1.0.2"
   },

raggr-frontend/src/App.css

@@ -60,7 +60,7 @@ body {
 ::-webkit-scrollbar-thumb { background: var(--color-sand); border-radius: 99px; }
 ::-webkit-scrollbar-thumb:hover { background: var(--color-warm-gray); }
 
-/* ── Markdown in answer bubbles ─────────────────────── */
+/* ── Markdown in assistant answers ──────────────────── */
 .markdown-content p { margin: 0.5em 0; line-height: 1.7; }
 .markdown-content p:first-child { margin-top: 0; }
 .markdown-content p:last-child { margin-bottom: 0; }
@@ -117,6 +117,29 @@ body {
 .markdown-content strong { font-weight: 700; }
 .markdown-content em { font-style: italic; }
 
+.markdown-content table {
+  width: 100%;
+  border-collapse: collapse;
+  margin: 0.75em 0;
+  font-size: 0.9em;
+  display: block;
+  overflow-x: auto;
+}
+.markdown-content th,
+.markdown-content td {
+  border: 1px solid var(--color-sand-light);
+  padding: 0.4em 0.6em;
+  text-align: left;
+  vertical-align: top;
+}
+.markdown-content thead th {
+  background: var(--color-sand-light);
+  font-weight: 700;
+}
+.markdown-content tbody tr:nth-child(even) {
+  background: color-mix(in srgb, var(--color-sand-light) 35%, transparent);
+}
+
 /* ── Animations ─────────────────────────────────────── */
 @keyframes fadeSlideUp {
   from { opacity: 0; transform: translateY(10px); }
@@ -126,6 +149,14 @@ body {
   animation: fadeSlideUp 0.3s ease-out forwards;
 }
 
+@keyframes drawer-in {
+  from { transform: translateX(-100%); }
+  to   { transform: translateX(0); }
+}
+.animate-drawer-in {
+  animation: drawer-in 0.25s ease-out;
+}
+
 @keyframes catPulse {
   0%, 80%, 100% { opacity: 0.25; transform: scale(0.75); }
   40%           { opacity: 1;    transform: scale(1); }

raggr-frontend/src/App.tsx

@@ -1,6 +1,8 @@
+import { Route, Routes } from "react-router-dom";
 import "./App.css";
 import { AuthProvider } from "./contexts/AuthContext";
 import { ChatScreen } from "./components/ChatScreen";
+import { ConversationsPage } from "./components/ConversationsPage";
 import { LoginScreen } from "./components/LoginScreen";
 import { useAuthCheck } from "./hooks/useAuthCheck";
 import catIcon from "./assets/cat.png";
@@ -23,14 +25,23 @@ const AppContainer = () => {
     );
   }
 
+  if (!isAuthenticated) {
+    return <LoginScreen setAuthenticated={setAuthenticated} />;
+  }
+
   return (
-    <>
-      {isAuthenticated ? (
-        <ChatScreen setAuthenticated={setAuthenticated} isAdmin={isAdmin} />
-      ) : (
-        <LoginScreen setAuthenticated={setAuthenticated} />
-      )}
-    </>
+    <Routes>
+      <Route path="/conversations" element={<ConversationsPage />} />
+      {/* One ChatScreen instance serves both the home ("/") and per-conversation
+          ("/c/:id") routes. Using a single catch-all route keeps that instance
+          mounted across the navigate() that fires when the first message creates
+          a conversation — a remount here would abort the in-flight SSE stream
+          (and drop the answer before it's persisted). */}
+      <Route
+        path="*"
+        element={<ChatScreen setAuthenticated={setAuthenticated} isAdmin={isAdmin} />}
+      />
+    </Routes>
   );
 };
 

raggr-frontend/src/api/conversationService.ts

@@ -1,17 +1,20 @@
 import { userService } from "./userService";
 
 export type SSEEvent =
+  | { type: "thinking" }
+  | { type: "thinking_delta"; delta: string }
   | { type: "tool_start"; tool: string }
   | { type: "tool_end"; tool: string }
+  | { type: "content"; delta: string }
   | { type: "response"; message: string }
-  | { type: "error"; message: string };
+  | { type: "error"; message: string; stalled?: boolean };
 
 export type SSEEventCallback = (event: SSEEvent) => void;
 
 interface Message {
   id: string;
   text: string;
-  speaker: "user" | "simba";
+  speaker: "user" | "simba" | "tool";
   created_at: string;
   image_key?: string | null;
 }
@@ -25,18 +28,10 @@ interface Conversation {
   user_id?: string;
 }
 
-interface QueryRequest {
-  query: string;
-}
-
 interface QueryResponse {
   response: string;
 }
 
-interface CreateConversationRequest {
-  user_id: string;
-}
-
 class ConversationService {
   private baseUrl = "/api";
   private conversationBaseUrl = "/api/conversation";
@@ -46,7 +41,7 @@ class ConversationService {
     conversation_id: string,
     signal?: AbortSignal,
   ): Promise<QueryResponse> {
-    const response = await userService.fetchWithRefreshToken(
+    const response = await userService.fetchWithAuth(
       `${this.conversationBaseUrl}/query`,
       {
         method: "POST",
@@ -63,7 +58,7 @@ class ConversationService {
   }
 
   async getMessages(): Promise<Conversation> {
-    const response = await userService.fetchWithRefreshToken(
+    const response = await userService.fetchWithAuth(
       `${this.baseUrl}/messages`,
       {
         method: "GET",
@@ -78,7 +73,7 @@ class ConversationService {
   }
 
   async getConversation(conversationId: string): Promise<Conversation> {
-    const response = await userService.fetchWithRefreshToken(
+    const response = await userService.fetchWithAuth(
       `${this.conversationBaseUrl}/${conversationId}`,
       {
         method: "GET",
@@ -93,7 +88,7 @@ class ConversationService {
   }
 
   async createConversation(): Promise<Conversation> {
-    const response = await userService.fetchWithRefreshToken(
+    const response = await userService.fetchWithAuth(
       `${this.conversationBaseUrl}/`,
       {
         method: "POST",
@@ -107,9 +102,51 @@ class ConversationService {
     return await response.json();
   }
 
-  async getAllConversations(): Promise<Conversation[]> {
-    const response = await userService.fetchWithRefreshToken(
-      `${this.conversationBaseUrl}/`,
+  async renameConversation(
+    conversationId: string,
+    name: string,
+  ): Promise<Conversation> {
+    const response = await userService.fetchWithAuth(
+      `${this.conversationBaseUrl}/${conversationId}`,
+      {
+        method: "PATCH",
+        body: JSON.stringify({ name }),
+      },
+    );
+
+    if (!response.ok) {
+      throw new Error("Failed to rename conversation");
+    }
+
+    return await response.json();
+  }
+
+  async deleteConversation(conversationId: string): Promise<void> {
+    const response = await userService.fetchWithAuth(
+      `${this.conversationBaseUrl}/${conversationId}`,
+      {
+        method: "DELETE",
+      },
+    );
+
+    if (!response.ok) {
+      throw new Error("Failed to delete conversation");
+    }
+  }
+
+  async getAllConversations(params?: {
+    limit?: number;
+    offset?: number;
+    search?: string;
+  }): Promise<Conversation[]> {
+    const search = new URLSearchParams();
+    if (params?.limit != null) search.set("limit", String(params.limit));
+    if (params?.offset != null) search.set("offset", String(params.offset));
+    if (params?.search) search.set("search", params.search);
+    const qs = search.toString();
+
+    const response = await userService.fetchWithAuth(
+      `${this.conversationBaseUrl}/${qs ? `?${qs}` : ""}`,
       {
         method: "GET",
       },
@@ -130,7 +167,7 @@ class ConversationService {
     formData.append("file", file);
     formData.append("conversation_id", conversationId);
 
-    const response = await userService.fetchWithRefreshToken(
+    const response = await userService.fetchWithAuth(
       `${this.conversationBaseUrl}/upload-image`,
       {
         method: "POST",
@@ -148,7 +185,7 @@ class ConversationService {
   }
 
   async getPresignedImageUrl(imageKey: string): Promise<string> {
-    const response = await userService.fetchWithRefreshToken(
+    const response = await userService.fetchWithAuth(
       `${this.conversationBaseUrl}/image/${imageKey}`,
     );
     if (!response.ok) {
@@ -170,7 +207,7 @@ class ConversationService {
       body.image_key = imageKey;
     }
 
-    const response = await userService.fetchWithRefreshToken(
+    const response = await userService.fetchWithAuth(
       `${this.conversationBaseUrl}/stream-query`,
       {
         method: "POST",

raggr-frontend/src/api/oidcService.ts

@@ -24,14 +24,11 @@ class OIDCService {
    * Initiate OIDC login flow
    * Returns authorization URL to redirect user to
    */
-  async initiateLogin(redirectAfterLogin: string = "/"): Promise<string> {
-    const response = await fetch(
-      `${this.baseUrl}/login?redirect=${encodeURIComponent(redirectAfterLogin)}`,
-      {
-        method: "GET",
-        headers: { "Content-Type": "application/json" },
-      }
-    );
+  async initiateLogin(): Promise<string> {
+    const response = await fetch(`${this.baseUrl}/login`, {
+      method: "GET",
+      headers: { "Content-Type": "application/json" },
+    });
 
     if (!response.ok) {
       throw new Error("Failed to initiate OIDC login");

raggr-frontend/src/api/scheduledMessageService.ts

@@ -0,0 +1,72 @@
+import { userService } from "./userService";
+
+export interface ScheduledMessage {
+  id: string;
+  recipient: string;
+  channel: "imessage" | "email";
+  content: string;
+  subject: string | null;
+  scheduled_at: string;
+  status: "pending" | "sent" | "failed" | "cancelled";
+  recurrence: "none" | "daily" | "weekly" | "monthly";
+  use_agent: boolean;
+  error_message: string | null;
+  created_at: string;
+  updated_at: string;
+}
+
+export interface CreateScheduledMessage {
+  recipient: string;
+  channel: "imessage" | "email";
+  content: string;
+  subject?: string;
+  scheduled_at: string;
+  recurrence?: "none" | "daily" | "weekly" | "monthly";
+  use_agent?: boolean;
+}
+
+class ScheduledMessageService {
+  private baseUrl = "/api/scheduled-messages";
+
+  async list(): Promise<ScheduledMessage[]> {
+    const response = await userService.fetchWithAuth(`${this.baseUrl}/`);
+    if (!response.ok) throw new Error("Failed to list scheduled messages");
+    return response.json();
+  }
+
+  async create(data: CreateScheduledMessage): Promise<ScheduledMessage> {
+    const response = await userService.fetchWithAuth(`${this.baseUrl}/`, {
+      method: "POST",
+      body: JSON.stringify(data),
+    });
+    if (!response.ok) {
+      const err = await response.json();
+      throw new Error(err.error ?? "Failed to create scheduled message");
+    }
+    return response.json();
+  }
+
+  async update(id: string, data: Partial<CreateScheduledMessage> & { status?: string }): Promise<ScheduledMessage> {
+    const response = await userService.fetchWithAuth(`${this.baseUrl}/${id}`, {
+      method: "PUT",
+      body: JSON.stringify(data),
+    });
+    if (!response.ok) {
+      const err = await response.json();
+      throw new Error(err.error ?? "Failed to update scheduled message");
+    }
+    return response.json();
+  }
+
+  async remove(id: string): Promise<void> {
+    const response = await userService.fetchWithAuth(`${this.baseUrl}/${id}`, {
+      method: "DELETE",
+    });
+    if (!response.ok) {
+      const err = await response.json();
+      throw new Error(err.error ?? "Failed to delete scheduled message");
+    }
+  }
+}
+
+export const scheduledMessageService = new ScheduledMessageService();

raggr-frontend/src/api/userService.ts

@@ -29,7 +29,22 @@ class UserService {
     return await response.json();
   }
 
+  private refreshInFlight: Promise<string> | null = null;
+
+  /**
+   * Exchange the refresh token for a new access token. The refresh token is
+   * only ever sent here. Concurrent callers share one in-flight request.
+   */
   async refreshToken(): Promise<string> {
+    if (!this.refreshInFlight) {
+      this.refreshInFlight = this.doRefresh().finally(() => {
+        this.refreshInFlight = null;
+      });
+    }
+    return this.refreshInFlight;
+  }
+
+  private async doRefresh(): Promise<string> {
     const refreshToken = localStorage.getItem("refresh_token");
 
     if (!refreshToken) {
@@ -71,85 +86,65 @@ class UserService {
     }
   }
 
+  /**
+   * Authenticated fetch: sends the access token and, on a 401 (expired or
+   * missing access token), refreshes once and retries. With no stored access
+   * token it refreshes up front instead of making a doomed request.
+   */
   async fetchWithAuth(
     url: string,
     options: RequestInit = {},
-  ): Promise<Response> {
-    const accessToken = localStorage.getItem("access_token");
-
-    // Add authorization header
-    const headers = {
-      "Content-Type": "application/json",
-      ...(options.headers || {}),
-      ...(accessToken && { Authorization: `Bearer ${accessToken}` }),
-    };
-
-    let response = await fetch(url, { ...options, headers });
-
-    // If unauthorized, try refreshing the token
-    if (response.status === 401) {
-      try {
-        const newAccessToken = await this.refreshToken();
-
-        // Retry the request with new token
-        headers.Authorization = `Bearer ${newAccessToken}`;
-        response = await fetch(url, { ...options, headers });
-      } catch (error) {
-        // Refresh failed, redirect to login or throw error
-        throw new Error("Session expired. Please log in again.");
-      }
-    }
-
-    return response;
-  }
-
-  async fetchWithRefreshToken(
-    url: string,
-    options: RequestInit = {},
     { skipContentType = false }: { skipContentType?: boolean } = {},
   ): Promise<Response> {
-    const refreshToken = localStorage.getItem("refresh_token");
-
-    // Add authorization header
-    const headers: Record<string, string> = {
+    const buildHeaders = (token: string | null): Record<string, string> => ({
       ...(skipContentType ? {} : { "Content-Type": "application/json" }),
       ...((options.headers as Record<string, string>) || {}),
-      ...(refreshToken ? { Authorization: `Bearer ${refreshToken}` } : {}),
-    };
+      ...(token ? { Authorization: `Bearer ${token}` } : {}),
+    });
 
-    let response = await fetch(url, { ...options, headers });
-
-    // If unauthorized, try refreshing the token
-    if (response.status === 401) {
+    const refreshOrExpire = async (): Promise<string> => {
       try {
-        const newAccessToken = await this.refreshToken();
-
-        // Retry the request with new token
-        headers.Authorization = `Bearer ${newAccessToken}`;
-        response = await fetch(url, { ...options, headers });
-      } catch (error) {
-        // Refresh failed, redirect to login or throw error
+        return await this.refreshToken();
+      } catch {
         throw new Error("Session expired. Please log in again.");
       }
+    };
+
+    let accessToken = localStorage.getItem("access_token");
+    if (!accessToken) {
+      accessToken = await refreshOrExpire();
+    }
+
+    let response = await fetch(url, {
+      ...options,
+      headers: buildHeaders(accessToken),
+    });
+
+    if (response.status === 401) {
+      accessToken = await refreshOrExpire();
+      response = await fetch(url, {
+        ...options,
+        headers: buildHeaders(accessToken),
+      });
     }
 
     return response;
   }
 
   async getMe(): Promise<{ id: string; username: string; email: string; is_admin: boolean }> {
-    const response = await this.fetchWithRefreshToken(`${this.baseUrl}/me`);
+    const response = await this.fetchWithAuth(`${this.baseUrl}/me`);
     if (!response.ok) throw new Error("Failed to fetch user profile");
     return response.json();
   }
 
   async adminListUsers(): Promise<AdminUserRecord[]> {
-    const response = await this.fetchWithRefreshToken(`${this.baseUrl}/admin/users`);
+    const response = await this.fetchWithAuth(`${this.baseUrl}/admin/users`);
     if (!response.ok) throw new Error("Failed to list users");
     return response.json();
   }
 
   async adminSetWhatsapp(userId: string, number: string): Promise<AdminUserRecord> {
-    const response = await this.fetchWithRefreshToken(
+    const response = await this.fetchWithAuth(
       `${this.baseUrl}/admin/users/${userId}/whatsapp`,
       { method: "PUT", body: JSON.stringify({ whatsapp_number: number }) },
     );
@@ -162,7 +157,7 @@ class UserService {
   }
 
   async adminUnlinkWhatsapp(userId: string): Promise<void> {
-    const response = await this.fetchWithRefreshToken(
+    const response = await this.fetchWithAuth(
       `${this.baseUrl}/admin/users/${userId}/whatsapp`,
       { method: "DELETE" },
     );
@@ -170,7 +165,7 @@ class UserService {
   }
 
   async adminToggleEmail(userId: string): Promise<AdminUserRecord> {
-    const response = await this.fetchWithRefreshToken(
+    const response = await this.fetchWithAuth(
       `${this.baseUrl}/admin/users/${userId}/email`,
       { method: "PUT" },
     );
@@ -179,7 +174,7 @@ class UserService {
   }
 
   async adminDisableEmail(userId: string): Promise<void> {
-    const response = await this.fetchWithRefreshToken(
+    const response = await this.fetchWithAuth(
       `${this.baseUrl}/admin/users/${userId}/email`,
       { method: "DELETE" },
     );

raggr-frontend/src/components/AnswerBubble.tsx

@@ -1,6 +1,7 @@
-import React from "react";
+import React, { useState } from "react";
 import ReactMarkdown from "react-markdown";
-import { cn } from "../lib/utils";
+import remarkGfm from "remark-gfm";
+import { Copy, Check } from "lucide-react";
 
 type AnswerBubbleProps = {
   text: string;
@@ -8,32 +9,41 @@ type AnswerBubbleProps = {
 };
 
 export const AnswerBubble = React.memo(({ text, loading }: AnswerBubbleProps) => {
-  return (
-    <div className="flex justify-start message-enter">
-      <div
-        className={cn(
-          "max-w-[78%] rounded-3xl rounded-bl-md",
-          "bg-warm-white border border-sand-light/70",
-          "shadow-sm shadow-sand/30",
-          "overflow-hidden",
-        )}
-      >
-        <div className="h-0.5 w-full bg-gradient-to-r from-amber-soft via-amber-glow/50 to-transparent" />
+  const [copied, setCopied] = useState(false);
 
-        <div className="px-4 py-3">
-          {loading ? (
-            <div className="flex items-center gap-1.5 py-1 px-1">
-              <span className="loading-dot w-2 h-2 rounded-full bg-amber-soft inline-block" />
-              <span className="loading-dot w-2 h-2 rounded-full bg-amber-soft inline-block" />
-              <span className="loading-dot w-2 h-2 rounded-full bg-amber-soft inline-block" />
-            </div>
-          ) : (
-            <div className="markdown-content text-sm leading-relaxed text-charcoal">
-              <ReactMarkdown>{text}</ReactMarkdown>
-            </div>
-          )}
+  const handleCopy = async (event: React.MouseEvent) => {
+    event.stopPropagation();
+    try {
+      await navigator.clipboard.writeText(text);
+      setCopied(true);
+      setTimeout(() => setCopied(false), 2000);
+    } catch {
+      // Clipboard unavailable (e.g. insecure context) — ignore
+    }
+  };
+
+  return (
+    <div className="message-enter">
+      {loading ? (
+        <div className="flex items-center gap-1.5 py-1">
+          <span className="loading-dot w-2 h-2 rounded-full bg-amber-soft inline-block" />
+          <span className="loading-dot w-2 h-2 rounded-full bg-amber-soft inline-block" />
+          <span className="loading-dot w-2 h-2 rounded-full bg-amber-soft inline-block" />
         </div>
-      </div>
+      ) : (
+        <div className="group relative -mx-3 -my-2 rounded-xl px-3 py-2 transition-colors duration-150 hover:bg-amber-soft/10">
+          <div className="markdown-content text-[15px] leading-relaxed text-charcoal">
+            <ReactMarkdown remarkPlugins={[remarkGfm]}>{text}</ReactMarkdown>
+          </div>
+          <button
+            onClick={handleCopy}
+            aria-label={copied ? "Copied" : "Copy message"}
+            className="absolute top-0 right-0 flex h-7 w-7 items-center justify-center rounded-lg border border-sand-light/60 bg-warm-white text-warm-gray shadow-sm opacity-0 transition-opacity duration-150 group-hover:opacity-100 hover:text-charcoal hover:bg-cream-dark focus:opacity-100 focus:outline-none cursor-pointer"
+          >
+            {copied ? <Check size={14} className="text-green-600" /> : <Copy size={14} />}
+          </button>
+        </div>
+      )}
     </div>
   );
 });

raggr-frontend/src/components/ChatScreen.tsx

@@ -1,11 +1,14 @@
-import { useCallback, useState, useRef } from "react";
-import { LogOut, Shield, PanelLeftClose, PanelLeftOpen, Menu, X } from "lucide-react";
+import React, { useCallback, useState, useRef } from "react";
+import { useNavigate } from "react-router-dom";
+import { PanelLeftOpen, Menu, X } from "lucide-react";
 import { QuestionBubble } from "./QuestionBubble";
 import { AnswerBubble } from "./AnswerBubble";
 import { ToolBubble } from "./ToolBubble";
+import { ThinkingBubble } from "./ThinkingBubble";
 import { MessageInput } from "./MessageInput";
-import { ConversationList } from "./ConversationList";
+import { SidebarContent } from "./SidebarContent";
 import { AdminPanel } from "./AdminPanel";
+import { ScheduledMessagesPanel } from "./ScheduledMessagesPanel";
 import { cn } from "../lib/utils";
 import { useConversations } from "../hooks/useConversations";
 import { useChat } from "../hooks/useChat";
@@ -17,11 +20,13 @@ type ChatScreenProps = {
 };
 
 export const ChatScreen = ({ setAuthenticated, isAdmin }: ChatScreenProps) => {
+  const navigate = useNavigate();
   const [query, setQuery] = useState("");
   const [simbaMode, setSimbaMode] = useState(false);
   const [showConversations, setShowConversations] = useState(false);
   const [sidebarCollapsed, setSidebarCollapsed] = useState(false);
   const [showAdminPanel, setShowAdminPanel] = useState(false);
+  const [showScheduler, setShowScheduler] = useState(false);
 
   const messagesEndRef = useRef<HTMLDivElement>(null);
   const isLoadingRef = useRef(false);
@@ -37,8 +42,9 @@ export const ChatScreen = ({ setAuthenticated, isAdmin }: ChatScreenProps) => {
   const {
     conversations,
     selectedConversation,
-    selectConversation,
     createConversation,
+    renameConversation,
+    deleteConversation,
     refreshConversations,
   } = useConversations();
 
@@ -46,13 +52,21 @@ export const ChatScreen = ({ setAuthenticated, isAdmin }: ChatScreenProps) => {
 
   const {
     messages,
-    setMessages,
     isLoading,
+    streaming,
+    thinking,
+    messagesLoading,
     pendingImage,
     setPendingImage,
     sendMessage,
+    stopGeneration,
+    error,
+    clearError,
+    stalled,
+    retryStalled,
+    thinkingText,
+    thinkingDurationMs,
   } = useChat({
-    selectedConversation,
     createConversation,
     refreshConversations,
     onSessionExpired,
@@ -63,18 +77,17 @@ export const ChatScreen = ({ setAuthenticated, isAdmin }: ChatScreenProps) => {
   isLoadingRef.current = isLoading;
 
   const handleSelectConversation = useCallback(
-    async (conversation: { title: string; id: string }) => {
+    (conversation: { title: string; id: string }) => {
       setShowConversations(false);
-      const loaded = await selectConversation(conversation);
-      setMessages(loaded);
+      navigate(`/c/${conversation.id}`);
     },
-    [selectConversation, setMessages],
+    [navigate],
   );
 
-  const handleCreateNewConversation = useCallback(async () => {
-    await createConversation();
-    setMessages([]);
-  }, [createConversation, setMessages]);
+  const handleCreateNewConversation = useCallback(() => {
+    setShowConversations(false);
+    navigate("/");
+  }, [navigate]);
 
   const handleQuestionSubmit = useCallback(() => {
     sendMessage(query, simbaMode);
@@ -85,14 +98,20 @@ export const ChatScreen = ({ setAuthenticated, isAdmin }: ChatScreenProps) => {
     setQuery(event.target.value);
   }, []);
 
-  const handleKeyDown = useCallback((event: React.ChangeEvent<HTMLTextAreaElement>) => {
-    const kev = event as unknown as React.KeyboardEvent<HTMLTextAreaElement>;
-    if (kev.key === "Enter" && !kev.shiftKey) {
-      kev.preventDefault();
+  const handleKeyDown = useCallback((event: React.KeyboardEvent<HTMLTextAreaElement>) => {
+    if (event.key === "Enter" && !event.shiftKey) {
+      event.preventDefault();
       handleQuestionSubmit();
     }
   }, [handleQuestionSubmit]);
 
+  const handleToggleSimbaMode = useCallback(() => setSimbaMode((v) => !v), []);
+
+  const handleDeleteConversation = useCallback(
+    (id: string) => deleteConversation(id),
+    [deleteConversation],
+  );
+
   const handleImageSelect = useCallback((file: File) => setPendingImage(file), [setPendingImage]);
   const handleClearImage = useCallback(() => setPendingImage(null), [setPendingImage]);
 
@@ -102,6 +121,16 @@ export const ChatScreen = ({ setAuthenticated, isAdmin }: ChatScreenProps) => {
     setAuthenticated(false);
   };
 
+  const sidebarProps = {
+    conversations,
+    onCreateNewConversation: handleCreateNewConversation,
+    onSelectConversation: handleSelectConversation,
+    onRenameConversation: renameConversation,
+    onDeleteConversation: handleDeleteConversation,
+    selectedId: selectedConversation?.id,
+    isAdmin,
+  };
+
   return (
     <div className="h-screen h-[100dvh] flex flex-row bg-cream overflow-hidden">
       {/* Desktop Sidebar */}
@@ -127,57 +156,43 @@ export const ChatScreen = ({ setAuthenticated, isAdmin }: ChatScreenProps) => {
             />
           </div>
         ) : (
-          <div className="flex flex-col h-full">
-            <div className="flex items-center justify-between px-4 py-4 border-b border-white/8">
-              <div className="flex items-center gap-2.5">
-                <img src={catIcon} alt="Simba" className="w-12 h-12" />
-                <h2
-                  className="text-lg font-bold text-cream tracking-tight"
-                  style={{ fontFamily: "var(--font-display)" }}
-                >
-                  asksimba
-                </h2>
-              </div>
-              <button
-                onClick={() => setSidebarCollapsed(true)}
-                className="w-7 h-7 rounded-lg flex items-center justify-center text-cream/40 hover:text-cream hover:bg-white/10 transition-all cursor-pointer"
-              >
-                <PanelLeftClose size={15} />
-              </button>
-            </div>
-
-            <div className="flex-1 overflow-y-auto px-2 py-3">
-              <ConversationList
-                conversations={conversations}
-                onCreateNewConversation={handleCreateNewConversation}
-                onSelectConversation={handleSelectConversation}
-                selectedId={selectedConversation?.id}
-              />
-            </div>
-
-            <div className="px-2 pb-3 pt-2 border-t border-white/8 flex flex-col gap-0.5">
-              {isAdmin && (
-                <button
-                  onClick={() => setShowAdminPanel(true)}
-                  className="flex items-center gap-2 w-full px-3 py-2 rounded-xl text-sm text-cream/50 hover:text-cream hover:bg-white/8 transition-all cursor-pointer"
-                >
-                  <Shield size={14} />
-                  <span>Admin</span>
-                </button>
-              )}
-              <button
-                onClick={handleLogout}
-                className="flex items-center gap-2 w-full px-3 py-2 rounded-xl text-sm text-cream/50 hover:text-cream hover:bg-white/8 transition-all cursor-pointer"
-              >
-                <LogOut size={14} />
-                <span>Sign out</span>
-              </button>
-            </div>
-          </div>
+          <SidebarContent
+            {...sidebarProps}
+            onShowAdmin={() => setShowAdminPanel(true)}
+            onShowScheduler={() => setShowScheduler(true)}
+            onLogout={handleLogout}
+            onCollapse={() => setSidebarCollapsed(true)}
+          />
         )}
       </aside>
 
+      {/* Mobile drawer */}
+      {showConversations && (
+        <div className="md:hidden fixed inset-0 z-50 flex">
+          <aside className="w-72 max-w-[80%] h-full bg-sidebar-bg shadow-xl animate-drawer-in">
+            <SidebarContent
+              {...sidebarProps}
+              onShowAdmin={() => {
+                setShowConversations(false);
+                setShowAdminPanel(true);
+              }}
+              onShowScheduler={() => {
+                setShowConversations(false);
+                setShowScheduler(true);
+              }}
+              onLogout={handleLogout}
+              onCloseDrawer={() => setShowConversations(false)}
+            />
+          </aside>
+          <div
+            className="flex-1 bg-charcoal/40 backdrop-blur-sm"
+            onClick={() => setShowConversations(false)}
+          />
+        </div>
+      )}
+
       {showAdminPanel && <AdminPanel onClose={() => setShowAdminPanel(false)} />}
+      {showScheduler && <ScheduledMessagesPanel onClose={() => setShowScheduler(false)} />}
 
       <div className="flex-1 flex flex-col h-full overflow-hidden min-w-0">
         <header className="md:hidden flex items-center justify-between px-4 py-3 bg-warm-white border-b border-sand-light/60">
@@ -190,35 +205,17 @@ export const ChatScreen = ({ setAuthenticated, isAdmin }: ChatScreenProps) => {
               asksimba
             </h1>
           </div>
-          <div className="flex items-center gap-2">
-            <button
-              className="w-8 h-8 rounded-xl flex items-center justify-center text-warm-gray hover:text-charcoal hover:bg-cream-dark transition-all cursor-pointer"
-              onClick={() => setShowConversations((v) => !v)}
-            >
-              {showConversations ? <X size={16} /> : <Menu size={16} />}
-            </button>
-            <button
-              className="w-8 h-8 rounded-xl flex items-center justify-center text-warm-gray hover:text-charcoal hover:bg-cream-dark transition-all cursor-pointer"
-              onClick={handleLogout}
-            >
-              <LogOut size={15} />
-            </button>
-          </div>
+          <button
+            className="w-8 h-8 rounded-xl flex items-center justify-center text-warm-gray hover:text-charcoal hover:bg-cream-dark transition-all cursor-pointer"
+            onClick={() => setShowConversations(true)}
+            aria-label="Open menu"
+          >
+            <Menu size={16} />
+          </button>
         </header>
 
-        {messages.length === 0 ? (
+        {messages.length === 0 && !messagesLoading ? (
           <div className="flex-1 flex flex-col items-center justify-center px-4 gap-6">
-            {showConversations && (
-              <div className="md:hidden w-full max-w-2xl bg-warm-white rounded-2xl border border-sand-light p-3 shadow-sm">
-                <ConversationList
-                  conversations={conversations}
-                  onCreateNewConversation={handleCreateNewConversation}
-                  onSelectConversation={handleSelectConversation}
-                  selectedId={selectedConversation?.id}
-                  variant="light"
-                />
-              </div>
-            )}
             <div className="relative">
               <div className="absolute -inset-6 bg-amber-soft/20 rounded-full blur-3xl" />
               <img src={catIcon} alt="Simba" className="relative w-36 h-36" />
@@ -235,52 +232,113 @@ export const ChatScreen = ({ setAuthenticated, isAdmin }: ChatScreenProps) => {
                 handleQueryChange={handleQueryChange}
                 handleKeyDown={handleKeyDown}
                 handleQuestionSubmit={handleQuestionSubmit}
-                setSimbaMode={setSimbaMode}
+                simbaMode={simbaMode}
+                onToggleSimbaMode={handleToggleSimbaMode}
                 isLoading={isLoading}
+                onStop={stopGeneration}
                 pendingImage={pendingImage}
                 onImageSelect={handleImageSelect}
                 onClearImage={handleClearImage}
+                autoFocus
               />
             </div>
           </div>
         ) : (
           <>
             <div className="flex-1 overflow-y-auto px-4 py-6">
-              <div className="max-w-2xl mx-auto flex flex-col gap-3">
-                {showConversations && (
-                  <div className="md:hidden mb-3 bg-warm-white rounded-2xl border border-sand-light p-3 shadow-sm">
-                    <ConversationList
-                      conversations={conversations}
-                      onCreateNewConversation={handleCreateNewConversation}
-                      onSelectConversation={handleSelectConversation}
-                      selectedId={selectedConversation?.id}
-                      variant="light"
-                    />
+              <div className="max-w-3xl mx-auto flex flex-col gap-6">
+                {messages.map((msg, index) => {
+                  // When the model has been thinking and content is now streaming,
+                  // render ThinkingBubble just before the streaming simba message
+                  // so it appears above the answer rather than below it.
+                  const showThinkingHere =
+                    streaming &&
+                    isLoading &&
+                    (thinking || thinkingText || thinkingDurationMs !== null) &&
+                    index === messages.length - 1 &&
+                    msg.speaker === "simba";
+
+                  const bubble =
+                    msg.speaker === "tool" ? (
+                      <ToolBubble key={index} text={msg.text} />
+                    ) : msg.speaker === "simba" ? (
+                      <AnswerBubble key={index} text={msg.text} />
+                    ) : (
+                      <QuestionBubble key={index} text={msg.text} image_key={msg.image_key} />
+                    );
+
+                  if (showThinkingHere) {
+                    return (
+                      <React.Fragment key={index}>
+                        <ThinkingBubble
+                          text={thinkingText}
+                          durationMs={thinkingDurationMs}
+                          active={thinking}
+                        />
+                        {bubble}
+                      </React.Fragment>
+                    );
+                  }
+                  return bubble;
+                })}
+
+                {/* ThinkingBubble before content arrives (no streaming message yet) */}
+                {isLoading && !streaming && (thinking || thinkingText || thinkingDurationMs !== null) && (
+                  <ThinkingBubble
+                    text={thinkingText}
+                    durationMs={thinkingDurationMs}
+                    active={thinking}
+                  />
+                )}
+
+                {((isLoading && !streaming && !thinking) || messagesLoading) && (
+                  <AnswerBubble text="" loading={true} />
+                )}
+
+                {error && (
+                  <div className="flex justify-center message-enter">
+                    <div className="inline-flex items-center gap-2 px-3 py-1.5 rounded-full bg-red-50 border border-red-200 text-xs text-red-600">
+                      <span>{error}</span>
+                      <button
+                        onClick={clearError}
+                        className="text-red-400 hover:text-red-600 transition-colors cursor-pointer"
+                        aria-label="Dismiss error"
+                      >
+                        <X size={13} />
+                      </button>
+                    </div>
                   </div>
                 )}
 
-                {messages.map((msg, index) => {
-                  if (msg.speaker === "tool")
-                    return <ToolBubble key={index} text={msg.text} />;
-                  if (msg.speaker === "simba")
-                    return <AnswerBubble key={index} text={msg.text} />;
-                  return <QuestionBubble key={index} text={msg.text} image_key={msg.image_key} />;
-                })}
+                {stalled && (
+                  <div className="flex justify-center message-enter">
+                    <div className="inline-flex items-center gap-2 px-3 py-1.5 rounded-full bg-red-50 border border-red-200 text-xs text-red-600">
+                      <span>Simba didn&apos;t respond in time.</span>
+                      <button
+                        onClick={retryStalled}
+                        className="font-medium underline underline-offset-2 hover:text-red-800 transition-colors cursor-pointer"
+                      >
+                        Retry
+                      </button>
+                    </div>
+                  </div>
+                )}
 
-                {isLoading && <AnswerBubble text="" loading={true} />}
                 <div ref={messagesEndRef} />
               </div>
             </div>
 
             <footer className="border-t border-sand-light/40 bg-cream">
-              <div className="max-w-2xl mx-auto px-4 py-3">
+              <div className="max-w-3xl mx-auto px-4 py-3">
                 <MessageInput
                   query={query}
                   handleQueryChange={handleQueryChange}
                   handleKeyDown={handleKeyDown}
                   handleQuestionSubmit={handleQuestionSubmit}
-                  setSimbaMode={setSimbaMode}
+                  simbaMode={simbaMode}
+                  onToggleSimbaMode={handleToggleSimbaMode}
                   isLoading={isLoading}
+                  onStop={stopGeneration}
                   pendingImage={pendingImage}
                   onImageSelect={handleImageSelect}
                   onClearImage={handleClearImage}

raggr-frontend/src/components/ConversationList.tsx

@@ -1,4 +1,5 @@
-import { Plus } from "lucide-react";
+import { useEffect, useRef, useState } from "react";
+import { Check, MoreHorizontal, Pencil, Plus, Trash2, X } from "lucide-react";
 import { cn } from "../lib/utils";
 
 type Conversation = {
@@ -10,6 +11,8 @@ type ConversationProps = {
   conversations: Conversation[];
   onSelectConversation: (conversation: Conversation) => void;
   onCreateNewConversation: () => void;
+  onRenameConversation?: (id: string, title: string) => void;
+  onDeleteConversation?: (id: string) => void;
   selectedId?: string;
   variant?: "dark" | "light";
 };
@@ -18,9 +21,49 @@ export const ConversationList = ({
   conversations,
   onSelectConversation,
   onCreateNewConversation,
+  onRenameConversation,
+  onDeleteConversation,
   selectedId,
   variant = "dark",
 }: ConversationProps) => {
+  const [menuOpenId, setMenuOpenId] = useState<string | null>(null);
+  const [editingId, setEditingId] = useState<string | null>(null);
+  const [editValue, setEditValue] = useState("");
+  const [confirmDeleteId, setConfirmDeleteId] = useState<string | null>(null);
+  const inputRef = useRef<HTMLInputElement>(null);
+
+  const isDark = variant === "dark";
+
+  // Close any open row menu when clicking elsewhere.
+  useEffect(() => {
+    if (!menuOpenId && !confirmDeleteId) return;
+    const close = () => {
+      setMenuOpenId(null);
+      setConfirmDeleteId(null);
+    };
+    window.addEventListener("click", close);
+    return () => window.removeEventListener("click", close);
+  }, [menuOpenId, confirmDeleteId]);
+
+  useEffect(() => {
+    if (editingId) inputRef.current?.focus();
+  }, [editingId]);
+
+  const startRename = (conv: Conversation) => {
+    setMenuOpenId(null);
+    setEditingId(conv.id);
+    setEditValue(conv.title);
+  };
+
+  const commitRename = () => {
+    if (editingId && editValue.trim()) {
+      onRenameConversation?.(editingId, editValue.trim());
+    }
+    setEditingId(null);
+  };
+
+  const hasActions = Boolean(onRenameConversation || onDeleteConversation);
+
   return (
     <div className="flex flex-col gap-1">
       <button
@@ -28,7 +71,7 @@ export const ConversationList = ({
         className={cn(
           "flex items-center gap-2 w-full px-3 py-2 rounded-xl",
           "text-sm transition-all duration-150 cursor-pointer mb-1",
-          variant === "dark"
+          isDark
             ? "text-cream/60 hover:text-cream hover:bg-white/8"
             : "text-warm-gray hover:text-charcoal hover:bg-cream-dark",
         )}
@@ -39,24 +82,148 @@ export const ConversationList = ({
 
       {conversations.map((conv) => {
         const isActive = conv.id === selectedId;
+        const isEditing = editingId === conv.id;
+
+        if (isEditing) {
+          return (
+            <div
+              key={conv.id}
+              className={cn(
+                "flex items-center gap-1 px-1.5 py-1 rounded-xl",
+                isDark ? "bg-white/12" : "bg-cream-dark",
+              )}
+            >
+              <input
+                ref={inputRef}
+                value={editValue}
+                onChange={(e) => setEditValue(e.target.value)}
+                onKeyDown={(e) => {
+                  if (e.key === "Enter") commitRename();
+                  if (e.key === "Escape") setEditingId(null);
+                }}
+                className={cn(
+                  "flex-1 min-w-0 bg-transparent px-1.5 py-1 text-sm rounded-lg",
+                  "focus:outline-none",
+                  isDark
+                    ? "text-cream placeholder:text-cream/40"
+                    : "text-charcoal placeholder:text-warm-gray/50",
+                )}
+              />
+              <button
+                onClick={commitRename}
+                className={cn(
+                  "w-6 h-6 rounded-lg flex items-center justify-center shrink-0 cursor-pointer transition-colors",
+                  isDark
+                    ? "text-cream/60 hover:text-cream hover:bg-white/10"
+                    : "text-warm-gray hover:text-charcoal hover:bg-sand-light",
+                )}
+              >
+                <Check size={14} />
+              </button>
+              <button
+                onClick={() => setEditingId(null)}
+                className={cn(
+                  "w-6 h-6 rounded-lg flex items-center justify-center shrink-0 cursor-pointer transition-colors",
+                  isDark
+                    ? "text-cream/60 hover:text-cream hover:bg-white/10"
+                    : "text-warm-gray hover:text-charcoal hover:bg-sand-light",
+                )}
+              >
+                <X size={14} />
+              </button>
+            </div>
+          );
+        }
+
         return (
-          <button
-            key={conv.id}
-            onClick={() => onSelectConversation(conv)}
-            className={cn(
-              "w-full px-3 py-2 rounded-xl text-left",
-              "text-sm truncate transition-all duration-150 cursor-pointer",
-              variant === "dark"
-                ? isActive
-                  ? "bg-white/12 text-cream font-medium"
-                  : "text-cream/60 hover:text-cream hover:bg-white/8"
-                : isActive
-                  ? "bg-cream-dark text-charcoal font-medium"
-                  : "text-warm-gray hover:text-charcoal hover:bg-cream-dark",
+          <div key={conv.id} className="group relative flex items-center">
+            <button
+              onClick={() => onSelectConversation(conv)}
+              className={cn(
+                "flex-1 min-w-0 px-3 py-2 rounded-xl text-left",
+                "text-sm truncate transition-all duration-150 cursor-pointer",
+                hasActions && "pr-8",
+                isDark
+                  ? isActive
+                    ? "bg-white/12 text-cream font-medium"
+                    : "text-cream/60 hover:text-cream hover:bg-white/8"
+                  : isActive
+                    ? "bg-cream-dark text-charcoal font-medium"
+                    : "text-warm-gray hover:text-charcoal hover:bg-cream-dark",
+              )}
+            >
+              {conv.title}
+            </button>
+
+            {hasActions && (
+              <button
+                onClick={(e) => {
+                  e.stopPropagation();
+                  setConfirmDeleteId(null);
+                  setMenuOpenId((prev) => (prev === conv.id ? null : conv.id));
+                }}
+                className={cn(
+                  "absolute right-1.5 w-6 h-6 rounded-lg flex items-center justify-center cursor-pointer transition-all",
+                  "opacity-0 group-hover:opacity-100 focus:opacity-100",
+                  menuOpenId === conv.id && "opacity-100",
+                  isDark
+                    ? "text-cream/50 hover:text-cream hover:bg-white/10"
+                    : "text-warm-gray hover:text-charcoal hover:bg-sand-light",
+                )}
+              >
+                <MoreHorizontal size={15} />
+              </button>
             )}
-          >
-            {conv.title}
-          </button>
+
+            {menuOpenId === conv.id && (
+              <div
+                onClick={(e) => e.stopPropagation()}
+                className={cn(
+                  "absolute right-1.5 top-9 z-20 w-36 rounded-xl p-1 shadow-lg",
+                  isDark
+                    ? "bg-sidebar-bg border border-white/10"
+                    : "bg-warm-white border border-sand-light",
+                )}
+              >
+                {onRenameConversation && (
+                  <button
+                    onClick={() => startRename(conv)}
+                    className={cn(
+                      "flex items-center gap-2 w-full px-2.5 py-1.5 rounded-lg text-sm cursor-pointer transition-colors",
+                      isDark
+                        ? "text-cream/70 hover:text-cream hover:bg-white/10"
+                        : "text-warm-gray hover:text-charcoal hover:bg-cream-dark",
+                    )}
+                  >
+                    <Pencil size={13} />
+                    <span>Rename</span>
+                  </button>
+                )}
+                {onDeleteConversation && (
+                  <button
+                    onClick={() => {
+                      if (confirmDeleteId === conv.id) {
+                        onDeleteConversation(conv.id);
+                        setMenuOpenId(null);
+                        setConfirmDeleteId(null);
+                      } else {
+                        setConfirmDeleteId(conv.id);
+                      }
+                    }}
+                    className={cn(
+                      "flex items-center gap-2 w-full px-2.5 py-1.5 rounded-lg text-sm cursor-pointer transition-colors",
+                      "text-red-400 hover:bg-red-500/10",
+                    )}
+                  >
+                    <Trash2 size={13} />
+                    <span>
+                      {confirmDeleteId === conv.id ? "Confirm delete" : "Delete"}
+                    </span>
+                  </button>
+                )}
+              </div>
+            )}
+          </div>
         );
       })}
     </div>

raggr-frontend/src/components/ConversationMenu.tsx

@@ -1,24 +0,0 @@
-type Conversation = {
-  title: string;
-  id: string;
-};
-
-type ConversationMenuProps = {
-  conversations: Conversation[];
-};
-
-export const ConversationMenu = ({ conversations }: ConversationMenuProps) => {
-  return (
-    <div className="absolute bg-white w-md rounded-md shadow-xl m-4 p-4">
-      <p className="py-2 px-4 rounded-md w-full text-xl font-bold">askSimba!</p>
-      {conversations.map((conversation) => (
-        <p
-          key={conversation.id}
-          className="py-2 px-4 rounded-md hover:bg-stone-200 w-full text-xl font-bold cursor-pointer"
-        >
-          {conversation.title}
-        </p>
-      ))}
-    </div>
-  );
-};

raggr-frontend/src/components/ConversationsPage.tsx

@@ -0,0 +1,94 @@
+import { useCallback } from "react";
+import { useNavigate } from "react-router-dom";
+import { ArrowLeft, Search } from "lucide-react";
+import { ConversationList } from "./ConversationList";
+import { useConversationBrowser } from "../hooks/useConversationBrowser";
+import type { Conversation } from "../hooks/useConversations";
+import { Input } from "./ui/input";
+import catIcon from "../assets/cat.png";
+
+export const ConversationsPage = () => {
+  const navigate = useNavigate();
+  const {
+    items,
+    search,
+    setSearch,
+    hasMore,
+    loading,
+    loadMore,
+    renameConversation,
+    deleteConversation,
+  } = useConversationBrowser();
+
+  const handleSelect = useCallback(
+    (conversation: Conversation) => navigate(`/c/${conversation.id}`),
+    [navigate],
+  );
+
+  const handleCreateNew = useCallback(() => navigate("/"), [navigate]);
+
+  return (
+    <div className="h-screen h-[100dvh] flex flex-col bg-cream overflow-hidden">
+      <header className="flex items-center gap-3 px-4 py-3 bg-warm-white border-b border-sand-light/60">
+        <button
+          onClick={() => navigate(-1)}
+          className="w-8 h-8 rounded-xl flex items-center justify-center text-warm-gray hover:text-charcoal hover:bg-cream-dark transition-all cursor-pointer"
+          aria-label="Back"
+        >
+          <ArrowLeft size={16} />
+        </button>
+        <img src={catIcon} alt="Simba" className="w-10 h-10" />
+        <h1
+          className="text-base font-bold text-charcoal"
+          style={{ fontFamily: "var(--font-display)" }}
+        >
+          All conversations
+        </h1>
+      </header>
+
+      <div className="flex-1 overflow-y-auto">
+        <div className="max-w-2xl mx-auto px-4 py-6 flex flex-col gap-4">
+          <div className="relative">
+            <Search
+              size={15}
+              className="absolute left-3 top-1/2 -translate-y-1/2 text-warm-gray/60"
+            />
+            <Input
+              value={search}
+              onChange={(e) => setSearch(e.target.value)}
+              placeholder="Search conversations..."
+              className="h-10 pl-9"
+            />
+          </div>
+
+          <div className="bg-warm-white rounded-2xl border border-sand-light p-3 shadow-sm">
+            <ConversationList
+              conversations={items}
+              onCreateNewConversation={handleCreateNew}
+              onSelectConversation={handleSelect}
+              onRenameConversation={renameConversation}
+              onDeleteConversation={deleteConversation}
+              variant="light"
+            />
+
+            {items.length === 0 && !loading && (
+              <p className="text-center text-sm text-warm-gray/70 py-6">
+                {search ? "No conversations match your search." : "No conversations yet."}
+              </p>
+            )}
+          </div>
+
+          {hasMore && (
+            <button
+              onClick={loadMore}
+              disabled={loading}
+              className="self-center px-4 py-2 rounded-xl text-sm text-warm-gray hover:text-charcoal hover:bg-cream-dark transition-all cursor-pointer disabled:opacity-50 disabled:cursor-not-allowed"
+            >
+              {loading ? "Loading..." : "Load more"}
+            </button>
+          )}
+        </div>
+      </div>
+    </div>
+  );
+};

raggr-frontend/src/components/MessageInput.tsx

@@ -1,160 +1,204 @@
-import React, { useEffect, useMemo, useRef, useState } from "react";
-import { ArrowUp, ImagePlus, X } from "lucide-react";
+import React, { useEffect, useMemo, useRef } from "react";
+import { ArrowUp, ImagePlus, Square, X } from "lucide-react";
 import { cn } from "../lib/utils";
 import { Textarea } from "./ui/textarea";
 
 type MessageInputProps = {
   handleQueryChange: (event: React.ChangeEvent<HTMLTextAreaElement>) => void;
-  handleKeyDown: (event: React.ChangeEvent<HTMLTextAreaElement>) => void;
+  handleKeyDown: (event: React.KeyboardEvent<HTMLTextAreaElement>) => void;
   handleQuestionSubmit: () => void;
-  setSimbaMode: (val: boolean) => void;
+  simbaMode: boolean;
+  onToggleSimbaMode: () => void;
   query: string;
   isLoading: boolean;
+  onStop: () => void;
   pendingImage: File | null;
   onImageSelect: (file: File) => void;
   onClearImage: () => void;
+  autoFocus?: boolean;
 };
 
-export const MessageInput = React.memo(({
-  query,
-  handleKeyDown,
-  handleQueryChange,
-  handleQuestionSubmit,
-  setSimbaMode,
-  isLoading,
-  pendingImage,
-  onImageSelect,
-  onClearImage,
-}: MessageInputProps) => {
-  const [simbaMode, setLocalSimbaMode] = useState(false);
-  const fileInputRef = useRef<HTMLInputElement>(null);
+export const MessageInput = React.memo(
+  ({
+    query,
+    handleKeyDown,
+    handleQueryChange,
+    handleQuestionSubmit,
+    simbaMode,
+    onToggleSimbaMode,
+    isLoading,
+    onStop,
+    pendingImage,
+    onImageSelect,
+    onClearImage,
+    autoFocus,
+  }: MessageInputProps) => {
+    const fileInputRef = useRef<HTMLInputElement>(null);
+    const textareaRef = useRef<HTMLTextAreaElement>(null);
 
-  // Create blob URL once per file, revoke on cleanup
-  const previewUrl = useMemo(
-    () => (pendingImage ? URL.createObjectURL(pendingImage) : null),
-    [pendingImage],
-  );
+    // Create blob URL once per file, revoke on cleanup
+    const previewUrl = useMemo(
+      () => (pendingImage ? URL.createObjectURL(pendingImage) : null),
+      [pendingImage],
+    );
 
-  useEffect(() => {
-    return () => {
-      if (previewUrl) URL.revokeObjectURL(previewUrl);
+    useEffect(() => {
+      return () => {
+        if (previewUrl) URL.revokeObjectURL(previewUrl);
+      };
+    }, [previewUrl]);
+
+    // Auto-grow the textarea to fit its content (capped by max-height in CSS).
+    useEffect(() => {
+      const el = textareaRef.current;
+      if (!el) return;
+      el.style.height = "auto";
+      el.style.height = `${el.scrollHeight}px`;
+    }, [query]);
+
+    const handleFileChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+      const file = e.target.files?.[0];
+      if (file) {
+        onImageSelect(file);
+      }
+      // Reset so the same file can be re-selected
+      e.target.value = "";
     };
-  }, [previewUrl]);
 
-  const toggleSimbaMode = () => {
-    const next = !simbaMode;
-    setLocalSimbaMode(next);
-    setSimbaMode(next);
-  };
+    const handlePaste = (e: React.ClipboardEvent<HTMLTextAreaElement>) => {
+      if (isLoading) return;
+      const items = e.clipboardData?.items;
+      if (!items) return;
+      for (const item of items) {
+        if (item.type.startsWith("image/")) {
+          const file = item.getAsFile();
+          if (file) {
+            e.preventDefault();
+            onImageSelect(file);
+            return;
+          }
+        }
+      }
+    };
 
-  const handleFileChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    const file = e.target.files?.[0];
-    if (file) {
-      onImageSelect(file);
-    }
-    // Reset so the same file can be re-selected
-    e.target.value = "";
-  };
+    const canSend = !isLoading && Boolean(query.trim() || pendingImage);
 
-  const canSend = !isLoading && (query.trim() || pendingImage);
+    return (
+      <div
+        className={cn(
+          "rounded-2xl bg-warm-white border border-sand shadow-md shadow-sand/30",
+          "transition-shadow duration-200 focus-within:shadow-lg focus-within:shadow-amber-soft/20",
+          "focus-within:border-amber-soft/60",
+        )}
+      >
+        {/* Image preview */}
+        {pendingImage && (
+          <div className="px-3 pt-3">
+            <div className="relative inline-block">
+              <img
+                src={previewUrl!}
+                alt="Pending upload"
+                className="h-20 rounded-lg object-cover border border-sand"
+              />
+              <button
+                type="button"
+                onClick={onClearImage}
+                className="absolute -top-1.5 -right-1.5 w-5 h-5 rounded-full bg-charcoal text-white flex items-center justify-center hover:bg-charcoal/80 transition-colors cursor-pointer"
+              >
+                <X size={12} />
+              </button>
+            </div>
+          </div>
+        )}
 
-  return (
-    <div
-      className={cn(
-        "rounded-2xl bg-warm-white border border-sand shadow-md shadow-sand/30",
-        "transition-shadow duration-200 focus-within:shadow-lg focus-within:shadow-amber-soft/20",
-        "focus-within:border-amber-soft/60",
-      )}
-    >
-      {/* Image preview */}
-      {pendingImage && (
-        <div className="px-3 pt-3">
-          <div className="relative inline-block">
-            <img
-              src={previewUrl!}
-              alt="Pending upload"
-              className="h-20 rounded-lg object-cover border border-sand"
-            />
+        {/* Textarea */}
+        <Textarea
+          ref={textareaRef}
+          onChange={handleQueryChange}
+          onKeyDown={handleKeyDown}
+          onPaste={handlePaste}
+          value={query}
+          rows={2}
+          placeholder="Ask Simba anything..."
+          className="min-h-[60px] max-h-40 overflow-y-auto"
+          autoFocus={autoFocus}
+        />
+
+        {/* Hidden file input */}
+        <input
+          ref={fileInputRef}
+          type="file"
+          accept="image/*"
+          onChange={handleFileChange}
+          className="hidden"
+        />
+
+        {/* Bottom toolbar */}
+        <div className="flex items-center justify-between px-3 pb-2.5 pt-1">
+          <div className="flex items-center gap-3">
+            {/* Simba mode toggle */}
             <button
               type="button"
-              onClick={onClearImage}
-              className="absolute -top-1.5 -right-1.5 w-5 h-5 rounded-full bg-charcoal text-white flex items-center justify-center hover:bg-charcoal/80 transition-colors cursor-pointer"
+              onClick={onToggleSimbaMode}
+              className="flex items-center gap-2 group cursor-pointer select-none"
             >
-              <X size={12} />
+              <div className={cn("toggle-track", simbaMode && "checked")}>
+                <div className="toggle-thumb" />
+              </div>
+              <span className="text-xs text-warm-gray group-hover:text-charcoal transition-colors">
+                simba mode
+              </span>
+            </button>
+
+            {/* Image attach button */}
+            <button
+              type="button"
+              onClick={() => fileInputRef.current?.click()}
+              disabled={isLoading}
+              className={cn(
+                "w-7 h-7 rounded-lg flex items-center justify-center transition-all cursor-pointer",
+                isLoading
+                  ? "text-warm-gray/40 cursor-not-allowed"
+                  : "text-warm-gray hover:text-charcoal hover:bg-cream-dark",
+              )}
+            >
+              <ImagePlus size={16} />
             </button>
           </div>
-        </div>
-      )}
 
-      {/* Textarea */}
-      <Textarea
-        onChange={handleQueryChange}
-        onKeyDown={handleKeyDown}
-        value={query}
-        rows={2}
-        placeholder="Ask Simba anything..."
-        className="min-h-[60px] max-h-40"
-      />
-
-      {/* Hidden file input */}
-      <input
-        ref={fileInputRef}
-        type="file"
-        accept="image/*"
-        onChange={handleFileChange}
-        className="hidden"
-      />
-
-      {/* Bottom toolbar */}
-      <div className="flex items-center justify-between px-3 pb-2.5 pt-1">
-        <div className="flex items-center gap-3">
-          {/* Simba mode toggle */}
-          <button
-            type="button"
-            onClick={toggleSimbaMode}
-            className="flex items-center gap-2 group cursor-pointer select-none"
-          >
-            <div className={cn("toggle-track", simbaMode && "checked")}>
-              <div className="toggle-thumb" />
-            </div>
-            <span className="text-xs text-warm-gray group-hover:text-charcoal transition-colors">
-              simba mode
-            </span>
-          </button>
-
-          {/* Image attach button */}
-          <button
-            type="button"
-            onClick={() => fileInputRef.current?.click()}
-            disabled={isLoading}
-            className={cn(
-              "w-7 h-7 rounded-lg flex items-center justify-center transition-all cursor-pointer",
-              isLoading
-                ? "text-warm-gray/40 cursor-not-allowed"
-                : "text-warm-gray hover:text-charcoal hover:bg-cream-dark",
-            )}
-          >
-            <ImagePlus size={16} />
-          </button>
-        </div>
-
-        {/* Send button */}
-        <button
-          type="submit"
-          onClick={handleQuestionSubmit}
-          disabled={!canSend}
-          className={cn(
-            "w-8 h-8 rounded-full flex items-center justify-center",
-            "transition-all duration-200 cursor-pointer",
-            "shadow-sm",
-            !canSend
-              ? "bg-sand text-warm-gray/50 cursor-not-allowed shadow-none"
-              : "bg-amber-glow text-white hover:bg-amber-dark hover:shadow-md hover:shadow-amber-glow/30 active:scale-95",
+          {/* Send / Stop button */}
+          {isLoading ? (
+            <button
+              type="button"
+              onClick={onStop}
+              aria-label="Stop generating"
+              className={cn(
+                "w-8 h-8 rounded-full flex items-center justify-center shadow-sm",
+                "bg-charcoal text-white transition-all duration-200 cursor-pointer",
+                "hover:bg-charcoal/85 active:scale-95",
+              )}
+            >
+              <Square size={13} strokeWidth={2.5} fill="currentColor" />
+            </button>
+          ) : (
+            <button
+              type="submit"
+              onClick={handleQuestionSubmit}
+              disabled={!canSend}
+              aria-label="Send message"
+              className={cn(
+                "w-8 h-8 rounded-full flex items-center justify-center",
+                "transition-all duration-200 cursor-pointer shadow-sm",
+                !canSend
+                  ? "bg-sand text-warm-gray/50 cursor-not-allowed shadow-none"
+                  : "bg-amber-glow text-white hover:bg-amber-dark hover:shadow-md hover:shadow-amber-glow/30 active:scale-95",
+              )}
+            >
+              <ArrowUp size={15} strokeWidth={2.5} />
+            </button>
           )}
-        >
-          <ArrowUp size={15} strokeWidth={2.5} />
-        </button>
+        </div>
       </div>
-    </div>
-  );
-});
+    );
+  },
+);

raggr-frontend/src/components/ScheduledMessagesPanel.tsx

@@ -0,0 +1,335 @@
+import { useState } from "react";
+import { X, Clock, Send, Trash2, XCircle, RotateCcw, Repeat, Bot } from "lucide-react";
+import { cn } from "../lib/utils";
+import { Button } from "./ui/button";
+import { Input } from "./ui/input";
+import { Badge } from "./ui/badge";
+import {
+  Table,
+  TableBody,
+  TableCell,
+  TableHead,
+  TableHeader,
+  TableRow,
+} from "./ui/table";
+import { useScheduledMessages } from "../hooks/useScheduledMessages";
+import {
+  scheduledMessageService,
+  type CreateScheduledMessage,
+} from "../api/scheduledMessageService";
+
+type Props = {
+  onClose: () => void;
+};
+
+const STATUS_BADGE: Record<string, "amber" | "default" | "destructive" | "muted"> = {
+  pending: "amber",
+  sent: "default",
+  failed: "destructive",
+  cancelled: "muted",
+};
+
+export const ScheduledMessagesPanel = ({ onClose }: Props) => {
+  const { messages, loading, refresh } = useScheduledMessages();
+  const [channel, setChannel] = useState<"imessage" | "email">("imessage");
+  const [recipient, setRecipient] = useState("");
+  const [subject, setSubject] = useState("");
+  const [content, setContent] = useState("");
+  const [scheduledAt, setScheduledAt] = useState("");
+  const [recurrence, setRecurrence] = useState<"none" | "daily" | "weekly" | "monthly">("none");
+  const [useAgent, setUseAgent] = useState(false);
+  const [error, setError] = useState("");
+  const [submitting, setSubmitting] = useState(false);
+
+  const handleCreate = async () => {
+    setError("");
+    if (!recipient || !content || !scheduledAt) {
+      setError("Recipient, content, and scheduled time are required.");
+      return;
+    }
+    if (channel === "email" && !subject) {
+      setError("Subject is required for email.");
+      return;
+    }
+
+    setSubmitting(true);
+    try {
+      const data: CreateScheduledMessage = {
+        recipient,
+        channel,
+        content,
+        scheduled_at: new Date(scheduledAt).toISOString(),
+        recurrence,
+        use_agent: useAgent,
+      };
+      if (channel === "email") data.subject = subject;
+      await scheduledMessageService.create(data);
+      setRecipient("");
+      setSubject("");
+      setContent("");
+      setScheduledAt("");
+      setRecurrence("none");
+      setUseAgent(false);
+      refresh();
+    } catch (err) {
+      setError(err instanceof Error ? err.message : "Failed to schedule message");
+    } finally {
+      setSubmitting(false);
+    }
+  };
+
+  const handleCancel = async (id: string) => {
+    try {
+      await scheduledMessageService.update(id, { status: "cancelled" });
+      refresh();
+    } catch {}
+  };
+
+  const handleDelete = async (id: string) => {
+    try {
+      await scheduledMessageService.remove(id);
+      refresh();
+    } catch {}
+  };
+
+  const handleRetry = async (id: string) => {
+    try {
+      const futureTime = new Date(Date.now() + 30_000).toISOString();
+      await scheduledMessageService.update(id, { scheduled_at: futureTime });
+      refresh();
+    } catch {}
+  };
+
+  return (
+    <div
+      className="fixed inset-0 z-50 flex items-center justify-center bg-charcoal/40 backdrop-blur-sm"
+      onClick={(e) => e.target === e.currentTarget && onClose()}
+    >
+      <div
+        className={cn(
+          "bg-warm-white rounded-3xl shadow-2xl shadow-charcoal/20",
+          "w-full max-w-3xl mx-4 max-h-[85vh] flex flex-col",
+          "border border-sand-light/60",
+        )}
+      >
+        {/* Header */}
+        <div className="flex items-center justify-between px-6 py-4 border-b border-sand-light/60">
+          <div className="flex items-center gap-2.5">
+            <div className="w-8 h-8 rounded-xl bg-amber-pale flex items-center justify-center">
+              <Clock size={14} className="text-amber-glow" />
+            </div>
+            <h2 className="text-sm font-semibold text-charcoal">
+              Scheduled Messages
+            </h2>
+          </div>
+          <button
+            onClick={onClose}
+            className="w-7 h-7 rounded-lg flex items-center justify-center text-warm-gray hover:text-charcoal hover:bg-cream-dark transition-colors cursor-pointer"
+          >
+            <X size={15} />
+          </button>
+        </div>
+
+        <div className="overflow-y-auto flex-1 rounded-b-3xl">
+          {/* Create form */}
+          <div className="px-6 py-5 border-b border-sand-light/60 space-y-3">
+            <div className="flex items-center gap-2">
+              <button
+                onClick={() => setChannel("imessage")}
+                className={cn(
+                  "px-3 py-1.5 rounded-lg text-xs font-medium transition-colors cursor-pointer",
+                  channel === "imessage"
+                    ? "bg-leaf-pale text-leaf-dark"
+                    : "bg-sand-light/40 text-warm-gray hover:text-charcoal",
+                )}
+              >
+                iMessage
+              </button>
+              <button
+                onClick={() => setChannel("email")}
+                className={cn(
+                  "px-3 py-1.5 rounded-lg text-xs font-medium transition-colors cursor-pointer",
+                  channel === "email"
+                    ? "bg-leaf-pale text-leaf-dark"
+                    : "bg-sand-light/40 text-warm-gray hover:text-charcoal",
+                )}
+              >
+                Email
+              </button>
+            </div>
+
+            <div className="flex gap-2">
+              <Input
+                value={recipient}
+                onChange={(e) => setRecipient(e.target.value)}
+                placeholder={channel === "imessage" ? "+15551234567" : "user@example.com"}
+                className="flex-1"
+              />
+              <Input
+                type="datetime-local"
+                value={scheduledAt}
+                onChange={(e) => setScheduledAt(e.target.value)}
+                className="w-52"
+              />
+            </div>
+
+            <div className="flex items-center gap-2">
+              <Repeat size={12} className="text-warm-gray" />
+              <span className="text-xs text-warm-gray">Repeat:</span>
+              {(["none", "daily", "weekly", "monthly"] as const).map((r) => (
+                <button
+                  key={r}
+                  onClick={() => setRecurrence(r)}
+                  className={cn(
+                    "px-2.5 py-1 rounded-lg text-xs font-medium transition-colors cursor-pointer",
+                    recurrence === r
+                      ? "bg-amber-pale text-amber-glow"
+                      : "bg-sand-light/40 text-warm-gray hover:text-charcoal",
+                  )}
+                >
+                  {r === "none" ? "Once" : r.charAt(0).toUpperCase() + r.slice(1)}
+                </button>
+              ))}
+            </div>
+
+            <div className="flex items-center gap-2">
+              <button
+                onClick={() => setUseAgent(!useAgent)}
+                className={cn(
+                  "flex items-center gap-1.5 px-3 py-1.5 rounded-lg text-xs font-medium transition-colors cursor-pointer",
+                  useAgent
+                    ? "bg-leaf-pale text-leaf-dark"
+                    : "bg-sand-light/40 text-warm-gray hover:text-charcoal",
+                )}
+              >
+                <Bot size={12} />
+                Ask Simba
+              </button>
+              <span className="text-xs text-warm-gray">
+                {useAgent ? "Content is a prompt — Simba's response will be sent" : "Content sent as-is"}
+              </span>
+            </div>
+
+            {channel === "email" && (
+              <Input
+                value={subject}
+                onChange={(e) => setSubject(e.target.value)}
+                placeholder="Subject"
+              />
+            )}
+
+            <textarea
+              value={content}
+              onChange={(e) => setContent(e.target.value)}
+              placeholder={useAgent ? "Enter a prompt for Simba..." : "Message content..."}
+              rows={3}
+              className="w-full rounded-xl border border-sand bg-cream-light px-3 py-2 text-sm text-charcoal placeholder:text-warm-gray/50 focus:outline-none focus:ring-2 focus:ring-leaf/30 resize-none"
+            />
+
+            {error && <p className="text-xs text-red-500">{error}</p>}
+
+            <Button onClick={handleCreate} disabled={submitting} size="sm">
+              <Send size={12} />
+              {submitting ? "Scheduling..." : "Schedule"}
+            </Button>
+          </div>
+
+          {/* Message list */}
+          {loading ? (
+            <div className="px-6 py-12 text-center text-warm-gray text-sm">
+              <div className="flex justify-center gap-1.5 mb-3">
+                <span className="loading-dot w-2 h-2 rounded-full bg-amber-soft inline-block" />
+                <span className="loading-dot w-2 h-2 rounded-full bg-amber-soft inline-block" />
+                <span className="loading-dot w-2 h-2 rounded-full bg-amber-soft inline-block" />
+              </div>
+              Loading...
+            </div>
+          ) : messages.length === 0 ? (
+            <div className="px-6 py-12 text-center text-warm-gray text-sm">
+              No scheduled messages yet.
+            </div>
+          ) : (
+            <Table>
+              <TableHeader>
+                <TableRow>
+                  <TableHead>Channel</TableHead>
+                  <TableHead>Recipient</TableHead>
+                  <TableHead>Content</TableHead>
+                  <TableHead>Scheduled</TableHead>
+                  <TableHead>Repeat</TableHead>
+                  <TableHead>Status</TableHead>
+                  <TableHead className="w-28">Actions</TableHead>
+                </TableRow>
+              </TableHeader>
+              <TableBody>
+                {messages.map((msg) => (
+                  <TableRow key={msg.id}>
+                    <TableCell className="capitalize text-xs">
+                      {msg.channel}
+                    </TableCell>
+                    <TableCell className="text-xs truncate max-w-[140px]" title={msg.recipient}>
+                      {msg.recipient}
+                    </TableCell>
+                    <TableCell className="text-xs max-w-[180px]" title={msg.content}>
+                      <div className="flex items-center gap-1">
+                        {msg.use_agent && <Bot size={10} className="text-leaf-dark shrink-0" />}
+                        <span className="truncate">
+                          {msg.content.length > 60
+                            ? msg.content.slice(0, 60) + "..."
+                            : msg.content}
+                        </span>
+                      </div>
+                    </TableCell>
+                    <TableCell className="text-xs text-warm-gray">
+                      {new Date(msg.scheduled_at).toLocaleString()}
+                    </TableCell>
+                    <TableCell className="text-xs text-warm-gray capitalize">
+                      {msg.recurrence === "none" ? "—" : msg.recurrence}
+                    </TableCell>
+                    <TableCell>
+                      <Badge variant={STATUS_BADGE[msg.status]}>{msg.status}</Badge>
+                    </TableCell>
+                    <TableCell>
+                      <div className="flex gap-1">
+                        {msg.status === "pending" && (
+                          <Button
+                            size="sm"
+                            variant="ghost-dark"
+                            onClick={() => handleCancel(msg.id)}
+                            title="Cancel"
+                          >
+                            <XCircle size={11} />
+                          </Button>
+                        )}
+                        {msg.status === "failed" && (
+                          <Button
+                            size="sm"
+                            variant="ghost-dark"
+                            onClick={() => handleRetry(msg.id)}
+                            title="Retry"
+                          >
+                            <RotateCcw size={11} />
+                          </Button>
+                        )}
+                        {(msg.status === "pending" || msg.status === "cancelled") && (
+                          <Button
+                            size="sm"
+                            variant="destructive"
+                            onClick={() => handleDelete(msg.id)}
+                            title="Delete"
+                          >
+                            <Trash2 size={11} />
+                          </Button>
+                        )}
+                      </div>
+                    </TableCell>
+                  </TableRow>
+                ))}
+              </TableBody>
+            </Table>
+          )}
+        </div>
+      </div>
+    </div>
+  );
+};

raggr-frontend/src/components/SidebarContent.tsx

@@ -0,0 +1,128 @@
+import { Link } from "react-router-dom";
+import {
+  Clock,
+  LogOut,
+  PanelLeftClose,
+  Shield,
+  ListTree,
+  X,
+} from "lucide-react";
+import { ConversationList } from "./ConversationList";
+import type { Conversation } from "../hooks/useConversations";
+import catIcon from "../assets/cat.png";
+
+type SidebarContentProps = {
+  conversations: Conversation[];
+  onCreateNewConversation: () => void;
+  onSelectConversation: (conversation: Conversation) => void;
+  onRenameConversation: (id: string, title: string) => void;
+  onDeleteConversation: (id: string) => void;
+  selectedId?: string;
+  isAdmin: boolean;
+  onShowAdmin: () => void;
+  onShowScheduler: () => void;
+  onLogout: () => void;
+  /** Desktop: collapse the sidebar. Renders a PanelLeftClose button. */
+  onCollapse?: () => void;
+  /** Mobile: close the drawer. Renders an X button. */
+  onCloseDrawer?: () => void;
+};
+
+/**
+ * The dark sidebar body shared by the desktop sidebar and the mobile drawer.
+ * Shows the recent conversations, a link to the full list, and admin/account
+ * actions. Exactly one of `onCollapse`/`onCloseDrawer` is expected per usage.
+ */
+export const SidebarContent = ({
+  conversations,
+  onCreateNewConversation,
+  onSelectConversation,
+  onRenameConversation,
+  onDeleteConversation,
+  selectedId,
+  isAdmin,
+  onShowAdmin,
+  onShowScheduler,
+  onLogout,
+  onCollapse,
+  onCloseDrawer,
+}: SidebarContentProps) => {
+  return (
+    <div className="flex flex-col h-full">
+      <div className="flex items-center justify-between px-4 py-4 border-b border-white/8">
+        <div className="flex items-center gap-2.5">
+          <img src={catIcon} alt="Simba" className="w-12 h-12" />
+          <h2
+            className="text-lg font-bold text-cream tracking-tight"
+            style={{ fontFamily: "var(--font-display)" }}
+          >
+            asksimba
+          </h2>
+        </div>
+        {onCollapse && (
+          <button
+            onClick={onCollapse}
+            className="w-7 h-7 rounded-lg flex items-center justify-center text-cream/40 hover:text-cream hover:bg-white/10 transition-all cursor-pointer"
+          >
+            <PanelLeftClose size={15} />
+          </button>
+        )}
+        {onCloseDrawer && (
+          <button
+            onClick={onCloseDrawer}
+            className="w-7 h-7 rounded-lg flex items-center justify-center text-cream/40 hover:text-cream hover:bg-white/10 transition-all cursor-pointer"
+          >
+            <X size={16} />
+          </button>
+        )}
+      </div>
+
+      <div className="flex-1 overflow-y-auto px-2 py-3">
+        <ConversationList
+          conversations={conversations}
+          onCreateNewConversation={onCreateNewConversation}
+          onSelectConversation={onSelectConversation}
+          onRenameConversation={onRenameConversation}
+          onDeleteConversation={onDeleteConversation}
+          selectedId={selectedId}
+        />
+      </div>
+
+      <div className="px-2 pb-3 pt-2 border-t border-white/8 flex flex-col gap-0.5">
+        <Link
+          to="/conversations"
+          onClick={onCloseDrawer}
+          className="flex items-center gap-2 w-full px-3 py-2 rounded-xl text-sm text-cream/50 hover:text-cream hover:bg-white/8 transition-all cursor-pointer"
+        >
+          <ListTree size={14} />
+          <span>See all conversations</span>
+        </Link>
+        {isAdmin && (
+          <>
+            <button
+              onClick={onShowAdmin}
+              className="flex items-center gap-2 w-full px-3 py-2 rounded-xl text-sm text-cream/50 hover:text-cream hover:bg-white/8 transition-all cursor-pointer"
+            >
+              <Shield size={14} />
+              <span>Admin</span>
+            </button>
+            <button
+              onClick={onShowScheduler}
+              className="flex items-center gap-2 w-full px-3 py-2 rounded-xl text-sm text-cream/50 hover:text-cream hover:bg-white/8 transition-all cursor-pointer"
+            >
+              <Clock size={14} />
+              <span>Scheduler</span>
+            </button>
+          </>
+        )}
+        <button
+          onClick={onLogout}
+          className="flex items-center gap-2 w-full px-3 py-2 rounded-xl text-sm text-cream/50 hover:text-cream hover:bg-white/8 transition-all cursor-pointer"
+        >
+          <LogOut size={14} />
+          <span>Sign out</span>
+        </button>
+      </div>
+    </div>
+  );
+};

raggr-frontend/src/components/ThinkingBubble.tsx

@@ -0,0 +1,78 @@
+import React, { useState, useEffect, useRef } from "react";
+import { ChevronDown } from "lucide-react";
+import { cn } from "../lib/utils";
+
+type ThinkingBubbleProps = {
+  text: string;
+  durationMs: number | null;
+  active: boolean;
+};
+
+export const ThinkingBubble = React.memo(
+  ({ text, durationMs, active }: ThinkingBubbleProps) => {
+    const [expanded, setExpanded] = useState(true);
+    const textRef = useRef<HTMLDivElement>(null);
+
+    // Auto-scroll thinking text as it streams in.
+    useEffect(() => {
+      if (active && textRef.current) {
+        textRef.current.scrollTop = textRef.current.scrollHeight;
+      }
+    }, [text, active]);
+
+    // Collapse automatically when thinking finishes.
+    useEffect(() => {
+      if (durationMs !== null) {
+        setExpanded(false);
+      }
+    }, [durationMs]);
+
+    const label = active
+      ? "Thinking…"
+      : durationMs !== null
+        ? `Thought for ${(durationMs / 1000).toFixed(1)}s`
+        : "Thought";
+
+    return (
+      <div className="flex justify-center message-enter">
+        <div className="w-full max-w-2xl">
+          <button
+            onClick={() => setExpanded((v) => !v)}
+            className={cn(
+              "w-full flex items-center justify-between gap-2",
+              "px-3 py-1.5 rounded-xl",
+              "bg-leaf-pale border border-leaf-light/50",
+              "text-xs text-leaf-dark italic",
+              "hover:bg-leaf-light/20 transition-colors cursor-pointer",
+              active && "animate-pulse",
+            )}
+          >
+            <span>{label}</span>
+            {text && (
+              <ChevronDown
+                size={13}
+                className={cn(
+                  "text-leaf-dark/60 transition-transform duration-200 shrink-0",
+                  expanded && "rotate-180",
+                )}
+              />
+            )}
+          </button>
+
+          {expanded && text && (
+            <div
+              ref={textRef}
+              className={cn(
+                "mt-1 px-3 py-2 rounded-xl max-h-48 overflow-y-auto",
+                "bg-leaf-pale/40 border border-leaf-light/30",
+                "text-xs text-leaf-dark/70 font-mono leading-relaxed whitespace-pre-wrap",
+              )}
+            >
+              {text}
+            </div>
+          )}
+        </div>
+      </div>
+    );
+  },
+);

raggr-frontend/src/components/ToolBubble.tsx

@@ -1,16 +1,19 @@
 import React from "react";
 import { cn } from "../lib/utils";
 
-export const ToolBubble = React.memo(({ text }: { text: string }) => (
-  <div className="flex justify-center message-enter">
-    <div
-      className={cn(
-        "inline-flex items-center gap-1.5 px-3 py-1 rounded-full",
-        "bg-leaf-pale border border-leaf-light/50",
-        "text-xs text-leaf-dark italic",
-      )}
-    >
-      {text}
+export const ToolBubble = React.memo(
+  ({ text, pulse = false }: { text: string; pulse?: boolean }) => (
+    <div className="flex justify-center message-enter">
+      <div
+        className={cn(
+          "inline-flex items-center gap-1.5 px-3 py-1 rounded-full",
+          "bg-leaf-pale border border-leaf-light/50",
+          "text-xs text-leaf-dark italic",
+          pulse && "animate-pulse",
+        )}
+      >
+        {text}
+      </div>
     </div>
-  </div>
-));
+  ),
+);

raggr-frontend/src/components/ui/badge.tsx

@@ -9,6 +9,7 @@ const badgeVariants = cva(
         default: "bg-leaf-pale text-leaf-dark border border-leaf-light/50",
         amber: "bg-amber-pale text-amber-glow border border-amber-soft/40",
         muted: "bg-sand-light/60 text-warm-gray border border-sand/40",
+        destructive: "bg-red-50 text-red-600 border border-red-200/50",
       },
     },
     defaultVariants: {

raggr-frontend/src/components/ui/textarea.tsx

@@ -1,11 +1,14 @@
 import { cn } from "../../lib/utils";
 
 export interface TextareaProps
-  extends React.TextareaHTMLAttributes<HTMLTextAreaElement> {}
+  extends React.TextareaHTMLAttributes<HTMLTextAreaElement> {
+  ref?: React.Ref<HTMLTextAreaElement>;
+}
 
-export const Textarea = ({ className, ...props }: TextareaProps) => {
+export const Textarea = ({ className, ref, ...props }: TextareaProps) => {
   return (
     <textarea
+      ref={ref}
       className={cn(
         "flex w-full resize-none rounded-xl border-0 bg-transparent px-3 py-2.5",
         "text-sm text-charcoal placeholder:text-warm-gray/50",

raggr-frontend/src/contexts/AuthContext.tsx

@@ -1,4 +1,4 @@
-import { createContext, useContext, useState, ReactNode } from "react";
+import { createContext, useContext, useState, type ReactNode } from "react";
 import { userService } from "../api/userService";
 
 interface AuthContextType {

raggr-frontend/src/hooks/useChat.ts

@@ -1,4 +1,5 @@
 import { useState, useCallback, useEffect, useRef } from "react";
+import { useMatch } from "react-router-dom";
 import { conversationService } from "../api/conversationService";
 import type { Conversation } from "./useConversations";
 
@@ -29,7 +30,6 @@ const TOOL_MESSAGES: Record<string, string> = {
 const simbaAnswers = ["meow.", "hiss...", "purrrrrr", "yowOWROWWowowr"];
 
 type UseChatOptions = {
-  selectedConversation: Conversation | null;
   createConversation: () => Promise<Conversation>;
   refreshConversations: () => Promise<void>;
   onSessionExpired: () => void;
@@ -37,24 +37,45 @@ type UseChatOptions = {
 };
 
 export function useChat({
-  selectedConversation,
   createConversation,
   refreshConversations,
   onSessionExpired,
   scrollToBottom,
 }: UseChatOptions) {
+  // ChatScreen renders under a single catch-all route so it isn't remounted
+  // when the first message navigates to /c/:id (which would abort the stream),
+  // so the id comes from matching the URL rather than useParams.
+  const conversationId = useMatch("/c/:conversationId")?.params.conversationId;
   const [messages, setMessages] = useState<Message[]>([]);
   const [isLoading, setIsLoading] = useState(false);
+  const [messagesLoading, setMessagesLoading] = useState(false);
   const [pendingImage, setPendingImage] = useState<File | null>(null);
+  const [error, setError] = useState<string | null>(null);
+  const [stalled, setStalled] = useState(false);
+  const [streaming, setStreaming] = useState(false);
+  const [thinking, setThinking] = useState(false);
+  const [thinkingText, setThinkingText] = useState("");
+  const [thinkingDurationMs, setThinkingDurationMs] = useState<number | null>(null);
+
+  const stalledQueryRef = useRef<string | null>(null);
+  const thinkingStartRef = useRef<number | null>(null);
 
   const isMountedRef = useRef(true);
+  // True once tokens for the current assistant reply have started arriving, so
+  // new content appends to the live bubble instead of creating another one.
+  const streamingActiveRef = useRef(false);
   const abortControllerRef = useRef<AbortController | null>(null);
+  // Set to a conversation id we just created locally, so the route-change
+  // loader below doesn't wipe the optimistic message + in-flight stream.
+  const skipLoadForIdRef = useRef<string | null>(null);
 
   useEffect(() => {
     isMountedRef.current = true;
     return () => {
       isMountedRef.current = false;
-      abortControllerRef.current?.abort();
+      // Intentionally do NOT abort on unmount — navigation away lets the
+      // stream finish in the background so the response gets persisted.
+      // stopGeneration() still aborts on explicit user cancel.
     };
   }, []);
 
@@ -66,19 +87,76 @@ export function useChat({
     [scrollToBottom],
   );
 
+  // Load messages whenever the active conversation (URL) changes. Clearing
+  // immediately makes the switch feel instant instead of lingering on the old
+  // thread until the fetch resolves.
+  useEffect(() => {
+    // Skip only for a conversation we just created locally (its optimistic
+    // message + stream are already in state). Guard against the null sentinel
+    // colliding with the "no conversation" (home) route.
+    if (
+      skipLoadForIdRef.current !== null &&
+      skipLoadForIdRef.current === conversationId
+    ) {
+      skipLoadForIdRef.current = null;
+      return;
+    }
+    if (!conversationId) {
+      setMessages([]);
+      setMessagesLoading(false);
+      return;
+    }
+    let cancelled = false;
+    setMessages([]);
+    setMessagesLoading(true);
+    (async () => {
+      try {
+        const fetched = await conversationService.getConversation(conversationId);
+        if (cancelled) return;
+        setMessages(
+          (fetched.messages ?? []).map((m) => ({
+            text: m.text,
+            speaker: m.speaker,
+            image_key: m.image_key,
+          })),
+        );
+        scrollToBottom();
+      } catch (err) {
+        if (!cancelled) {
+          console.error("Failed to load messages:", err);
+          setMessages([]);
+        }
+      } finally {
+        if (!cancelled) setMessagesLoading(false);
+      }
+    })();
+    return () => {
+      cancelled = true;
+    };
+  }, [conversationId, scrollToBottom]);
+
   const sendMessage = useCallback(
     async (query: string, simbaMode: boolean) => {
       if ((!query.trim() && !pendingImage) || isLoading) return;
 
-      let activeConversation = selectedConversation;
-      let createdNew = false;
-      if (!activeConversation) {
-        activeConversation = await createConversation();
-        createdNew = true;
+      let activeId = conversationId;
+      if (!activeId) {
+        const created = await createConversation();
+        // Prevent the route-change loader from clearing what we're about to add.
+        skipLoadForIdRef.current = created.id;
+        activeId = created.id;
       }
 
       const imageFile = pendingImage;
 
+      setError(null);
+      setStalled(false);
+      stalledQueryRef.current = null;
+      setThinkingText("");
+      setThinkingDurationMs(null);
+      thinkingStartRef.current = null;
+      streamingActiveRef.current = false;
+      setStreaming(false);
       updateMessages((prev) => prev.concat([{ text: query, speaker: "user" }]));
       setPendingImage(null);
       setIsLoading(true);
@@ -101,7 +179,7 @@ export function useChat({
         if (imageFile) {
           const uploadResult = await conversationService.uploadImage(
             imageFile,
-            activeConversation.id,
+            activeId,
           );
           imageKey = uploadResult.image_key;
 
@@ -119,52 +197,111 @@ export function useChat({
 
         await conversationService.streamQuery(
           query,
-          activeConversation.id,
+          activeId,
           (event) => {
             if (!isMountedRef.current) return;
-            if (event.type === "tool_start") {
+            if (event.type === "thinking") {
+              setThinking(true);
+              if (thinkingStartRef.current === null) thinkingStartRef.current = Date.now();
+            } else if (event.type === "thinking_delta") {
+              setThinking(true);
+              if (thinkingStartRef.current === null) thinkingStartRef.current = Date.now();
+              setThinkingText((prev) => prev + event.delta);
+            } else if (event.type === "tool_start") {
+              // Any text after a tool call belongs in a fresh bubble.
+              streamingActiveRef.current = false;
+              setThinking(false);
               const friendly =
                 TOOL_MESSAGES[event.tool] ?? `Using ${event.tool}...`;
               updateMessages((prev) =>
                 prev.concat([{ text: friendly, speaker: "tool" }]),
               );
+            } else if (event.type === "content") {
+              setThinking(false);
+              if (thinkingStartRef.current !== null && thinkingDurationMs === null) {
+                setThinkingDurationMs(Date.now() - thinkingStartRef.current);
+              }
+              if (streamingActiveRef.current) {
+                updateMessages((prev) => {
+                  const updated = [...prev];
+                  const last = updated[updated.length - 1];
+                  updated[updated.length - 1] = {
+                    ...last,
+                    text: last.text + event.delta,
+                  };
+                  return updated;
+                });
+              } else {
+                streamingActiveRef.current = true;
+                setStreaming(true);
+                updateMessages((prev) =>
+                  prev.concat([{ text: event.delta, speaker: "simba" }]),
+                );
+              }
             } else if (event.type === "response") {
-              updateMessages((prev) =>
-                prev.concat([{ text: event.message, speaker: "simba" }]),
-              );
+              // Reconcile the streamed bubble with the authoritative (persisted)
+              // text; if nothing streamed, append it as a new message.
+              if (streamingActiveRef.current) {
+                updateMessages((prev) => {
+                  const updated = [...prev];
+                  updated[updated.length - 1] = {
+                    ...updated[updated.length - 1],
+                    text: event.message,
+                  };
+                  return updated;
+                });
+                streamingActiveRef.current = false;
+              } else {
+                updateMessages((prev) =>
+                  prev.concat([{ text: event.message, speaker: "simba" }]),
+                );
+              }
             } else if (event.type === "error") {
               console.error("Stream error:", event.message);
+              if (!isMountedRef.current) return;
+              if (event.stalled) {
+                stalledQueryRef.current = query;
+                setStalled(true);
+              } else {
+                setError("Simba ran into a problem answering that.");
+              }
             }
           },
           abortController.signal,
           imageKey,
         );
-      } catch (error) {
-        if (error instanceof Error && error.name === "AbortError") {
-          console.log("Request was aborted");
+      } catch (err) {
+        if (err instanceof Error && err.name === "AbortError") {
+          // User cancelled — not an error to surface.
         } else {
-          console.error("Failed to send query:", error);
+          console.error("Failed to send query:", err);
           if (
-            error instanceof Error &&
-            error.message.includes("Session expired")
+            err instanceof Error &&
+            err.message.includes("Session expired")
           ) {
             onSessionExpired();
+          } else if (isMountedRef.current) {
+            setError("Couldn't reach Simba. Check your connection and try again.");
           }
         }
       } finally {
         if (isMountedRef.current) {
           setIsLoading(false);
-          if (createdNew) {
-            refreshConversations();
-          }
+          setStreaming(false);
+          setThinking(false);
+          // Refresh after every send so the just-used conversation floats to
+          // the top of the sidebar (sorted by last activity) and picks up the
+          // auto-generated title on the first message.
+          refreshConversations();
         }
+        streamingActiveRef.current = false;
         abortControllerRef.current = null;
       }
     },
     [
       pendingImage,
       isLoading,
-      selectedConversation,
+      conversationId,
       createConversation,
       refreshConversations,
       onSessionExpired,
@@ -172,12 +309,37 @@ export function useChat({
     ],
   );
 
+  const stopGeneration = useCallback(() => {
+    abortControllerRef.current?.abort();
+    setIsLoading(false);
+  }, []);
+
+  const clearError = useCallback(() => setError(null), []);
+
+  const retryStalled = useCallback(() => {
+    const q = stalledQueryRef.current;
+    if (!q) return;
+    setStalled(false);
+    stalledQueryRef.current = null;
+    sendMessage(q, false);
+  }, [sendMessage]);
+
   return {
     messages,
     setMessages: updateMessages,
     isLoading,
+    streaming,
+    thinking,
+    messagesLoading,
     pendingImage,
     setPendingImage,
     sendMessage,
+    stopGeneration,
+    error,
+    clearError,
+    stalled,
+    retryStalled,
+    thinkingText,
+    thinkingDurationMs,
   };
 }

raggr-frontend/src/hooks/useConversationBrowser.ts

@@ -0,0 +1,102 @@
+import { useCallback, useEffect, useRef, useState } from "react";
+import { conversationService } from "../api/conversationService";
+import type { Conversation } from "./useConversations";
+
+const PAGE_SIZE = 20;
+
+/**
+ * Data source for the dedicated /conversations page: server-side search plus
+ * "Load more" pagination. Detects whether more rows exist by asking for one
+ * extra item beyond the page size.
+ */
+export function useConversationBrowser() {
+  const [items, setItems] = useState<Conversation[]>([]);
+  const [search, setSearchValue] = useState("");
+  const [hasMore, setHasMore] = useState(false);
+  const [loading, setLoading] = useState(false);
+
+  // Guards against a slow earlier request overwriting a newer one.
+  const requestIdRef = useRef(0);
+
+  const fetchPage = useCallback(
+    async (offset: number, searchTerm: string) => {
+      const requestId = ++requestIdRef.current;
+      setLoading(true);
+      try {
+        const fetched = await conversationService.getAllConversations({
+          limit: PAGE_SIZE + 1,
+          offset,
+          search: searchTerm || undefined,
+        });
+        if (requestId !== requestIdRef.current) return;
+
+        const page = fetched
+          .slice(0, PAGE_SIZE)
+          .map((c) => ({ id: c.id, title: c.name }));
+        setHasMore(fetched.length > PAGE_SIZE);
+        setItems((prev) => (offset === 0 ? page : [...prev, ...page]));
+      } catch (err) {
+        if (requestId === requestIdRef.current) {
+          console.error("Failed to load conversations:", err);
+        }
+      } finally {
+        if (requestId === requestIdRef.current) setLoading(false);
+      }
+    },
+    [],
+  );
+
+  // Debounce search changes; reset to the first page on each new term.
+  useEffect(() => {
+    const handle = setTimeout(() => fetchPage(0, search), 250);
+    return () => clearTimeout(handle);
+  }, [search, fetchPage]);
+
+  const loadMore = useCallback(() => {
+    if (loading || !hasMore) return;
+    fetchPage(items.length, search);
+  }, [loading, hasMore, items.length, search, fetchPage]);
+
+  const renameConversation = useCallback(
+    async (id: string, title: string) => {
+      const trimmed = title.trim();
+      if (!trimmed) return;
+      const previous = items;
+      setItems((prev) =>
+        prev.map((c) => (c.id === id ? { ...c, title: trimmed } : c)),
+      );
+      try {
+        await conversationService.renameConversation(id, trimmed);
+      } catch (err) {
+        console.error("Failed to rename conversation:", err);
+        setItems(previous);
+      }
+    },
+    [items],
+  );
+
+  const deleteConversation = useCallback(
+    async (id: string) => {
+      const previous = items;
+      setItems((prev) => prev.filter((c) => c.id !== id));
+      try {
+        await conversationService.deleteConversation(id);
+      } catch (err) {
+        console.error("Failed to delete conversation:", err);
+        setItems(previous);
+      }
+    },
+    [items],
+  );
+
+  return {
+    items,
+    search,
+    setSearch: setSearchValue,
+    hasMore,
+    loading,
+    loadMore,
+    renameConversation,
+    deleteConversation,
+  };
+}

raggr-frontend/src/hooks/useConversations.ts

@@ -1,4 +1,5 @@
-import { useState, useCallback, useEffect } from "react";
+import { useState, useCallback, useEffect, useMemo } from "react";
+import { useMatch, useNavigate } from "react-router-dom";
 import { conversationService } from "../api/conversationService";
 
 export type Conversation = {
@@ -6,20 +7,22 @@ export type Conversation = {
   id: string;
 };
 
-type Message = {
-  text: string;
-  speaker: "simba" | "user" | "tool";
-  image_key?: string | null;
-};
+// The sidebar/drawer only shows the most recent conversations; the full list
+// lives on the dedicated /conversations page.
+const SIDEBAR_LIMIT = 10;
 
 export function useConversations() {
+  const navigate = useNavigate();
+  // ChatScreen now renders under a single catch-all route, so useParams no
+  // longer captures the id. Derive it from the URL directly instead.
+  const conversationId = useMatch("/c/:conversationId")?.params.conversationId;
   const [conversations, setConversations] = useState<Conversation[]>([]);
-  const [selectedConversation, setSelectedConversation] =
-    useState<Conversation | null>(null);
 
   const refreshConversations = useCallback(async () => {
     try {
-      const fetched = await conversationService.getAllConversations();
+      const fetched = await conversationService.getAllConversations({
+        limit: SIDEBAR_LIMIT,
+      });
       setConversations(fetched.map((c) => ({ id: c.id, title: c.name })));
     } catch (err) {
       console.error("Failed to load conversations:", err);
@@ -30,40 +33,69 @@ export function useConversations() {
     refreshConversations();
   }, [refreshConversations]);
 
-  const selectConversation = useCallback(
-    async (conversation: Conversation): Promise<Message[]> => {
-      setSelectedConversation(conversation);
-      try {
-        const fetched = await conversationService.getConversation(
-          conversation.id,
-        );
-        return fetched.messages.map((m) => ({
-          text: m.text,
-          speaker: m.speaker,
-          image_key: m.image_key,
-        }));
-      } catch (err) {
-        console.error("Failed to load messages:", err);
-        return [];
+  // The active conversation is derived from the URL. Fall back to a minimal
+  // object while the list is still loading (e.g. on a deep-link refresh).
+  const selectedConversation = useMemo<Conversation | null>(() => {
+    if (!conversationId) return null;
+    return (
+      conversations.find((c) => c.id === conversationId) ?? {
+        id: conversationId,
+        title: "",
       }
-    },
-    [],
-  );
+    );
+  }, [conversationId, conversations]);
 
   const createConversation = useCallback(async (): Promise<Conversation> => {
     const newConv = await conversationService.createConversation();
     const conversation = { title: newConv.name, id: newConv.id };
     setConversations((prev) => [conversation, ...prev]);
-    setSelectedConversation(conversation);
+    navigate(`/c/${conversation.id}`);
     return conversation;
-  }, []);
+  }, [navigate]);
+
+  const renameConversation = useCallback(
+    async (id: string, title: string): Promise<void> => {
+      const trimmed = title.trim();
+      if (!trimmed) return;
+      // Optimistic update, roll back on failure. selectedConversation is
+      // derived from `conversations`, so it updates automatically.
+      const previous = conversations;
+      setConversations((prev) =>
+        prev.map((c) => (c.id === id ? { ...c, title: trimmed } : c)),
+      );
+      try {
+        await conversationService.renameConversation(id, trimmed);
+      } catch (err) {
+        console.error("Failed to rename conversation:", err);
+        setConversations(previous);
+      }
+    },
+    [conversations],
+  );
+
+  const deleteConversation = useCallback(
+    async (id: string): Promise<void> => {
+      const previous = conversations;
+      const wasActive = conversationId === id;
+      setConversations((prev) => prev.filter((c) => c.id !== id));
+      // Navigating home clears the message view via the route change.
+      if (wasActive) navigate("/");
+      try {
+        await conversationService.deleteConversation(id);
+      } catch (err) {
+        console.error("Failed to delete conversation:", err);
+        setConversations(previous);
+      }
+    },
+    [conversations, conversationId, navigate],
+  );
 
   return {
     conversations,
     selectedConversation,
-    setSelectedConversation,
-    selectConversation,
     createConversation,
+    renameConversation,
+    deleteConversation,
     refreshConversations,
   };
 }

raggr-frontend/src/hooks/useScheduledMessages.ts

@@ -0,0 +1,25 @@
+import { useState, useEffect, useCallback } from "react";
+import {
+  scheduledMessageService,
+  type ScheduledMessage,
+} from "../api/scheduledMessageService";
+
+export function useScheduledMessages() {
+  const [messages, setMessages] = useState<ScheduledMessage[]>([]);
+  const [loading, setLoading] = useState(true);
+
+  const refresh = useCallback(() => {
+    setLoading(true);
+    scheduledMessageService
+      .list()
+      .then(setMessages)
+      .catch(() => {})
+      .finally(() => setLoading(false));
+  }, []);
+
+  useEffect(() => {
+    refresh();
+  }, [refresh]);
+
+  return { messages, loading, refresh };
+}

raggr-frontend/src/index.tsx

@@ -1,5 +1,6 @@
 import React from 'react';
 import ReactDOM from 'react-dom/client';
+import { BrowserRouter } from 'react-router-dom';
 import App from './App';
 
 const rootEl = document.getElementById('root');
@@ -7,7 +8,9 @@ if (rootEl) {
   const root = ReactDOM.createRoot(rootEl);
   root.render(
     <React.StrictMode>
-      <App />
+      <BrowserRouter>
+        <App />
+      </BrowserRouter>
     </React.StrictMode>,
   );
 }

raggr-frontend/yarn.lock

@@ -598,6 +598,11 @@ comma-separated-tokens@^2.0.0:
   resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz#4e89c9458acb61bc8fef19f4529973b2392839ee"
   integrity sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==
 
+cookie@^1.0.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-1.1.1.tgz#3bb9bdfc82369db9c2f69c93c9c3ceb310c88b3c"
+  integrity sha512-ei8Aos7ja0weRpFzJnEA9UHJ/7XQmqglbRwnf2ATjcB9Wq874VKH9kfjjirM6UhU2/E5fFYadylyhFldcqSidQ==
+
 core-js@~3.47.0:
   version "3.47.0"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.47.0.tgz#436ef07650e191afeb84c24481b298bd60eb4a17"
@@ -695,6 +700,11 @@ es-set-tostringtag@^2.1.0:
     has-tostringtag "^1.0.2"
     hasown "^2.0.2"
 
+escape-string-regexp@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz#4683126b500b61762f2dbebace1806e8be31b1c8"
+  integrity sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==
+
 estree-util-is-identifier-name@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/estree-util-is-identifier-name/-/estree-util-is-identifier-name-3.0.0.tgz#0b5ef4c4ff13508b34dcd01ecfa945f61fce5dbd"
@@ -1011,6 +1021,11 @@ magic-string@^0.30.21:
   dependencies:
     "@jridgewell/sourcemap-codec" "^1.5.5"
 
+markdown-table@^3.0.0:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-3.0.4.tgz#fe44d6d410ff9d6f2ea1797a3f60aa4d2b631c2a"
+  integrity sha512-wiYz4+JrLyb/DqW2hkFJxP7Vd7JuTDm77fvbM8VfEQdmSMqcImWeeRbHwZjBjIFki/VaMK2BhFi7oUUZeM5bqw==
+
 marked@^16.3.0:
   version "16.4.2"
   resolved "https://registry.yarnpkg.com/marked/-/marked-16.4.2.tgz#4959a64be6c486f0db7467ead7ce288de54290a3"
@@ -1021,6 +1036,16 @@ math-intrinsics@^1.1.0:
   resolved "https://registry.yarnpkg.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz#a0dd74be81e2aa5c2f27e65ce283605ee4e2b7f9"
   integrity sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==
 
+mdast-util-find-and-replace@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/mdast-util-find-and-replace/-/mdast-util-find-and-replace-3.0.2.tgz#70a3174c894e14df722abf43bc250cbae44b11df"
+  integrity sha512-Tmd1Vg/m3Xz43afeNxDIhWRtFZgM2VLyaf4vSTYwudTyeuTneoL3qtWMA5jeLyz/O1vDJmmV4QuScFCA2tBPwg==
+  dependencies:
+    "@types/mdast" "^4.0.0"
+    escape-string-regexp "^5.0.0"
+    unist-util-is "^6.0.0"
+    unist-util-visit-parents "^6.0.0"
+
 mdast-util-from-markdown@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-2.0.3.tgz#c95822b91aab75f18a4cbe8b2f51b873ed2cf0c7"
@@ -1039,6 +1064,71 @@ mdast-util-from-markdown@^2.0.0:
     micromark-util-types "^2.0.0"
     unist-util-stringify-position "^4.0.0"
 
+mdast-util-gfm-autolink-literal@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-2.0.1.tgz#abd557630337bd30a6d5a4bd8252e1c2dc0875d5"
+  integrity sha512-5HVP2MKaP6L+G6YaxPNjuL0BPrq9orG3TsrZ9YXbA3vDw/ACI4MEsnoDpn6ZNm7GnZgtAcONJyPhOP8tNJQavQ==
+  dependencies:
+    "@types/mdast" "^4.0.0"
+    ccount "^2.0.0"
+    devlop "^1.0.0"
+    mdast-util-find-and-replace "^3.0.0"
+    micromark-util-character "^2.0.0"
+
+mdast-util-gfm-footnote@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-gfm-footnote/-/mdast-util-gfm-footnote-2.1.0.tgz#7778e9d9ca3df7238cc2bd3fa2b1bf6a65b19403"
+  integrity sha512-sqpDWlsHn7Ac9GNZQMeUzPQSMzR6Wv0WKRNvQRg0KqHh02fpTz69Qc1QSseNX29bhz1ROIyNyxExfawVKTm1GQ==
+  dependencies:
+    "@types/mdast" "^4.0.0"
+    devlop "^1.1.0"
+    mdast-util-from-markdown "^2.0.0"
+    mdast-util-to-markdown "^2.0.0"
+    micromark-util-normalize-identifier "^2.0.0"
+
+mdast-util-gfm-strikethrough@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-2.0.0.tgz#d44ef9e8ed283ac8c1165ab0d0dfd058c2764c16"
+  integrity sha512-mKKb915TF+OC5ptj5bJ7WFRPdYtuHv0yTRxK2tJvi+BDqbkiG7h7u/9SI89nRAYcmap2xHQL9D+QG/6wSrTtXg==
+  dependencies:
+    "@types/mdast" "^4.0.0"
+    mdast-util-from-markdown "^2.0.0"
+    mdast-util-to-markdown "^2.0.0"
+
+mdast-util-gfm-table@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-gfm-table/-/mdast-util-gfm-table-2.0.0.tgz#7a435fb6223a72b0862b33afbd712b6dae878d38"
+  integrity sha512-78UEvebzz/rJIxLvE7ZtDd/vIQ0RHv+3Mh5DR96p7cS7HsBhYIICDBCu8csTNWNO6tBWfqXPWekRuj2FNOGOZg==
+  dependencies:
+    "@types/mdast" "^4.0.0"
+    devlop "^1.0.0"
+    markdown-table "^3.0.0"
+    mdast-util-from-markdown "^2.0.0"
+    mdast-util-to-markdown "^2.0.0"
+
+mdast-util-gfm-task-list-item@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-2.0.0.tgz#e68095d2f8a4303ef24094ab642e1047b991a936"
+  integrity sha512-IrtvNvjxC1o06taBAVJznEnkiHxLFTzgonUdy8hzFVeDun0uTjxxrRGVaNFqkU1wJR3RBPEfsxmU6jDWPofrTQ==
+  dependencies:
+    "@types/mdast" "^4.0.0"
+    devlop "^1.0.0"
+    mdast-util-from-markdown "^2.0.0"
+    mdast-util-to-markdown "^2.0.0"
+
+mdast-util-gfm@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-gfm/-/mdast-util-gfm-3.1.0.tgz#2cdf63b92c2a331406b0fb0db4c077c1b0331751"
+  integrity sha512-0ulfdQOM3ysHhCJ1p06l0b0VKlhU0wuQs3thxZQagjcjPrlFRqY215uZGHHJan9GEAXd9MbfPjFJz+qMkVR6zQ==
+  dependencies:
+    mdast-util-from-markdown "^2.0.0"
+    mdast-util-gfm-autolink-literal "^2.0.0"
+    mdast-util-gfm-footnote "^2.0.0"
+    mdast-util-gfm-strikethrough "^2.0.0"
+    mdast-util-gfm-table "^2.0.0"
+    mdast-util-gfm-task-list-item "^2.0.0"
+    mdast-util-to-markdown "^2.0.0"
+
 mdast-util-mdx-expression@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/mdast-util-mdx-expression/-/mdast-util-mdx-expression-2.0.1.tgz#43f0abac9adc756e2086f63822a38c8d3c3a5096"
@@ -1153,6 +1243,85 @@ micromark-core-commonmark@^2.0.0:
     micromark-util-symbol "^2.0.0"
     micromark-util-types "^2.0.0"
 
+micromark-extension-gfm-autolink-literal@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-2.1.0.tgz#6286aee9686c4462c1e3552a9d505feddceeb935"
+  integrity sha512-oOg7knzhicgQ3t4QCjCWgTmfNhvQbDDnJeVu9v81r7NltNCVmhPy1fJRX27pISafdjL+SVc4d3l48Gb6pbRypw==
+  dependencies:
+    micromark-util-character "^2.0.0"
+    micromark-util-sanitize-uri "^2.0.0"
+    micromark-util-symbol "^2.0.0"
+    micromark-util-types "^2.0.0"
+
+micromark-extension-gfm-footnote@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-footnote/-/micromark-extension-gfm-footnote-2.1.0.tgz#4dab56d4e398b9853f6fe4efac4fc9361f3e0750"
+  integrity sha512-/yPhxI1ntnDNsiHtzLKYnE3vf9JZ6cAisqVDauhp4CEHxlb4uoOTxOCJ+9s51bIB8U1N1FJ1RXOKTIlD5B/gqw==
+  dependencies:
+    devlop "^1.0.0"
+    micromark-core-commonmark "^2.0.0"
+    micromark-factory-space "^2.0.0"
+    micromark-util-character "^2.0.0"
+    micromark-util-normalize-identifier "^2.0.0"
+    micromark-util-sanitize-uri "^2.0.0"
+    micromark-util-symbol "^2.0.0"
+    micromark-util-types "^2.0.0"
+
+micromark-extension-gfm-strikethrough@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-2.1.0.tgz#86106df8b3a692b5f6a92280d3879be6be46d923"
+  integrity sha512-ADVjpOOkjz1hhkZLlBiYA9cR2Anf8F4HqZUO6e5eDcPQd0Txw5fxLzzxnEkSkfnD0wziSGiv7sYhk/ktvbf1uw==
+  dependencies:
+    devlop "^1.0.0"
+    micromark-util-chunked "^2.0.0"
+    micromark-util-classify-character "^2.0.0"
+    micromark-util-resolve-all "^2.0.0"
+    micromark-util-symbol "^2.0.0"
+    micromark-util-types "^2.0.0"
+
+micromark-extension-gfm-table@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-table/-/micromark-extension-gfm-table-2.1.1.tgz#fac70bcbf51fe65f5f44033118d39be8a9b5940b"
+  integrity sha512-t2OU/dXXioARrC6yWfJ4hqB7rct14e8f7m0cbI5hUmDyyIlwv5vEtooptH8INkbLzOatzKuVbQmAYcbWoyz6Dg==
+  dependencies:
+    devlop "^1.0.0"
+    micromark-factory-space "^2.0.0"
+    micromark-util-character "^2.0.0"
+    micromark-util-symbol "^2.0.0"
+    micromark-util-types "^2.0.0"
+
+micromark-extension-gfm-tagfilter@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-tagfilter/-/micromark-extension-gfm-tagfilter-2.0.0.tgz#f26d8a7807b5985fba13cf61465b58ca5ff7dc57"
+  integrity sha512-xHlTOmuCSotIA8TW1mDIM6X2O1SiX5P9IuDtqGonFhEK0qgRI4yeC6vMxEV2dgyr2TiD+2PQ10o+cOhdVAcwfg==
+  dependencies:
+    micromark-util-types "^2.0.0"
+
+micromark-extension-gfm-task-list-item@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-task-list-item/-/micromark-extension-gfm-task-list-item-2.1.0.tgz#bcc34d805639829990ec175c3eea12bb5b781f2c"
+  integrity sha512-qIBZhqxqI6fjLDYFTBIa4eivDMnP+OZqsNwmQ3xNLE4Cxwc+zfQEfbs6tzAo2Hjq+bh6q5F+Z8/cksrLFYWQQw==
+  dependencies:
+    devlop "^1.0.0"
+    micromark-factory-space "^2.0.0"
+    micromark-util-character "^2.0.0"
+    micromark-util-symbol "^2.0.0"
+    micromark-util-types "^2.0.0"
+
+micromark-extension-gfm@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-extension-gfm/-/micromark-extension-gfm-3.0.0.tgz#3e13376ab95dd7a5cfd0e29560dfe999657b3c5b"
+  integrity sha512-vsKArQsicm7t0z2GugkCKtZehqUm31oeGBV/KVSorWSy8ZlNAv7ytjFhvaryUiCUJYqs+NoE6AFhpQvBTM6Q4w==
+  dependencies:
+    micromark-extension-gfm-autolink-literal "^2.0.0"
+    micromark-extension-gfm-footnote "^2.0.0"
+    micromark-extension-gfm-strikethrough "^2.0.0"
+    micromark-extension-gfm-table "^2.0.0"
+    micromark-extension-gfm-tagfilter "^2.0.0"
+    micromark-extension-gfm-task-list-item "^2.0.0"
+    micromark-util-combine-extensions "^2.0.0"
+    micromark-util-types "^2.0.0"
+
 micromark-factory-destination@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/micromark-factory-destination/-/micromark-factory-destination-2.0.1.tgz#8fef8e0f7081f0474fbdd92deb50c990a0264639"
@@ -1464,6 +1633,21 @@ react-refresh@^0.18.0:
   resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.18.0.tgz#2dce97f4fe932a4d8142fa1630e475c1729c8062"
   integrity sha512-QgT5//D3jfjJb6Gsjxv0Slpj23ip+HtOpnNgnb2S5zU3CB26G/IDPGoy4RJB42wzFE46DRsstbW6tKHoKbhAxw==
 
+react-router-dom@^7.18.3:
+  version "7.18.3"
+  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-7.18.3.tgz#0688c91b4b376c8b0dcaf0a0064975d52a32e0f7"
+  integrity sha512-ytVbyBBM7vMfRCam25r0WMhSVSom909A8p+8m0/f1w853dz/xfFu6etAT2SEbVoSnI+ZoPRDqIsQXVT89gp7kg==
+  dependencies:
+    react-router "7.18.3"
+
+react-router@7.18.3:
+  version "7.18.3"
+  resolved "https://registry.yarnpkg.com/react-router/-/react-router-7.18.3.tgz#2a3257aa7c5edd5a71f878063e4c7f3fcfc4b76a"
+  integrity sha512-gyXgtdr5uACJ5b1Q4udzjVV+tb/rlHIMJKuJ0e89R4Kzgz47z/rgP0dIKxktqIEUhDHluGTPJJH/wRha7CyqsA==
+  dependencies:
+    cookie "^1.0.1"
+    set-cookie-parser "^2.6.0"
+
 react@^19.1.1:
   version "19.2.4"
   resolved "https://registry.yarnpkg.com/react/-/react-19.2.4.tgz#438e57baa19b77cb23aab516cf635cd0579ee09a"
@@ -1485,6 +1669,18 @@ readdirp@~3.6.0:
   dependencies:
     picomatch "^2.2.1"
 
+remark-gfm@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/remark-gfm/-/remark-gfm-4.0.1.tgz#33227b2a74397670d357bf05c098eaf8513f0d6b"
+  integrity sha512-1quofZ2RQ9EWdeN34S79+KExV1764+wCUGop5CPL1WGdD0ocPpu91lzPGbwWMECpEpd42kJGQwzRfyov9j4yNg==
+  dependencies:
+    "@types/mdast" "^4.0.0"
+    mdast-util-gfm "^3.0.0"
+    micromark-extension-gfm "^3.0.0"
+    remark-parse "^11.0.0"
+    remark-stringify "^11.0.0"
+    unified "^11.0.0"
+
 remark-parse@^11.0.0:
   version "11.0.0"
   resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-11.0.0.tgz#aa60743fcb37ebf6b069204eb4da304e40db45a1"
@@ -1506,6 +1702,15 @@ remark-rehype@^11.0.0:
     unified "^11.0.0"
     vfile "^6.0.0"
 
+remark-stringify@^11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-11.0.0.tgz#4c5b01dd711c269df1aaae11743eb7e2e7636fd3"
+  integrity sha512-1OSmLd3awB/t8qdoEOMazZkNsfVTeY4fTsgzcQFdXNq8ToTN4ZGwrMnlda4K6smTFKD+GRV6O48i6Z4iKgPPpw==
+  dependencies:
+    "@types/mdast" "^4.0.0"
+    mdast-util-to-markdown "^2.0.0"
+    unified "^11.0.0"
+
 safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
@@ -1521,6 +1726,11 @@ semver@^7.5.3:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.4.tgz#28464e36060e991fa7a11d0279d2d3f3b57a7e8a"
   integrity sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==
 
+set-cookie-parser@^2.6.0:
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/set-cookie-parser/-/set-cookie-parser-2.7.2.tgz#ccd08673a9ae5d2e44ea2a2de25089e67c7edf68"
+  integrity sha512-oeM1lpU/UvhTxw+g3cIfxXHyJRc/uidd3yK1P242gzHds0udQBYzs3y8j4gCCW+ZJ7ad0yctld8RYO+bdurlvw==
+
 simple-update-notifier@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz#d70b92bdab7d6d90dfd73931195a30b6e3d7cebb"

scripts/deploy.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+# Zero-downtime blue-green deploy.
+#
+# Builds the inactive color, starts it, waits for its healthcheck to pass,
+# then gracefully stops the old color. Caddy health-checks both ports
+# (8080 = blue, 8081 = green) and routes traffic to whichever is healthy,
+# so the swap is invisible to clients.
+#
+# Caveats:
+# - Migrations run on the new container's startup while the old one still
+#   serves, so they must be backward-compatible (additive changes only;
+#   destructive changes need a two-step deploy).
+# - During the brief overlap both containers run pull-only Obsidian sync
+#   against the shared ./obvault mount.
+set -euo pipefail
+
+cd "$(dirname "$0")/.."
+
+running_services=$(docker compose ps --status running --services)
+
+if echo "$running_services" | grep -qx "raggr-blue"; then
+    OLD=blue NEW=green
+elif echo "$running_services" | grep -qx "raggr-green"; then
+    OLD=green NEW=blue
+else
+    OLD="" NEW=blue
+fi
+
+echo "==> Active: ${OLD:-none} | Deploying: $NEW"
+
+echo "==> Building raggr-$NEW..."
+docker compose --profile "$NEW" build "raggr-$NEW"
+
+echo "==> Starting raggr-$NEW and waiting for healthy..."
+if ! docker compose --profile "$NEW" up -d --wait "raggr-$NEW"; then
+    echo "!! raggr-$NEW failed to become healthy${OLD:+; raggr-$OLD is still serving}" >&2
+    docker compose --profile "$NEW" logs --tail 50 "raggr-$NEW" >&2 || true
+    docker compose --profile "$NEW" stop -t 5 "raggr-$NEW" || true
+    exit 1
+fi
+
+if [ -n "$OLD" ]; then
+    echo "==> raggr-$NEW healthy; stopping raggr-$OLD (30s grace for in-flight streams)..."
+    docker compose --profile "$OLD" stop -t 30 "raggr-$OLD"
+    docker compose --profile "$OLD" rm -f "raggr-$OLD"
+fi
+
+echo "==> Deploy complete: raggr-$NEW is live"

scripts/google_auth.py

@@ -0,0 +1,62 @@
+# /// script
+# requires-python = ">=3.13"
+# dependencies = [
+#   "google-auth-oauthlib>=1.0.0",
+# ]
+# ///
+"""One-time OAuth2 setup to generate token.json for Google Calendar and Gmail.
+
+Usage:
+    uv run scripts/google_auth.py [--credentials credentials.json] [--token token.json]
+
+Requires credentials.json downloaded from Google Cloud Console
+(APIs & Services → Credentials → OAuth 2.0 Client ID → Desktop app).
+"""
+
+import argparse
+import sys
+from pathlib import Path
+
+from google_auth_oauthlib.flow import InstalledAppFlow
+
+SCOPES = [
+    "https://www.googleapis.com/auth/calendar.events",
+    "https://www.googleapis.com/auth/gmail.readonly",
+]
+
+
+def main():
+    parser = argparse.ArgumentParser(description="Authorize Google APIs for raggr")
+    parser.add_argument(
+        "--credentials",
+        default="credentials.json",
+        help="Path to OAuth2 credentials JSON from Google Cloud Console",
+    )
+    parser.add_argument(
+        "--token",
+        default="token.json",
+        help="Output path for the generated token file",
+    )
+    args = parser.parse_args()
+
+    creds_path = Path(args.credentials)
+    if not creds_path.exists():
+        print(f"Error: credentials file not found: {creds_path}")
+        print(
+            "Download it from Google Cloud Console → APIs & Services → Credentials → OAuth 2.0 Client ID"
+        )
+        sys.exit(1)
+
+    flow = InstalledAppFlow.from_client_secrets_file(str(creds_path), SCOPES)
+    creds = flow.run_local_server(port=0)
+
+    token_path = Path(args.token)
+    token_path.write_text(creds.to_json())
+    print(f"Token saved to {token_path}")
+    print(
+        f"Mount this file into Docker: - ./{token_path}:/app/config/google-token.json:ro"
+    )
+
+
+if __name__ == "__main__":
+    main()

scripts/link_imessage.py

@@ -0,0 +1,70 @@
+"""Link an iMessage phone number to an existing user account.
+
+Usage:
+  python scripts/link_imessage.py <username_or_email> <phone_number>
+  python scripts/link_imessage.py ryan +15551234567
+
+Run inside Docker:
+  docker compose exec raggr python scripts/link_imessage.py ryan +15551234567
+"""
+
+import os
+import sys
+import asyncio
+
+from dotenv import load_dotenv
+from tortoise import Tortoise
+
+from blueprints.users.models import User
+
+load_dotenv()
+
+DATABASE_URL = os.getenv("DATABASE_URL", "sqlite://database/raggr.db")
+
+
+async def link_imessage(identifier: str, phone_number: str):
+    await Tortoise.init(
+        db_url=DATABASE_URL,
+        modules={
+            "models": [
+                "blueprints.users.models",
+                "blueprints.conversation.models",
+            ]
+        },
+    )
+
+    try:
+        user = await User.filter(username=identifier).first()
+        if not user:
+            user = await User.filter(email=identifier).first()
+        if not user:
+            print(f"Error: No user found with username or email '{identifier}'")
+            return False
+
+        conflict = (
+            await User.filter(imessage_number=phone_number).exclude(id=user.id).first()
+        )
+        if conflict:
+            print(
+                f"Error: {phone_number} is already linked to user '{conflict.username}'"
+            )
+            return False
+
+        user.imessage_number = phone_number
+        await user.save()
+        print(f"Linked {phone_number} to user '{user.username}' ({user.email})")
+        return True
+
+    finally:
+        await Tortoise.close_connections()
+
+
+if __name__ == "__main__":
+    if len(sys.argv) != 3:
+        print(
+            "Usage: python scripts/link_imessage.py <username_or_email> <phone_number>"
+        )
+        sys.exit(1)
+
+    success = asyncio.run(link_imessage(sys.argv[1], sys.argv[2]))
+    sys.exit(0 if success else 1)