lite stuff

backend/ee/onyx/main.py

@@ -4,6 +4,7 @@ from contextlib import asynccontextmanager
 from fastapi import FastAPI
 from httpx_oauth.clients.google import GoogleOAuth2
 
+from ee.onyx.configs.app_configs import LICENSE_ENFORCEMENT_ENABLED
 from ee.onyx.server.analytics.api import router as analytics_router
 from ee.onyx.server.auth_check import check_ee_router_auth
 from ee.onyx.server.billing.api import router as billing_router
@@ -152,9 +153,12 @@ def get_application() -> FastAPI:
     # License management
     include_router_with_global_prefix_prepended(application, license_router)
 
-    # Unified billing API - always registered in EE.
-    # Each endpoint is protected by the `current_admin_user` dependency (admin auth).
-    include_router_with_global_prefix_prepended(application, billing_router)
+    # Unified billing API - available when license system is enabled
+    # Works for both self-hosted and cloud deployments
+    # TODO(ENG-3533): Once frontend migrates to /admin/billing/*, this becomes the
+    # primary billing API and /tenants/* billing endpoints can be removed
+    if LICENSE_ENFORCEMENT_ENABLED:
+        include_router_with_global_prefix_prepended(application, billing_router)
 
     if MULTI_TENANT:
         # Tenant management

backend/onyx/server/settings/models.py

@@ -60,11 +60,9 @@ class Settings(BaseModel):
     deep_research_enabled: bool | None = None
     search_ui_enabled: bool | None = None
 
-    # Whether EE features are unlocked for use.
-    # Depends on license status: True when the user has a valid license
-    # (ACTIVE, GRACE_PERIOD, PAYMENT_REMINDER), False when there's no license
-    # or the license is expired (GATED_ACCESS).
-    # This controls UI visibility of EE features (user groups, analytics, RBAC, etc.).
+    # Enterprise features flag - set by license enforcement at runtime
+    # When LICENSE_ENFORCEMENT_ENABLED=true, this reflects license status
+    # When LICENSE_ENFORCEMENT_ENABLED=false, defaults to False
     ee_features_enabled: bool = False
 
     temperature_override_enabled: bool | None = False

backend/tests/unit/ee/onyx/server/settings/test_license_enforcement_settings.py

@@ -281,10 +281,9 @@ class TestApplyLicenseStatusToSettings:
         }
 
 
-class TestSettingsDefaults:
-    """Verify Settings model defaults for CE deployments."""
+class TestSettingsDefaultEEDisabled:
+    """Verify the Settings model defaults ee_features_enabled to False."""
 
     def test_default_ee_features_disabled(self) -> None:
-        """CE default: ee_features_enabled is False."""
         settings = Settings()
         assert settings.ee_features_enabled is False

deployment/docker_compose/install.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
-set -e
+set -euo pipefail
 
-# Expected resource requirements
+# Expected resource requirements (overridden below if --lite)
 EXPECTED_DOCKER_RAM_GB=10
 EXPECTED_DISK_GB=32
 
@@ -10,6 +10,10 @@ EXPECTED_DISK_GB=32
 SHUTDOWN_MODE=false
 DELETE_DATA_MODE=false
 INCLUDE_CRAFT=false  # Disabled by default, use --include-craft to enable
+LITE_MODE=false       # Disabled by default, use --lite to enable
+NO_PROMPT=false
+DRY_RUN=false
+VERBOSE=false
 
 while [[ $# -gt 0 ]]; do
     case $1 in
@@ -25,6 +29,22 @@ while [[ $# -gt 0 ]]; do
             INCLUDE_CRAFT=true
             shift
             ;;
+        --lite)
+            LITE_MODE=true
+            shift
+            ;;
+        --no-prompt)
+            NO_PROMPT=true
+            shift
+            ;;
+        --dry-run)
+            DRY_RUN=true
+            shift
+            ;;
+        --verbose)
+            VERBOSE=true
+            shift
+            ;;
         --help|-h)
             echo "Onyx Installation Script"
             echo ""
@@ -32,15 +52,21 @@ while [[ $# -gt 0 ]]; do
             echo ""
             echo "Options:"
             echo "  --include-craft  Enable Onyx Craft (AI-powered web app building)"
+            echo "  --lite           Deploy Onyx Lite (no Vespa, Redis, or model servers)"
             echo "  --shutdown       Stop (pause) Onyx containers"
             echo "  --delete-data    Remove all Onyx data (containers, volumes, and files)"
+            echo "  --no-prompt      Run non-interactively with defaults (for CI/automation)"
+            echo "  --dry-run        Show what would be done without making changes"
+            echo "  --verbose        Show detailed output for debugging"
             echo "  --help, -h       Show this help message"
             echo ""
             echo "Examples:"
             echo "  $0                    # Install Onyx"
+            echo "  $0 --lite             # Install Onyx Lite (minimal deployment)"
             echo "  $0 --include-craft    # Install Onyx with Craft enabled"
             echo "  $0 --shutdown         # Pause Onyx services"
             echo "  $0 --delete-data      # Completely remove Onyx and all data"
+            echo "  $0 --no-prompt        # Non-interactive install with defaults"
             exit 0
             ;;
         *)
@@ -51,8 +77,116 @@ while [[ $# -gt 0 ]]; do
     esac
 done
 
+if [[ "$VERBOSE" = true ]]; then
+    set -x
+fi
+
+if [[ "$LITE_MODE" = true ]] && [[ "$INCLUDE_CRAFT" = true ]]; then
+    echo "ERROR: --lite and --include-craft cannot be used together."
+    echo "Craft requires services (Vespa, Redis, background workers) that lite mode disables."
+    exit 1
+fi
+
+# Lite mode needs far fewer resources (no Vespa, Redis, or model servers)
+if [[ "$LITE_MODE" = true ]]; then
+    EXPECTED_DOCKER_RAM_GB=4
+    EXPECTED_DISK_GB=16
+fi
+
 INSTALL_ROOT="${INSTALL_PREFIX:-onyx_data}"
 
+LITE_COMPOSE_FILE="docker-compose.onyx-lite.yml"
+
+# Build the -f flags for docker compose. For shutdown/delete-data we auto-detect
+# whether the lite overlay was previously downloaded; for install we use --lite.
+compose_file_args() {
+    local args="-f docker-compose.yml"
+    if [[ "$LITE_MODE" = true ]] || [[ -f "${INSTALL_ROOT}/deployment/${LITE_COMPOSE_FILE}" ]]; then
+        args="$args -f ${LITE_COMPOSE_FILE}"
+    fi
+    echo "$args"
+}
+
+# --- Temp file cleanup ---
+TMPFILES=()
+cleanup_tmpfiles() {
+    local f
+    for f in "${TMPFILES[@]:-}"; do
+        rm -rf "$f" 2>/dev/null || true
+    done
+}
+trap cleanup_tmpfiles EXIT
+
+mktempfile() {
+    local f
+    f="$(mktemp)"
+    TMPFILES+=("$f")
+    echo "$f"
+}
+
+# --- Downloader detection (curl with wget fallback) ---
+DOWNLOADER=""
+detect_downloader() {
+    if command -v curl &> /dev/null; then
+        DOWNLOADER="curl"
+        return 0
+    fi
+    if command -v wget &> /dev/null; then
+        DOWNLOADER="wget"
+        return 0
+    fi
+    echo "ERROR: Neither curl nor wget found. Please install one and retry."
+    exit 1
+}
+detect_downloader
+
+download_file() {
+    local url="$1"
+    local output="$2"
+    if [[ "$DOWNLOADER" == "curl" ]]; then
+        curl -fsSL --retry 3 --retry-delay 2 --retry-connrefused -o "$output" "$url"
+    else
+        wget -q --tries=3 --timeout=20 -O "$output" "$url"
+    fi
+}
+
+# --- Interactive prompt helpers ---
+is_interactive() {
+    [[ "$NO_PROMPT" = false ]] && [[ -t 0 ]]
+}
+
+prompt_or_default() {
+    local prompt_text="$1"
+    local default_value="$2"
+    if is_interactive; then
+        read -p "$prompt_text" -r REPLY
+        if [[ -z "$REPLY" ]]; then
+            REPLY="$default_value"
+        fi
+    else
+        REPLY="$default_value"
+    fi
+}
+
+prompt_yn_or_default() {
+    local prompt_text="$1"
+    local default_value="$2"
+    if is_interactive; then
+        read -p "$prompt_text" -n 1 -r
+        echo ""
+    else
+        REPLY="$default_value"
+    fi
+}
+
+prompt_enter_or_skip() {
+    local prompt_text="$1"
+    if is_interactive; then
+        echo -e "$prompt_text"
+        read -r
+    fi
+}
+
 # Colors for output
 RED='\033[0;31m'
 GREEN='\033[0;32m'
@@ -111,7 +245,7 @@ if [ "$SHUTDOWN_MODE" = true ]; then
             fi
 
             # Stop containers (without removing them)
-            (cd "${INSTALL_ROOT}/deployment" && $COMPOSE_CMD -f docker-compose.yml stop)
+            (cd "${INSTALL_ROOT}/deployment" && $COMPOSE_CMD $(compose_file_args) stop)
             if [ $? -eq 0 ]; then
                 print_success "Onyx containers stopped (paused)"
             else
@@ -140,12 +274,17 @@ if [ "$DELETE_DATA_MODE" = true ]; then
     echo "  • All downloaded files and configurations"
     echo "  • All user data and documents"
     echo ""
-    read -p "Are you sure you want to continue? Type 'DELETE' to confirm: " -r
-    echo ""
-
-    if [ "$REPLY" != "DELETE" ]; then
-        print_info "Operation cancelled."
-        exit 0
+    if is_interactive; then
+        read -p "Are you sure you want to continue? Type 'DELETE' to confirm: " -r
+        echo ""
+        if [ "$REPLY" != "DELETE" ]; then
+            print_info "Operation cancelled."
+            exit 0
+        fi
+    else
+        print_error "Cannot confirm destructive operation in non-interactive mode."
+        print_info "Run interactively or remove the ${INSTALL_ROOT} directory manually."
+        exit 1
     fi
 
     print_info "Removing Onyx containers and volumes..."
@@ -164,7 +303,7 @@ if [ "$DELETE_DATA_MODE" = true ]; then
             fi
 
             # Stop and remove containers with volumes
-            (cd "${INSTALL_ROOT}/deployment" && $COMPOSE_CMD -f docker-compose.yml down -v)
+            (cd "${INSTALL_ROOT}/deployment" && $COMPOSE_CMD $(compose_file_args) down -v)
             if [ $? -eq 0 ]; then
                 print_success "Onyx containers and volumes removed"
             else
@@ -198,8 +337,13 @@ echo " \____/|_| |_|\__, /_/\_\ "
 echo "               __/ |      "
 echo "              |___/       "
 echo -e "${NC}"
-echo "Welcome to Onyx Installation Script"
-echo "===================================="
+if [[ "$LITE_MODE" = true ]]; then
+    echo "Welcome to Onyx Lite Installation Script"
+    echo "========================================="
+else
+    echo "Welcome to Onyx Installation Script"
+    echo "===================================="
+fi
 echo ""
 
 # User acknowledgment section
@@ -207,10 +351,14 @@ echo -e "${YELLOW}${BOLD}This script will:${NC}"
 echo "1. Download deployment files for Onyx into a new '${INSTALL_ROOT}' directory"
 echo "2. Check your system resources (Docker, memory, disk space)"
 echo "3. Guide you through deployment options (version, authentication)"
+if [[ "$LITE_MODE" = true ]]; then
+    echo ""
+    echo -e "${YELLOW}${BOLD}Lite mode:${NC} Vespa, Redis, and model servers will NOT be started."
+    echo "This gives you the core chat experience with lower resource requirements."
+fi
 echo ""
 
-# Only prompt for acknowledgment if running interactively
-if [ -t 0 ]; then
+if is_interactive; then
     echo -e "${YELLOW}${BOLD}Please acknowledge and press Enter to continue...${NC}"
     read -r
     echo ""
@@ -219,6 +367,26 @@ else
     echo ""
 fi
 
+# Detect OS (including WSL)
+IS_WSL=false
+if [[ -n "${WSL_DISTRO_NAME:-}" ]] || grep -qi microsoft /proc/version 2>/dev/null; then
+    IS_WSL=true
+fi
+
+# Dry-run: show plan and exit
+if [[ "$DRY_RUN" = true ]]; then
+    print_info "Dry run mode — showing what would happen:"
+    echo "  • Install root: ${INSTALL_ROOT}"
+    echo "  • Lite mode: ${LITE_MODE}"
+    echo "  • Include Craft: ${INCLUDE_CRAFT}"
+    echo "  • OS type: ${OSTYPE:-unknown} (WSL: ${IS_WSL})"
+    echo "  • Downloader: ${DOWNLOADER}"
+    echo "  • Min RAM: ${EXPECTED_DOCKER_RAM_GB}GB, Min disk: ${EXPECTED_DISK_GB}GB"
+    echo ""
+    print_success "Dry run complete (no changes made)"
+    exit 0
+fi
+
 # GitHub repo base URL - using main branch
 GITHUB_RAW_URL="https://raw.githubusercontent.com/onyx-dot-app/onyx/main/deployment/docker_compose"
 
@@ -260,41 +428,35 @@ else
     exit 1
 fi
 
-# Function to compare version numbers
+# Returns 0 if $1 <= $2, 1 if $1 > $2
+# Handles missing or non-numeric parts gracefully (treats them as 0)
 version_compare() {
-    # Returns 0 if $1 <= $2, 1 if $1 > $2
-    local version1=$1
-    local version2=$2
+    local version1="${1:-0.0.0}"
+    local version2="${2:-0.0.0}"
 
-    # Split versions into components
-    local v1_major=$(echo $version1 | cut -d. -f1)
-    local v1_minor=$(echo $version1 | cut -d. -f2)
-    local v1_patch=$(echo $version1 | cut -d. -f3)
+    local v1_major v1_minor v1_patch v2_major v2_minor v2_patch
+    v1_major=$(echo "$version1" | cut -d. -f1)
+    v1_minor=$(echo "$version1" | cut -d. -f2)
+    v1_patch=$(echo "$version1" | cut -d. -f3)
+    v2_major=$(echo "$version2" | cut -d. -f1)
+    v2_minor=$(echo "$version2" | cut -d. -f2)
+    v2_patch=$(echo "$version2" | cut -d. -f3)
 
-    local v2_major=$(echo $version2 | cut -d. -f1)
-    local v2_minor=$(echo $version2 | cut -d. -f2)
-    local v2_patch=$(echo $version2 | cut -d. -f3)
+    # Default non-numeric or empty parts to 0
+    [[ "$v1_major" =~ ^[0-9]+$ ]] || v1_major=0
+    [[ "$v1_minor" =~ ^[0-9]+$ ]] || v1_minor=0
+    [[ "$v1_patch" =~ ^[0-9]+$ ]] || v1_patch=0
+    [[ "$v2_major" =~ ^[0-9]+$ ]] || v2_major=0
+    [[ "$v2_minor" =~ ^[0-9]+$ ]] || v2_minor=0
+    [[ "$v2_patch" =~ ^[0-9]+$ ]] || v2_patch=0
 
-    # Compare major version
-    if [ "$v1_major" -lt "$v2_major" ]; then
-        return 0
-    elif [ "$v1_major" -gt "$v2_major" ]; then
-        return 1
-    fi
+    if [ "$v1_major" -lt "$v2_major" ]; then return 0
+    elif [ "$v1_major" -gt "$v2_major" ]; then return 1; fi
 
-    # Compare minor version
-    if [ "$v1_minor" -lt "$v2_minor" ]; then
-        return 0
-    elif [ "$v1_minor" -gt "$v2_minor" ]; then
-        return 1
-    fi
+    if [ "$v1_minor" -lt "$v2_minor" ]; then return 0
+    elif [ "$v1_minor" -gt "$v2_minor" ]; then return 1; fi
 
-    # Compare patch version
-    if [ "$v1_patch" -le "$v2_patch" ]; then
-        return 0
-    else
-        return 1
-    fi
+    [ "$v1_patch" -le "$v2_patch" ]
 }
 
 # Check Docker daemon
@@ -371,8 +533,7 @@ if [ "$RESOURCE_WARNING" = true ]; then
     echo ""
     print_warning "Onyx recommends at least ${EXPECTED_DOCKER_RAM_GB}GB RAM and ${EXPECTED_DISK_GB}GB disk space for optimal performance."
     echo ""
-    read -p "Do you want to continue anyway? (y/N): " -n 1 -r
-    echo ""
+    prompt_yn_or_default "Do you want to continue anyway? (y/N): " "y"
     if [[ ! $REPLY =~ ^[Yy]$ ]]; then
         print_info "Installation cancelled. Please allocate more resources and try again."
         exit 1
@@ -397,6 +558,9 @@ print_info "This step downloads all necessary configuration files from GitHub...
 echo ""
 print_info "Downloading the following files:"
 echo "  • docker-compose.yml - Main Docker Compose configuration"
+if [[ "$LITE_MODE" = true ]]; then
+    echo "  • ${LITE_COMPOSE_FILE} - Lite mode overlay"
+fi
 echo "  • env.template - Environment variables template"
 echo "  • nginx/app.conf.template - Nginx web server configuration"
 echo "  • nginx/run-nginx.sh - Nginx startup script"
@@ -406,7 +570,7 @@ echo ""
 # Download Docker Compose file
 COMPOSE_FILE="${INSTALL_ROOT}/deployment/docker-compose.yml"
 print_info "Downloading docker-compose.yml..."
-if curl -fsSL -o "$COMPOSE_FILE" "${GITHUB_RAW_URL}/docker-compose.yml" 2>/dev/null; then
+if download_file "${GITHUB_RAW_URL}/docker-compose.yml" "$COMPOSE_FILE" 2>/dev/null; then
     print_success "Docker Compose file downloaded successfully"
 
     # Check if Docker Compose version is older than 2.24.0 and show warning
@@ -431,8 +595,7 @@ if curl -fsSL -o "$COMPOSE_FILE" "${GITHUB_RAW_URL}/docker-compose.yml" 2>/dev/n
         echo ""
         print_warning "The installation will continue, but may fail if Docker Compose cannot parse the file."
         echo ""
-        read -p "Do you want to continue anyway? (y/N): " -n 1 -r
-        echo ""
+        prompt_yn_or_default "Do you want to continue anyway? (y/N): " "y"
         if [[ ! $REPLY =~ ^[Yy]$ ]]; then
             print_info "Installation cancelled. Please upgrade Docker Compose or manually edit the docker-compose.yml file."
             exit 1
@@ -445,10 +608,23 @@ else
     exit 1
 fi
 
+# Download lite overlay if --lite was requested
+if [[ "$LITE_MODE" = true ]]; then
+    LITE_FILE="${INSTALL_ROOT}/deployment/${LITE_COMPOSE_FILE}"
+    print_info "Downloading ${LITE_COMPOSE_FILE} (lite overlay)..."
+    if download_file "${GITHUB_RAW_URL}/${LITE_COMPOSE_FILE}" "$LITE_FILE" 2>/dev/null; then
+        print_success "Lite overlay downloaded successfully"
+    else
+        print_error "Failed to download lite overlay"
+        print_info "Please ensure you have internet connection and try again"
+        exit 1
+    fi
+fi
+
 # Download env.template file
 ENV_TEMPLATE="${INSTALL_ROOT}/deployment/env.template"
 print_info "Downloading env.template..."
-if curl -fsSL -o "$ENV_TEMPLATE" "${GITHUB_RAW_URL}/env.template" 2>/dev/null; then
+if download_file "${GITHUB_RAW_URL}/env.template" "$ENV_TEMPLATE" 2>/dev/null; then
     print_success "Environment template downloaded successfully"
 else
     print_error "Failed to download env.template"
@@ -462,7 +638,7 @@ NGINX_BASE_URL="https://raw.githubusercontent.com/onyx-dot-app/onyx/main/deploym
 # Download app.conf.template
 NGINX_CONFIG="${INSTALL_ROOT}/data/nginx/app.conf.template"
 print_info "Downloading nginx configuration template..."
-if curl -fsSL -o "$NGINX_CONFIG" "$NGINX_BASE_URL/app.conf.template" 2>/dev/null; then
+if download_file "$NGINX_BASE_URL/app.conf.template" "$NGINX_CONFIG" 2>/dev/null; then
     print_success "Nginx configuration template downloaded"
 else
     print_error "Failed to download nginx configuration template"
@@ -473,7 +649,7 @@ fi
 # Download run-nginx.sh script
 NGINX_RUN_SCRIPT="${INSTALL_ROOT}/data/nginx/run-nginx.sh"
 print_info "Downloading nginx startup script..."
-if curl -fsSL -o "$NGINX_RUN_SCRIPT" "$NGINX_BASE_URL/run-nginx.sh" 2>/dev/null; then
+if download_file "$NGINX_BASE_URL/run-nginx.sh" "$NGINX_RUN_SCRIPT" 2>/dev/null; then
     chmod +x "$NGINX_RUN_SCRIPT"
     print_success "Nginx startup script downloaded and made executable"
 else
@@ -485,7 +661,7 @@ fi
 # Download README file
 README_FILE="${INSTALL_ROOT}/README.md"
 print_info "Downloading README.md..."
-if curl -fsSL -o "$README_FILE" "${GITHUB_RAW_URL}/README.md" 2>/dev/null; then
+if download_file "${GITHUB_RAW_URL}/README.md" "$README_FILE" 2>/dev/null; then
     print_success "README.md downloaded successfully"
 else
     print_error "Failed to download README.md"
@@ -513,7 +689,7 @@ if [ -d "${INSTALL_ROOT}/deployment" ] && [ -f "${INSTALL_ROOT}/deployment/docke
 
     if [ -n "$COMPOSE_CMD" ]; then
         # Check if any containers are running
-        RUNNING_CONTAINERS=$(cd "${INSTALL_ROOT}/deployment" && $COMPOSE_CMD -f docker-compose.yml ps -q 2>/dev/null | wc -l)
+        RUNNING_CONTAINERS=$(cd "${INSTALL_ROOT}/deployment" && $COMPOSE_CMD $(compose_file_args) ps -q 2>/dev/null | wc -l)
         if [ "$RUNNING_CONTAINERS" -gt 0 ]; then
             print_error "Onyx services are currently running!"
             echo ""
@@ -534,7 +710,7 @@ if [ -f "$ENV_FILE" ]; then
     echo "• Press Enter to restart with current configuration"
     echo "• Type 'update' to update to a newer version"
     echo ""
-    read -p "Choose an option [default: restart]: " -r
+    prompt_or_default "Choose an option [default: restart]: " ""
     echo ""
 
     if [ "$REPLY" = "update" ]; then
@@ -543,22 +719,19 @@ if [ -f "$ENV_FILE" ]; then
         echo "• Press Enter for latest (recommended)"
         echo "• Type a specific tag (e.g., v0.1.0)"
         echo ""
-        # If --include-craft was passed, default to craft-latest
         if [ "$INCLUDE_CRAFT" = true ]; then
-            read -p "Enter tag [default: craft-latest]: " -r VERSION
+            prompt_or_default "Enter tag [default: craft-latest]: " "craft-latest"
+            VERSION="$REPLY"
         else
-            read -p "Enter tag [default: latest]: " -r VERSION
+            prompt_or_default "Enter tag [default: latest]: " "latest"
+            VERSION="$REPLY"
         fi
         echo ""
 
-        if [ -z "$VERSION" ]; then
-            if [ "$INCLUDE_CRAFT" = true ]; then
-                VERSION="craft-latest"
-                print_info "Selected: craft-latest (Craft enabled)"
-            else
-                VERSION="latest"
-                print_info "Selected: Latest version"
-            fi
+        if [ "$INCLUDE_CRAFT" = true ] && [ "$VERSION" = "craft-latest" ]; then
+            print_info "Selected: craft-latest (Craft enabled)"
+        elif [ "$VERSION" = "latest" ]; then
+            print_info "Selected: Latest version"
         else
             print_info "Selected: $VERSION"
         fi
@@ -595,23 +768,21 @@ else
         echo "• Press Enter for craft-latest (recommended for Craft)"
         echo "• Type a specific tag (e.g., craft-v1.0.0)"
         echo ""
-        read -p "Enter tag [default: craft-latest]: " -r VERSION
+        prompt_or_default "Enter tag [default: craft-latest]: " "craft-latest"
+        VERSION="$REPLY"
     else
         echo "• Press Enter for latest (recommended)"
         echo "• Type a specific tag (e.g., v0.1.0)"
         echo ""
-        read -p "Enter tag [default: latest]: " -r VERSION
+        prompt_or_default "Enter tag [default: latest]: " "latest"
+        VERSION="$REPLY"
     fi
     echo ""
 
-    if [ -z "$VERSION" ]; then
-        if [ "$INCLUDE_CRAFT" = true ]; then
-            VERSION="craft-latest"
-            print_info "Selected: craft-latest (Craft enabled)"
-        else
-            VERSION="latest"
-            print_info "Selected: Latest tag"
-        fi
+    if [ "$INCLUDE_CRAFT" = true ] && [ "$VERSION" = "craft-latest" ]; then
+        print_info "Selected: craft-latest (Craft enabled)"
+    elif [ "$VERSION" = "latest" ]; then
+        print_info "Selected: Latest tag"
     else
         print_info "Selected: $VERSION"
     fi
@@ -686,6 +857,13 @@ else
     echo ""
 fi
 
+# Reject craft image tags when running in lite mode
+if [[ "$LITE_MODE" = true ]] && [[ "${VERSION:-}" == craft-* ]]; then
+    print_error "Cannot use a craft image tag (${VERSION}) with --lite."
+    print_info "Craft requires services (Vespa, Redis, background workers) that lite mode disables."
+    exit 1
+fi
+
 # Function to check if a port is available
 is_port_available() {
     local port=$1
@@ -771,7 +949,7 @@ print_step "Pulling Docker images"
 print_info "This may take several minutes depending on your internet connection..."
 echo ""
 print_info "Downloading Docker images (this may take a while)..."
-(cd "${INSTALL_ROOT}/deployment" && $COMPOSE_CMD -f docker-compose.yml pull --quiet)
+(cd "${INSTALL_ROOT}/deployment" && $COMPOSE_CMD $(compose_file_args) pull --quiet)
 if [ $? -eq 0 ]; then
     print_success "Docker images downloaded successfully"
 else
@@ -785,9 +963,9 @@ print_info "Launching containers..."
 echo ""
 if [ "$USE_LATEST" = true ]; then
     print_info "Force pulling latest images and recreating containers..."
-    (cd "${INSTALL_ROOT}/deployment" && $COMPOSE_CMD -f docker-compose.yml up -d --pull always --force-recreate)
+    (cd "${INSTALL_ROOT}/deployment" && $COMPOSE_CMD $(compose_file_args) up -d --pull always --force-recreate)
 else
-    (cd "${INSTALL_ROOT}/deployment" && $COMPOSE_CMD -f docker-compose.yml up -d)
+    (cd "${INSTALL_ROOT}/deployment" && $COMPOSE_CMD $(compose_file_args) up -d)
 fi
 if [ $? -ne 0 ]; then
     print_error "Failed to start Onyx services"
@@ -809,7 +987,7 @@ echo ""
 # Check for restart loops
 print_info "Checking container health status..."
 RESTART_ISSUES=false
-CONTAINERS=$(cd "${INSTALL_ROOT}/deployment" && $COMPOSE_CMD -f docker-compose.yml ps -q 2>/dev/null)
+CONTAINERS=$(cd "${INSTALL_ROOT}/deployment" && $COMPOSE_CMD $(compose_file_args) ps -q 2>/dev/null)
 
 for CONTAINER in $CONTAINERS; do
     PROJECT_NAME="$(basename "$INSTALL_ROOT")_deployment_"
@@ -838,7 +1016,7 @@ if [ "$RESTART_ISSUES" = true ]; then
     print_error "Some containers are experiencing issues!"
     echo ""
     print_info "Please check the logs for more information:"
-    echo "  (cd \"${INSTALL_ROOT}/deployment\" && $COMPOSE_CMD -f docker-compose.yml logs)"
+    echo "  (cd \"${INSTALL_ROOT}/deployment\" && $COMPOSE_CMD $(compose_file_args) logs)"
 
     echo ""
     print_info "If the issue persists, please contact: founders@onyx.app"
@@ -857,8 +1035,12 @@ check_onyx_health() {
     echo ""
 
     while [ $attempt -le $max_attempts ]; do
-        # Check for successful HTTP responses (200, 301, 302, etc.)
-        local http_code=$(curl -s -o /dev/null -w "%{http_code}" "http://localhost:$port")
+        local http_code=""
+        if [[ "$DOWNLOADER" == "curl" ]]; then
+            http_code=$(curl -s -o /dev/null -w "%{http_code}" "http://localhost:$port" 2>/dev/null || echo "000")
+        else
+            http_code=$(wget -q --spider -S "http://localhost:$port" 2>&1 | grep "HTTP/" | tail -1 | awk '{print $2}' || echo "000")
+        fi
         if echo "$http_code" | grep -qE "^(200|301|302|303|307|308)$"; then
             return 0
         fi
@@ -914,6 +1096,18 @@ print_info "If authentication is enabled, you can create your admin account here
 echo "   • Visit http://localhost:${HOST_PORT}/auth/signup to create your admin account"
 echo "   • The first user created will automatically have admin privileges"
 echo ""
+if [[ "$LITE_MODE" = true ]]; then
+    echo ""
+    print_info "Running in Lite mode — the following services are NOT started:"
+    echo "  • Vespa (vector database)"
+    echo "  • Redis (cache)"
+    echo "  • Model servers (embedding/inference)"
+    echo "  • Background workers (Celery)"
+    echo ""
+    print_info "Connectors and RAG search are disabled. LLM chat, tools, user file"
+    print_info "uploads, Projects, Agent knowledge, and code interpreter still work."
+fi
+echo ""
 print_info "Refer to the README in the ${INSTALL_ROOT} directory for more information."
 echo ""
 print_info "For help or issues, contact: founders@onyx.app"

web/src/app/admin/demo/table-qualifier/page.tsx

@@ -0,0 +1,190 @@
+"use client";
+
+import { useState } from "react";
+import Text from "@/refresh-components/texts/Text";
+import TableQualifier from "@/refresh-components/table/TableQualifier";
+import { TableSizeProvider } from "@/refresh-components/table/TableSizeContext";
+import type { TableSize } from "@/refresh-components/table/TableSizeContext";
+import type { QualifierContentType } from "@/refresh-components/table/types";
+import { SvgCheckCircle } from "@opal/icons";
+
+// ---------------------------------------------------------------------------
+// Content type configurations
+// ---------------------------------------------------------------------------
+
+interface ContentConfig {
+  label: string;
+  content: QualifierContentType;
+  extraProps: Record<string, unknown>;
+}
+
+const CONTENT_TYPES: ContentConfig[] = [
+  {
+    label: "Simple",
+    content: "simple",
+    extraProps: {},
+  },
+  {
+    label: "Icon",
+    content: "icon",
+    extraProps: { icon: SvgCheckCircle },
+  },
+  {
+    label: "Image",
+    content: "image",
+    extraProps: {
+      imageSrc: "https://picsum.photos/36",
+      imageAlt: "Placeholder",
+    },
+  },
+  {
+    label: "Avatar Icon",
+    content: "avatar-icon",
+    extraProps: {},
+  },
+  {
+    label: "Avatar User",
+    content: "avatar-user",
+    extraProps: { initials: "AJ" },
+  },
+];
+
+// ---------------------------------------------------------------------------
+// Row of qualifier states for a single content type
+// ---------------------------------------------------------------------------
+
+interface QualifierRowProps {
+  config: ContentConfig;
+}
+
+function QualifierRow({ config }: QualifierRowProps) {
+  const [selectableSelected, setSelectableSelected] = useState(false);
+  const [permanentSelected, setPermanentSelected] = useState(true);
+
+  return (
+    <div className="space-y-2">
+      <Text mainUiAction text02>
+        {config.label}
+      </Text>
+
+      <div className="flex items-start gap-8">
+        {/* Default */}
+        <div className="flex w-20 flex-col items-center gap-2">
+          <TableQualifier
+            content={config.content}
+            selectable={false}
+            selected={false}
+            disabled={false}
+            {...config.extraProps}
+          />
+          <Text secondaryBody text04>
+            Default
+          </Text>
+        </div>
+
+        {/* Selectable (hover to reveal checkbox) */}
+        <div className="flex w-20 flex-col items-center gap-2">
+          <TableQualifier
+            content={config.content}
+            selectable={true}
+            selected={selectableSelected}
+            disabled={false}
+            onSelectChange={setSelectableSelected}
+            {...config.extraProps}
+          />
+          <Text secondaryBody text04>
+            Selectable
+          </Text>
+        </div>
+
+        {/* Selected */}
+        <div className="flex w-20 flex-col items-center gap-2">
+          <TableQualifier
+            content={config.content}
+            selectable={true}
+            selected={permanentSelected}
+            disabled={false}
+            onSelectChange={setPermanentSelected}
+            {...config.extraProps}
+          />
+          <Text secondaryBody text04>
+            Selected
+          </Text>
+        </div>
+
+        {/* Disabled (unselected) */}
+        <div className="flex w-20 flex-col items-center gap-2">
+          <TableQualifier
+            content={config.content}
+            selectable={true}
+            selected={false}
+            disabled={true}
+            {...config.extraProps}
+          />
+          <Text secondaryBody text04>
+            Disabled
+          </Text>
+        </div>
+
+        {/* Disabled (selected) */}
+        <div className="flex w-20 flex-col items-center gap-2">
+          <TableQualifier
+            content={config.content}
+            selectable={true}
+            selected={true}
+            disabled={true}
+            {...config.extraProps}
+          />
+          <Text secondaryBody text04>
+            Disabled+Sel
+          </Text>
+        </div>
+      </div>
+    </div>
+  );
+}
+
+// ---------------------------------------------------------------------------
+// Size section — all content types at a given size
+// ---------------------------------------------------------------------------
+
+interface SizeSectionProps {
+  size: TableSize;
+  title: string;
+}
+
+function SizeSection({ size, title }: SizeSectionProps) {
+  return (
+    <div className="space-y-6">
+      <Text headingH3>{title}</Text>
+      <TableSizeProvider size={size}>
+        <div className="flex flex-col gap-8">
+          {CONTENT_TYPES.map((config) => (
+            <QualifierRow key={`${size}-${config.content}`} config={config} />
+          ))}
+        </div>
+      </TableSizeProvider>
+    </div>
+  );
+}
+
+// ---------------------------------------------------------------------------
+// Page
+// ---------------------------------------------------------------------------
+
+export default function TableQualifierDemoPage() {
+  return (
+    <div className="p-6 space-y-10">
+      <div className="space-y-4">
+        <Text headingH2>TableQualifier Demo</Text>
+        <Text mainContentMuted text03>
+          All content types, sizes, and interactive states. Hover selectable
+          variants to reveal the checkbox; click to toggle.
+        </Text>
+      </div>
+
+      <SizeSection size="regular" title="Regular (36px)" />
+      <SizeSection size="small" title="Small (28px)" />
+    </div>
+  );
+}

web/src/app/admin/users2/StatsBar.tsx

@@ -1,133 +0,0 @@
-import { SvgArrowUpRight, SvgUserSync } from "@opal/icons";
-import { ContentAction } from "@opal/layouts";
-import { Button } from "@opal/components";
-import { Section } from "@/layouts/general-layouts";
-import Card from "@/refresh-components/cards/Card";
-import Separator from "@/refresh-components/Separator";
-import Text from "@/refresh-components/texts/Text";
-import Link from "next/link";
-import { ADMIN_PATHS } from "@/lib/admin-routes";
-
-// ---------------------------------------------------------------------------
-// Stats cell
-// ---------------------------------------------------------------------------
-
-interface StatCellProps {
-  value: number | null;
-  label: string;
-}
-
-function StatCell({ value, label }: StatCellProps) {
-  const display = value === null ? "—" : value.toLocaleString();
-
-  return (
-    <Section alignItems="start" gap={0.25} width="fit" padding={0.5}>
-      <Text as="p" headingH3 text05>
-        {display}
-      </Text>
-      <Text as="p" mainUiMuted text03>
-        {label}
-      </Text>
-    </Section>
-  );
-}
-
-// ---------------------------------------------------------------------------
-// SCIM card
-// ---------------------------------------------------------------------------
-
-function ScimCard() {
-  return (
-    <Card gap={0.5} padding={0.75}>
-      <ContentAction
-        icon={SvgUserSync}
-        title="SCIM Sync"
-        description="Users are synced from your identity provider."
-        sizePreset="main-ui"
-        variant="section"
-        paddingVariant="fit"
-        rightChildren={
-          <Link href={ADMIN_PATHS.SCIM}>
-            <Button prominence="tertiary" rightIcon={SvgArrowUpRight} size="sm">
-              Manage
-            </Button>
-          </Link>
-        }
-      />
-    </Card>
-  );
-}
-
-// ---------------------------------------------------------------------------
-// Stats bar — layout varies by SCIM status
-// ---------------------------------------------------------------------------
-
-interface StatsBarProps {
-  activeUsers: number | null;
-  pendingInvites: number | null;
-  requests: number | null;
-  showScim: boolean;
-}
-
-export default function StatsBar({
-  activeUsers,
-  pendingInvites,
-  requests,
-  showScim,
-}: StatsBarProps) {
-  if (showScim) {
-    // With SCIM: one card containing all 3 stats (dividers) + separate SCIM card
-    return (
-      <Section
-        flexDirection="row"
-        justifyContent="start"
-        alignItems="stretch"
-        gap={0.5}
-      >
-        <Card padding={0}>
-          <Section
-            flexDirection="row"
-            alignItems="stretch"
-            gap={0}
-            width="fit"
-            height="auto"
-          >
-            <StatCell value={activeUsers} label="active users" />
-            <Separator orientation="vertical" noPadding />
-            <StatCell value={pendingInvites} label="pending invites" />
-            {requests !== null && (
-              <>
-                <Separator orientation="vertical" noPadding />
-                <StatCell value={requests} label="requests to join" />
-              </>
-            )}
-          </Section>
-        </Card>
-
-        <ScimCard />
-      </Section>
-    );
-  }
-
-  // Without SCIM: 3 separate cards
-  return (
-    <Section
-      flexDirection="row"
-      justifyContent="start"
-      alignItems="stretch"
-      gap={0.5}
-    >
-      <Card padding={0.5}>
-        <StatCell value={activeUsers} label="active users" />
-      </Card>
-      <Card padding={0.5}>
-        <StatCell value={pendingInvites} label="pending invites" />
-      </Card>
-      {requests !== null && (
-        <Card padding={0.5}>
-          <StatCell value={requests} label="requests to join" />
-        </Card>
-      )}
-    </Section>
-  );
-}

web/src/app/admin/users2/page.tsx

@@ -1,94 +0,0 @@
-"use client";
-
-import { useState } from "react";
-
-import { SvgUser, SvgUserPlus } from "@opal/icons";
-import { Button } from "@opal/components";
-import * as SettingsLayouts from "@/layouts/settings-layouts";
-import { useScimToken } from "@/hooks/useScimToken";
-import { usePaidEnterpriseFeaturesEnabled } from "@/components/settings/usePaidEnterpriseFeaturesEnabled";
-import useSWR from "swr";
-import { errorHandlingFetcher } from "@/lib/fetcher";
-import type { InvitedUserSnapshot } from "@/lib/types";
-import { NEXT_PUBLIC_CLOUD_ENABLED } from "@/lib/constants";
-
-import StatsBar from "./StatsBar";
-
-// ---------------------------------------------------------------------------
-// Types
-// ---------------------------------------------------------------------------
-
-interface PaginatedResponse {
-  items: unknown[];
-  total_items: number;
-}
-
-// ---------------------------------------------------------------------------
-// Users page content
-// ---------------------------------------------------------------------------
-
-function UsersContent() {
-  const isEe = usePaidEnterpriseFeaturesEnabled();
-
-  const { data: scimToken } = useScimToken();
-  const showScim = isEe && !!scimToken;
-
-  // Active user count — lightweight fetch (page_size=1 to minimize payload)
-  const { data: activeData } = useSWR<PaginatedResponse>(
-    "/api/manage/users/accepted?page_num=0&page_size=1",
-    errorHandlingFetcher
-  );
-
-  const { data: invitedUsers } = useSWR<InvitedUserSnapshot[]>(
-    "/api/manage/users/invited",
-    errorHandlingFetcher
-  );
-
-  const { data: pendingUsers } = useSWR<InvitedUserSnapshot[]>(
-    NEXT_PUBLIC_CLOUD_ENABLED ? "/api/tenants/users/pending" : null,
-    errorHandlingFetcher
-  );
-
-  const activeCount = activeData?.total_items ?? null;
-  const invitedCount = invitedUsers?.length ?? null;
-  const pendingCount = pendingUsers?.length ?? null;
-
-  return (
-    <>
-      <StatsBar
-        activeUsers={activeCount}
-        pendingInvites={invitedCount}
-        requests={pendingCount}
-        showScim={showScim}
-      />
-
-      {/* Table and filters will be added in subsequent PRs */}
-    </>
-  );
-}
-
-// ---------------------------------------------------------------------------
-// Page
-// ---------------------------------------------------------------------------
-
-export default function Page() {
-  // TODO (ENG-3806): Wire up invite modal in a future PR
-  const [_showInviteModal, setShowInviteModal] = useState(false);
-
-  return (
-    <SettingsLayouts.Root width="lg">
-      <SettingsLayouts.Header
-        title="Users & Requests"
-        icon={SvgUser}
-        rightChildren={
-          <Button icon={SvgUserPlus} onClick={() => setShowInviteModal(true)}>
-            Invite Users
-          </Button>
-        }
-      />
-      <SettingsLayouts.Body>
-        <UsersContent />
-      </SettingsLayouts.Body>
-    </SettingsLayouts.Root>
-  );
-}

web/src/app/app/message/HumanMessage.tsx

@@ -1,12 +1,11 @@
 "use client";
 
-import React, { useEffect, useMemo, useRef, useState } from "react";
+import React, { useEffect, useRef, useState } from "react";
 import { FileDescriptor } from "@/app/app/interfaces";
 import "katex/dist/katex.min.css";
 import MessageSwitcher from "@/app/app/message/MessageSwitcher";
 import Text from "@/refresh-components/texts/Text";
 import { cn } from "@/lib/utils";
-import useScreenSize from "@/hooks/useScreenSize";
 import CopyIconButton from "@/refresh-components/buttons/CopyIconButton";
 import { Button } from "@opal/components";
 import { SvgEdit } from "@opal/icons";
@@ -138,7 +137,6 @@ const HumanMessage = React.memo(function HumanMessage({
   const [content, setContent] = useState(initialContent);
 
   const [isEditing, setIsEditing] = useState(false);
-  const { isMobile } = useScreenSize();
 
   // Use nodeId for switching (finding position in siblings)
   const indexInSiblings = otherMessagesCanSwitchTo?.indexOf(nodeId);
@@ -170,104 +168,119 @@ const HumanMessage = React.memo(function HumanMessage({
     return undefined;
   };
 
-  const copyEditButton = useMemo(
-    () => (
-      <div className="flex flex-row flex-shrink px-1 opacity-0 group-hover:opacity-100 transition-opacity">
-        <CopyIconButton
-          getCopyText={() => content}
-          prominence="tertiary"
-          data-testid="HumanMessage/copy-button"
-        />
-        <Button
-          icon={SvgEdit}
-          prominence="tertiary"
-          tooltip="Edit"
-          onClick={() => setIsEditing(true)}
-          data-testid="HumanMessage/edit-button"
-        />
-      </div>
-    ),
-    [content]
-  );
-
   return (
     <div
       id="onyx-human-message"
       className="group flex flex-col justify-end w-full relative"
     >
       <FileDisplay alignBubble files={files || []} />
-      {isEditing ? (
-        <MessageEditing
-          content={content}
-          onSubmitEdit={(editedContent) => {
-            // Don't update UI for edits that can't be persisted
-            if (messageId === undefined || messageId === null) {
-              setIsEditing(false);
-              return;
-            }
-            onEdit?.(editedContent, messageId);
-            setContent(editedContent);
-            setIsEditing(false);
-          }}
-          onCancelEdit={() => setIsEditing(false)}
-        />
-      ) : (
-        <div className="flex justify-end">
-          {onEdit && !isMobile && copyEditButton}
-          <div className="md:max-w-[37.5rem]">
-            <div
-              className={
-                "max-w-[30rem] md:max-w-[37.5rem] whitespace-break-spaces break-anywhere rounded-t-16 rounded-bl-16 bg-background-tint-02 py-2 px-3"
+      <div className="md:flex md:flex-wrap relative justify-end break-words">
+        {isEditing ? (
+          <MessageEditing
+            content={content}
+            onSubmitEdit={(editedContent) => {
+              // Don't update UI for edits that can't be persisted
+              if (messageId === undefined || messageId === null) {
+                setIsEditing(false);
+                return;
               }
-              onCopy={(e) => {
-                const selection = window.getSelection();
-                if (selection) {
-                  e.preventDefault();
-                  const text = selection
-                    .toString()
-                    .replace(/\n{2,}/g, "\n")
-                    .trim();
-                  e.clipboardData.setData("text/plain", text);
+              onEdit?.(editedContent, messageId);
+              setContent(editedContent);
+              setIsEditing(false);
+            }}
+            onCancelEdit={() => setIsEditing(false)}
+          />
+        ) : typeof content === "string" ? (
+          <>
+            <div className="md:max-w-[37.5rem] flex basis-[100%] md:basis-auto justify-end md:order-1">
+              <div
+                className={
+                  "max-w-[30rem] md:max-w-[37.5rem] whitespace-break-spaces break-anywhere rounded-t-16 rounded-bl-16 bg-background-tint-02 py-2 px-3"
                 }
-              }}
-            >
-              <Text
-                as="p"
-                className="inline-block align-middle"
-                mainContentBody
+                onCopy={(e) => {
+                  const selection = window.getSelection();
+                  if (selection) {
+                    e.preventDefault();
+                    const text = selection
+                      .toString()
+                      .replace(/\n{2,}/g, "\n")
+                      .trim();
+                    e.clipboardData.setData("text/plain", text);
+                  }
+                }}
               >
-                {content}
-              </Text>
+                <Text
+                  as="p"
+                  className="inline-block align-middle"
+                  mainContentBody
+                >
+                  {content}
+                </Text>
+              </div>
             </div>
-          </div>
+            {onEdit && !isEditing && (
+              <div className="absolute md:relative right-0 z-content flex flex-row p-1 opacity-0 group-hover:opacity-100 transition-opacity">
+                <CopyIconButton
+                  getCopyText={() => content}
+                  prominence="tertiary"
+                  data-testid="HumanMessage/copy-button"
+                />
+                <Button
+                  icon={SvgEdit}
+                  prominence="tertiary"
+                  tooltip="Edit"
+                  onClick={() => setIsEditing(true)}
+                  data-testid="HumanMessage/edit-button"
+                />
+              </div>
+            )}
+          </>
+        ) : (
+          <>
+            <div
+              className={cn(
+                "my-auto",
+                onEdit && !isEditing
+                  ? "opacity-0 group-hover:opacity-100 transition-opacity"
+                  : "invisible"
+              )}
+            >
+              <Button
+                icon={SvgEdit}
+                onClick={() => setIsEditing(true)}
+                prominence="tertiary"
+                tooltip="Edit"
+              />
+            </div>
+            <div className="ml-auto rounded-lg p-1">{content}</div>
+          </>
+        )}
+        <div className="md:min-w-[100%] flex justify-end order-1 mt-1">
+          {currentMessageInd !== undefined &&
+            onMessageSelection &&
+            otherMessagesCanSwitchTo &&
+            otherMessagesCanSwitchTo.length > 1 && (
+              <MessageSwitcher
+                disableForStreaming={disableSwitchingForStreaming}
+                currentPage={currentMessageInd + 1}
+                totalPages={otherMessagesCanSwitchTo.length}
+                handlePrevious={() => {
+                  stopGenerating();
+                  const prevMessage = getPreviousMessage();
+                  if (prevMessage !== undefined) {
+                    onMessageSelection(prevMessage);
+                  }
+                }}
+                handleNext={() => {
+                  stopGenerating();
+                  const nextMessage = getNextMessage();
+                  if (nextMessage !== undefined) {
+                    onMessageSelection(nextMessage);
+                  }
+                }}
+              />
+            )}
         </div>
-      )}
-      <div className="flex justify-end pt-1">
-        {!isEditing && onEdit && isMobile && copyEditButton}
-        {currentMessageInd !== undefined &&
-          onMessageSelection &&
-          otherMessagesCanSwitchTo &&
-          otherMessagesCanSwitchTo.length > 1 && (
-            <MessageSwitcher
-              disableForStreaming={disableSwitchingForStreaming}
-              currentPage={currentMessageInd + 1}
-              totalPages={otherMessagesCanSwitchTo.length}
-              handlePrevious={() => {
-                stopGenerating();
-                const prevMessage = getPreviousMessage();
-                if (prevMessage !== undefined) {
-                  onMessageSelection(prevMessage);
-                }
-              }}
-              handleNext={() => {
-                stopGenerating();
-                const nextMessage = getNextMessage();
-                if (nextMessage !== undefined) {
-                  onMessageSelection(nextMessage);
-                }
-              }}
-            />
-          )}
       </div>
     </div>
   );

web/src/app/ee/EEFeatureRedirect.tsx

@@ -1,18 +0,0 @@
-"use client";
-
-import { useEffect } from "react";
-import { useRouter } from "next/navigation";
-import { toast } from "@/hooks/useToast";
-
-export default function EEFeatureRedirect() {
-  const router = useRouter();
-
-  useEffect(() => {
-    toast.error(
-      "This feature requires a license. Please upgrade your plan to access."
-    );
-    router.replace("/app");
-  }, [router]);
-
-  return null;
-}

web/src/app/ee/layout.tsx

@@ -1,6 +1,5 @@
 import { SERVER_SIDE_ONLY__PAID_ENTERPRISE_FEATURES_ENABLED } from "@/lib/constants";
 import { fetchStandardSettingsSS } from "@/components/settings/lib";
-import EEFeatureRedirect from "@/app/ee/EEFeatureRedirect";
 
 export default async function AdminLayout({
   children,
@@ -9,7 +8,13 @@ export default async function AdminLayout({
 }) {
   // First check build-time constant (fast path)
   if (!SERVER_SIDE_ONLY__PAID_ENTERPRISE_FEATURES_ENABLED) {
-    return <EEFeatureRedirect />;
+    return (
+      <div className="flex h-screen">
+        <div className="mx-auto my-auto text-lg font-bold text-red-500">
+          This functionality is only available in the Enterprise Edition :(
+        </div>
+      </div>
+    );
   }
 
   // Then check runtime license status (for license enforcement mode)
@@ -26,7 +31,13 @@ export default async function AdminLayout({
           return children;
         }
 
-        return <EEFeatureRedirect />;
+        return (
+          <div className="flex h-screen">
+            <div className="mx-auto my-auto text-lg font-bold text-red-500">
+              This functionality requires an active Enterprise license.
+            </div>
+          </div>
+        );
       }
     }
   } catch (error) {

web/src/app/nrf/NRFPage.tsx

@@ -484,8 +484,12 @@ export default function NRFPage({ isSidePanel = false }: NRFPageProps) {
                 ref={chatInputBarRef}
                 deepResearchEnabled={deepResearchEnabled}
                 toggleDeepResearch={toggleDeepResearch}
+                toggleDocumentSidebar={() => {}}
                 filterManager={filterManager}
                 llmManager={llmManager}
+                removeDocs={() => {}}
+                retrievalEnabled={retrievalEnabled}
+                selectedDocuments={[]}
                 initialMessage={message}
                 stopGenerating={stopGenerating}
                 onSubmit={handleChatInputSubmit}

web/src/components/admin/ClientLayout.tsx

@@ -31,7 +31,6 @@ const SETTINGS_LAYOUT_PREFIXES = [
   ADMIN_PATHS.LLM_MODELS,
   ADMIN_PATHS.AGENTS,
   ADMIN_PATHS.USERS,
-  ADMIN_PATHS.USERS_V2,
   ADMIN_PATHS.TOKEN_RATE_LIMITS,
   ADMIN_PATHS.SEARCH_SETTINGS,
   ADMIN_PATHS.DOCUMENT_PROCESSING,

web/src/ee/providers/AppModeProvider.tsx

@@ -23,7 +23,8 @@ export interface AppModeProviderProps {
 export function AppModeProvider({ children }: AppModeProviderProps) {
   const isPaidEnterpriseFeaturesEnabled = usePaidEnterpriseFeaturesEnabled();
   const { user } = useUser();
-  const { isSearchModeAvailable } = useSettingsContext();
+  const settings = useSettingsContext();
+  const { isSearchModeAvailable } = settings;
 
   const persistedMode = user?.preferences?.default_app_mode;
   const [appMode, setAppModeState] = useState<AppMode>("chat");

web/src/hooks/useBillingInformation.ts

@@ -11,8 +11,21 @@ import {
  * Hook to fetch billing information from Stripe.
  *
  * Works for both cloud and self-hosted deployments:
- * - Cloud: fetches from /api/tenants/billing-information
+ * - Cloud: fetches from /api/tenants/billing-information (legacy endpoint)
  * - Self-hosted: fetches from /api/admin/billing/billing-information
+ *
+ * Returns subscription status, seats, billing period, etc.
+ *
+ * @example
+ * ```tsx
+ * const { data, isLoading, error, refresh } = useBillingInformation();
+ *
+ * if (isLoading) return <Loading />;
+ * if (error) return <Error />;
+ * if (!data || !hasActiveSubscription(data)) return <NoSubscription />;
+ *
+ * return <BillingDetails billing={data} />;
+ * ```
  */
 export function useBillingInformation() {
   const url = NEXT_PUBLIC_CLOUD_ENABLED
@@ -25,9 +38,16 @@ export function useBillingInformation() {
     revalidateOnFocus: false,
     revalidateOnReconnect: false,
     dedupingInterval: 30000,
+    // Don't auto-retry on errors (circuit breaker will block requests anyway)
     shouldRetryOnError: false,
+    // Keep previous data while revalidating to prevent UI flashing
     keepPreviousData: true,
   });
 
-  return { data, isLoading, error, refresh: mutate };
+  return {
+    data,
+    isLoading,
+    error,
+    refresh: mutate,
+  };
 }

web/src/hooks/useLicense.ts

@@ -7,9 +7,23 @@ import { LicenseStatus } from "@/lib/billing/interfaces";
 /**
  * Hook to fetch license status for self-hosted deployments.
  *
- * Skips the fetch on cloud deployments (uses tenant auth instead).
+ * Returns license information including seats, expiry, and status.
+ * Only fetches for self-hosted deployments (cloud uses tenant auth instead).
+ *
+ * @example
+ * ```tsx
+ * const { data, isLoading, error, refresh } = useLicense();
+ *
+ * if (isLoading) return <Loading />;
+ * if (error) return <Error />;
+ * if (!data?.has_license) return <NoLicense />;
+ *
+ * return <LicenseDetails license={data} />;
+ * ```
  */
 export function useLicense() {
+  // Only fetch license for self-hosted deployments
+  // Cloud deployments use tenant-based auth, not license files
   const url = NEXT_PUBLIC_CLOUD_ENABLED ? null : "/api/license";
 
   const { data, error, mutate, isLoading } = useSWR<LicenseStatus>(
@@ -24,14 +38,20 @@ export function useLicense() {
     }
   );
 
-  if (!url) {
+  // Return empty state for cloud deployments
+  if (NEXT_PUBLIC_CLOUD_ENABLED) {
     return {
-      data: undefined,
+      data: null,
       isLoading: false,
       error: undefined,
       refresh: () => Promise.resolve(undefined),
     };
   }
 
-  return { data, isLoading, error, refresh: mutate };
+  return {
+    data,
+    isLoading,
+    error,
+    refresh: mutate,
+  };
 }

web/src/interfaces/settings.ts

@@ -46,8 +46,8 @@ export interface Settings {
   // Onyx Craft (Build Mode) feature flag
   onyx_craft_enabled?: boolean;
 
-  // Whether EE features are unlocked (user has a valid enterprise license).
-  // Controls UI visibility of EE features like user groups, analytics, RBAC.
+  // Enterprise features flag - controlled by license enforcement at runtime
+  // True when user has a valid license, False for community edition
   ee_features_enabled?: boolean;
 
   // Seat usage - populated when seat limit is exceeded

web/src/layouts/general-layouts.tsx

@@ -190,17 +190,14 @@ function AttachmentItemLayout({
         alignItems="center"
         gap={1.5}
       >
-        <div className="flex-1 min-w-0">
-          <Content
-            title={title}
-            description={description}
-            sizePreset="main-ui"
-            variant="section"
-            widthVariant="full"
-          />
-        </div>
+        <Content
+          title={title}
+          description={description}
+          sizePreset="main-ui"
+          variant="section"
+        />
         {middleText && (
-          <div className="flex-1 min-w-0">
+          <div className="flex-1">
             <Truncated text03 secondaryBody>
               {middleText}
             </Truncated>

web/src/layouts/settings-layouts.tsx

@@ -86,7 +86,7 @@ function SettingsRoot({ width = "md", ...props }: SettingsRootProps) {
   return (
     <div
       id="page-wrapper-scroll-container"
-      className="w-full h-full flex flex-col items-center overflow-y-auto pt-10"
+      className="w-full h-full flex flex-col items-center overflow-y-auto"
     >
       {/* WARNING: The id="page-wrapper-scroll-container" above is used by SettingsHeader
           to detect scroll position and show/hide the scroll shadow.

web/src/lib/admin-routes.ts

@@ -58,7 +58,6 @@ export const ADMIN_PATHS = {
   DOCUMENT_PROCESSING: "/admin/configuration/document-processing",
   KNOWLEDGE_GRAPH: "/admin/kg",
   USERS: "/admin/users",
-  USERS_V2: "/admin/users2",
   API_KEYS: "/admin/api-key",
   TOKEN_RATE_LIMITS: "/admin/token-rate-limits",
   USAGE: "/admin/performance/usage",
@@ -191,11 +190,6 @@ export const ADMIN_ROUTE_CONFIG: Record<string, AdminRouteConfig> = {
     title: "Manage Users",
     sidebarLabel: "Users",
   },
-  [ADMIN_PATHS.USERS_V2]: {
-    icon: SvgUser,
-    title: "Users & Requests",
-    sidebarLabel: "Users v2",
-  },
   [ADMIN_PATHS.API_KEYS]: {
     icon: SvgKey,
     title: "API Keys",

web/src/lib/constants.ts

@@ -42,13 +42,8 @@ export const NEXT_PUBLIC_CUSTOM_REFRESH_URL =
 
 // NOTE: this should ONLY be used on the server-side. If used client side,
 // it will not be accurate (will always be false).
-// Mirrors backend logic: EE is enabled if EITHER the legacy flag OR license
-// enforcement is active. LICENSE_ENFORCEMENT_ENABLED defaults to true on the
-// backend, so we treat undefined as enabled here to match.
 export const SERVER_SIDE_ONLY__PAID_ENTERPRISE_FEATURES_ENABLED =
-  process.env.ENABLE_PAID_ENTERPRISE_EDITION_FEATURES?.toLowerCase() ===
-    "true" ||
-  process.env.LICENSE_ENFORCEMENT_ENABLED?.toLowerCase() !== "false";
+  process.env.ENABLE_PAID_ENTERPRISE_EDITION_FEATURES?.toLowerCase() === "true";
 // NOTE: since this is a `NEXT_PUBLIC_` variable, it will be set at
 // build-time
 // TODO: consider moving this to an API call so that the api_server

web/src/providers/ToastProvider.tsx

@@ -51,6 +51,16 @@ function ToastContainer() {
     }, ANIMATION_DURATION);
   }, []);
 
+  // NOTE (@raunakab):
+  //
+  // Keep this here for debugging purposes.
+  // useOnMount(() => {
+  //   toast.success("Test success toast", { duration: Infinity });
+  //   toast.error("Test error toast", { duration: Infinity });
+  //   toast.warning("Test warning toast", { duration: Infinity });
+  //   toast.info("Test info toast", { duration: Infinity });
+  // });
+
   if (visible.length === 0) return null;
 
   return (

web/src/refresh-components/table/DataTable.tsx

@@ -1,455 +0,0 @@
-"use client";
-"use no memo";
-
-import { useMemo } from "react";
-import { flexRender } from "@tanstack/react-table";
-import useDataTable, {
-  toOnyxSortDirection,
-} from "@/refresh-components/table/hooks/useDataTable";
-import useColumnWidths from "@/refresh-components/table/hooks/useColumnWidths";
-import useDraggableRows from "@/refresh-components/table/hooks/useDraggableRows";
-import Table from "@/refresh-components/table/Table";
-import TableHeader from "@/refresh-components/table/TableHeader";
-import TableBody from "@/refresh-components/table/TableBody";
-import TableRow from "@/refresh-components/table/TableRow";
-import TableHead from "@/refresh-components/table/TableHead";
-import TableCell from "@/refresh-components/table/TableCell";
-import TableQualifier from "@/refresh-components/table/TableQualifier";
-import QualifierContainer from "@/refresh-components/table/QualifierContainer";
-import ActionsContainer from "@/refresh-components/table/ActionsContainer";
-import DragOverlayRow from "@/refresh-components/table/DragOverlayRow";
-import Footer from "@/refresh-components/table/Footer";
-import { TableSizeProvider } from "@/refresh-components/table/TableSizeContext";
-import { ColumnVisibilityPopover } from "@/refresh-components/table/ColumnVisibilityPopover";
-import { SortingPopover } from "@/refresh-components/table/SortingPopover";
-import type { WidthConfig } from "@/refresh-components/table/hooks/useColumnWidths";
-import type { ColumnDef } from "@tanstack/react-table";
-import type {
-  DataTableProps,
-  DataTableFooterConfig,
-  OnyxColumnDef,
-  OnyxDataColumn,
-  OnyxQualifierColumn,
-  OnyxActionsColumn,
-} from "@/refresh-components/table/types";
-import type { TableSize } from "@/refresh-components/table/TableSizeContext";
-
-const noopGetRowId = () => "";
-
-// ---------------------------------------------------------------------------
-// Internal: resolve size-dependent widths and build TanStack columns
-// ---------------------------------------------------------------------------
-
-interface ProcessedColumns<TData> {
-  tanstackColumns: ColumnDef<TData, any>[];
-  widthConfig: WidthConfig;
-  qualifierColumn: OnyxQualifierColumn<TData> | null;
-  /** Map from column ID → OnyxColumnDef for dispatch in render loops. */
-  columnKindMap: Map<string, OnyxColumnDef<TData>>;
-}
-
-function processColumns<TData>(
-  columns: OnyxColumnDef<TData>[],
-  size: TableSize
-): ProcessedColumns<TData> {
-  const tanstackColumns: ColumnDef<TData, any>[] = [];
-  const fixedColumnIds = new Set<string>();
-  const columnWeights: Record<string, number> = {};
-  const columnMinWidths: Record<string, number> = {};
-  const columnKindMap = new Map<string, OnyxColumnDef<TData>>();
-  let qualifierColumn: OnyxQualifierColumn<TData> | null = null;
-
-  for (const col of columns) {
-    const resolvedWidth =
-      typeof col.width === "function" ? col.width(size) : col.width;
-
-    // Clone def to avoid mutating the caller's column definitions
-    const clonedDef: ColumnDef<TData, any> = {
-      ...col.def,
-      id: col.id,
-      size:
-        "fixed" in resolvedWidth ? resolvedWidth.fixed : resolvedWidth.weight,
-    };
-
-    tanstackColumns.push(clonedDef);
-
-    const id = col.id;
-    columnKindMap.set(id, col);
-
-    if ("fixed" in resolvedWidth) {
-      fixedColumnIds.add(id);
-    } else {
-      columnWeights[id] = resolvedWidth.weight;
-      columnMinWidths[id] = resolvedWidth.minWidth ?? 50;
-    }
-
-    if (col.kind === "qualifier") qualifierColumn = col;
-  }
-
-  return {
-    tanstackColumns,
-    widthConfig: { fixedColumnIds, columnWeights, columnMinWidths },
-    qualifierColumn,
-    columnKindMap,
-  };
-}
-
-// ---------------------------------------------------------------------------
-// DataTable component
-// ---------------------------------------------------------------------------
-
-/**
- * Config-driven table component that wires together `useDataTable`,
- * `useColumnWidths`, and `useDraggableRows` automatically.
- *
- * Full flexibility via the column definitions from `createTableColumns()`.
- *
- * @example
- * ```tsx
- * const tc = createTableColumns<TeamMember>();
- * const columns = [
- *   tc.qualifier({ content: "avatar-user", getInitials: (r) => r.initials }),
- *   tc.column("name", { header: "Name", weight: 23, minWidth: 120 }),
- *   tc.column("email", { header: "Email", weight: 28 }),
- *   tc.actions(),
- * ];
- *
- * <DataTable data={items} columns={columns} footer={{ mode: "selection" }} />
- * ```
- */
-export default function DataTable<TData>(props: DataTableProps<TData>) {
-  const {
-    data,
-    columns,
-    pageSize,
-    initialSorting,
-    initialColumnVisibility,
-    draggable,
-    footer,
-    size = "regular",
-    onRowClick,
-    height,
-    headerBackground,
-  } = props;
-
-  const effectivePageSize = pageSize ?? (footer ? 10 : data.length);
-
-  // 1. Process columns (memoized on columns + size)
-  const { tanstackColumns, widthConfig, qualifierColumn, columnKindMap } =
-    useMemo(() => processColumns(columns, size), [columns, size]);
-
-  // 2. Call useDataTable
-  const {
-    table,
-    currentPage,
-    totalPages,
-    totalItems,
-    setPage,
-    pageSize: resolvedPageSize,
-    selectionState,
-    selectedCount,
-    clearSelection,
-    toggleAllPageRowsSelected,
-    isAllPageRowsSelected,
-  } = useDataTable({
-    data,
-    columns: tanstackColumns,
-    pageSize: effectivePageSize,
-    initialSorting,
-    initialColumnVisibility,
-  });
-
-  // 3. Call useColumnWidths
-  const { containerRef, columnWidths, createResizeHandler } = useColumnWidths({
-    headers: table.getHeaderGroups()[0]?.headers ?? [],
-    ...widthConfig,
-  });
-
-  // 4. Call useDraggableRows (conditional)
-  const draggableReturn = useDraggableRows({
-    data,
-    getRowId: draggable?.getRowId ?? noopGetRowId,
-    enabled: !!draggable && table.getState().sorting.length === 0,
-    onReorder: draggable?.onReorder,
-  });
-
-  const hasDraggable = !!draggable;
-  const rowVariant = hasDraggable ? "table" : "list";
-
-  const isSelectable =
-    qualifierColumn != null && qualifierColumn.selectable !== false;
-
-  // ---------------------------------------------------------------------------
-  // Render
-  // ---------------------------------------------------------------------------
-
-  function renderContent() {
-    return (
-      <div>
-        <div
-          className="overflow-x-auto"
-          ref={containerRef}
-          style={{
-            ...(height != null
-              ? {
-                  maxHeight:
-                    typeof height === "number" ? `${height}px` : height,
-                  overflowY: "auto" as const,
-                }
-              : undefined),
-            ...(headerBackground
-              ? ({
-                  "--table-header-bg": headerBackground,
-                } as React.CSSProperties)
-              : undefined),
-          }}
-        >
-          <Table>
-            <TableHeader>
-              {table.getHeaderGroups().map((headerGroup) => (
-                <TableRow key={headerGroup.id}>
-                  {headerGroup.headers.map((header, headerIndex) => {
-                    const colDef = columnKindMap.get(header.id);
-
-                    // Qualifier header
-                    if (colDef?.kind === "qualifier") {
-                      if (qualifierColumn?.header === false) {
-                        return (
-                          <QualifierContainer key={header.id} type="head" />
-                        );
-                      }
-                      return (
-                        <QualifierContainer key={header.id} type="head">
-                          <TableQualifier
-                            content={
-                              qualifierColumn?.headerContentType ?? "simple"
-                            }
-                            selectable={isSelectable}
-                            selected={isSelectable && isAllPageRowsSelected}
-                            onSelectChange={
-                              isSelectable
-                                ? (checked) =>
-                                    toggleAllPageRowsSelected(checked)
-                                : undefined
-                            }
-                          />
-                        </QualifierContainer>
-                      );
-                    }
-
-                    // Actions header
-                    if (colDef?.kind === "actions") {
-                      const actionsDef = colDef as OnyxActionsColumn<TData>;
-                      return (
-                        <ActionsContainer key={header.id} type="head">
-                          {actionsDef.showColumnVisibility !== false && (
-                            <ColumnVisibilityPopover
-                              table={table}
-                              columnVisibility={
-                                table.getState().columnVisibility
-                              }
-                              size={size}
-                            />
-                          )}
-                          {actionsDef.showSorting !== false && (
-                            <SortingPopover
-                              table={table}
-                              sorting={table.getState().sorting}
-                              size={size}
-                              footerText={actionsDef.sortingFooterText}
-                            />
-                          )}
-                        </ActionsContainer>
-                      );
-                    }
-
-                    // Data / Display header
-                    const canSort = header.column.getCanSort();
-                    const sortDir = header.column.getIsSorted();
-                    const nextHeader = headerGroup.headers[headerIndex + 1];
-                    const canResize =
-                      header.column.getCanResize() &&
-                      !!nextHeader &&
-                      !widthConfig.fixedColumnIds.has(nextHeader.id);
-
-                    const dataCol =
-                      colDef?.kind === "data"
-                        ? (colDef as OnyxDataColumn<TData>)
-                        : null;
-
-                    return (
-                      <TableHead
-                        key={header.id}
-                        width={columnWidths[header.id]}
-                        sorted={
-                          canSort ? toOnyxSortDirection(sortDir) : undefined
-                        }
-                        onSort={
-                          canSort
-                            ? () => header.column.toggleSorting()
-                            : undefined
-                        }
-                        icon={dataCol?.icon}
-                        resizable={canResize}
-                        onResizeStart={
-                          canResize
-                            ? createResizeHandler(header.id, nextHeader.id)
-                            : undefined
-                        }
-                      >
-                        {flexRender(
-                          header.column.columnDef.header,
-                          header.getContext()
-                        )}
-                      </TableHead>
-                    );
-                  })}
-                </TableRow>
-              ))}
-            </TableHeader>
-
-            <TableBody
-              dndSortable={hasDraggable ? draggableReturn : undefined}
-              renderDragOverlay={
-                hasDraggable
-                  ? (activeId) => {
-                      const row = table
-                        .getRowModel()
-                        .rows.find(
-                          (r) => draggable!.getRowId(r.original) === activeId
-                        );
-                      if (!row) return null;
-                      return <DragOverlayRow row={row} variant={rowVariant} />;
-                    }
-                  : undefined
-              }
-            >
-              {table.getRowModel().rows.map((row) => {
-                const rowId = hasDraggable
-                  ? draggable!.getRowId(row.original)
-                  : undefined;
-
-                return (
-                  <TableRow
-                    key={row.id}
-                    variant={rowVariant}
-                    sortableId={rowId}
-                    selected={row.getIsSelected()}
-                    onClick={() => {
-                      if (onRowClick) {
-                        onRowClick(row.original);
-                      } else if (isSelectable) {
-                        row.toggleSelected();
-                      }
-                    }}
-                  >
-                    {row.getVisibleCells().map((cell) => {
-                      const cellColDef = columnKindMap.get(cell.column.id);
-
-                      // Qualifier cell
-                      if (cellColDef?.kind === "qualifier") {
-                        const qDef = cellColDef as OnyxQualifierColumn<TData>;
-                        return (
-                          <QualifierContainer
-                            key={cell.id}
-                            type="cell"
-                            onClick={(e) => e.stopPropagation()}
-                          >
-                            <TableQualifier
-                              content={qDef.content}
-                              initials={qDef.getInitials?.(row.original)}
-                              icon={qDef.getIcon?.(row.original)}
-                              imageSrc={qDef.getImageSrc?.(row.original)}
-                              selectable={isSelectable}
-                              selected={isSelectable && row.getIsSelected()}
-                              onSelectChange={
-                                isSelectable
-                                  ? (checked) => {
-                                      row.toggleSelected(checked);
-                                    }
-                                  : undefined
-                              }
-                            />
-                          </QualifierContainer>
-                        );
-                      }
-
-                      // Actions cell
-                      if (cellColDef?.kind === "actions") {
-                        return (
-                          <ActionsContainer key={cell.id} type="cell">
-                            {flexRender(
-                              cell.column.columnDef.cell,
-                              cell.getContext()
-                            )}
-                          </ActionsContainer>
-                        );
-                      }
-
-                      // Data / Display cell
-                      return (
-                        <TableCell key={cell.id}>
-                          {flexRender(
-                            cell.column.columnDef.cell,
-                            cell.getContext()
-                          )}
-                        </TableCell>
-                      );
-                    })}
-                  </TableRow>
-                );
-              })}
-            </TableBody>
-          </Table>
-        </div>
-
-        {footer && renderFooter(footer)}
-      </div>
-    );
-  }
-
-  function renderFooter(footerConfig: DataTableFooterConfig) {
-    if (footerConfig.mode === "selection") {
-      return (
-        <Footer
-          mode="selection"
-          multiSelect={footerConfig.multiSelect !== false}
-          selectionState={selectionState}
-          selectedCount={selectedCount}
-          onClear={footerConfig.onClear ?? clearSelection}
-          onView={footerConfig.onView}
-          pageSize={resolvedPageSize}
-          totalItems={totalItems}
-          currentPage={currentPage}
-          totalPages={totalPages}
-          onPageChange={setPage}
-        />
-      );
-    }
-
-    // Summary mode
-    const rangeStart =
-      totalItems === 0
-        ? 0
-        : !isFinite(resolvedPageSize)
-          ? 1
-          : (currentPage - 1) * resolvedPageSize + 1;
-    const rangeEnd = !isFinite(resolvedPageSize)
-      ? totalItems
-      : Math.min(currentPage * resolvedPageSize, totalItems);
-
-    return (
-      <Footer
-        mode="summary"
-        rangeStart={rangeStart}
-        rangeEnd={rangeEnd}
-        totalItems={totalItems}
-        currentPage={currentPage}
-        totalPages={totalPages}
-        onPageChange={setPage}
-      />
-    );
-  }
-
-  return <TableSizeProvider size={size}>{renderContent()}</TableSizeProvider>;
-}

web/src/refresh-components/table/README.md

@@ -1,317 +0,0 @@
-# DataTable
-
-Config-driven table built on [TanStack Table](https://tanstack.com/table). Handles column sizing (weight-based proportional distribution), drag-and-drop row reordering, pagination, row selection, column visibility, and sorting out of the box.
-
-## Quick Start
-
-```tsx
-import DataTable from "@/refresh-components/table/DataTable";
-import { createTableColumns } from "@/refresh-components/table/columns";
-
-interface Person {
-  name: string;
-  email: string;
-  role: string;
-}
-
-// Define columns at module scope (stable reference, no re-renders)
-const tc = createTableColumns<Person>();
-const columns = [
-  tc.qualifier(),
-  tc.column("name", { header: "Name", weight: 30, minWidth: 120 }),
-  tc.column("email", { header: "Email", weight: 40, minWidth: 150 }),
-  tc.column("role", { header: "Role", weight: 30, minWidth: 80 }),
-  tc.actions(),
-];
-
-function PeopleTable({ data }: { data: Person[] }) {
-  return (
-    <DataTable
-      data={data}
-      columns={columns}
-      pageSize={10}
-      footer={{ mode: "selection" }}
-    />
-  );
-}
-```
-
-## Column Builder API
-
-`createTableColumns<TData>()` returns a typed builder with four methods. Each returns an `OnyxColumnDef<TData>` that you pass to the `columns` prop.
-
-### `tc.qualifier(config?)`
-
-Leading column for avatars, icons, images, or checkboxes.
-
-| Option | Type | Default | Description |
-|---|---|---|---|
-| `content` | `"simple" \| "icon" \| "image" \| "avatar-icon" \| "avatar-user"` | `"simple"` | Body row content type |
-| `headerContentType` | same as `content` | `"simple"` | Header row content type |
-| `getInitials` | `(row: TData) => string` | - | Extract initials (for `"avatar-user"`) |
-| `getIcon` | `(row: TData) => IconFunctionComponent` | - | Extract icon (for `"icon"` / `"avatar-icon"`) |
-| `getImageSrc` | `(row: TData) => string` | - | Extract image src (for `"image"`) |
-| `selectable` | `boolean` | `true` | Show selection checkboxes |
-| `header` | `boolean` | `true` | Render qualifier content in the header |
-
-Width is fixed: 56px at `"regular"` size, 40px at `"small"`.
-
-```ts
-tc.qualifier({
-  content: "avatar-user",
-  getInitials: (row) => row.initials,
-})
-```
-
-### `tc.column(accessor, config)`
-
-Data column with sorting, resizing, and hiding. The `accessor` is a type-safe deep key into `TData`.
-
-| Option | Type | Default | Description |
-|---|---|---|---|
-| `header` | `string` | **required** | Column header label |
-| `cell` | `(value: TValue, row: TData) => ReactNode` | renders value as string | Custom cell renderer |
-| `enableSorting` | `boolean` | `true` | Allow sorting |
-| `enableResizing` | `boolean` | `true` | Allow column resize |
-| `enableHiding` | `boolean` | `true` | Allow hiding via actions popover |
-| `icon` | `(sorted: SortDirection) => IconFunctionComponent` | - | Override the sort indicator icon |
-| `weight` | `number` | `20` | Proportional width weight |
-| `minWidth` | `number` | `50` | Minimum width in pixels |
-
-```ts
-tc.column("email", {
-  header: "Email",
-  weight: 28,
-  minWidth: 150,
-  cell: (value) => <Content sizePreset="main-ui" variant="body" title={value} prominence="muted" />,
-})
-```
-
-### `tc.displayColumn(config)`
-
-Non-accessor column for custom content (e.g. computed values, action buttons per row).
-
-| Option | Type | Default | Description |
-|---|---|---|---|
-| `id` | `string` | **required** | Unique column ID |
-| `header` | `string` | - | Optional header label |
-| `cell` | `(row: TData) => ReactNode` | **required** | Cell renderer |
-| `width` | `ColumnWidth` | **required** | `{ weight, minWidth? }` or `{ fixed }` |
-| `enableHiding` | `boolean` | `true` | Allow hiding |
-
-```ts
-tc.displayColumn({
-  id: "fullName",
-  header: "Full Name",
-  cell: (row) => `${row.firstName} ${row.lastName}`,
-  width: { weight: 25, minWidth: 100 },
-})
-```
-
-### `tc.actions(config?)`
-
-Fixed-width column rendered at the trailing edge. Houses column visibility and sorting popovers in the header.
-
-| Option | Type | Default | Description |
-|---|---|---|---|
-| `showColumnVisibility` | `boolean` | `true` | Show the column visibility popover |
-| `showSorting` | `boolean` | `true` | Show the sorting popover |
-| `sortingFooterText` | `string` | - | Footer text inside the sorting popover |
-
-Width is fixed: 88px at `"regular"`, 20px at `"small"`.
-
-```ts
-tc.actions({
-  sortingFooterText: "Everyone will see agents in this order.",
-})
-```
-
-## DataTable Props
-
-`DataTableProps<TData>`:
-
-| Prop | Type | Default | Description |
-|---|---|---|---|
-| `data` | `TData[]` | **required** | Row data |
-| `columns` | `OnyxColumnDef<TData>[]` | **required** | Columns from `createTableColumns()` |
-| `pageSize` | `number` | `10` (with footer) or `data.length` (without) | Rows per page. `Infinity` disables pagination |
-| `initialSorting` | `SortingState` | `[]` | TanStack sorting state |
-| `initialColumnVisibility` | `VisibilityState` | `{}` | Map of column ID to `false` to hide initially |
-| `draggable` | `DataTableDraggableConfig<TData>` | - | Enable drag-and-drop (see below) |
-| `footer` | `DataTableFooterConfig` | - | Footer mode (see below) |
-| `size` | `"regular" \| "small"` | `"regular"` | Table density variant |
-| `onRowClick` | `(row: TData) => void` | toggles selection | Called on row click, replaces default selection toggle |
-| `height` | `number \| string` | - | Max height for scrollable body (header stays pinned). `300` or `"50vh"` |
-| `headerBackground` | `string` | - | CSS color for the sticky header (prevents content showing through) |
-
-## Footer Config
-
-The `footer` prop accepts a discriminated union on `mode`.
-
-### Selection mode
-
-For tables with selectable rows. Shows a selection message + count pagination.
-
-```ts
-footer={{
-  mode: "selection",
-  multiSelect: true,        // default true
-  onView: () => { ... },    // optional "View" button
-  onClear: () => { ... },   // optional "Clear" button (falls back to default clearSelection)
-}}
-```
-
-### Summary mode
-
-For read-only tables. Shows "Showing X~Y of Z" + list pagination.
-
-```ts
-footer={{ mode: "summary" }}
-```
-
-## Draggable Config
-
-Enable drag-and-drop row reordering. DnD is automatically disabled when column sorting is active.
-
-```ts
-<DataTable
-  data={items}
-  columns={columns}
-  draggable={{
-    getRowId: (row) => row.id,
-    onReorder: (ids, changedOrders) => {
-      // ids: new ordered array of all row IDs
-      // changedOrders: { [id]: newIndex } for rows that moved
-      setItems(ids.map((id) => items.find((r) => r.id === id)!));
-    },
-  }}
-/>
-```
-
-| Option | Type | Description |
-|---|---|---|
-| `getRowId` | `(row: TData) => string` | Extract a unique string ID from each row |
-| `onReorder` | `(ids: string[], changedOrders: Record<string, number>) => void \| Promise<void>` | Called after a successful reorder |
-
-## Sizing
-
-The `size` prop (`"regular"` or `"small"`) affects:
-
-- Qualifier column width (56px vs 40px)
-- Actions column width (88px vs 20px)
-- Footer text styles and pagination size
-- All child components via `TableSizeContext`
-
-Column widths can be responsive to size using a function:
-
-```ts
-// In types.ts, width accepts:
-width: ColumnWidth | ((size: TableSize) => ColumnWidth)
-
-// Example (this is what qualifier/actions use internally):
-width: (size) => size === "small" ? { fixed: 40 } : { fixed: 56 }
-```
-
-### Width system
-
-Data columns use **weight-based proportional distribution**. A column with `weight: 40` gets twice the space of one with `weight: 20`. When the container is narrower than the sum of `minWidth` values, columns clamp to their minimums.
-
-Fixed columns (`{ fixed: N }`) take exactly N pixels and don't participate in proportional distribution.
-
-Resizing uses **splitter semantics**: dragging a column border grows that column and shrinks its neighbor by the same amount, keeping total width constant.
-
-## Advanced Examples
-
-### Scrollable table with pinned header
-
-```tsx
-<DataTable
-  data={allRows}
-  columns={columns}
-  height={300}
-  headerBackground="var(--background-tint-00)"
-/>
-```
-
-### Hidden columns on load
-
-```tsx
-<DataTable
-  data={data}
-  columns={columns}
-  initialColumnVisibility={{ department: false, joinDate: false }}
-  footer={{ mode: "selection" }}
-/>
-```
-
-### Icon-based data column
-
-```tsx
-const STATUS_ICONS = {
-  active: SvgCheckCircle,
-  pending: SvgClock,
-  inactive: SvgAlertCircle,
-} as const;
-
-tc.column("status", {
-  header: "Status",
-  weight: 14,
-  minWidth: 80,
-  cell: (value) => (
-    <Content
-      sizePreset="main-ui"
-      variant="body"
-      icon={STATUS_ICONS[value]}
-      title={value.charAt(0).toUpperCase() + value.slice(1)}
-    />
-  ),
-})
-```
-
-### Non-selectable qualifier with icons
-
-```ts
-tc.qualifier({
-  content: "icon",
-  getIcon: (row) => row.icon,
-  selectable: false,
-  header: false,
-})
-```
-
-### Small variant in a bordered container
-
-```tsx
-<div className="border border-border-01 rounded-lg overflow-hidden">
-  <DataTable
-    data={data}
-    columns={columns}
-    size="small"
-    pageSize={10}
-    footer={{ mode: "selection" }}
-  />
-</div>
-```
-
-### Custom row click handler
-
-```tsx
-<DataTable
-  data={data}
-  columns={columns}
-  onRowClick={(row) => router.push(`/users/${row.id}`)}
-/>
-```
-
-## Source Files
-
-| File | Purpose |
-|---|---|
-| `DataTable.tsx` | Main component |
-| `columns.ts` | `createTableColumns` builder |
-| `types.ts` | All TypeScript interfaces |
-| `hooks/useDataTable.ts` | TanStack table wrapper hook |
-| `hooks/useColumnWidths.ts` | Weight-based width system |
-| `hooks/useDraggableRows.ts` | DnD hook (`@dnd-kit`) |
-| `Footer.tsx` | Selection / Summary footer modes |
-| `TableSizeContext.tsx` | Size context provider |

web/src/refresh-pages/AppPage.tsx

@@ -830,8 +830,12 @@ export default function AppPage({ firstMessage }: ChatPageProps) {
                         ref={chatInputBarRef}
                         deepResearchEnabled={deepResearchEnabled}
                         toggleDeepResearch={toggleDeepResearch}
+                        toggleDocumentSidebar={toggleDocumentSidebar}
                         filterManager={filterManager}
                         llmManager={llmManager}
+                        removeDocs={() => setSelectedDocuments([])}
+                        retrievalEnabled={retrievalEnabled}
+                        selectedDocuments={selectedDocuments}
                         initialMessage={
                           searchParams?.get(SEARCH_PARAM_NAMES.USER_PROMPT) ||
                           ""

web/src/sections/cards/FileCard.tsx

@@ -173,21 +173,19 @@ export function FileCard({
         removeFile && doneUploading ? () => removeFile(file.id) : undefined
       }
     >
-      <div className="min-w-0 max-w-[12rem]">
+      <div className="max-w-[12rem]">
         <Interactive.Container border heightVariant="fit">
-          <div className="[&_.opal-content-md-body]:min-w-0 [&_.opal-content-md-title]:break-all">
-            <AttachmentItemLayout
-              icon={isProcessing ? SimpleLoader : SvgFileText}
-              title={file.name}
-              description={
-                isProcessing
-                  ? file.status === UserFileStatus.UPLOADING
-                    ? "Uploading..."
-                    : "Processing..."
-                  : typeLabel
-              }
-            />
-          </div>
+          <AttachmentItemLayout
+            icon={isProcessing ? SimpleLoader : SvgFileText}
+            title={file.name}
+            description={
+              isProcessing
+                ? file.status === UserFileStatus.UPLOADING
+                  ? "Uploading..."
+                  : "Processing..."
+                : typeLabel
+            }
+          />
           <Spacer horizontal rem={0.5} />
         </Interactive.Container>
       </div>

web/src/sections/input/AppInputBar.tsx

@@ -16,18 +16,16 @@ import { FilterManager, LlmManager, useFederatedConnectors } from "@/lib/hooks";
 import usePromptShortcuts from "@/hooks/usePromptShortcuts";
 import useFilter from "@/hooks/useFilter";
 import useCCPairs from "@/hooks/useCCPairs";
-import { MinimalOnyxDocument } from "@/lib/search/interfaces";
+import { OnyxDocument, MinimalOnyxDocument } from "@/lib/search/interfaces";
 import { ChatState } from "@/app/app/interfaces";
 import { useForcedTools } from "@/lib/hooks/useForcedTools";
 import { useAppMode } from "@/providers/AppModeProvider";
 import useAppFocus from "@/hooks/useAppFocus";
-import { cn, isImageFile } from "@/lib/utils";
+import { getFormattedDateRangeString } from "@/lib/dateUtils";
+import { truncateString, cn, isImageFile } from "@/lib/utils";
 import { Disabled } from "@/refresh-components/Disabled";
 import { useUser } from "@/providers/UserProvider";
-import {
-  SettingsContext,
-  useVectorDbEnabled,
-} from "@/providers/SettingsProvider";
+import { SettingsContext } from "@/providers/SettingsProvider";
 import { useProjectsContext } from "@/providers/ProjectsContext";
 import { FileCard } from "@/sections/cards/FileCard";
 import {
@@ -42,6 +40,9 @@ import {
 } from "@/app/app/services/actionUtils";
 import {
   SvgArrowUp,
+  SvgCalendar,
+  SvgFiles,
+  SvgFileText,
   SvgGlobe,
   SvgHourglass,
   SvgPlus,
@@ -50,22 +51,64 @@ import {
   SvgStop,
   SvgX,
 } from "@opal/icons";
-import { Button } from "@opal/components";
+import { Button, OpenButton } from "@opal/components";
 import Popover from "@/refresh-components/Popover";
 import SimpleLoader from "@/refresh-components/loaders/SimpleLoader";
 import { useQueryController } from "@/providers/QueryControllerProvider";
 import { Section } from "@/layouts/general-layouts";
 import Spacer from "@/refresh-components/Spacer";
 
+const LINE_HEIGHT = 24;
 const MIN_INPUT_HEIGHT = 44;
 const MAX_INPUT_HEIGHT = 200;
 
+export interface SourceChipProps {
+  icon?: React.ReactNode;
+  title: string;
+  onRemove?: () => void;
+  onClick?: () => void;
+  truncateTitle?: boolean;
+}
+
+export function SourceChip({
+  icon,
+  title,
+  onRemove,
+  onClick,
+  truncateTitle = true,
+}: SourceChipProps) {
+  return (
+    <div
+      onClick={onClick ? onClick : undefined}
+      className={cn(
+        "flex-none flex items-center px-1 bg-background-neutral-01 text-xs text-text-04 border border-border-01 rounded-08 box-border gap-x-1 h-6",
+        onClick && "cursor-pointer"
+      )}
+    >
+      {icon}
+      {truncateTitle ? truncateString(title, 20) : title}
+      {onRemove && (
+        <SvgX
+          size={12}
+          className="text-text-01 ml-auto cursor-pointer"
+          onClick={(e: React.MouseEvent<SVGSVGElement>) => {
+            e.stopPropagation();
+            onRemove();
+          }}
+        />
+      )}
+    </div>
+  );
+}
+
 export interface AppInputBarHandle {
   reset: () => void;
   focus: () => void;
 }
 
 export interface AppInputBarProps {
+  removeDocs: () => void;
+  selectedDocuments: OnyxDocument[];
   initialMessage?: string;
   stopGenerating: () => void;
   onSubmit: (message: string) => void;
@@ -77,8 +120,10 @@ export interface AppInputBarProps {
   // agents
   selectedAgent: MinimalPersonaSnapshot | undefined;
 
+  toggleDocumentSidebar: () => void;
   handleFileUpload: (files: File[]) => void;
   filterManager: FilterManager;
+  retrievalEnabled: boolean;
   deepResearchEnabled: boolean;
   setPresentingDocument?: (document: MinimalOnyxDocument) => void;
   toggleDeepResearch: () => void;
@@ -92,13 +137,18 @@ export interface AppInputBarProps {
 
 const AppInputBar = React.memo(
   ({
+    retrievalEnabled,
+    removeDocs,
+    toggleDocumentSidebar,
     filterManager,
+    selectedDocuments,
     initialMessage = "",
     stopGenerating,
     onSubmit,
     chatState,
     currentSessionFileTokenCount,
     availableContextTokens,
+    // agents
     selectedAgent,
 
     handleFileUpload,
@@ -115,9 +165,6 @@ const AppInputBar = React.memo(
     // Internal message state - kept local to avoid parent re-renders on every keystroke
     const [message, setMessage] = useState(initialMessage);
     const textAreaRef = useRef<HTMLTextAreaElement>(null);
-    const textAreaWrapperRef = useRef<HTMLDivElement>(null);
-    const filesWrapperRef = useRef<HTMLDivElement>(null);
-    const filesContentRef = useRef<HTMLDivElement>(null);
     const containerRef = useRef<HTMLDivElement>(null);
     const { user } = useUser();
     const { isClassifying, classification } = useQueryController();
@@ -131,16 +178,6 @@ const AppInputBar = React.memo(
         textAreaRef.current?.focus();
       },
     }));
-
-    // Sync non-empty prop changes to internal state (e.g. NRFPage reads URL params
-    // after mount). Intentionally skips empty strings — clearing is handled via the
-    // imperative ref.reset() method, not by passing initialMessage="".
-    useEffect(() => {
-      if (initialMessage) {
-        setMessage(initialMessage);
-      }
-    }, [initialMessage]);
-
     const { appMode } = useAppMode();
     const appFocus = useAppFocus();
     const isSearchMode =
@@ -190,39 +227,46 @@ const AppInputBar = React.memo(
 
     const combinedSettings = useContext(SettingsContext);
 
-    // TODO(@raunakab): Replace this useEffect with CSS `field-sizing: content` once
-    // Firefox ships it unflagged (currently behind `layout.css.field-sizing.enabled`).
-    // Auto-resize textarea based on content (chat mode only).
-    // Reset to min-height first so scrollHeight reflects actual content size,
-    // then clamp between min and max. This handles both growing and shrinking.
-    useEffect(() => {
-      const wrapper = textAreaWrapperRef.current;
-      const textarea = textAreaRef.current;
-      if (!wrapper || !textarea) return;
+    // Track previous message to detect when lines might decrease
+    const prevMessageRef = useRef("");
 
-      wrapper.style.height = `${MIN_INPUT_HEIGHT}px`;
-      wrapper.style.height = `${Math.min(
-        Math.max(textarea.scrollHeight, MIN_INPUT_HEIGHT),
-        MAX_INPUT_HEIGHT
-      )}px`;
+    // Auto-resize textarea based on content
+    useEffect(() => {
+      if (isSearchMode) return;
+      const textarea = textAreaRef.current;
+      if (textarea) {
+        const prevLineCount = (prevMessageRef.current.match(/\n/g) || [])
+          .length;
+        const currLineCount = (message.match(/\n/g) || []).length;
+        const lineRemoved = currLineCount < prevLineCount;
+        prevMessageRef.current = message;
+
+        if (message.length === 0) {
+          textarea.style.height = `${MIN_INPUT_HEIGHT}px`;
+          return;
+        } else if (lineRemoved) {
+          const linesRemoved = prevLineCount - currLineCount;
+          textarea.style.height = `${Math.max(
+            MIN_INPUT_HEIGHT,
+            Math.min(
+              textarea.scrollHeight - LINE_HEIGHT * linesRemoved,
+              MAX_INPUT_HEIGHT
+            )
+          )}px`;
+        } else {
+          textarea.style.height = `${Math.min(
+            textarea.scrollHeight,
+            MAX_INPUT_HEIGHT
+          )}px`;
+        }
+      }
     }, [message, isSearchMode]);
 
-    // Animate attached files wrapper to its content height so CSS transitions
-    // can interpolate between concrete pixel values (0px ↔ Npx).
-    const showFiles = !isSearchMode && currentMessageFiles.length > 0;
     useEffect(() => {
-      const wrapper = filesWrapperRef.current;
-      const content = filesContentRef.current;
-      if (!wrapper || !content) return;
-
-      if (showFiles) {
-        // Measure the inner content's actual height, then add padding (p-1 = 8px total)
-        const PADDING = 8;
-        wrapper.style.height = `${content.offsetHeight + PADDING}px`;
-      } else {
-        wrapper.style.height = "0px";
+      if (initialMessage) {
+        setMessage(initialMessage);
       }
-    }, [showFiles, currentMessageFiles]);
+    }, [initialMessage]);
 
     function handlePaste(event: React.ClipboardEvent) {
       const items = event.clipboardData?.items;
@@ -250,7 +294,8 @@ const AppInputBar = React.memo(
     );
 
     const { activePromptShortcuts } = usePromptShortcuts();
-    const vectorDbEnabled = useVectorDbEnabled();
+    const vectorDbEnabled =
+      combinedSettings?.settings.vector_db_enabled !== false;
     const { ccPairs, isLoading: ccPairsLoading } = useCCPairs(vectorDbEnabled);
     const { data: federatedConnectorsData, isLoading: federatedLoading } =
       useFederatedConnectors();
@@ -367,9 +412,7 @@ const AppInputBar = React.memo(
       combinedSettings?.settings?.deep_research_enabled,
     ]);
 
-    function handleKeyDownForPromptShortcuts(
-      e: React.KeyboardEvent<HTMLTextAreaElement>
-    ) {
+    function handleKeyDown(e: React.KeyboardEvent<HTMLTextAreaElement>) {
       if (!user?.preferences?.shortcut_enabled || !showPrompts) return;
 
       if (e.key === "Enter") {
@@ -404,171 +447,6 @@ const AppInputBar = React.memo(
       }
     }
 
-    const chatControls = (
-      <div
-        {...(isSearchMode ? { inert: true } : {})}
-        className={cn(
-          "flex justify-between items-center w-full",
-          isSearchMode
-            ? "opacity-0 p-0 h-0 overflow-hidden pointer-events-none"
-            : "opacity-100 p-1 h-[2.75rem] pointer-events-auto",
-          "transition-all duration-150"
-        )}
-      >
-        {/* Bottom left controls */}
-        <div className="flex flex-row items-center">
-          {/* (+) button - always visible */}
-          <FilePickerPopover
-            onFileClick={handleFileClick}
-            onPickRecent={(file: ProjectFile) => {
-              // Check if file with same ID already exists
-              if (
-                !currentMessageFiles.some(
-                  (existingFile) => existingFile.file_id === file.file_id
-                )
-              ) {
-                setCurrentMessageFiles((prev) => [...prev, file]);
-              }
-            }}
-            onUnpickRecent={(file: ProjectFile) => {
-              setCurrentMessageFiles((prev) =>
-                prev.filter(
-                  (existingFile) => existingFile.file_id !== file.file_id
-                )
-              );
-            }}
-            handleUploadChange={handleUploadChange}
-            trigger={(open) => (
-              <Button
-                icon={SvgPlusCircle}
-                tooltip="Attach Files"
-                transient={open}
-                disabled={disabled}
-                prominence="tertiary"
-              />
-            )}
-            selectedFileIds={currentMessageFiles.map((f) => f.id)}
-          />
-
-          {/* Controls that load in when data is ready */}
-          <div
-            data-testid="actions-container"
-            className={cn(
-              "flex flex-row items-center",
-              controlsLoading && "invisible"
-            )}
-          >
-            {selectedAgent && selectedAgent.tools.length > 0 && (
-              <ActionsPopover
-                selectedAgent={selectedAgent}
-                filterManager={filterManager}
-                availableSources={memoizedAvailableSources}
-                disabled={disabled}
-              />
-            )}
-            {onToggleTabReading ? (
-              <Button
-                icon={SvgGlobe}
-                onClick={onToggleTabReading}
-                variant="select"
-                selected={tabReadingEnabled}
-                foldable={!tabReadingEnabled}
-                disabled={disabled}
-              >
-                {tabReadingEnabled
-                  ? currentTabUrl
-                    ? (() => {
-                        try {
-                          return new URL(currentTabUrl).hostname;
-                        } catch {
-                          return currentTabUrl;
-                        }
-                      })()
-                    : "Reading tab..."
-                  : "Read this tab"}
-              </Button>
-            ) : (
-              showDeepResearch && (
-                <Button
-                  icon={SvgHourglass}
-                  onClick={toggleDeepResearch}
-                  variant="select"
-                  selected={deepResearchEnabled}
-                  foldable={!deepResearchEnabled}
-                  disabled={disabled}
-                >
-                  Deep Research
-                </Button>
-              )
-            )}
-
-            {selectedAgent &&
-              forcedToolIds.length > 0 &&
-              forcedToolIds.map((toolId) => {
-                const tool = selectedAgent.tools.find(
-                  (tool) => tool.id === toolId
-                );
-                if (!tool) {
-                  return null;
-                }
-                return (
-                  <Button
-                    key={toolId}
-                    icon={getIconForAction(tool)}
-                    onClick={() => {
-                      setForcedToolIds(
-                        forcedToolIds.filter((id) => id !== toolId)
-                      );
-                    }}
-                    variant="select"
-                    selected
-                    disabled={disabled}
-                  >
-                    {tool.display_name}
-                  </Button>
-                );
-              })}
-          </div>
-        </div>
-
-        {/* Bottom right controls */}
-        <div className="flex flex-row items-center gap-1">
-          <div
-            data-testid="AppInputBar/llm-popover-trigger"
-            className={cn(controlsLoading && "invisible")}
-          >
-            <LLMPopover
-              llmManager={llmManager}
-              requiresImageInput={hasImageFiles}
-              disabled={disabled}
-            />
-          </div>
-          <Button
-            id="onyx-chat-input-send-button"
-            icon={
-              isClassifying
-                ? SimpleLoader
-                : chatState === "input"
-                  ? SvgArrowUp
-                  : SvgStop
-            }
-            disabled={
-              (chatState === "input" && !message) ||
-              hasUploadingFiles ||
-              isClassifying
-            }
-            onClick={() => {
-              if (chatState == "streaming") {
-                stopGenerating();
-              } else if (message) {
-                onSubmit(message);
-              }
-            }}
-          />
-        </div>
-      </div>
-    );
-
     return (
       <Disabled disabled={disabled} allowClick>
         <div
@@ -589,17 +467,8 @@ const AppInputBar = React.memo(
           )}
         >
           {/* Attached Files */}
-          <div
-            ref={filesWrapperRef}
-            {...(!showFiles ? { inert: true } : {})}
-            className={cn(
-              "transition-all duration-150",
-              showFiles
-                ? "opacity-100 p-1"
-                : "opacity-0 p-0 overflow-hidden pointer-events-none"
-            )}
-          >
-            <div ref={filesContentRef} className="flex flex-wrap gap-1">
+          {currentMessageFiles.length > 0 && (
+            <div className="p-2 rounded-t-16 flex flex-wrap gap-1">
               {currentMessageFiles.map((file) => (
                 <FileCard
                   key={file.id}
@@ -611,61 +480,76 @@ const AppInputBar = React.memo(
                 />
               ))}
             </div>
-          </div>
+          )}
 
-          <div className="flex flex-row items-center w-full">
+          {/* Input area */}
+          <div
+            className={cn(
+              "flex flex-row items-center w-full",
+              isSearchMode && "p-1"
+            )}
+          >
             <Popover
               open={user?.preferences?.shortcut_enabled && showPrompts}
               onOpenChange={setShowPrompts}
             >
               <Popover.Anchor asChild>
-                <div
-                  ref={textAreaWrapperRef}
-                  className="px-3 py-2 flex-1 flex h-[2.75rem]"
-                >
-                  <textarea
-                    id="onyx-chat-input-textarea"
-                    role="textarea"
-                    ref={textAreaRef}
-                    onPaste={handlePaste}
-                    onKeyDownCapture={handleKeyDownForPromptShortcuts}
-                    onChange={handleInputChange}
-                    className={cn(
-                      "p-[2px] w-full h-full outline-none bg-transparent resize-none placeholder:text-text-03 whitespace-pre-wrap break-words",
-                      "overflow-y-auto"
-                    )}
-                    autoFocus
-                    rows={1}
-                    style={{ scrollbarWidth: "thin" }}
-                    aria-multiline={true}
-                    placeholder={
-                      isSearchMode
-                        ? "Search connected sources"
-                        : "How can I help you today?"
-                    }
-                    value={message}
-                    onKeyDown={(event) => {
+                <textarea
+                  onPaste={handlePaste}
+                  onKeyDownCapture={handleKeyDown}
+                  onChange={handleInputChange}
+                  ref={textAreaRef}
+                  id="onyx-chat-input-textarea"
+                  className={cn(
+                    "w-full",
+                    "outline-none",
+                    "bg-transparent",
+                    "resize-none",
+                    "placeholder:text-text-03",
+                    "whitespace-pre-wrap",
+                    "break-word",
+                    "overscroll-contain",
+                    "px-3",
+                    isSearchMode
+                      ? "h-[40px] py-2.5 overflow-hidden"
+                      : [
+                          "h-[44px]", // Fixed initial height to prevent flash - useEffect will adjust as needed
+                          "overflow-y-auto",
+                          "pb-2",
+                          "pt-3",
+                        ]
+                  )}
+                  autoFocus
+                  style={{ scrollbarWidth: "thin" }}
+                  role="textarea"
+                  aria-multiline
+                  placeholder={
+                    isSearchMode
+                      ? "Search connected sources"
+                      : "How can I help you today"
+                  }
+                  value={message}
+                  onKeyDown={(event) => {
+                    if (
+                      event.key === "Enter" &&
+                      !showPrompts &&
+                      !event.shiftKey &&
+                      !(event.nativeEvent as any).isComposing
+                    ) {
+                      event.preventDefault();
                       if (
-                        event.key === "Enter" &&
-                        !showPrompts &&
-                        !event.shiftKey &&
-                        !(event.nativeEvent as any).isComposing
+                        message &&
+                        !disabled &&
+                        !isClassifying &&
+                        !hasUploadingFiles
                       ) {
-                        event.preventDefault();
-                        if (
-                          message &&
-                          !disabled &&
-                          !isClassifying &&
-                          !hasUploadingFiles
-                        ) {
-                          onSubmit(message);
-                        }
+                        onSubmit(message);
                       }
-                    }}
-                    suppressContentEditableWarning={true}
-                    disabled={disabled}
-                  />
-                </div>
+                    }
+                  }}
+                  suppressContentEditableWarning={true}
+                  disabled={disabled}
+                />
               </Popover.Anchor>
 
               <Popover.Content
@@ -732,7 +616,214 @@ const AppInputBar = React.memo(
             )}
           </div>
 
-          {chatControls}
+          {/* Source chips */}
+          {(selectedDocuments.length > 0 ||
+            filterManager.timeRange ||
+            filterManager.selectedDocumentSets.length > 0) && (
+            <div className="flex gap-x-.5 px-2">
+              <div className="flex gap-x-1 px-2 overflow-visible overflow-x-scroll items-end miniscroll">
+                {filterManager.timeRange && (
+                  <SourceChip
+                    truncateTitle={false}
+                    key="time-range"
+                    icon={<SvgCalendar size={12} />}
+                    title={`${getFormattedDateRangeString(
+                      filterManager.timeRange.from,
+                      filterManager.timeRange.to
+                    )}`}
+                    onRemove={() => {
+                      filterManager.setTimeRange(null);
+                    }}
+                  />
+                )}
+                {filterManager.selectedDocumentSets.length > 0 &&
+                  filterManager.selectedDocumentSets.map((docSet, index) => (
+                    <SourceChip
+                      key={`doc-set-${index}`}
+                      icon={<SvgFiles size={16} />}
+                      title={docSet}
+                      onRemove={() => {
+                        filterManager.setSelectedDocumentSets(
+                          filterManager.selectedDocumentSets.filter(
+                            (ds) => ds !== docSet
+                          )
+                        );
+                      }}
+                    />
+                  ))}
+                {selectedDocuments.length > 0 && (
+                  <SourceChip
+                    key="selected-documents"
+                    onClick={() => {
+                      toggleDocumentSidebar();
+                    }}
+                    icon={<SvgFileText size={16} />}
+                    title={`${selectedDocuments.length} selected`}
+                    onRemove={removeDocs}
+                  />
+                )}
+              </div>
+            </div>
+          )}
+
+          {!isSearchMode && (
+            <div className="flex justify-between items-center w-full p-1 min-h-[40px]">
+              {/* Bottom left controls */}
+              <div className="flex flex-row items-center">
+                {/* (+) button - always visible */}
+                <FilePickerPopover
+                  onFileClick={handleFileClick}
+                  onPickRecent={(file: ProjectFile) => {
+                    // Check if file with same ID already exists
+                    if (
+                      !currentMessageFiles.some(
+                        (existingFile) => existingFile.file_id === file.file_id
+                      )
+                    ) {
+                      setCurrentMessageFiles((prev) => [...prev, file]);
+                    }
+                  }}
+                  onUnpickRecent={(file: ProjectFile) => {
+                    setCurrentMessageFiles((prev) =>
+                      prev.filter(
+                        (existingFile) => existingFile.file_id !== file.file_id
+                      )
+                    );
+                  }}
+                  handleUploadChange={handleUploadChange}
+                  trigger={(open) => (
+                    <Button
+                      icon={SvgPlusCircle}
+                      tooltip="Attach Files"
+                      transient={open}
+                      disabled={disabled}
+                      prominence="tertiary"
+                    />
+                  )}
+                  selectedFileIds={currentMessageFiles.map((f) => f.id)}
+                />
+
+                {/* Controls that load in when data is ready */}
+                <div
+                  data-testid="actions-container"
+                  className={cn(
+                    "flex flex-row items-center",
+                    controlsLoading && "invisible"
+                  )}
+                >
+                  {selectedAgent && selectedAgent.tools.length > 0 && (
+                    <ActionsPopover
+                      selectedAgent={selectedAgent}
+                      filterManager={filterManager}
+                      availableSources={memoizedAvailableSources}
+                      disabled={disabled}
+                    />
+                  )}
+                  {onToggleTabReading ? (
+                    <Button
+                      icon={SvgGlobe}
+                      onClick={onToggleTabReading}
+                      variant="select"
+                      selected={tabReadingEnabled}
+                      foldable={!tabReadingEnabled}
+                      disabled={disabled}
+                    >
+                      {tabReadingEnabled
+                        ? currentTabUrl
+                          ? (() => {
+                              try {
+                                return new URL(currentTabUrl).hostname;
+                              } catch {
+                                return currentTabUrl;
+                              }
+                            })()
+                          : "Reading tab..."
+                        : "Read this tab"}
+                    </Button>
+                  ) : (
+                    showDeepResearch && (
+                      <Button
+                        icon={SvgHourglass}
+                        onClick={toggleDeepResearch}
+                        variant="select"
+                        selected={deepResearchEnabled}
+                        foldable={!deepResearchEnabled}
+                        disabled={disabled}
+                      >
+                        Deep Research
+                      </Button>
+                    )
+                  )}
+
+                  {selectedAgent &&
+                    forcedToolIds.length > 0 &&
+                    forcedToolIds.map((toolId) => {
+                      const tool = selectedAgent.tools.find(
+                        (tool) => tool.id === toolId
+                      );
+                      if (!tool) {
+                        return null;
+                      }
+                      return (
+                        <Button
+                          key={toolId}
+                          icon={getIconForAction(tool)}
+                          onClick={() => {
+                            setForcedToolIds(
+                              forcedToolIds.filter((id) => id !== toolId)
+                            );
+                          }}
+                          variant="select"
+                          selected
+                          disabled={disabled}
+                        >
+                          {tool.display_name}
+                        </Button>
+                      );
+                    })}
+                </div>
+              </div>
+
+              {/* Bottom right controls */}
+              <div className="flex flex-row items-center gap-1">
+                {/* LLM popover - loads when ready */}
+                <div
+                  data-testid="AppInputBar/llm-popover-trigger"
+                  className={cn(controlsLoading && "invisible")}
+                >
+                  <LLMPopover
+                    llmManager={llmManager}
+                    requiresImageInput={hasImageFiles}
+                    disabled={disabled}
+                  />
+                </div>
+
+                {/* Submit button */}
+                <Button
+                  id="onyx-chat-input-send-button"
+                  icon={
+                    isClassifying
+                      ? SimpleLoader
+                      : chatState === "input"
+                        ? SvgArrowUp
+                        : SvgStop
+                  }
+                  disabled={
+                    (chatState === "input" && !message) ||
+                    hasUploadingFiles ||
+                    isClassifying
+                  }
+                  onClick={() => {
+                    if (chatState == "streaming") {
+                      stopGenerating();
+                    } else if (message) {
+                      onSubmit(message);
+                    }
+                  }}
+                />
+              </div>
+            </div>
+          )}
         </div>
       </Disabled>
     );

web/src/sections/modals/AgentViewerModal.tsx

@@ -116,6 +116,8 @@ function ViewerOpenApiToolCard({ tool }: { tool: ToolSnapshot }) {
   );
 }
 
+const EMPTY_DOCS: [] = [];
+
 /**
  * Floating ChatInputBar below the AgentViewerModal.
  * On submit, navigates to the agent's chat with the message pre-filled.
@@ -135,10 +137,14 @@ function AgentChatInput({ agent, onSubmit }: AgentChatInputProps) {
       chatState="input"
       filterManager={filterManager}
       selectedAgent={agent}
+      selectedDocuments={EMPTY_DOCS}
+      removeDocs={() => {}}
       stopGenerating={() => {}}
       handleFileUpload={() => {}}
+      toggleDocumentSidebar={() => {}}
       currentSessionFileTokenCount={0}
       availableContextTokens={Infinity}
+      retrievalEnabled={false}
       deepResearchEnabled={false}
       toggleDeepResearch={() => {}}
       disabled={false}

web/src/sections/sidebar/AdminSidebar.tsx

@@ -131,11 +131,7 @@ const collections = (
             ? [
                 {
                   name: "Permissions",
-                  items: [
-                    // TODO: Uncomment once Users v2 page is complete
-                    // sidebarItem(ADMIN_PATHS.USERS_V2),
-                    sidebarItem(ADMIN_PATHS.SCIM),
-                  ],
+                  items: [sidebarItem(ADMIN_PATHS.SCIM)],
                 },
               ]
             : []),

web/tests/e2e/admin/ee_feature_redirect.spec.ts

@@ -1,20 +0,0 @@
-import { test, expect } from "@tests/e2e/fixtures/eeFeatures";
-
-test.describe("EE Feature Redirect", () => {
-  test("redirects to /chat with toast when EE features are not licensed", async ({
-    page,
-    eeEnabled,
-  }) => {
-    test.skip(eeEnabled, "Redirect only happens without Enterprise license");
-
-    await page.goto("/admin/theme");
-
-    await expect(page).toHaveURL(/\/chat/, { timeout: 10_000 });
-
-    const toastContainer = page.getByTestId("toast-container");
-    await expect(toastContainer).toBeVisible({ timeout: 5_000 });
-    await expect(
-      toastContainer.getByText(/only accessible with a paid license/i)
-    ).toBeVisible();
-  });
-});

web/tests/e2e/admin/theme/appearance_theme_settings.spec.ts

@@ -1,4 +1,4 @@
-import { test, expect } from "@tests/e2e/fixtures/eeFeatures";
+import { test, expect } from "@playwright/test";
 import { loginAs } from "@tests/e2e/utils/auth";
 
 test.describe("Appearance Theme Settings @exclusive", () => {
@@ -12,21 +12,24 @@ test.describe("Appearance Theme Settings @exclusive", () => {
     consentPrompt: "I agree to the terms",
   };
 
-  test.beforeEach(async ({ page, eeEnabled }) => {
-    test.skip(
-      !eeEnabled,
-      "Enterprise license not active — skipping theme tests"
-    );
-
-    // Fresh session — the eeEnabled fixture already logged in to check the
-    // setting, so clear cookies and re-login for a clean test state.
+  test.beforeEach(async ({ page }) => {
     await page.context().clearCookies();
     await loginAs(page, "admin");
 
+    // Navigate first so localStorage is accessible (API-based login
+    // doesn't navigate, leaving the page on about:blank).
     await page.goto("/admin/theme");
-    await expect(
-      page.locator('[data-label="application-name-input"]')
-    ).toBeVisible({ timeout: 10_000 });
+    await page.waitForLoadState("networkidle");
+
+    // Skip the entire test when Enterprise features are not licensed.
+    // The /admin/theme page is gated behind ee_features_enabled and
+    // renders a license-required message instead of the settings form.
+    const eeLocked = page.getByText(
+      "This functionality requires an active Enterprise license."
+    );
+    if (await eeLocked.isVisible({ timeout: 1000 }).catch(() => false)) {
+      test.skip(true, "Enterprise license not active — skipping theme tests");
+    }
 
     // Clear localStorage to ensure consent modal shows
     await page.evaluate(() => {

web/tests/e2e/fixtures/eeFeatures.ts

@@ -1,43 +0,0 @@
-/**
- * Playwright fixture that detects EE (Enterprise Edition) license state.
- *
- * Usage:
- * ```ts
- * import { test, expect } from "@tests/e2e/fixtures/eeFeatures";
- *
- * test("my EE-gated test", async ({ page, eeEnabled }) => {
- *   test.skip(!eeEnabled, "Requires active Enterprise license");
- *   // ... rest of test
- * });
- * ```
- *
- * The fixture:
- * - Authenticates as admin
- * - Fetches /api/settings to check ee_features_enabled
- * - Provides a boolean to the test BEFORE any navigation happens
- *
- * This lets tests call test.skip() synchronously at the top, which is the
- * correct Playwright pattern — never navigate then decide to skip.
- */
-
-import { test as base, expect } from "@playwright/test";
-import { loginAs } from "@tests/e2e/utils/auth";
-
-export const test = base.extend<{
-  /** Whether EE features are enabled (valid enterprise license). */
-  eeEnabled: boolean;
-}>({
-  eeEnabled: async ({ page }, use) => {
-    await loginAs(page, "admin");
-    const res = await page.request.get("/api/settings");
-    if (!res.ok()) {
-      // Fail open — if we can't determine, assume EE is not enabled
-      await use(false);
-      return;
-    }
-    const settings = await res.json();
-    await use(settings.ee_features_enabled === true);
-  },
-});
-
-export { expect };