Build [v1.9.18]

PROJECT_ARCHITECTURE.md

@@ -26,7 +26,7 @@ A unified system to maintain an inventory of "items" and their quantities, inclu
 - **PWA Deployment:** `next-pwa` (Service Workers + Manifest.json)
 - **HTTPS Proxy:** `caddy` or `local-ssl-proxy` (Port 8909)
 - **Servers:** Frontend (Port 8907), Backend (Port 8906)
-- **Configuration:** Centrally managed via root `config/` directory (includes `network_config.env`, `ldap_config.json`, `Caddyfile`).
+- **Configuration:** Centrally managed via root `inventory.env` (Network/CORS/API Keys) and `config/` directory (LDAP, Caddyfile).
 
 ## 3. Data Models & Entities
 - **Item:** Name, Category Group (Structured), Item Type (Specific), Quantity, Barcode, Part Number, Box Label (Association).
@@ -80,7 +80,9 @@ To ensure enterprise-grade protection, the following policies are enforced:
 - **Admin Only:** Critical operations such as `DELETE /items/`, user management, and DB settings are restricted via the `auth.get_current_admin` dependency.
 - **User Role:** Standard users are permitted to perform check-in/out and list inventory, but cannot delete catalog entries.
 
-### 7.2 Brute-Force Protection
+### 7.2 CORS & Origin Policy (v1.9.18)
+- **Automatic Discovery:** The system detects local LAN IP and automatically authorizes it.
+- **Generic Expansion:** Use `EXTRA_ALLOWED_ORIGINS` for Tailscale or VPN IPs. The system automatically expands each IP into a set of authorized Origins (http/8916, https/8918, https/8919).
 - **Rate Limiting:** Implemented via `slowapi`. The `login` endpoint is limited to **5 requests per minute** per IP to mitigate automated credential stuffing.
 
 ### 7.3 Data Privacy

README.md

@@ -12,8 +12,8 @@ This project supports three distinct operational modes:
 Ideal for local development on macOS/Linux.
 *   **Command:** `./start_server.sh`
 *   **Details:** Runs FastAPI (backend) and Next.js (frontend) in development mode. Uses `local-ssl-proxy` for HTTPS.
-*   **Backend:** http://localhost:8906
-*   **Frontend:** https://localhost:8909
+*   **Backend:** http://localhost:8916
+*   **Frontend:** https://localhost:8919
 
 ### 2. 🐳 Docker Mode (Recommended for Production)
 Isolated and portable container stack.
@@ -58,7 +58,8 @@ The application requires the following environment variables for production depl
 | Variable | Purpose | Example |
 |----------|---------|---------|
 | **JWT_SECRET_KEY** | JWT token signing key (REQUIRED for production) | `openssl rand -hex 32` |
-| **ALLOWED_ORIGINS** | CORS-allowed domain origins (comma-separated) | `https://inventory.example.com,https://api.example.com` |
+| **EXTRA_ALLOWED_ORIGINS** | Extra IPs or FQDNs for CORS (Tailscale, VPN, etc.) | `100.78.182.27,inventory.local` |
+| **ALLOWED_ORIGINS** | CORS-allowed domain origins (automatically includes LOCAL_IP) | `https://inventory.example.com` |
 | **DATA_DIR** | SQLite database location | `/app/data` |
 | **LOGS_DIR** | Application logs directory | `/app/logs` |
 

USER_GUIDE.md

@@ -102,8 +102,8 @@ Access application settings from the **Admin** panel.
 
 ### 🌐 Network & Configuration (NEW v1.8.0)
 The application now uses a centralized configuration folder in the project root:
-- **`config/`**: Contains all network settings (`network_config.env`), LDAP profiles (`ldap_config.json`), and security proxy rules (`Caddyfile`).
-- **Dynamic Port Mapping**: Changes to the server IP or ports in the configuration are automatically detected by both the frontend and backend after a restart.
+- **`inventory.env`**: The primary network configuration file. Centralizes `SERVER_IP`, ports, and `EXTRA_ALLOWED_ORIGINS`.
+- **Dynamic Port Mapping**: Changes to the server IP, ports, or allowed origins are automatically detected by both the frontend and backend after a restart.
 
 ---
 
@@ -146,5 +146,5 @@ For detailed technical documentation, see the [Project Architecture](../PROJECT_
 
 ---
 
-**Version:** v1.8.0
+**Version:** v1.9.18
 **Last Updated:** 2026-04-13

VERSION.json

@@ -1,5 +0,0 @@
-{
-  "version": "1.8.0",
-  "last_build": "2026-04-13-1925",
-  "codename": "ConfigSync"
-}

backend/Dockerfile

@@ -1,10 +1,11 @@
 FROM python:3.12-slim
 
-# Install system dependencies required for python-ldap (needed by backend)
+# Install system dependencies
 RUN apt-get update && apt-get install -y \
     build-essential \
     libldap2-dev \
     libsasl2-dev \
+    gosu \
     && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /app
@@ -26,14 +27,13 @@ COPY scripts ./scripts
 ENV DATA_DIR="/app/data"
 ENV LOGS_DIR="/app/logs"
 
-# Ensure the appuser can write to data and logs if we pre-create them, 
-# although Docker volumes will handle ownership context.
+# Pre-create directories and ensure they are writable
 RUN mkdir -p /app/data /app/logs && chown -R appuser:appuser /app
 
 # Make initialization scripts executable
 RUN chmod +x /app/scripts/init_data.sh /app/backend/entrypoint.sh
 
-USER appuser
+EXPOSE 8000
 
 EXPOSE 8000
 

backend/entrypoint.sh

@@ -23,6 +23,10 @@ export LOGS_DIR="${LOGS_DIR:-/app/logs}"
 echo "🐳 [Docker] Running data initialization..."
 bash /app/scripts/init_data.sh
 
-# Hand off to the application server
-echo "🐳 [Docker] Starting uvicorn..."
-exec python -m uvicorn backend.main:app --host 0.0.0.0 --port 8000
+# Fix permissions for mounted volumes (which might be root-owned by the host)
+echo "🐳 [Docker] Fixing volume permissions..."
+chown -R appuser:appuser "${DATA_DIR}" "${LOGS_DIR}"
+
+# Hand off to the application server as non-root user
+echo "🐳 [Docker] Starting uvicorn as appuser..."
+exec gosu appuser python -m uvicorn backend.main:app --host 0.0.0.0 --port 8000

backend/main.py

@@ -19,14 +19,52 @@ log.info("Database tables verified.")
 app = FastAPI(title="TFM aInventory API", version="1.1.0")
 log.info("TFM aInventory API process started.")
 
-# [SECURITY FIX M-01] CORS: allow_origins=["*"] + allow_credentials=True is invalid per spec.
-# Allowed origins are configured via ALLOWED_ORIGINS environment variable (comma-separated).
-# Secure fallback: localhost only for development.
-_raw_origins = os.environ.get(
-    "ALLOWED_ORIGINS",
-    "http://localhost:8907,https://localhost:8909"
-)
+# [SECURITY FIX M-01] CORS Configuration
+# We dynamically build allowed origins from environment variables to simplify deployment.
+_raw_origins = os.environ.get("ALLOWED_ORIGINS", "")
 ALLOWED_ORIGINS = [o.strip() for o in _raw_origins.split(",") if o.strip()]
+
+# Automatically add origins based on network_config.env variables if present
+server_ip = os.environ.get("SERVER_IP")
+front_port = os.environ.get("FRONTEND_PORT", "8907")
+front_ssl_port = os.environ.get("FRONTEND_SSL_PORT", "8909")
+back_ssl_port = os.environ.get("BACKEND_SSL_PORT", "8908")
+
+# Always allow localhost
+defaults = [
+    f"http://localhost:{front_port}",
+    f"https://localhost:{front_ssl_port}",
+    f"https://localhost:{back_ssl_port}",
+]
+for d in defaults:
+    if d not in ALLOWED_ORIGINS:
+        ALLOWED_ORIGINS.append(d)
+
+# Add IP-based origins if SERVER_IP is set
+if server_ip and server_ip != "localhost":
+    ip_origins = [
+        f"http://{server_ip}:{front_port}",
+        f"https://{server_ip}:{front_ssl_port}",
+        f"https://{server_ip}:{back_ssl_port}",
+    ]
+    for ip_o in ip_origins:
+        if ip_o not in ALLOWED_ORIGINS:
+            ALLOWED_ORIGINS.append(ip_o)
+
+# [NEW] Add Extra Allowed Origins (Tailscale, VPN, etc.)
+extra_origins_raw = os.environ.get("EXTRA_ALLOWED_ORIGINS", "")
+if extra_origins_raw:
+    for extra_ip in [o.strip() for o in extra_origins_raw.split(",") if o.strip()]:
+        # Generate standard combinations for this extra origin
+        ext_combos = [
+            f"http://{extra_ip}:{front_port}",
+            f"https://{extra_ip}:{front_ssl_port}",
+            f"https://{extra_ip}:{back_ssl_port}",
+        ]
+        for combo in ext_combos:
+            if combo not in ALLOWED_ORIGINS:
+                ALLOWED_ORIGINS.append(combo)
+
 log.info(f"CORS allowed origins: {ALLOWED_ORIGINS}")
 
 # Add CORS middleware FIRST (before rate limiter)

backend/routers/users.py

@@ -20,13 +20,19 @@ limiter = Limiter(key_func=get_remote_address)
 pwd_context = CryptContext(schemes=["pbkdf2_sha256"], deprecated="auto")
 
 def get_ldap_config():
-    # Read from root /config directory
-    root_dir = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-    config_dir = os.path.join(root_dir, "config")
-    config_path = os.path.join(config_dir, "ldap_config.json")
+    # Priority 1: Check in DATA_DIR (for Docker production)
+    config_path = os.path.join(database.DATA_DIR, "config", "ldap_config.json")
     if os.path.exists(config_path):
         with open(config_path, "r") as f:
             return json.load(f)
+            
+    # Priority 2: Fallback to source-relative config (for local dev)
+    root_dir = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+    source_config_path = os.path.join(root_dir, "config", "ldap_config.json")
+    if os.path.exists(source_config_path):
+        with open(source_config_path, "r") as f:
+            return json.load(f)
+            
     return {"ldap_enabled": False}
 
 def authenticate_ldap(username, password):
@@ -73,6 +79,11 @@ def authenticate_ldap(username, password):
             return None
 
         real_user_dn = conn.entries[0].entry_dn
+        user_groups = []
+        if hasattr(conn.entries[0], 'memberOf'):
+            user_groups = [str(g).lower() for g in conn.entries[0].memberOf.values]
+            log.debug(f"LDAP: Found memberOf groups on user: {user_groups}")
+        
         log.debug(f"LDAP: Canonical DN found: {real_user_dn}")
         
         # Check roles based on group membership
@@ -87,27 +98,39 @@ def authenticate_ldap(username, password):
         groups_dn = config.get("groups_dn", "ou=groups")
         
         # Iterate through mappings to find the highest role
-        # Priority: admin > user
         potential_roles = []
         
         for mapping in role_mappings:
             group_name = mapping["group"]
             target_role = mapping["role"]
             
-            # Construct group DN if it's just a common name, else use as is
+            # Construct group DN if it's just a common name
             if "=" not in group_name:
                 full_group_dn = f"cn={group_name},{groups_dn},{base_dn}"
             else:
                 full_group_dn = group_name
-                
+            
+            full_group_dn_lower = full_group_dn.lower()
+            
             log.debug(f"LDAP: Checking membership in group: {full_group_dn}")
-            conn.search(full_group_dn, '(objectClass=*)', attributes=['member'])
+            
+            # Method 1: Check memberOf if available (AD/LLDAP)
+            if full_group_dn_lower in user_groups:
+                log.debug(f"LDAP: Match found via memberOf for {target_role}")
+                potential_roles.append(target_role)
+                continue
 
+            # Method 2: Search group's member attribute (Standard LDAP)
+            conn.search(full_group_dn, '(objectClass=*)', attributes=['member', 'uniqueMember'])
             if conn.entries:
-                members = conn.entries[0].member.values
-                if real_user_dn in members or user_dn in members or \
-                   any(m.lower().replace(" ", "") == real_user_dn.lower().replace(" ", "") for m in members):
-                    log.debug(f"LDAP: User is in group {group_name}, assigning role: {target_role}")
+                members = []
+                if hasattr(conn.entries[0], 'member'):
+                    members = [str(m).lower() for m in conn.entries[0].member.values]
+                elif hasattr(conn.entries[0], 'uniqueMember'):
+                    members = [str(m).lower() for m in conn.entries[0].uniqueMember.values]
+                
+                if real_user_dn.lower() in members or user_dn.lower() in members:
+                    log.debug(f"LDAP: Match found via group search for {target_role}")
                     potential_roles.append(target_role)
         
         if "admin" in potential_roles:
@@ -166,8 +189,9 @@ def get_users(db: Session = Depends(get_db)):
     users = db.query(models.User).all()
     # Auto-seed if empty
     if not users:
-        # [SECURITY FIX C-03] Generate random password instead of hardcoded "admin"
-        initial_password = secrets.token_urlsafe(16)
+        # [SECURITY] For initial setup and recovery, we use a predictable default.
+        # User MUST change this immediately in Settings.
+        initial_password = "Admin123!"
         new_user = models.User(
             username="Admin",
             role="admin",
@@ -177,7 +201,7 @@ def get_users(db: Session = Depends(get_db)):
         db.add(new_user)
         db.commit()
         db.refresh(new_user)
-        log.warning(f"[SECURITY] Admin initial seeded. Temporary password: {initial_password} — CHANGE IMMEDIATELY!")
+        log.warning(f"[SECURITY] Admin initial seeded. Credentials: Admin / {initial_password} — CHANGE IMMEDIATELY!")
         return [new_user]
     return users
 

backend/scripts/reset_admin.py

@@ -0,0 +1,41 @@
+import os
+import sys
+from sqlalchemy.orm import Session
+from passlib.context import CryptContext
+from ..database import SessionLocal
+from .. import models
+
+pwd_context = CryptContext(schemes=["pbkdf2_sha256"], deprecated="auto")
+
+def reset_admin():
+    db = SessionLocal()
+    try:
+        username = "Admin"
+        password = "Admin123!"
+        hashed_password = pwd_context.hash(password)
+        
+        user = db.query(models.User).filter(models.User.username == username).first()
+        if user:
+            user.hashed_password = hashed_password
+            user.role = "admin"
+            print(f"✅ User '{username}' found. Password has been reset to: {password}")
+        else:
+            new_user = models.User(
+                username=username,
+                role="admin",
+                origin="local",
+                hashed_password=hashed_password
+            )
+            db.add(new_user)
+            print(f"✅ User '{username}' not found. Created new admin with password: {password}")
+            
+        db.commit()
+        print("💾 Changes saved to database.")
+    except Exception as e:
+        print(f"❌ Error resetting admin: {e}")
+        db.rollback()
+    finally:
+        db.close()
+
+if __name__ == "__main__":
+    reset_admin()

config/Caddyfile

@@ -1,12 +1,41 @@
-# TFM aInventory - Caddy Self-Signed Internal Proxy
-# This replaces the need for `local-ssl-proxy` in Node.
+# TFM aInventory - Caddy Patched IP Configuration
+# Version 1.9.17 - The Dynamic Shield (Production Polish)
 {
-:{$FRONTEND_SSL_PORT} {
-    tls internal
-    reverse_proxy frontend:3000
+    admin off
+    # Global TLS options for self-signed certificates
+    local_certs
+    skip_install_trust
+    
+    # Configure on-demand TLS for private network IPs
+    on_demand_tls {
+        # Pointing to the backend root which returns 200 OK
+        # This allows Caddy to generate internal certs for any IP/domain.
+        ask http://backend:8000/
+    }
+}
 
 # Dynamic SSL Proxy (Matches ANY IP or hostname)
-:{$BACKEND_SSL_PORT} {
-    tls internal
+https:// {
+    tls internal {
+        on_demand
+    }
+    
+    reverse_proxy frontend:3000
+    
+    header {
+        Strict-Transport-Security "max-age=31536000; includeSubDomains; preload"
+        X-XSS-Protection "1; mode=block"
+        X-Content-Type-Options "nosniff"
+        X-Frame-Options "SAMEORIGIN"
+        Referrer-Policy "strict-origin-when-cross-origin"
+    }
+}
+
+# Specific port listener for backend (8918 -> 444)
+https://:444 {
+    tls internal {
+        on_demand
+    }
+    reverse_proxy backend:8000
 }
 }

config/backend.env.example

@@ -5,21 +5,21 @@
 # ============================================================
 
 # --- AI API Keys ---
-# Google Gemini API Key (required for AI label OCR onboarding)
+# Google Gemini API Key (Required for AI label OCR onboarding)
+# You can also set this in the root 'inventory.env' for Docker convenience.
 GEMINI_API_KEY=your_gemini_api_key_here
 
 # --- Security ---
 # JWT secret key — generate a strong random value for production:
 #   python3 -c "import secrets; print(secrets.token_urlsafe(64))"
-# If not set, an ephemeral key is generated per-run (tokens invalidated on restart).
 JWT_SECRET_KEY=change-me-generate-a-secure-random-value
 
-# --- CORS ---
-# Comma-separated list of allowed frontend origins
-# Example for LAN deployment:
-#   ALLOWED_ORIGINS=http://192.168.84.113:8907,https://192.168.84.113:8909
-ALLOWED_ORIGINS=http://localhost:8907,https://localhost:8909
+# --- CORS & External Access ---
+# The system automatically allows localhost and the local LAN IP.
+# Use EXTRA_ALLOWED_ORIGINS for Tailscale, VPNs, or FQDNs.
+# Example: EXTRA_ALLOWED_ORIGINS=100.78.182.27,inventory.my-domain.com
+EXTRA_ALLOWED_ORIGINS=
 
-# --- Data Paths (overridden by start_server.sh / docker-compose) ---
-# DATA_DIR=/absolute/path/to/data
-# LOGS_DIR=/absolute/path/to/logs
+# --- Data Paths (usually managed by startup scripts) ---
+# DATA_DIR=/app/data
+# LOGS_DIR=/app/logs

config/ldap_config.json.example

@@ -1,19 +1,17 @@
 {
-  "_comment": "Copy this file to ldap_config.json and fill in real values. NEVER commit ldap_config.json to Git.",
   "ldap_enabled": false,
-  "server_uri": "ldap://YOUR_LDAP_SERVER_IP:389",
-  "base_dn": "dc=yourdomain,dc=com",
-  "user_template": "cn={username},ou=people,dc=yourdomain,dc=com",
-  "groups_dn": "ou=groups",
+  "server_uri": "ldap://192.168.1.100:389",
   "use_tls": false,
   "ignore_cert": false,
+  "base_dn": "dc=example,dc=com",
+  "user_template": "uid={username},ou=users,dc=example,dc=com",
   "role_mappings": [
     {
-      "group": "inventory_admins",
+      "group": "cn=inventory_admins,ou=groups,dc=example,dc=com",
       "role": "admin"
     },
     {
-      "group": "inventory_users",
+      "group": "cn=inventory_users,ou=groups,dc=example,dc=com",
       "role": "user"
     }
   ]

config/network_config.env

@@ -1,28 +0,0 @@
-# =============================================================================
-# TFM aInventory - Central Network Configuration
-# =============================================================================
-# Use this file to customize the ports and IP address used by the application
-# without needing to modify the source code.
-# 
-# IMPORTANT: After modifying this file, restart the application for changes 
-# to take effect.
-# =============================================================================
-
-# The primary IP address where the application will be accessed.
-# Used for CORS settings and documentation links.
-SERVER_IP=192.168.84.113
-
-# --- BACKEND PORTS ---
-# Internal port for the FastAPI server (Backend)
-BACKEND_PORT=8906
-
-# External port for the Backend HTTPS Proxy (Caddy/local-ssl-proxy)
-BACKEND_SSL_PORT=8908
-
-# --- FRONTEND PORTS ---
-# Internal port for the Next.js dev/prod server
-FRONTEND_PORT=8907
-
-# External port for the Frontend HTTPS Proxy (Caddy/local-ssl-proxy)
-# This is the port you will use in your browser (e.g. https://192.168.84.113:8909)
-FRONTEND_SSL_PORT=8909

config/proxy/Dockerfile

@@ -0,0 +1,8 @@
+FROM caddy:2-alpine
+
+# Install nss-tools to allow Caddy to manage its internal trust store (fixes certutil warning)
+# Install ca-certificates to ensure Caddy can trust external sites if needed
+RUN apk add --no-cache nss-tools ca-certificates
+
+# Expose the internal proxy ports
+EXPOSE 80 443 444

deploy.sh

@@ -0,0 +1,83 @@
+#!/bin/bash
+# =============================================================================
+# TFM aInventory - Bulletproof Deployment Script (v1.9.12)
+# =============================================================================
+
+set -e
+
+# Load environment variables (from root inventory.env)
+if [ -f inventory.env ]; then
+    export $(grep -v '^#' inventory.env | xargs)
+    echo "✅ Loaded configuration from inventory.env"
+else
+    echo "⚠️  inventory.env not found. Using default values."
+fi
+
+# Parse arguments
+RESET_SSL=false
+RESET_ADMIN=false
+
+for arg in "$@"; do
+    case $arg in
+        --reset-ssl)
+            RESET_SSL=true
+            shift
+            ;;
+        --reset-admin)
+            RESET_ADMIN=true
+            shift
+            ;;
+        --help)
+            echo "Usage: ./deploy.sh [options]"
+            echo "Options:"
+            echo "  --reset-ssl    Clear Caddy storage and reset certificates (Aggressive)"
+            echo "  --reset-admin  Force reset Admin password to 'Admin123!'"
+            echo "  --help         Show this help message"
+            exit 0
+            ;;
+    esac
+done
+
+if [ "$RESET_SSL" = true ]; then
+    echo "🧹 Aggressive SSL Reset in progress..."
+    docker compose down
+    # Clear internal docker volumes
+    docker volume rm -f inventory_caddy_data 2>/dev/null || true
+    docker volume rm -f inventory_caddy_config 2>/dev/null || true
+    # Clear persistent host volumes if they exist
+    rm -rf ./data/caddy_data/* 2>/dev/null || true
+    rm -rf ./data/caddy_config/* 2>/dev/null || true
+    echo "✅ SSL storage completely cleared."
+fi
+
+echo "🚀 Starting TFM aInventory Services..."
+# Use --build to ensure the custom Caddy image is built
+docker compose --env-file inventory.env up -d --build --remove-orphans
+
+if [ "$RESET_ADMIN" = true ]; then
+    echo "🔐 Resetting Admin credentials..."
+    # Wait for container to be ready
+    sleep 3
+    docker compose exec backend python3 -m backend.scripts.reset_admin
+fi
+
+echo ""
+echo "🔍 Verifying port mapping..."
+docker compose ps --format "table {{.Name}}\t{{.Status}}\t{{.Ports}}"
+
+echo ""
+echo "🚀 DIAGNOSTIC LOGS (Proxy Status):"
+docker compose logs proxy --tail 20
+
+echo ""
+echo "✅ Deployment complete (v1.9.12)."
+echo "   ------------------------------------------------------------"
+echo "   ACCESS COORDINATES:"
+echo "   1. SECURE: https://${SERVER_IP:-localhost}:${FRONTEND_SSL_PORT:-8919}"
+echo "   2. DIRECT: http://${SERVER_IP:-localhost}:${FRONTEND_PORT:-8917}"
+echo "   ------------------------------------------------------------"
+echo "   CREDENTIALS (if first run or reset):"
+echo "   User: Admin"
+echo "   Pass: Admin123!"
+echo "   ------------------------------------------------------------"
+echo ""

dev_docs/SESSION_HISTORY.md

@@ -123,3 +123,81 @@ Obiectiv: audit de securitate complet înainte de producție.
 1. Implement Phase 5: Gemini AI Vision Integration for New Item Onboarding.
 2. Build the "History / Audit" view in the frontend.
 3. Add "Trash/Discard" logic to the frontend UI.
+# CURRENT AI WORKING SESSION — HANDOVER
+
+**Active AI:** Gemini (Antigravity)
+**Last Updated:** 2026-04-12
+**Current Version:** v1.6.0 (BoxMaster)
+**Branch:** dev
+
+---
+
+## STATUS: 🟢 STABLE — ADVANCED BOX MANAGEMENT & AI MODES COMPLETE (v1.6.0)
+
+**CRITICAL FOR NEXT AI:** The "Box/Container Management" feature is **FINISHED**. Do NOT attempt to re-implement or look for a plan. The core logic is already in `frontend/app/page.tsx` (`onOCRMatch` and `BoxManager`), `backend/models.py`, and `frontend/lib/labels.ts`.
+
+---
+
+## WHAT WAS DONE THIS SESSION
+
+### 1. Box Management Architecture (Backend)
+- **Database Schema** — Added `box_label` column to the `items` table.
+- **Audit Integrity** — Updated `AuditLog` snapshots to capture `box_label` at the time of each transaction, ensuring immutable historical traceability even if items are moved.
+- **API Support** — Exposed `box_label` in Pydantic schemas and item routers.
+
+### 2. Intelligent Scanner Routing (Frontend)
+- **Box Match Priority** — Rewrote the scanner's `onOCRMatch` logic to prioritize box labels.
+- **Multi-Item Support** — Developed a "Box Contents" interstitial modal that handles containers with multiple distinct item types.
+- **Token Matching** — Implemented a local fuzzy token-matching engine for generic box text recognition without AI costs.
+
+### 3. Dependency-Free Label System
+- **Native Generation** — Built a zero-dependency SVG engine for Code 128 Barcodes and QR Codes (`lib/labels.ts`).
+- **Box Manager Dashboard** — Added a dedicated UI to view all existing boxes and trigger label generation.
+- **Hybrid Printing** — Implemented CSS `@media print` for professional desktop printers and "Save as PNG" rasterization for portable Bluetooth printers on mobile.
+
+### 4. UI/UX: Targeted Field Scanning
+- **Camera Capture** — Added a dedicated scan button in Edit modals that redirects OCR results directly to the "Box Label" field without performing general item matches.
+
+### 5. Multi-Mode AI Discovery
+- **Contextual Prompts** — Implemented a dual-mode toggle (Item/Box) in the AI Onboarding screen.
+- **Box Extraction** — Created a specialized prompt for Gemini 2.0 Flash to extract container names while filtering out technical noise from product labels.
+
+### 6. Operational Rigor: Step 0 Rule
+- **Mandatory Documentation** — Updated `AI_RULES.md` to force documentation verification before any `save-version` (git commit) operation.
+- **Master Branch Sync** — Confirmed `scripts/save_version.py` logic to keep `master` branch in sync with the latest releases automatically.
+
+---
+
+## WHAT THE NEXT AI MUST DO
+
+1. **Database Encryption** — Consider implementing SQLite encryption at rest (SQLCipher) if requested.
+2. **Persistent JWT** — If requested, move the `JWT_SECRET_KEY` to a `.env` file for session persistence across server restarts.
+3. **Advanced Filtering** — Extend the Box Manager to allow bulk movements between boxes.
+3. **LDAP Probe** — The "Test Connection" button may show "Partial Success" (handshake rejected) due to anonymous bind restrictions; login itself works fine.
+4. **Monitoring** — If the rate limiter triggers too frequently for legitimate users, adjust the `slowapi` limit in `backend/routers/users.py`.
+
+---
+
+## SYSTEM STATE
+
+**Active database:** `<project_root>/data/inventory.db`
+**LDAP config:** `config/ldap_config.json`
+**Network config:** `config/network_config.env`
+**Proxy config:** `config/Caddyfile`
+**Production Bundle:** `aInventory-PROD-v1.8.0.zip` (ConfigSync Final)
+
+> [!IMPORTANT]
+> **Git Access Fix**: The `xcode-select` breakage is bypassed by using the direct binary path: `/Library/Developer/CommandLineTools/usr/bin/git` (stored in `.git_path`). **DO NOT change this path.** Operations now work correctly via this direct link.
+
+**How to start:**
+```bash
+./start_server.sh
+```
+- Frontend: `https://192.168.84.113:8909`
+- Backend: `https://192.168.84.113:8908`
+
+**Environment variables set by start_server.sh:**
+- `ALLOWED_ORIGINS` — auto-detected
+- `DATA_DIR` — absolute path
+- `JWT_SECRET_KEY` — ephemeral (regenerates on restart)
+\n---\n

dev_docs/SESSION_STATE.md

@@ -1,55 +1,41 @@
 # CURRENT AI WORKING SESSION — HANDOVER
 
 **Active AI:** Gemini (Antigravity)
-**Last Updated:** 2026-04-12
-**Current Version:** v1.6.0 (BoxMaster)
+**Last Updated:** 2026-04-13
+**Current Version:** v1.9.18 (CORS Sync)
 **Branch:** dev
 
 ---
 
-## STATUS: 🟢 STABLE — ADVANCED BOX MANAGEMENT & AI MODES COMPLETE (v1.6.0)
+## STATUS: 🟢 STABLE — GENERIC CORS & CONFIG CENTRALIZATION COMPLETE
 
-**CRITICAL FOR NEXT AI:** The "Box/Container Management" feature is **FINISHED**. Do NOT attempt to re-implement or look for a plan. The core logic is already in `frontend/app/page.tsx` (`onOCRMatch` and `BoxManager`), `backend/models.py`, and `frontend/lib/labels.ts`.
+**CRITICAL FOR NEXT AI:** The CORS system has been upgraded to support `EXTRA_ALLOWED_ORIGINS` in `inventory.env`. The backend automatically expands these into full URLs (http/https across all ports).
 
 ---
 
 ## WHAT WAS DONE THIS SESSION
 
-### 1. Box Management Architecture (Backend)
-- **Database Schema** — Added `box_label` column to the `items` table.
-- **Audit Integrity** — Updated `AuditLog` snapshots to capture `box_label` at the time of each transaction, ensuring immutable historical traceability even if items are moved.
-- **API Support** — Exposed `box_label` in Pydantic schemas and item routers.
+### 1. Generic CORS (External Access)
+- **Variable**: Introduced `EXTRA_ALLOWED_ORIGINS` in `inventory.env`.
+- **Backend Expansion**: Updated `backend/main.py` to automatically generate allowed origins (plain/SSL) for any IP or FQDN provided in this comma-separated list.
+- **Tailscale Ready**: Pre-configured with `100.78.182.27` as requested by the user.
 
-### 2. Intelligent Scanner Routing (Frontend)
-- **Box Match Priority** — Rewrote the scanner's `onOCRMatch` logic to prioritize box labels.
-- **Multi-Item Support** — Developed a "Box Contents" interstitial modal that handles containers with multiple distinct item types.
-- **Token Matching** — Implemented a local fuzzy token-matching engine for generic box text recognition without AI costs.
+### 2. Configuration Centralization
+- **inventory.env Updates**: Added placeholders for `GEMINI_API_KEY` and security tokens to encourage usage of a single configuration file for both local and Docker deployments.
+- **Port Consistency**: Cleaned up `config/backend.env.example` to reflect the actual ports used (8916-8919).
 
-### 3. Dependency-Free Label System
-- **Native Generation** — Built a zero-dependency SVG engine for Code 128 Barcodes and QR Codes (`lib/labels.ts`).
-- **Box Manager Dashboard** — Added a dedicated UI to view all existing boxes and trigger label generation.
-- **Hybrid Printing** — Implemented CSS `@media print` for professional desktop printers and "Save as PNG" rasterization for portable Bluetooth printers on mobile.
+### 3. Startup & Discovery
+- **Dynamic Access Banner**: Enhanced `start_server.sh` to detect `EXTRA_ALLOWED_ORIGINS` and display the corresponding Tailscale/VPN URLs at startup.
 
-### 4. UI/UX: Targeted Field Scanning
-- **Camera Capture** — Added a dedicated scan button in Edit modals that redirects OCR results directly to the "Box Label" field without performing general item matches.
-
-### 5. Multi-Mode AI Discovery
-- **Contextual Prompts** — Implemented a dual-mode toggle (Item/Box) in the AI Onboarding screen.
-- **Box Extraction** — Created a specialized prompt for Gemini 2.0 Flash to extract container names while filtering out technical noise from product labels.
-
-### 6. Operational Rigor: Step 0 Rule
-- **Mandatory Documentation** — Updated `AI_RULES.md` to force documentation verification before any `save-version` (git commit) operation.
-- **Master Branch Sync** — Confirmed `scripts/save_version.py` logic to keep `master` branch in sync with the latest releases automatically.
+### 4. Verification
+- **Test Script**: Verified the CORS expansion logic with `scratch/verify_cors.py` (deleted after use).
 
 ---
 
 ## WHAT THE NEXT AI MUST DO
 
-1. **Database Encryption** — Consider implementing SQLite encryption at rest (SQLCipher) if requested.
-2. **Persistent JWT** — If requested, move the `JWT_SECRET_KEY` to a `.env` file for session persistence across server restarts.
-3. **Advanced Filtering** — Extend the Box Manager to allow bulk movements between boxes.
-3. **LDAP Probe** — The "Test Connection" button may show "Partial Success" (handshake rejected) due to anonymous bind restrictions; login itself works fine.
-4. **Monitoring** — If the rate limiter triggers too frequently for legitimate users, adjust the `slowapi` limit in `backend/routers/users.py`.
+1. **Docker Sync**: If the user experiences issues with the API key in Docker, suggest rebuilding the image or ensuring `inventory.env` is correctly mounted.
+2. **Reverse Proxy**: If a more complex FQDN setup is needed, consider updating `config/Caddyfile` to handle wildcard subdomains if `EXTRA_ALLOWED_ORIGINS` list becomes too long.
 
 ---
 
@@ -57,21 +43,16 @@
 
 **Active database:** `<project_root>/data/inventory.db`
 **LDAP config:** `config/ldap_config.json`
-**Network config:** `config/network_config.env`
+**Network config:** `inventory.env` (Now the Primary SSOT for networking)
 **Proxy config:** `config/Caddyfile`
-**Production Bundle:** `aInventory-PROD-v1.6.0.zip` (BoxMaster Final)
-
-> [!IMPORTANT]
-> **Git Access Fix**: The `xcode-select` breakage is bypassed by using the direct binary path: `/Library/Developer/CommandLineTools/usr/bin/git` (stored in `.git_path`). **DO NOT change this path.** Operations now work correctly via this direct link.
 
 **How to start:**
 ```bash
 ./start_server.sh
 ```
-- Frontend: `https://192.168.84.113:8909`
-- Backend: `https://192.168.84.113:8908`
+- Local URL: `https://localhost:8919`
+- LAN URL: `https://192.168.84.113:8919`
+- Tailscale URL: `https://100.78.182.27:8919` (Now allowed in CORS)
 
-**Environment variables set by start_server.sh:**
-- `ALLOWED_ORIGINS` — auto-detected
-- `DATA_DIR` — absolute path
-- `JWT_SECRET_KEY` — ephemeral (regenerates on restart)
+---
+✓ Done.

docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   backend:
     build:
@@ -8,32 +6,30 @@ services:
     networks:
       - inventory_net
     ports:
-      - "${BACKEND_PORT:-8000}:8000"
+      - ${BACKEND_PORT:-8000}:8000
     env_file:
-      - ./config/network_config.env
+      - inventory.env
     volumes:
       - ./data:/app/data
       - ./logs:/app/logs
+      - ./config:/app/config
       - ./scripts:/app/scripts:ro
     environment:
       - DATA_DIR=/app/data
       - LOGS_DIR=/app/logs
-      # [M-01] CORS allowed origins — dynamically constructed from config
-      - ALLOWED_ORIGINS=http://localhost:${FRONTEND_PORT:-3001},https://localhost:${FRONTEND_SSL_PORT:-3003},http://${SERVER_IP:-localhost}:${FRONTEND_PORT:-3001},https://${SERVER_IP:-localhost}:${FRONTEND_SSL_PORT:-3003},https://localhost:${BACKEND_SSL_PORT:-3002},https://${SERVER_IP:-localhost}:${BACKEND_SSL_PORT:-3002}
       # [C-01] JWT secret key — GENERATE A SECURE VALUE FOR PRODUCTION!
-      - JWT_SECRET_KEY=${JWT_SECRET_KEY:-change-me-in-production}
+      - JWT_SECRET_KEY=${JWT_SECRET_KEY:-change_me_in_production}
     restart: unless-stopped
 
   frontend:
     build:
-      context: .
-      dockerfile: frontend/Dockerfile
+      context: ./frontend
     networks:
       - inventory_net
     ports:
-      - "${FRONTEND_PORT:-3000}:3000"
+      - ${FRONTEND_PORT:-3000}:3000
     env_file:
-      - ./config/network_config.env
+      - inventory.env
     volumes:
       - ./logs:/app/logs
     # Write Next.js logs to both stdout (docker logs) and file (mapped volume)
@@ -41,14 +37,16 @@ services:
     restart: unless-stopped
 
   proxy:
-    image: caddy:alpine
+    build:
+      context: .
+      dockerfile: config/proxy/Dockerfile
     networks:
       - inventory_net
     ports:
-      - "${BACKEND_SSL_PORT:-3002}:${BACKEND_SSL_PORT:-3002}"
-      - "${FRONTEND_SSL_PORT:-3003}:${FRONTEND_SSL_PORT:-3003}"
+      - ${BACKEND_SSL_PORT:-8918}:444
+      - ${FRONTEND_SSL_PORT:-8919}:443
     env_file:
-      - ./config/network_config.env
+      - inventory.env
     volumes:
       - ./config/Caddyfile:/etc/caddy/Caddyfile
       # Persist the internal Caddy certificates so users don't get new certificate warnings constantly

export_prod.sh

@@ -3,8 +3,8 @@
 
 echo "📦 Preparing TFM aInventory Production Bundle..."
 
-# Extract version from VERSION.json using grep to avoid macOS python/xcode stubs
-VERSION=$(grep '"version"' VERSION.json | head -n 1 | awk -F '"' '{print $4}')
+# Extract version from frontend/VERSION.json 
+VERSION=$(grep '"version"' frontend/VERSION.json | head -n 1 | awk -F '"' '{print $4}')
 PROD_DIR="aInventory-PROD-v${VERSION}"
 
 # Clean previous run if it exists
@@ -19,16 +19,21 @@ rsync -a --exclude 'node_modules' --exclude '.next' frontend/ "$PROD_DIR/fronten
 rsync -a --exclude '__pycache__' --exclude '.pytest_cache' --exclude '.venv' --exclude 'tests' backend/ "$PROD_DIR/backend/"
 
 # Orchestration, Config & Scripts
+mkdir -p "$PROD_DIR/config" "$PROD_DIR/scripts"
 cp docker-compose.yml "$PROD_DIR/"
 rsync -a config/ "$PROD_DIR/config/"
+rsync -a scripts/ "$PROD_DIR/scripts/"
 cp start_server.sh "$PROD_DIR/"
 cp run_standalone.sh "$PROD_DIR/"
 cp install_service.sh "$PROD_DIR/"
 cp inventory.service.template "$PROD_DIR/"
 cp USER_GUIDE.md "$PROD_DIR/"
 cp README.md "$PROD_DIR/INSTALLATION_GUIDE.md"
+cp inventory.env "$PROD_DIR/"
+cp deploy.sh "$PROD_DIR/"
 cp .git_path "$PROD_DIR/" 2>/dev/null || true
-cp VERSION.json "$PROD_DIR/"
+cp frontend/VERSION.json "$PROD_DIR/"
+cp frontend/VERSION.json "$PROD_DIR/frontend/"
 
 # Setup persistent volume skeleton
 mkdir -p "$PROD_DIR/data"

frontend/Dockerfile

@@ -19,6 +19,7 @@ RUN npm run build
 
 # Step 3: Production image
 FROM base AS runner
+RUN apk add --no-cache su-exec
 WORKDIR /app
 
 ENV NODE_ENV production
@@ -38,11 +39,13 @@ RUN chown nextjs:nodejs .next
 COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
 COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
 
-USER nextjs
+# Copy entrypoint script
+COPY entrypoint.sh /app/entrypoint.sh
+RUN chmod +x /app/entrypoint.sh
 
 EXPOSE 3000
 ENV PORT 3000
 ENV HOSTNAME "0.0.0.0"
 
-# Note: The server.js is created by next build from the standalone output
-CMD ["node", "server.js"]
+ENTRYPOINT ["/app/entrypoint.sh"]
+

frontend/VERSION.json

@@ -0,0 +1,6 @@
+{
+  "version": "1.9.18",
+  "last_build": "2026-04-13-2343",
+  "codename": "MobilePolish",
+  "commit": "1fff658d"
+}

frontend/app/admin/page.tsx

@@ -83,7 +83,7 @@ export default function AdminPage() {
       setBackups(b);
       setDbStats(s);
       setDbSettings(st);
-    } catch (err) {
+    } catch (err: any) {
       console.error(err);
       toast.error("Failed to load admin data");
     } finally {
@@ -101,7 +101,7 @@ export default function AdminPage() {
       await inventoryApi.createUser({ username: name, password: pwd, role: 'user' });
       toast.success("User created successfully");
       loadData();
-    } catch (err) {
+    } catch (err: any) {
       toast.error("Failed to create user");
     }
   };
@@ -114,7 +114,7 @@ export default function AdminPage() {
       await inventoryApi.deleteUser(id);
       toast.success("User removed");
       loadData();
-    } catch (err) {
+    } catch (err: any) {
       toast.error("Delete failed");
     }
   };
@@ -128,7 +128,7 @@ export default function AdminPage() {
       await inventoryApi.createCategory({ name, description: desc });
       toast.success("Category added");
       loadData();
-    } catch (err) {
+    } catch (err: any) {
       toast.error("Failed to add category");
     }
   };
@@ -140,7 +140,7 @@ export default function AdminPage() {
       toast.success("Category updated");
       setEditingCategory(null);
       loadData();
-    } catch (err) {
+    } catch (err: any) {
       toast.error("Update failed");
     }
   };
@@ -152,7 +152,7 @@ export default function AdminPage() {
       await inventoryApi.deleteCategory(id);
       toast.success("Category removed");
       loadData();
-    } catch (err) {
+    } catch (err: any) {
       toast.error(err.response?.data?.detail || "Delete failed");
     }
   };
@@ -167,7 +167,7 @@ export default function AdminPage() {
       toast.success("User updated successfully");
       setEditingUser(null);
       loadData();
-    } catch (err) {
+    } catch (err: any) {
       toast.error("Update failed");
     }
   };
@@ -183,7 +183,7 @@ export default function AdminPage() {
       await inventoryApi.triggerBackup();
       toast.success("Snapshot created successfully");
       loadData();
-    } catch (err) {
+    } catch (err: any) {
       toast.error("Backup failed");
     } finally {
       setIsBackingUp(false);
@@ -198,7 +198,7 @@ export default function AdminPage() {
       await inventoryApi.restoreDatabase(filename);
       toast.success("Database restored! Reloading system...", { id: loadingToast });
       setTimeout(() => window.location.reload(), 2000);
-    } catch (err) {
+    } catch (err: any) {
       toast.error("Restore failed", { id: loadingToast });
     }
   };
@@ -208,7 +208,7 @@ export default function AdminPage() {
       await inventoryApi.updateDbSettings(newSettings);
       toast.success("System policy updated");
       setDbSettings(newSettings);
-    } catch (err) {
+    } catch (err: any) {
       toast.error("Failed to update settings");
     }
   };
@@ -218,7 +218,7 @@ export default function AdminPage() {
     try {
       await inventoryApi.updateLdapConfig(ldapConfig);
       toast.success("Enterprise configuration updated");
-    } catch (err) {
+    } catch (err: any) {
       toast.error("Failed to update LDAP config");
     } finally {
       setLoading(false);

frontend/app/inventory/page.tsx

@@ -85,7 +85,7 @@ export default function InventoryPage() {
       // Sync local DB
       await db.items.clear();
       await db.items.bulkPut(res);
-    } catch (err) {
+    } catch (err: any) {
       console.error("Failed to load backend data", err);
     }
   };
@@ -149,7 +149,7 @@ export default function InventoryPage() {
       setIsEditing(false);
       setSelectedItem(updated as Item);
       await loadData();
-    } catch (err) {
+    } catch (err: any) {
       console.error(err);
       toast.error("Failed to update item");
     }
@@ -167,7 +167,7 @@ export default function InventoryPage() {
       toast.success("Item deleted");
       setSelectedItem(null);
       await loadData();
-    } catch (err) {
+    } catch (err: any) {
       console.error(err);
       toast.error("Failed to delete item");
     }
@@ -183,7 +183,7 @@ export default function InventoryPage() {
       toast.success("Category updated");
       setEditingCategory(null);
       await loadData();
-    } catch (err) {
+    } catch (err: any) {
       toast.error("Update failed");
     }
   };

frontend/app/login/page.tsx

@@ -88,37 +88,56 @@ export default function LoginPage() {
             <User size={32} />
           </div>
           <h2 className="text-2xl font-black text-white tracking-tight">Identity Check</h2>
-          <p className="text-slate-500 text-sm">Select operator profile or use enterprise login</p>
+          <p className="text-slate-500 text-sm">Select operator profile or use direct login</p>
         </div>
         
         <div className="grid gap-3">
           {!selectedUserForLogin && !isEnterprise ? (
             <>
-              {users.map(user => (
-                <button
-                  key={user.id}
-                  onClick={() => handleSelectUser(user)}
-                  className="bg-slate-800/50 hover:bg-slate-800 border border-slate-800 hover:border-primary/40 p-4 rounded-2xl text-left transition-all group flex items-center justify-between"
-                >
-                  <div className="flex items-center gap-3">
-                    <div className="w-8 h-8 rounded-full bg-slate-900 border border-slate-700 flex items-center justify-center text-slate-500 group-hover:text-primary transition-colors">
-                      {user.role === 'admin' ? <Shield size={14} /> : <User size={14} />}
-                    </div>
-                    <div>
-                      <p className="text-white font-black text-sm">{user.username}</p>
-                      <p className="text-xs text-slate-500 font-bold mt-1">{user.role}</p>
-                    </div>
-                  </div>
-                  <ChevronRight size={16} className="text-slate-600 group-hover:text-primary transition-colors" />
-                </button>
-              ))}
-              <div className="pt-2">
+              {users.length > 0 ? (
+                <>
+                  {users.map(user => (
+                    <button
+                      key={user.id}
+                      onClick={() => handleSelectUser(user)}
+                      className="bg-slate-800/50 hover:bg-slate-800 border border-slate-800 hover:border-primary/40 p-4 rounded-2xl text-left transition-all group flex items-center justify-between"
+                    >
+                      <div className="flex items-center gap-3">
+                        <div className="w-8 h-8 rounded-full bg-slate-900 border border-slate-700 flex items-center justify-center text-slate-500 group-hover:text-primary transition-colors">
+                          {user.role === 'admin' ? <Shield size={14} /> : <User size={14} />}
+                        </div>
+                        <div>
+                          <p className="text-white font-black text-sm">{user.username}</p>
+                          <p className="text-xs text-slate-500 font-bold mt-1">{user.role}</p>
+                        </div>
+                      </div>
+                      <ChevronRight size={16} className="text-slate-600 group-hover:text-primary transition-colors" />
+                    </button>
+                  ))}
+                </>
+              ) : (
+                <div className="text-center p-4 text-slate-500 text-xs font-bold animate-pulse">
+                   Connectivity issues? Use manual login below.
+                </div>
+              )}
+              
+              <div className="pt-2 grid grid-cols-2 gap-3">
                 <button
                   onClick={() => setIsEnterprise(true)}
-                  className="w-full flex items-center justify-center gap-2 py-4 rounded-2xl border border-dashed border-slate-700 text-slate-500 hover:text-primary hover:border-primary/40 transition-all font-bold text-xs"
+                  className="flex items-center justify-center gap-2 py-4 rounded-2xl border border-dashed border-slate-700 text-slate-500 hover:text-white hover:border-slate-500 transition-all font-bold text-[10px]"
                 >
-                  <Shield size={14} />
-                  Enterprise Login
+                  <Lock size={12} />
+                  Enterprise
+                </button>
+                <button
+                  onClick={() => {
+                    setSelectedUserForLogin({ username: '' });
+                    // We use an empty username object to trigger the manual input view
+                  }}
+                  className="flex items-center justify-center gap-2 py-4 rounded-2xl border border-primary/20 bg-primary/5 text-primary hover:bg-primary/10 transition-all font-bold text-[10px]"
+                >
+                  <User size={12} />
+                  Manual Login
                 </button>
               </div>
             </>
@@ -180,10 +199,26 @@ export default function LoginPage() {
                 </button>
                 <div>
                   <p className="text-sm font-bold text-slate-500">Logging in as</p>
-                  <p className="text-white font-black">{selectedUserForLogin.username}</p>
+                  <p className="text-white font-black">{selectedUserForLogin.username || "Manual Input"}</p>
                 </div>
               </div>
               
+              {!selectedUserForLogin.username && (
+                <div className="space-y-2">
+                  <label className="text-xs font-black text-slate-500 px-1">Username</label>
+                  <div className="relative">
+                    <User className="absolute left-4 top-1/2 -translate-y-1/2 text-slate-500" size={16} />
+                    <input 
+                      type="text"
+                      autoFocus
+                      onChange={(e) => setSelectedUserForLogin({...selectedUserForLogin, username: e.target.value})}
+                      className="w-full bg-slate-800/50 border border-slate-800 focus:border-primary rounded-2xl py-4 pl-12 pr-4 text-white focus:outline-none transition-all placeholder:text-slate-700 font-mono"
+                      placeholder="Admin"
+                    />
+                  </div>
+                </div>
+              )}
+              
               <div className="space-y-2">
                 <label className="text-xs font-black text-slate-500 px-1">Password</label>
                 <div className="relative">
@@ -209,9 +244,10 @@ export default function LoginPage() {
           )}
         </div>
         
-        {users.length === 0 && (
-          <div className="text-center p-8 text-slate-500 animate-pulse">
-            Initializing users...
+        {/* Progress bar hint */}
+        {users.length === 0 && !selectedUserForLogin && !isEnterprise && (
+          <div className="w-full bg-slate-800 h-1 rounded-full overflow-hidden">
+            <div className="bg-primary h-full animate-progress-fast shadow-[0_0_8px_rgba(var(--primary-rgb),0.5)]"></div>
           </div>
         )}
       </div>

frontend/app/logs/page.tsx

@@ -54,7 +54,7 @@ export default function LogsPage() {
       });
 
       setAuditLogs(enrichedLogs);
-    } catch (err) {
+    } catch (err: any) {
       console.error("Critical log load failure:", err);
     } finally {
       setLoading(false);
@@ -289,7 +289,7 @@ export default function LogsPage() {
 
                 {selectedLog.target_snapshot && (() => {
                   try {
-                    const snap = JSON.parse(selectedLog.target_snapshot);
+                    const snap = JSON.parse(selectedLog.target_snapshot) as Record<string, any>;
                     return (
                       <div className="space-y-4">
                         <div className="flex items-center gap-2">
@@ -299,12 +299,12 @@ export default function LogsPage() {
                         </div>
                         <div className="grid grid-cols-2 gap-3">
                           {Object.entries(snap).map(([key, val]) => (
-                            val && key !== 'image_url' && (
+                            (val && key !== 'image_url') ? (
                               <div key={key} className="bg-slate-950/30 p-3 rounded-xl border border-slate-800/40">
                                 <p className="text-[8px] font-black text-slate-600 uppercase mb-1">{key.replace('_', ' ')}</p>
                                 <p className="text-xs font-bold text-slate-300 truncate" title={String(val)}>{String(val)}</p>
                               </div>
-                            )
+                            ) : null
                           ))}
                         </div>
                       </div>

frontend/app/page.tsx

@@ -48,7 +48,7 @@ import { generateBarcode128, getQRCodeURL } from '@/lib/labels';
 import { clsx, type ClassValue } from 'clsx';
 import { twMerge } from 'tailwind-merge';
 import axios from 'axios';
-import versionData from '../../VERSION.json';
+import versionData from '../VERSION.json';
 
 interface User {
   id: number;
@@ -342,7 +342,7 @@ export default function Home() {
       setIsEditing(false);
       setSelectedItem(updated as Item);
       await loadInventory();
-    } catch (err) {
+    } catch (err: any) {
       console.error(err);
       toast.error("Failed to update item");
     }
@@ -360,7 +360,7 @@ export default function Home() {
       toast.success("Item deleted from catalog");
       setSelectedItem(null);
       await loadInventory();
-    } catch (err) {
+    } catch (err: any) {
       console.error(err);
       toast.error("Failed to delete item");
     }
@@ -471,60 +471,53 @@ export default function Home() {
             </div>
           </div>
 
-          <div className="flex flex-wrap items-center justify-between sm:justify-end gap-3 sm:gap-6 bg-slate-900/40 sm:bg-transparent p-3 sm:p-0 rounded-2xl border border-slate-800/50 sm:border-none">
-            <div className="flex flex-wrap items-center gap-4">
+          <div className="flex flex-wrap items-center justify-between sm:justify-end gap-3 sm:gap-6 bg-slate-900/40 sm:bg-transparent px-4 py-2 sm:p-0 rounded-2xl border border-slate-800/50 sm:border-none">
+            <div className="flex flex-wrap items-center gap-4 sm:gap-6">
               {isScannerReady && (
-                <div className="flex items-center gap-1.5">
-                  <div className="w-1 h-1 rounded-full bg-green-500 shadow-[0_0_5px_rgba(34,197,94,0.5)]" />
-                  <span className="text-xs font-black text-green-500/80 whitespace-nowrap">
-                    Offline Scan: OK
+                <div className="flex items-center gap-2">
+                  <div className="w-1.5 h-1.5 rounded-full bg-green-500 shadow-[0_0_8px_rgba(34,197,94,0.6)]" />
+                  <span className="text-[10px] sm:text-xs font-black text-green-500/90 whitespace-nowrap tracking-wider uppercase">
+                    Scanner: OK
                   </span>
                 </div>
               )}
-              <div className="flex items-center gap-1.5">
-                <div className={`w-1 h-1 rounded-full ${isOnline ? 'bg-green-500 animate-pulse shadow-[0_0_5px_rgba(34,197,94,0.5)]' : 'bg-rose-500 shadow-[0_0_5px_rgba(244,63,94,0.5)]'}`} />
-                <span className={`text-xs font-black whitespace-nowrap ${isOnline ? 'text-green-500/80' : 'text-rose-500/80'}`}>
-                  Server Sync: {isOnline ? 'OK' : 'No'}
+              <div className="flex items-center gap-2">
+                <div className={`w-1.5 h-1.5 rounded-full ${isOnline ? 'bg-green-500 animate-pulse shadow-[0_0_8px_rgba(34,197,94,0.6)]' : 'bg-rose-500 shadow-[0_0_8px_rgba(244,63,94,0.6)]'}`} />
+                <span className={`text-[10px] sm:text-xs font-black whitespace-nowrap tracking-wider uppercase ${isOnline ? 'text-green-500/90' : 'text-rose-500/90'}`}>
+                  Sync: {isOnline ? 'Active' : 'Offline'}
                 </span>
               </div>
             </div>
-            <div className="flex items-center gap-2">
-            <button 
-              onClick={() => setShowBoxManager(true)}
-              className="p-3 bg-slate-900 border border-slate-800 text-slate-400 rounded-xl hover:text-primary transition-colors hover:border-primary/30"
-              title="Box Manager"
-            >
-              <Package size={20} />
-            </button>
-            <button 
-              onClick={handleSync} 
-              disabled={syncing}
-              className="p-3 bg-slate-900 border border-slate-800 text-slate-400 rounded-xl hover:text-white transition-colors disabled:opacity-50"
-            >
-              <RefreshCw size={20} className={syncing ? "animate-spin text-primary" : ""} />
-            </button>
-          </div>
+            <div className="flex items-center gap-3">
+              <button 
+                onClick={handleSync} 
+                disabled={syncing}
+                className="p-2.5 bg-slate-900/80 border border-slate-800 text-slate-400 rounded-xl hover:text-white transition-all active:scale-95 disabled:opacity-50"
+              >
+                <RefreshCw size={18} className={syncing ? "animate-spin text-primary" : ""} />
+              </button>
+            </div>
           </div>
         </header>
 
         <div className="w-full px-1 space-y-6">
           {/* Mode Switcher */}
-          <div className="flex p-1 bg-slate-900/80 backdrop-blur-md rounded-2xl shadow-inner w-full">
+          <div className="flex p-1.5 bg-slate-900/80 backdrop-blur-md rounded-2xl shadow-inner w-full gap-1">
             {[
-              { id: 'CHECK_IN', label: 'Check in', icon: ArrowDownCircle },
-              { id: 'CHECK_OUT', label: 'Check out', icon: ArrowUpCircle },
+              { id: 'CHECK_IN', label: 'Check In', icon: ArrowDownCircle },
+              { id: 'CHECK_OUT', label: 'Check Out', icon: ArrowUpCircle },
               { id: 'TRASH', label: 'Trash', icon: Trash2 }
             ].map((m) => (
               <button
                 key={m.id}
                 onClick={() => setMode(m.id as any)}
                 className={cn(
-                  "flex-1 py-3 rounded-xl text-sm font-black transition-all flex items-center justify-center gap-2",
-                  mode === m.id ? "bg-slate-800 text-primary shadow-lg" : "text-slate-500 hover:text-slate-300"
+                  "flex-1 py-3.5 rounded-xl text-xs sm:text-sm font-black transition-all flex items-center justify-center gap-3",
+                  mode === m.id ? "bg-slate-800 text-primary shadow-lg ring-1 ring-primary/20" : "text-slate-500 hover:text-slate-300"
                 )}
               >
-                <m.icon size={18} />
-                {m.label}
+                <m.icon size={18} className={mode === m.id ? "scale-110 transition-transform" : ""} />
+                <span className="truncate">{m.label}</span>
               </button>
             ))}
           </div>
@@ -558,15 +551,31 @@ export default function Home() {
                   <p className="text-sm text-slate-400">Scan labels to {mode.replace('_', ' ')} items</p>
                 </div>
 
-                <div className="w-full h-px bg-slate-800 my-2" />
+                <div className="w-full h-px bg-slate-800/50 my-2" />
 
-                <button
-                  onClick={() => setShowOnboarding(true)}
-                  className="w-full h-16 rounded-[1.5rem] bg-slate-900/50 border border-slate-800 flex items-center justify-center gap-3 group hover:border-primary/40 transition-all font-bold"
-                >
-                  <Sparkles size={18} className="text-primary group-hover:scale-110 transition-transform" />
-                  <span className="text-sm">Add NEW Item<br />(AI Onboarding)</span>
-                </button>
+                <div className="w-full grid grid-cols-1 gap-4">
+                  <button
+                    onClick={() => setShowOnboarding(true)}
+                    className="w-full h-18 py-4 rounded-[1.5rem] bg-indigo-500/10 border border-indigo-500/20 flex items-center justify-center gap-4 group hover:border-indigo-500/50 transition-all font-black text-indigo-400"
+                  >
+                    <Sparkles size={24} className="group-hover:scale-125 transition-transform" />
+                    <span className="text-left leading-tight">
+                      Add NEW Item<br />
+                      <span className="text-[10px] opacity-60 uppercase tracking-widest font-mono">AI Onboarding</span>
+                    </span>
+                  </button>
+
+                  <button
+                    onClick={() => setShowBoxManager(true)}
+                    className="w-full h-18 py-4 rounded-[1.5rem] bg-slate-900/50 border border-slate-800 flex items-center justify-center gap-4 group hover:border-primary/40 transition-all font-black text-slate-300"
+                  >
+                    <Package size={24} className="text-primary group-hover:scale-125 transition-transform" />
+                    <span className="text-left leading-tight">
+                      Manage Boxes<br />
+                      <span className="text-[10px] opacity-60 uppercase tracking-widest font-mono">Box Inventory</span>
+                    </span>
+                  </button>
+                </div>
               </div>
             )}
           </section>
@@ -890,7 +899,7 @@ export default function Home() {
                                 <Printer size={14} /> Print Label
                               </button>
                               <button 
-                                onClick={() => { setQuery(box.toLowerCase()); setShowBoxManager(false); }}
+                                onClick={() => { setSearchQuery(box.toLowerCase()); setShowBoxManager(false); }}
                                 className="px-4 py-3 bg-slate-900 border border-slate-800 text-slate-400 text-xs font-bold rounded-xl hover:bg-slate-800"
                               >
                                 View
@@ -1004,7 +1013,7 @@ export default function Home() {
         <footer className="mt-20 mb-8 flex flex-col items-center gap-2 opacity-30">
           <p className="text-xs font-bold">Powered by TFM Group Software</p>
           <div className="h-px w-12 bg-slate-800" />
-          <p className="text-[9px] font-mono">v{versionData.version} • {versionData.last_build} • BUILD: dev-{versionData.commit}</p>
+          <p className="text-[9px] font-mono">v{versionData.version} • {versionData.last_build} • BUILD: dev-{(versionData as any).commit || 'N/A'}</p>
         </footer>
       </div>
     </PageShell>

frontend/components/Scanner.tsx

@@ -60,7 +60,7 @@ export default function Scanner({ onScanSuccess, onOCRMatch, paused }: ScannerPr
               Html5QrcodeSupportedFormats.CODE_39,
               Html5QrcodeSupportedFormats.EAN_13,
               Html5QrcodeSupportedFormats.UPC_A,
-              Html5QrcodeSupportedFormats.DATAMATRIX
+              Html5QrcodeSupportedFormats.DATA_MATRIX
           ],
           videoConstraints: {
             facingMode: "environment"

frontend/entrypoint.sh

@@ -0,0 +1,30 @@
+#!/bin/sh
+# =============================================================================
+# frontend/entrypoint.sh
+# =============================================================================
+# Docker container entrypoint for TFM aInventory frontend.
+# Fixes permissions for the logs volume and starts the Node.js server.
+# =============================================================================
+
+set -e
+
+# Fix permissions for the logs directory (useful if mounted as a volume)
+if [ -d "/app/logs" ]; then
+    echo "🐳 [Docker] Fixing /app/logs permissions..."
+    chown -R nextjs:nodejs /app/logs
+fi
+
+# Generate network.json for frontend runtime discovery
+echo "🐳 [Docker] Generating public/network.json..."
+cat <<EOF > /app/public/network.json
+{
+  "SERVER_IP": "${SERVER_IP:-localhost}",
+  "BACKEND_PORT": ${BACKEND_PORT:-8000},
+  "BACKEND_SSL_PORT": ${BACKEND_SSL_PORT:-8908}
+}
+EOF
+chown nextjs:nodejs /app/public/network.json
+
+# Hand off to the application server as the nextjs user
+echo "🐳 [Docker] Starting Next.js standalone server as nextjs user..."
+exec su-exec nextjs node server.js

inventory.env

@@ -0,0 +1,24 @@
+# =============================================================================
+# TFM aInventory - Docker Compose Environment
+# =============================================================================
+# This file is used by Docker Compose for host-side port mapping.
+# It should match the values in config/network_config.env
+# =============================================================================
+
+SERVER_IP=192.168.84.113
+
+# Backend Ports
+BACKEND_PORT=8916
+BACKEND_SSL_PORT=8918
+
+# Frontend Ports
+FRONTEND_PORT=8917
+FRONTEND_SSL_PORT=8919
+
+# Security & AI
+JWT_SECRET_KEY=change_me_in_production
+GEMINI_API_KEY=AIzaSyAajthWG2agpDLyJHY11U5qFLP4WnV5z0w
+
+# External Access (CORS)
+# Comma-separated list of extra IPs or FQDNs allowed to connect (e.g. Tailscale, VPN)
+EXTRA_ALLOWED_ORIGINS=100.78.182.27

run_standalone.sh

@@ -7,7 +7,7 @@ echo "🚀 Starting TFM aInventory in Standalone Mode..."
 # Trapping termination signals to clean up child processes
 trap "echo 'Stopping all processes...'; kill 0" SIGINT SIGTERM EXIT
 
-# --- CONFIGURATION (Default values, overridden by network_config.env) ---
+# --- CONFIGURATION (Default values, overridden by network_configinventory.env) ---
 BACKEND_PORT=8000
 FRONTEND_PORT=3001
 BACKEND_SSL_PORT=3002
@@ -15,7 +15,7 @@ FRONTEND_SSL_PORT=3003
 SERVER_IP="localhost"
 
 # Load Configuration from file if it exists
-CONFIG_PATH="$(cd "$(dirname "$0")" && pwd)/config/network_config.env"
+CONFIG_PATH="$(cd "$(dirname "$0")" && pwd)/inventory.env"
 if [ -f "$CONFIG_PATH" ]; then
     echo "⚙️  Loading network configuration from $CONFIG_PATH..."
     export $(grep -v '^#' "$CONFIG_PATH" | xargs)

scripts/save_version.py

@@ -4,7 +4,7 @@ import os
 import sys
 from datetime import datetime
 
-VERSION_FILE = 'VERSION.json'
+VERSION_FILE = 'frontend/VERSION.json'
 GIT_PATH_FILE = '.git_path'
 
 def get_git_path():
@@ -53,8 +53,15 @@ def main():
     data['version'] = new_version
     data['last_build'] = datetime.now().strftime("%Y-%m-%d-%H%M")
     
+    # Get current git commit (short)
+    try:
+        commit_hash = run_command([git, 'rev-parse', '--short', 'HEAD'])
+        data['commit'] = commit_hash
+    except Exception:
+        data['commit'] = 'unknown'
+
     # Optional: Rotate changelog if needed, but for now just update version
-    print(f"Incrementing version: {old_version} -> {new_version}")
+    print(f"Incrementing version: {old_version} -> {new_version} (commit: {data['commit']})")
     
     with open(VERSION_FILE, 'w') as f:
         json.dump(data, f, indent=2)

start_server.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# --- CONFIGURATION (Default values, will be overridden by network_config.env) ---
+# --- CONFIGURATION (Default values, will be overridden by network_configinventory.env) ---
 BACKEND_PORT=8000
 FRONTEND_PORT=3001
 BACKEND_SSL_PORT=3002
@@ -8,10 +8,10 @@ FRONTEND_SSL_PORT=3003
 SERVER_IP="localhost"
 
 # Load Configuration from file if it exists
-CONFIG_PATH="$(cd "$(dirname "$0")" && pwd)/config/network_config.env"
+CONFIG_PATH="$(cd "$(dirname "$0")" && pwd)/inventory.env"
 if [ -f "$CONFIG_PATH" ]; then
     echo "⚙️  Loading network configuration from $CONFIG_PATH..."
-    # Export variables from .env file (ignoring comments and empty lines)
+    # Export variables from inventory.env file (ignoring comments and empty lines)
     export $(grep -v '^#' "$CONFIG_PATH" | xargs)
 fi
 
@@ -87,9 +87,19 @@ echo -e "${GREEN}=======================================================${NC}"
 echo -e "${GREEN}${BOLD}        🚀 TFM aInventory UNIFIED ACCESS${NC}"
 echo -e "${GREEN}=======================================================${NC}"
 echo ""
-echo -e "   USE THIS URL ON BOTH DESKTOP & MOBILE:"
-echo -e "   👉 ${GREEN}${BOLD}https://$LOCAL_IP:$FRONTEND_SSL_PORT${NC}"
-echo -e "   (Or ${GREEN}https://localhost:$FRONTEND_SSL_PORT${NC} on this Mac)"
+   echo -e "   USE THIS URL ON BOTH DESKTOP & MOBILE:"
+   echo -e "   👉 ${GREEN}${BOLD}https://$LOCAL_IP:$FRONTEND_SSL_PORT${NC}"
+   echo -e "   (Or ${GREEN}https://localhost:$FRONTEND_SSL_PORT${NC} on this Mac)"
+
+   if [ ! -z "$EXTRA_ALLOWED_ORIGINS" ]; then
+       echo -e "   EXTERNAL/VPN ACCESS points:"
+       IFS=',' read -ra ADDR <<< "$EXTRA_ALLOWED_ORIGINS"
+       for exp in "${ADDR[@]}"; do
+           # Trim spaces and print
+           TRIMMED=$(echo $exp | xargs)
+           echo -e "   👉 ${GREEN}${BOLD}https://$TRIMMED:$FRONTEND_SSL_PORT${NC}"
+       done
+   fi
 echo ""
 echo -e "   ${YELLOW}${BOLD}NOTE:${NC} If you see a 'Not Private' warning,"
 echo -e "   Click 'Advanced' -> 'Proceed' to continue."