diff --git a/CURRENT-STATE.md b/CURRENT-STATE.md
index 3cc7329c..1c4ac7dc 100644
--- a/CURRENT-STATE.md
+++ b/CURRENT-STATE.md
@@ -2,7 +2,7 @@
 
 > **Purpose:** Quick-reference file showing exactly where the project stands.
 > **For Claude Code:** Read this first to understand what's done and what's next.
-> **Last Updated:** March 23, 2026
+> **Last Updated:** April 4, 2026
 
 ---
 
@@ -13,8 +13,8 @@
 ## What's Complete
 
 ### Core Platform
-- FastAPI project structure with 35+ API endpoints
-- PostgreSQL database with Docker, 75+ Alembic migrations
+- FastAPI project structure with 55+ API endpoints
+- PostgreSQL database with Docker, 100+ Alembic migrations
 - User authentication (JWT, register, login, refresh, logout, invite codes)
 - Refresh token rotation with JTI-based revocation
 - Trees CRUD with full-text search (FTS index)
@@ -29,7 +29,7 @@
 
 ### Frontend Core
 - React 19 + Vite + TypeScript + Tailwind CSS v4 (`@tailwindcss/vite`)
-- **Charcoal Design System** — Flat, high-contrast dark theme (Sentry/PostHog-inspired), charcoal palette with sidebar-darkest approach
+- **Charcoal Design System v6** — Flat, high-contrast dark theme (Sentry/PostHog-inspired), charcoal palette; accent color is electric blue (#60a5fa), replacing ember orange
 - **Brand fonts:** Bricolage Grotesque (headings), IBM Plex Sans (body), JetBrains Mono (code)
 - Authentication UI (login, register, email verification)
 - Tree library/browsing page with grid/list/table views
@@ -130,6 +130,36 @@
 - Enhanced PSA metrics: time entries, hours logged, push success funnel, daily trend chart
 - 13 new backend tests for coverage and flow quality endpoints
 
+### Conversational Branching (Complete)
+
+- SessionBranch, ForkPoint, SessionHandoff, SessionResolutionOutput models + migration (4 tables, 13 columns)
+- BranchManager service, BranchAwarePromptBuilder, HandoffManager service with integration tests
+- Branch API endpoints: `session_branches.py`, `session_handoffs.py`, `session_resolutions.py`
+- Integrated into `unified_chat_service.py` and AI session step creation
+- Frontend: BranchNode, ForkCard, BranchMap, BranchRevivalCard, BranchTransitionBar, HandoffModal, ResolutionOutputPanel components
+- Wired into FlowPilotSession and `useFlowPilotSession` hook
+
+### Script Library Enhancements (Complete)
+
+- ParameterizeAndSavePanel replaces SaveToLibraryDialog — accepts `script_body` and `parameters_schema` in save flow
+- "New from Script" button on ScriptLibraryPage for one-click script creation from template
+- Default tab is "All Scripts" (previously filtered to owned scripts)
+- Ownership filter state preserved across category and search changes
+- Backend: `save-to-library` endpoint accepts `script_body` + `parameters_schema`
+
+### AI Vision Support (Complete)
+
+- Image uploads (paste/drag-drop) wired into AI assistant chat via `upload_ids`
+- Server-side image resize before sending to Claude (Pillow, 1568px max, PNG→JPEG)
+- `storage_service.resize_image_for_vision()` handles vision pipeline
+- Images are NOT stored in conversation history (text-only history)
+
+### Mid-Session Status Updates (Complete)
+
+- AI assistant can generate `status_update` steps (step_type added to CHECK constraint)
+- Status update generation wired into `unified_chat_service.py`
+- Frontend renders status update cards in session view
+
 ### Search & Recall + Evidence-Rich Sessions (Complete)
 
 **Evidence:**
@@ -163,7 +193,7 @@
 - SQL wildcard escaping in tag search
 - PSA credentials encrypted at rest (Fernet)
 
-### Copilot-First Dashboard (March 2026)
+### Copilot-First Dashboard (March–April 2026)
 
 - Redesigned dashboard as FlowPilot copilot launchpad (ChatGPT-style input)
 - Chat-style input with paste images, drag-drop files, attach button, paste logs
@@ -173,9 +203,17 @@
 - Unified Command Palette (Cmd+K) — merged QuickLaunch into omnibar
 - "Solutions Library" rename (from "Step Library") site-wide
 - Maintenance flows hidden from UI for pilot (backend still supports them)
-- Landing page copy rewrite: "Resolve tickets faster. Notes write themselves."
-- Spring bounce hover animation on dashboard cards
-- Charcoal color palette: sidebar `#10121a`, page `#1a1c23`, cards `#22252e`
+- Charcoal color palette: sidebar `#0e1016`, page `#16181f`, cards `#1e2028`
+- **Landing page redesign** — scroll-driven reveal animations, live chat animation, FAQ section, improved trust signals; copy: "Resolve tickets faster. Notes write themselves."
+- **Session History redesign** — tabbed layout with Load More pagination
+- **Edit Procedure page** — layout and color system overhaul
+- **TaskLane UX** improvements in assistant chat; persistence across page reload
+- TaskLane answers persist in sessionStorage; correct behavior on all three chat paths (send, prefill, resume)
+- **Action bar consolidation** — Deduplicated actions across FlowPilot/Cockpit headers and chat toolbars; chat toolbar now only has input tools (Attach, Paste Logs, Tasks)
+- **ViewToggle redesigned** as persistent tab bar with bottom-border active indicator and ARIA attributes (FlowPilot/Cockpit switcher)
+- **Standardized action naming** across all session pages: Resolve (emerald), Update (blue), Close (rose), Pause (muted)
+- **ConcludeSessionModal copy refresh** — Forward-facing action verbs, "Close & Generate" CTA, consistent outcome labels
+- Deleted unused FlowPilotActionBar component (227 lines dead code)
 
 ### Maintenance Flows (Hidden from UI)
 
@@ -235,21 +273,22 @@
 
 ### Start Development
 ```bash
-# Start PostgreSQL (Docker Compose)
-docker compose up -d
+# Start PostgreSQL (Docker — container name resolutionflow_postgres, port 5433, DB resolutionflow)
+docker start resolutionflow_postgres
 
 # Backend (from backend/)
 source venv/bin/activate
 uvicorn app.main:app --reload
 
-# Frontend (from frontend/)
+# Frontend (from frontend/, requires Node 20)
 npm run dev
 ```
 
 ### URLs
-- Frontend: http://192.168.0.9:5173
-- Backend API: http://192.168.0.9:8000
-- API Docs: http://192.168.0.9:8000/api/docs
+- Frontend: http://46.202.92.250:5173 (or https via Traefik reverse proxy)
+- Backend API: http://46.202.92.250:8000
+- API Docs: http://46.202.92.250:8000/api/docs
+- Dev env runs on Hostinger VPS (46.202.92.250) with Traefik + HTTPS; see [DEV-ENV.md](DEV-ENV.md)
 
 ### Run Tests
 ```bash