limpieza de scipts

tenant arreglado
2026-03-09 13:47:20 -06:00 · 2026-03-09 13:40:28 -06:00 · 2026-03-05 14:04:04 -07:00 · 2026-03-04 13:31:38 -07:00 · 2026-03-03 14:02:18 -07:00 · 2026-03-03 11:25:37 -07:00
71 changed files with 3387 additions and 3006 deletions
--- a/README.legacy.md
+++ b/README.legacy.md
@@ -0,0 +1,178 @@
+# ServiceManagerWeb - Mesa de Ayuda B2B
+
+Sistema multi-tenant de Mesa de Ayuda/Soporte Técnico empresarial para Aduanasoft.
+
+## Arquitectura
+
+- **Frontend**: SvelteKit + TypeScript (portal clientes + panel interno)
+- **Backend**: Python FastAPI + Pydantic v2 
+- **Workers**: Celery + Redis (notificaciones, SLAs, jobs)
+- **BD**: PostgreSQL + Alembic migrations
+- **Auth**: JWT + Refresh tokens + 2FA opcional (TOTP)
+- **Infra**: Docker Compose local, preparado para producción
+
+## Estructura del Monorepo
+
+```
+ServiceManagerWeb/
+├── backend/               # FastAPI app
+├── frontend-client/       # SvelteKit app para clientes
+├── frontend-internal/     # SvelteKit app para staff interno
+├── workers/              # Celery tasks
+├── db/                   # Migrations y esquemas
+├── docker/               # Dockerfiles específicos
+├── docs/                 # Documentación adicional
+├── scripts/              # Scripts de desarrollo/despliegue
+├── docker-compose.yml    # Orquestación completa
+└── .env.example          # Variables de entorno
+```
+
+## Stack Tecnológico
+
+### Backend (Python)
+- FastAPI (async)
+- Pydantic v2
+- SQLAlchemy 2.0 (async)
+- Alembic (migrations)
+- Argon2 (hashing passwords)
+- PyJWT
+- Celery + Redis
+
+### Frontend (JavaScript/TypeScript)
+- SvelteKit
+- TypeScript
+- TailwindCSS
+- shadcn/ui o similar
+- Zod (validación)
+
+### Infraestructura
+- PostgreSQL 15+
+- Redis 7+
+- Docker & Docker Compose
+- Nginx (reverse proxy)
+
+## Dominios del Sistema
+
+1. **Auth**: Usuarios, roles, permisos, 2FA
+2. **Tenants**: Multi-tenancy, organizaciones
+3. **Tickets**: Gestión de tickets, estados, SLAs
+4. **Notifications**: Email, plantillas, logs
+5. **Audit**: Bitácora de acciones
+
+## Roles de Usuario
+
+### Internos (Staff)
+- `ADMIN`: Control total del sistema
+- `SUPPORT_MANAGER`: Gestión de equipos y SLAs
+- `AGENT`: Atención de tickets
+- `AUDITOR`: Solo lectura para auditoría
+
+### Clientes
+- `CLIENT_ADMIN`: Gestión de organización cliente
+- `CLIENT_USER`: Creación y seguimiento de tickets
+
+## Quick Start
+
+```bash
+# Clonar y configurar
+git clone <repo>
+cd ServiceManagerWeb
+cp .env.example .env
+
+# Levantar servicios
+docker-compose up -d
+
+# Verificar estado
+docker-compose ps
+```
+
+## URLs por Defecto
+
+- Frontend Clientes: http://localhost:3000
+- Frontend Interno: http://localhost:3001  
+- API Backend: http://localhost:8000
+- API Docs: http://localhost:8000/docs
+- Adminer (DB): http://localhost:8080
+
+## Scripts de Desarrollo
+
+```bash
+# Backend
+cd backend
+python -m uvicorn app.main:app --reload --port 8000
+
+# Frontend Cliente
+cd frontend-client
+npm run dev -- --port 3000
+
+# Frontend Interno  
+cd frontend-internal
+npm run dev -- --port 3001
+
+# Workers
+cd workers
+celery -A app.worker worker --loglevel=info
+celery -A app.worker beat --loglevel=info
+```
+
+## Testing
+
+```bash
+# Backend tests
+cd backend
+pytest
+
+# Frontend tests
+cd frontend-client
+npm test
+cd ../frontend-internal
+npm test
+```
+
+## Troubleshooting
+
+### Error 500 en Login / Proxy Error
+
+**Síntoma**: Error 500 al intentar hacer login, o error de proxy de Vite "connect ECONNREFUSED".
+
+**Causa**: Configuración incorrecta de la comunicación entre servicios de Docker.
+
+**Solución**:
+1. En desarrollo con Docker, los servicios usan nombres de servicio (no `localhost`)
+2. Verificar `vite.config.js`: el proxy debe apuntar a `http://backend:8000`
+3. Verificar `docker-compose.yml`: `PUBLIC_API_URL` debe ser `http://backend:8000`
+4. Después de cambios, reiniciar contenedor: `docker-compose restart frontend-internal`
+
+**Nota**: Para desarrollo local sin Docker, cambiar el proxy a `http://localhost:8000`.
+
+### Tenant Slug Incorrecto
+
+**Síntoma**: Error de autenticación incluso con credenciales correctas.
+
+**Causa**: El `tenant_slug` en el login no coincide con los tenants en la BD.
+
+**Solución**:
+1. Verificar tenants existentes: `docker exec servicemanager-backend python check_tenants.py`
+2. Actualizar el tenant_slug en el código de login
+3. Tenants por defecto: `aduanasoft-demo`, `test-tenant`
+
+### Credenciales de Prueba
+
+```
+Email: admin@aduanasoft.com
+Password: admin123
+Tenant: aduanasoft-demo
+Role: ADMIN
+```
+
+## Contribución
+
+1. Fork del proyecto
+2. Crear feature branch (`git checkout -b feature/nueva-funcionalidad`)
+3. Commit cambios (`git commit -am 'Agregar nueva funcionalidad'`)
+4. Push a branch (`git push origin feature/nueva-funcionalidad`)
+5. Crear Pull Request
+
+## Licencia
+
+Propietario - Aduanasoft © 2026
--- a/README.md
+++ b/README.md
@@ -1,178 +1,755 @@
-# ServiceManagerWeb - Mesa de Ayuda B2B
+# ServiceManagerWeb — Mesa de Ayuda B2B

-Sistema multi-tenant de Mesa de Ayuda/Soporte Técnico empresarial para Aduanasoft.
+> **Versión actual:** v1.15.1 — Módulo de reportes implementado
+>
+> Sistema multi-tenant de Mesa de Ayuda / Soporte Técnico empresarial desarrollado para Aduanasoft.
+> Arquitectura Modular Monolith con Clean Architecture, preparado para escalar a microservicios.

-## Arquitectura
+---

- **Frontend**: SvelteKit + TypeScript (portal clientes + panel interno)
- **Backend**: Python FastAPI + Pydantic v2 
- **Workers**: Celery + Redis (notificaciones, SLAs, jobs)
- **BD**: PostgreSQL + Alembic migrations
- **Auth**: JWT + Refresh tokens + 2FA opcional (TOTP)
- **Infra**: Docker Compose local, preparado para producción
+## Tabla de Contenidos

-## Estructura del Monorepo
+1. [Requisitos previos](#requisitos-previos)
+2. [Inicio rápido con Docker (recomendado)](#inicio-rápido-con-docker-recomendado)
+3. [Configuración de variables de entorno](#configuración-de-variables-de-entorno)
+4. [Cargar datos de prueba](#cargar-datos-de-prueba)
+5. [URLs y puertos por defecto](#urls-y-puertos-por-defecto)
+6. [Credenciales de prueba](#credenciales-de-prueba)
+7. [Desarrollo local sin Docker](#desarrollo-local-sin-docker)
+8. [Arquitectura del proyecto](#arquitectura-del-proyecto)
+9. [Roles y permisos](#roles-y-permisos)
+10. [Comandos útiles](#comandos-útiles)
+11. [Pruebas (testing)](#pruebas-testing)
+12. [Solución de problemas](#solución-de-problemas)
+13. [Contribución](#contribución)
+14. [Historial de versiones](#historial-de-versiones)
+
+---
+
+## Requisitos previos
+
+Antes de clonar el proyecto, asegúrate de tener instalado:
+
+| Herramienta | Versión mínima | Descarga |
+|-------------|---------------|---------|
+| **Git** | 2.x | https://git-scm.com/downloads |
+| **Docker Desktop** | 24.x | https://www.docker.com/products/docker-desktop |
+| **Docker Compose** | v2.x (incluido en Docker Desktop) | — |
+
+> **Nota para desarrolladores que quieran editar código localmente (sin Docker):**
+> también necesitarás Python 3.11+ y Node.js 18+. Ver sección
+> [Desarrollo local sin Docker](#desarrollo-local-sin-docker).
+
+### Verificar que Docker esté corriendo
+
+```bash
+docker --version        # Debe mostrar Docker version 24.x o superior
+docker compose version  # Debe mostrar Docker Compose version v2.x
+```
+
+Si `docker compose version` falla, prueba `docker-compose --version` (versión standalone).
+
+---
+
+## Inicio rápido con Docker (recomendado)
+
+Este es el método más simple y funciona igual en **Windows, Linux y macOS**.
+Solo necesitas Docker Desktop instalado y corriendo.
+
+### Paso 1 — Clonar el repositorio
+
+```bash
+git clone https://git.aduanasoft.com/ADUANASOFT/service_manager.git
+cd service_manager
+```
+
+### Paso 2 — Crear el archivo de variables de entorno
+
+**Linux / macOS:**
+```bash
+cp .env.example .env
+```
+
+**Windows (PowerShell):**
+```powershell
+Copy-Item .env.example .env
+```
+
+**Windows (CMD):**
+```cmd
+copy .env.example .env
+```
+
+> **Importante:** El archivo `.env` nunca se sube a git (está en `.gitignore`).
+> Para desarrollo local los valores del `.env.example` funcionan sin cambios.
+> En producción **debes** generar claves secretas únicas (ver sección de variables de entorno).
+
+### Paso 3 — Levantar todos los servicios
+
+```bash
+docker compose up -d
+```
+
+Este comando descarga las imágenes, construye los contenedores e inicia todo el stack.
+La primera vez tarda entre 3 y 8 minutos dependiendo de la conexión a internet.
+
+> **Alternativa con herramientas de desarrollo** (Adminer, MailHog, Redis Commander):
+> ```bash
+> docker compose --profile dev up -d
+> ```
+
+### Paso 4 — Verificar que todo esté funcionando
+
+```bash
+docker compose ps
+```
+
+Deberías ver todos los servicios con estado `Up` o `healthy`:
+
+```
+NAME                            STATUS
+servicemanager-db               Up (healthy)
+servicemanager-redis            Up (healthy)
+servicemanager-backend          Up (healthy)
+servicemanager-worker           Up
+servicemanager-beat             Up
+servicemanager-client-frontend  Up
+servicemanager-internal-...     Up
+servicemanager-nginx            Up
+```
+
+Si algún servicio muestra `Exit` o `Restarting`, revisa la sección
+[Solución de problemas](#solución-de-problemas).
+
+### Paso 5 — Cargar datos de ejemplo (opcional pero recomendado)
+
+```bash
+docker exec servicemanager-backend python /scripts/seed_data.py
+```
+
+Esto crea el tenant de demostración, categorías, usuarios y tickets de prueba.
+
+### ¡Listo! Abre el navegador
+
+| Aplicación | URL |
+|------------|-----|
+| Portal de clientes | http://localhost:3000 |
+| Panel interno (staff) | http://localhost:3001 |
+| API REST | http://localhost:8000 |
+| Documentación API (Swagger) | http://localhost:8000/docs |
+| Documentación API (ReDoc) | http://localhost:8000/redoc |
+| Health check | http://localhost:8000/health |
+
+> **Con perfil dev** activo también tendrás:
+> - Adminer (gestor visual de PostgreSQL): http://localhost:8080
+> - MailHog (pruebas de email): http://localhost:8025
+> - Redis Commander (inspector de Redis): http://localhost:8081
+
+---
+
+## Configuración de variables de entorno
+
+El archivo `.env` controla todo el comportamiento de la aplicación.
+Copia `.env.example` como `.env` y revisa los valores siguientes:
+
+### Variables críticas
+
+| Variable | Descripción | Valor por defecto (dev) |
+|----------|-------------|-------------------------|
+| `SECRET_KEY` | Clave secreta general de Flask/FastAPI | _(cambiar en producción)_ |
+| `JWT_SECRET_KEY` | Clave para firmar tokens JWT | _(cambiar en producción)_ |
+| `DATABASE_URL` | Cadena de conexión a PostgreSQL | `postgresql+asyncpg://servicemanager:...@postgres:5432/servicemanager` |
+| `REDIS_URL` | URL de conexión a Redis | `redis://redis:6379/0` |
+| `ENVIRONMENT` | Entorno actual | `development` |
+| `DEBUG` | Modo debug (muestra errores detallados) | `true` |
+
+### Generar claves seguras para producción
+
+**Linux / macOS:**
+```bash
+openssl rand -base64 32   # Genera SECRET_KEY
+openssl rand -base64 32   # Genera JWT_SECRET_KEY
+```
+
+**Windows (PowerShell):**
+```powershell
+[Convert]::ToBase64String((1..32 | ForEach-Object { Get-Random -Maximum 256 }))
+```
+
+> **Advertencia:** Nunca uses las claves del `.env.example` en producción.
+> Cambiar las claves en producción invalida todas las sesiones activas.
+
+### Desarrollo local vs Docker
+
+En `.env.example` las URLs apuntan a nombres de servicio Docker (`postgres`, `redis`, `backend`).
+Si ejecutas el backend directamente en tu máquina (sin Docker), cambia:
+
+```dotenv
+# Para desarrollo local sin Docker:
+DATABASE_URL=postgresql+asyncpg://servicemanager:servicemanager123@localhost:5432/servicemanager
+REDIS_URL=redis://localhost:6379/0
+CELERY_BROKER_URL=redis://localhost:6379/0
+```
+
+---
+
+## Cargar datos de prueba
+
+El script `seed_data.py` crea datos iniciales en la base de datos.
+
+**Con Docker (recomendado):**
+```bash
+docker exec servicemanager-backend python /scripts/seed_data.py
+```
+
+**Sin Docker:**
+```bash
+cd backend
+python ../scripts/seed_data.py
+```
+
+El script crea:
+- Tenant de demostración: `aduanasoft-demo`
+- Categorías de tickets (Soporte Técnico, Facturación, Incidentes Críticos, etc.)
+- Sistemas registrados
+- Usuarios de prueba con distintos roles
+
+---
+
+## URLs y puertos por defecto
+
+| Servicio | Puerto | Descripción |
+|----------|--------|-------------|
+| Frontend Clientes | **3000** | Portal para usuarios clientes |
+| Frontend Interno | **3001** | Panel para staff (agentes, admins) |
+| Backend API | **8000** | FastAPI — endpoints REST |
+| PostgreSQL | **5432** | Base de datos (no exponer en producción) |
+| Redis | **6379** | Cache y broker Celery (no exponer en producción) |
+| Nginx | **80** | Reverse proxy |
+| Adminer *(perfil dev)* | **8080** | GUI para PostgreSQL |
+| MailHog *(perfil dev)* | **8025** | Capturador de emails en desarrollo |
+| Redis Commander *(perfil dev)* | **8081** | GUI para Redis |
+
+### ¿Conflicto de puertos?
+
+Si algún puerto ya está en uso en tu máquina, edita `docker-compose.yml` y cambia
+el número **izquierdo** del mapeo `host:container`. Por ejemplo, para backend en el 8080:
+
+```yaml
+ports:
+  - "8080:8000"   # ahora accesible en localhost:8080
+```
+
+---
+
+## Credenciales de prueba
+
+Después de ejecutar el seed, puedes iniciar sesión con:
+
+| Campo | Valor |
+|-------|-------|
+| Email | `admin@aduanasoft.com` |
+| Contraseña | `admin123` |
+| Tenant | `aduanasoft-demo` |
+| Rol | `ADMIN` |
+
+> Otros usuarios creados por el seed tienen el mismo sufijo de contraseña (`123`).
+> Revisa `scripts/seed_data.py` para ver la lista completa.
+
+---
+
+## Desarrollo local sin Docker
+
+Útil cuando necesitas depurar el código con breakpoints o acelerar el ciclo de desarrollo.
+Requiere que **PostgreSQL y Redis sí corran en Docker** (o instalación nativa).
+
+### Requisitos adicionales
+
+| Herramienta | Versión | Descarga |
+|------------|---------|---------|
+| Python | 3.11 o 3.12 | https://www.python.org/downloads/ |
+| Node.js (con npm) | 18 LTS | https://nodejs.org/ |
+| pip | incluido con Python | — |
+
+### Iniciar solo la base de datos y Redis
+
+```bash
+docker compose up -d postgres redis
+```
+
+### Backend (FastAPI)
+
+```bash
+cd backend
+
+# Crear entorno virtual (solo la primera vez)
+python -m venv ../.venv
+
+# Activar entorno virtual
+# Linux / macOS:
+source ../.venv/bin/activate
+# Windows (PowerShell):
+..\.venv\Scripts\Activate.ps1
+# Windows (CMD):
+..\.venv\Scripts\activate.bat
+
+# Instalar dependencias (solo la primera vez o cuando cambie requirements.txt)
+pip install -r requirements.txt
+
+# Ejecutar migraciones de base de datos
+alembic upgrade head
+
+# Iniciar servidor de desarrollo
+uvicorn app.main:app --reload --host 0.0.0.0 --port 8000
+```
+
+> Si `uvicorn` no se encuentra, asegúrate de que el entorno virtual está activado
+> (`(.venv)` debe aparecer en tu terminal).
+
+### Frontend Clientes
+
+```bash
+cd frontend-client
+
+# Instalar dependencias (solo la primera vez)
+npm install
+
+# Iniciar servidor de desarrollo en puerto 3000
+npm run dev
+```
+
+### Frontend Interno (staff)
+
+```bash
+cd frontend-internal
+
+# Instalar dependencias (solo la primera vez)
+npm install
+
+# Iniciar servidor de desarrollo en puerto 3001
+npm run dev
+```
+
+> Los dos frontends tienen puertos distintos (3000 y 3001) para que no haya conflicto
+> cuando corren al mismo tiempo.
+
+### Workers Celery (opcional en desarrollo)
+
+Necesario solo si desarrollas funcionalidades de notificaciones o SLAs automáticos.
+
+```bash
+cd workers
+
+# Activar el mismo entorno virtual del backend:
+# Linux / macOS:
+source ../.venv/bin/activate
+# Windows:
+..\.venv\Scripts\Activate.ps1
+
+pip install -r requirements.txt
+
+# Worker principal
+celery -A app.celery worker --loglevel=info
+
+# Scheduler de tareas periódicas (en otra terminal)
+celery -A app.celery beat --loglevel=info --schedule=/tmp/celerybeat-schedule
+```
+
+---
+
+## Arquitectura del proyecto

 ```
 ServiceManagerWeb/
-├── backend/               # FastAPI app
-├── frontend-client/       # SvelteKit app para clientes
-├── frontend-internal/     # SvelteKit app para staff interno
-├── workers/              # Celery tasks
-├── db/                   # Migrations y esquemas
-├── docker/               # Dockerfiles específicos
-├── docs/                 # Documentación adicional
-├── scripts/              # Scripts de desarrollo/despliegue
-├── docker-compose.yml    # Orquestación completa
-└── .env.example          # Variables de entorno
+├── backend/                    # Aplicación FastAPI (Python 3.11)
+│   ├── app/
+│   │   ├── main.py             # Punto de entrada, lifespan, middlewares
+│   │   ├── api/v1/
+│   │   │   ├── router.py       # Registro de todos los routers
+│   │   │   └── endpoints/      # Endpoints REST por dominio
+│   │   ├── core/               # Config, seguridad, base de datos, caché
+│   │   ├── models/             # Modelos SQLAlchemy (ORM)
+│   │   ├── services/           # Lógica de negocio
+│   │   └── middleware/         # Tenant context, Correlation ID
+│   ├── migrations/             # Migraciones Alembic
+│   ├── tests/                  # Pruebas backend
+│   └── requirements.txt        # Dependencias Python
+│
+├── frontend-client/            # Portal de clientes (SvelteKit + TypeScript)
+│   └── src/routes/             # Páginas: login, tickets, perfil
+│
+├── frontend-internal/          # Panel de staff (SvelteKit + TypeScript)
+│   └── src/routes/             # Páginas: dashboard, tickets, reportes, auditoría
+│
+├── workers/                    # Tareas asíncronas Celery
+│   └── app/tasks/              # email_tasks.py, sla_tasks.py, etc.
+│
+├── docker/                     # Dockerfiles y configuración Nginx
+├── db/                         # schema.sql inicial
+├── docs/                       # Documentación técnica adicional
+├── scripts/                    # seed_data.py, setup-dev.sh, etc.
+├── docker-compose.yml          # Orquestación completa
+└── .env.example                # Plantilla de variables de entorno
 ```

-## Stack Tecnológico
+### Stack tecnológico

-### Backend (Python)
- FastAPI (async)
- Pydantic v2
- SQLAlchemy 2.0 (async)
- Alembic (migrations)
- Argon2 (hashing passwords)
- PyJWT
- Celery + Redis
+**Backend:**  Python 3.11 · FastAPI · Pydantic v2 · SQLAlchemy 2.0 (async) · Alembic · Argon2 · PyJWT · Celery · Redis

-### Frontend (JavaScript/TypeScript)
- SvelteKit
- TypeScript
- TailwindCSS
- shadcn/ui o similar
- Zod (validación)
+**Frontend:** Node.js 18 · SvelteKit · TypeScript · TailwindCSS · Zod

-### Infraestructura
- PostgreSQL 15+
- Redis 7+
- Docker & Docker Compose
- Nginx (reverse proxy)
+**Infraestructura:** PostgreSQL 15 · Redis 7 · Docker Compose · Nginx

-## Dominios del Sistema
+---

-1. **Auth**: Usuarios, roles, permisos, 2FA
-2. **Tenants**: Multi-tenancy, organizaciones
-3. **Tickets**: Gestión de tickets, estados, SLAs
-4. **Notifications**: Email, plantillas, logs
-5. **Audit**: Bitácora de acciones
+## Roles y permisos

-## Roles de Usuario
-
-### Internos (Staff)
- `ADMIN`: Control total del sistema
- `SUPPORT_MANAGER`: Gestión de equipos y SLAs
- `AGENT`: Atención de tickets
- `AUDITOR`: Solo lectura para auditoría
+### Personal interno (staff)
+| Rol | Descripción |
+|-----|-------------|
+| `ADMIN` | Control total del sistema |
+| `SUPPORT_MANAGER` | Gestión de equipos y configuración de SLAs |
+| `AGENT` | Atención y resolución de tickets |
+| `AUDITOR` | Solo lectura para revisiones y cumplimiento |

 ### Clientes
- `CLIENT_ADMIN`: Gestión de organización cliente
- `CLIENT_USER`: Creación y seguimiento de tickets
+| Rol | Descripción |
+|-----|-------------|
+| `CLIENT_ADMIN` | Gestión de su organización cliente |
+| `CLIENT_USER` | Creación y seguimiento de sus propios tickets |

-## Quick Start
+---
+
+## Comandos útiles
+
+### Docker Compose

 ```bash
-# Clonar y configurar
-git clone <repo>
-cd ServiceManagerWeb
-cp .env.example .env
+# Levantar todos los servicios (segundo plano)
+docker compose up -d

-# Levantar servicios
-docker-compose up -d
+# Levantar con herramientas de desarrollo
+docker compose --profile dev up -d

-# Verificar estado
-docker-compose ps
+# Ver logs en tiempo real de todos los servicios
+docker compose logs -f
+
+# Ver logs de un servicio específico
+docker compose logs -f backend
+docker compose logs -f frontend-internal
+
+# Detener todos los servicios (mantiene los datos)
+docker compose down
+
+# Detener Y borrar todos los volúmenes (¡borra la base de datos!)
+docker compose down -v
+
+# Reconstruir imagen de un servicio (después de cambiar Dockerfile o requirements)
+docker compose build backend
+docker compose up -d backend
+
+# Reiniciar un servicio
+docker compose restart backend
 ```

-## URLs por Defecto
-
- Frontend Clientes: http://localhost:3000
- Frontend Interno: http://localhost:3001  
- API Backend: http://localhost:8000
- API Docs: http://localhost:8000/docs
- Adminer (DB): http://localhost:8080
-
-## Scripts de Desarrollo
+### Base de datos (Alembic)

 ```bash
-# Backend
+# Aplicar todas las migraciones pendientes
 cd backend
-python -m uvicorn app.main:app --reload --port 8000
+alembic upgrade head

-# Frontend Cliente
-cd frontend-client
-npm run dev -- --port 3000
+# Ver estado de migraciones
+alembic current

-# Frontend Interno  
-cd frontend-internal
-npm run dev -- --port 3001
+# Revertir última migración
+alembic downgrade -1

-# Workers
-cd workers
-celery -A app.worker worker --loglevel=info
-celery -A app.worker beat --loglevel=info
+# Crear nueva migración (después de modificar models/)
+alembic revision --autogenerate -m "nombre descriptivo del cambio"
+
+# Con Docker:
+docker exec servicemanager-backend alembic upgrade head
 ```

-## Testing
+### Calidad de código

 ```bash
-# Backend tests
 cd backend
+
+# Linter y auto-fix
+ruff check . --fix
+
+# Formateador
+black .
+
+# Verificación de tipos
+mypy .
+
+# Todo de una vez
+ruff check . --fix && black . && mypy .
+```
+
+---
+
+## Pruebas (testing)
+
+### Backend
+
+```bash
+cd backend
+
+# Ejecutar todas las pruebas
 pytest

-# Frontend tests
-cd frontend-client
-npm test
-cd ../frontend-internal
-npm test
+# Con cobertura detallada
+pytest --cov=app --cov-report=html
+
+# Abrir reporte de cobertura (Linux/macOS)
+open htmlcov/index.html
+# Windows
+start htmlcov/index.html
+
+# Prueba específica
+pytest tests/test_auth.py -v
+
+# Con Docker
+docker exec servicemanager-backend pytest -v --cov=app
 ```

-## Troubleshooting
-
-### Error 500 en Login / Proxy Error
-
-**Síntoma**: Error 500 al intentar hacer login, o error de proxy de Vite "connect ECONNREFUSED".
-
-**Causa**: Configuración incorrecta de la comunicación entre servicios de Docker.
-
-**Solución**:
-1. En desarrollo con Docker, los servicios usan nombres de servicio (no `localhost`)
-2. Verificar `vite.config.js`: el proxy debe apuntar a `http://backend:8000`
-3. Verificar `docker-compose.yml`: `PUBLIC_API_URL` debe ser `http://backend:8000`
-4. Después de cambios, reiniciar contenedor: `docker-compose restart frontend-internal`
-
-**Nota**: Para desarrollo local sin Docker, cambiar el proxy a `http://localhost:8000`.
-
-### Tenant Slug Incorrecto
-
-**Síntoma**: Error de autenticación incluso con credenciales correctas.
-
-**Causa**: El `tenant_slug` en el login no coincide con los tenants en la BD.
-
-**Solución**:
-1. Verificar tenants existentes: `docker exec servicemanager-backend python check_tenants.py`
-2. Actualizar el tenant_slug en el código de login
-3. Tenants por defecto: `aduanasoft-demo`, `test-tenant`
-
-### Credenciales de Prueba
+### Frontend

+```bash
+cd frontend-internal   # o frontend-client
+npm test               # Ejecutar una vez
+npm run test:watch     # Modo observador
 ```
-Email: admin@aduanasoft.com
-Password: admin123
-Tenant: aduanasoft-demo
-Role: ADMIN
+
+---
+
+## Solución de problemas
+
+### El backend no inicia — error en `DATABASE_URL`
+
+**Síntoma:** El contenedor `servicemanager-backend` reinicia continuamente.
+
+**Causa frecuente:** El archivo `.env` no existe o tiene `DATABASE_URL` apuntando a `localhost`
+en lugar del nombre del servicio Docker `postgres`.
+
+**Solución:**
+```bash
+# Verificar que .env existe
+ls .env   # Linux/macOS
+dir .env  # Windows
+
+# Si no existe, crearlo
+cp .env.example .env     # Linux/macOS
+Copy-Item .env.example .env  # Windows PowerShell
+
+# Verificar el valor correcto en .env:
+# DATABASE_URL=postgresql+asyncpg://servicemanager:servicemanager123@postgres:5432/servicemanager
+#                                                                      ^^^^^^^
+#                                                          Nombre de servicio Docker, NO localhost
 ```

+---
+
+### Error 500 en login / "connect ECONNREFUSED"
+
+**Síntoma:** El frontend muestra error 500 al hacer login, o la consola del navegador
+muestra `ECONNREFUSED 127.0.0.1:8000`.
+
+**Causa:** El proxy de Vite no encuentra el backend.
+
+**Solución en Docker:** El proxy ya está configurado para usar `PUBLIC_API_URL`.
+Verifica en `docker-compose.yml` que `frontend-internal` y `frontend-client` tienen:
+```yaml
+environment:
+  - PUBLIC_API_URL=http://backend:8000
+```
+Después reinicia:
+```bash
+docker compose restart frontend-internal frontend-client
+```
+
+**Solución en desarrollo local:** Asegúrate de que el backend está corriendo:
+```bash
+curl http://localhost:8000/health
+# Debe responder: {"status": "ok", ...}
+```
+
+---
+
+### El frontend-internal y frontend-client usan el mismo puerto localmente
+
+**Síntoma:** Al correr ambos frontends sin Docker, uno de los dos falla
+con `Port 3000 is already in use`.
+
+**Solución:** 
+- `frontend-client` → usa el puerto **3000** (por defecto con `npm run dev`)
+- `frontend-internal` → usa el puerto **3001** (configurado en `vite.config.js`)
+
+Nunca hay conflicto si los iniciaste con `npm run dev` en cada carpeta por separado.
+Si aún hay conflicto, mata el proceso en ese puerto:
+
+```bash
+# Linux / macOS
+lsof -ti:3000 | xargs kill -9
+
+# Windows (PowerShell)
+Get-Process -Id (Get-NetTCPConnection -LocalPort 3000).OwningProcess | Stop-Process -Force
+```
+
+---
+
+### El tenant slug es incorrecto al hacer login
+
+**Síntoma:** Login falla con "credenciales inválidas" aunque el email y contraseña son correctos.
+
+**Causa:** El campo `tenant_slug` no corresponde a ningún tenant en la base de datos.
+
+**Solución:**
+```bash
+# Ver los tenants disponibles
+docker exec servicemanager-backend python -c "
+import asyncio
+from sqlalchemy.ext.asyncio import create_async_engine, AsyncSession
+from sqlalchemy import text
+import os
+async def main():
+    engine = create_async_engine(os.environ['DATABASE_URL'])
+    async with AsyncSession(engine) as s:
+        result = await s.execute(text('SELECT slug, name FROM tenants'))
+        for row in result:
+            print(row)
+asyncio.run(main())
+"
+```
+Tenant por defecto (después del seed): **`aduanasoft-demo`**
+
+---
+
+### Puerto ocupado — cambiar puertos de los servicios
+
+Edita `docker-compose.yml` y modifica **solo el número izquierdo** del mapeo de puertos:
+
+```yaml
+# Ejemplo: mover el backend al puerto 9000
+backend:
+  ports:
+    - "9000:8000"   # accesible en localhost:9000
+
+# Ejemplo: mover el frontend al puerto 4000
+frontend-client:
+  ports:
+    - "4000:3000"   # accesible en localhost:4000
+```
+
+---
+
+### Migraciones fallidas — `alembic upgrade head` da error
+
+```bash
+# Verificar el estado actual
+docker exec servicemanager-backend alembic current
+
+# Si hay conflicto, hacer downgrade hasta la base y volver a subir
+docker exec servicemanager-backend alembic downgrade base
+docker exec servicemanager-backend alembic upgrade head
+```
+
+---
+
+### Módulo Python no encontrado (`ModuleNotFoundError`)
+
+**Con Docker:** El módulo no está en `requirements.txt` o la imagen no fue reconstruida.
+```bash
+# Reconstruir la imagen del backend
+docker compose build backend
+docker compose up -d backend
+```
+
+**Local:** El entorno virtual no está activado.
+```bash
+# Verificar que el venv está activo (debe aparecer (.venv) en el prompt)
+which python   # Linux/macOS — debe apuntar a .venv/
+# Windows:
+where python   # debe apuntar a .venv\Scripts\python.exe
+```
+
+---
+
+### `npm: command not found` o versión de Node incorrecta
+
+```bash
+node --version   # Debe ser v18.x o superior
+npm --version    # Debe ser 9.x o superior
+```
+
+Si Node no está instalado, descárgalo desde https://nodejs.org/ (elige "LTS").
+
+En macOS con Homebrew:
+```bash
+brew install node@18
+```
+
+En Linux (Ubuntu/Debian):
+```bash
+curl -fsSL https://deb.nodesource.com/setup_18.x | sudo -E bash -
+sudo apt-get install -y nodejs
+```
+
+---
+
+### `docker-compose` no se reconoce como comando
+
+En versiones modernas de Docker Desktop, el comando es `docker compose` (con espacio, sin guion).
+Si tienes instalación separada de Docker Compose v1, usa `docker-compose` (con guion).
+
+---
+
+### Logs de los contenedores
+
+```bash
+# Ver qué está fallando
+docker compose logs backend --tail=50
+docker compose logs frontend-internal --tail=50
+docker compose logs postgres --tail=20
+```
+
+---
+
 ## Contribución

-1. Fork del proyecto
-2. Crear feature branch (`git checkout -b feature/nueva-funcionalidad`)
-3. Commit cambios (`git commit -am 'Agregar nueva funcionalidad'`)
-4. Push a branch (`git push origin feature/nueva-funcionalidad`)
-5. Crear Pull Request
+1. Haz fork del proyecto
+2. Crea una rama de funcionalidad: `git checkout -b feature/nombre-funcionalidad`
+3. Realiza tus cambios siguiendo las convenciones del proyecto
+4. Ejecuta las pruebas: `pytest` y el linter: `ruff check .`
+5. Haz commit con un mensaje descriptivo: `git commit -m "feat: agregar exportación a CSV"`
+6. Sube tu rama: `git push origin feature/nombre-funcionalidad`
+7. Abre un Pull Request hacia `main`
+
+### Convenciones de nombres
+
+- **Modelos**: `PascalCase` → `User`, `Ticket`, `TenantOrganization`
+- **Endpoints (URL)**: `kebab-case` → `/api/v1/user-management/`
+- **Componentes Svelte**: `PascalCase.svelte` → `TicketCard.svelte`
+- **Stores**: `camelCase` → `ticketStore.ts`
+
+---
+
+## Historial de versiones
+
+| Versión | Descripción |
+|---------|-------------|
+| **v1.15.1** | Módulo de reportes implementado |
+| v1.14.x | Mejoras al módulo de auditoría |
+| v1.13.x | Sistema de SLAs automático |
+| v1.12.x | Notificaciones por email |
+| v1.0.0 | MVP inicial — tickets, tenants, autenticación |
+
+---

 ## Licencia

-Propietario - Aduanasoft © 2026
+Propietario — Aduanasoft © 2026. Todos los derechos reservados.
--- a/backend/.coverage
+++ b/backend/.coverage
--- a/backend/app/api/deps.py
+++ b/backend/app/api/deps.py
@@ -1,3 +1,4 @@
+from typing import Optional
 from fastapi import Depends, HTTPException, status
 from starlette.requests import Request
 from fastapi.security import OAuth2PasswordBearer
@@ -15,7 +16,48 @@ from app.models.tenant import Tenant
 settings = get_settings()

 # Esquema OAuth2 centralizado — auth.py importa desde aquí
-oauth2_scheme = OAuth2PasswordBearer(tokenUrl=f"/{settings.API_VERSION}/auth/login")
+# Soporta: 1) Authorization: Bearer header (Swagger/API clients)
+#           2) Cookie access_token HttpOnly (apps web)
+_bearer_scheme = OAuth2PasswordBearer(
+    tokenUrl=f"/{settings.API_VERSION}/auth/login",
+    auto_error=False,
+)
+
+
+async def oauth2_scheme(
+    request: Request,
+    bearer_token: Optional[str] = Depends(_bearer_scheme),
+) -> str:
+    """Extrae JWT desde header Authorization (prioridad) o cookie del frontend correcto.
+    
+    Usa el header X-App para seleccionar la cookie:
+      - X-App: internal  → solo 'internal_access_token'
+      - X-App: client    → solo 'client_access_token'
+      - sin header       → prueba ambas (compatibilidad con Swagger/CLI)
+    """
+    if bearer_token:
+        return bearer_token
+
+    app_hint = request.headers.get("X-App", "").lower()
+    if app_hint == "internal":
+        token = request.cookies.get("internal_access_token")
+    elif app_hint == "client":
+        token = request.cookies.get("client_access_token")
+    else:
+        # Fallback para Swagger, tests y clientes sin header
+        token = (
+            request.cookies.get("internal_access_token")
+            or request.cookies.get("client_access_token")
+        )
+
+    if not token:
+        raise HTTPException(
+            status_code=status.HTTP_401_UNAUTHORIZED,
+            detail="Not authenticated",
+            headers={"WWW-Authenticate": "Bearer"},
+        )
+    return token
+

 async def get_current_user(
    request: Request,
@@ -47,9 +89,10 @@ async def get_current_user(
        raise HTTPException(status_code=400, detail="Inactive user")

    # Enforce that tenant header (if present) matches the authenticated user's tenant.
-    # Prevents cross-tenant header impersonation.
+    # Roles globales (is_global) pueden operar en cualquier tenant → omitir chequeo.
+    # Roles de cliente (is_client) deben coincidir con su propio tenant.
    request_tenant_id = getattr(getattr(request, "state", None), "tenant_id", None)
-    if request_tenant_id and str(user.tenant_id) != str(request_tenant_id):
+    if request_tenant_id and user.role.is_client and str(user.tenant_id) != str(request_tenant_id):
        raise HTTPException(
            status_code=status.HTTP_403_FORBIDDEN,
            detail="Tenant header does not match authenticated user",
--- a/backend/app/api/schemas/auth.py
+++ b/backend/app/api/schemas/auth.py
@@ -1,7 +1,7 @@
 """
 Auth Schemas - ServiceManagerWeb

-Pydantic schemas para autenticación y autorización.
+Pydantic schemas para autenticaciÃ³n y autorizaciÃ³n.
 """

 from pydantic import BaseModel, EmailStr
@@ -12,7 +12,7 @@ class LoginRequest(BaseModel):
    """Schema para solicitud de login."""
    email: EmailStr
    password: str
-    tenant_slug: str
+    tenant_slug: Optional[str] = None
    totp_code: Optional[str] = None


@@ -53,28 +53,28 @@ class TwoFactorSetupResponse(BaseModel):


 class TwoFactorEnableRequest(BaseModel):
-    """Código TOTP para confirmar y activar 2FA."""
+    """CÃ³digo TOTP para confirmar y activar 2FA."""
    totp_code: str


 class TwoFactorEnableResponse(BaseModel):
-    """Resultado al habilitar 2FA: incluye los códigos de respaldo."""
+    """Resultado al habilitar 2FA: incluye los cÃ³digos de respaldo."""
    enabled: bool
    backup_codes: List[str]


 class TwoFactorDisableRequest(BaseModel):
-    """Deshabilitar 2FA verificando con TOTP o código de respaldo."""
+    """Deshabilitar 2FA verificando con TOTP o cÃ³digo de respaldo."""
    totp_code: Optional[str] = None
    backup_code: Optional[str] = None


 # ============================================================
-# Cambio de contraseña
+# Cambio de contraseÃ±a
 # ============================================================

 class ChangePasswordRequest(BaseModel):
-    """Schema para cambio de contraseña del usuario autenticado."""
+    """Schema para cambio de contraseÃ±a del usuario autenticado."""
    current_password: str
    new_password: str

@@ -82,15 +82,15 @@ class ChangePasswordRequest(BaseModel):


 # ============================================================
-# Recuperación de contraseña
+# RecuperaciÃ³n de contraseÃ±a
 # ============================================================

 class ForgotPasswordRequest(BaseModel):
-    """Solicitar enlace de reseteo de contraseña por email."""
+    """Solicitar enlace de reseteo de contraseÃ±a por email."""
    email: EmailStr


 class ResetPasswordRequest(BaseModel):
-    """Aplicar nueva contraseña usando token de reseteo."""
+    """Aplicar nueva contraseÃ±a usando token de reseteo."""
    token: str
    new_password: str
--- a/backend/app/api/v1/endpoints/audit_backup.py
+++ b/backend/app/api/v1/endpoints/audit_backup.py
--- a/backend/app/api/v1/endpoints/auth.py
+++ b/backend/app/api/v1/endpoints/auth.py
@@ -1,10 +1,10 @@
 """
 Authentication Endpoints - ServiceManagerWeb

-Endpoints para autenticación y autorización
+Endpoints para autenticaciÃ³n y autorizaciÃ³n
 """

-from fastapi import APIRouter, HTTPException, status, Depends, Request
+from fastapi import APIRouter, HTTPException, status, Depends, Request, Response
 from fastapi.security import OAuth2PasswordRequestForm
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy import select
@@ -21,6 +21,15 @@ from app.services.audit_service import AuditService
 from app.services.token_service import TokenService
 from app.api.deps import oauth2_scheme, get_current_user
 from app.core.cache import cache, cache_key
+from app.core.limiter import limiter
+
+# Nombres de cookie por tipo de usuario
+CLIENT_ROLES = {"CLIENT_ADMIN", "CLIENT_USER"}
+
+
+def _cookie_name_for_role(role: str) -> str:
+    """Devuelve el nombre de cookie segÃºn el rol del usuario."""
+    return "client_access_token" if role in CLIENT_ROLES else "internal_access_token"
 from app.api.schemas.auth import (
    LoginRequest, LoginResponse, RefreshTokenRequest, TokenResponse,
    TwoFactorStatusResponse, TwoFactorSetupResponse,
@@ -38,9 +47,11 @@ settings = get_settings()
 # ===================================

@router.post("/login", response_model=LoginResponse)
+@limiter.limit("10/minute")
 async def login(
    login_data: LoginRequest,
    request: Request,
+    response: Response,
    db: AsyncSession = Depends(get_db)
 ):
    """
@@ -77,25 +88,23 @@ async def login(
                headers={"Retry-After": str(settings.LOGIN_RATE_LIMIT_WINDOW_SECONDS)},
            )
    
-    # 1. Validar tenant
-    tenant_result = await db.execute(
-        select(Tenant).where(Tenant.slug == login_data.tenant_slug)
-    )
-    tenant = tenant_result.scalar_one_or_none()
-    if tenant is None:
-        logger.warning(
-            "Login failed - tenant not found",
-            email=login_data.email,
-            tenant_slug=login_data.tenant_slug,
-        )
-        raise HTTPException(
-            status_code=status.HTTP_404_NOT_FOUND,
-            detail="Tenant not found",
+    # 1. Validar tenant - por slug si viene, sino buscar por email
+    if login_data.tenant_slug:
+        tenant_result = await db.execute(
+            select(Tenant).where(Tenant.slug == login_data.tenant_slug)
        )
+        tenant = tenant_result.scalar_one_or_none()
+        if tenant is None:
+            raise HTTPException(
+                status_code=status.HTTP_404_NOT_FOUND,
+                detail="Tenant not found",
+            )
+    else:
+        tenant = None

    # Rate limiting (best-effort): by (tenant,email) to slow brute force.
    ident_key = None
-    if settings.RATE_LIMIT_ENABLED and not settings.TESTING:
+    if settings.RATE_LIMIT_ENABLED and not settings.TESTING and tenant:
        email_norm = login_data.email.strip().lower()
        ident_key = cache_key("rl", "login", "id", str(tenant.id), email_norm)
        ident_count = await cache.incr(ident_key, 1)
@@ -131,22 +140,25 @@ async def login(
                headers={"Retry-After": str(settings.LOGIN_RATE_LIMIT_WINDOW_SECONDS)},
            )

-    # 2. Buscar usuario en base de datos (aislado por tenant)
-    query = select(User).where(
-        User.email == login_data.email,
-        User.tenant_id == tenant.id,
-    )
+    # 2. Buscar usuario - filtrar por tenant si se detecto, sino buscar por email
+    if tenant:
+        query = select(User).where(
+            User.email == login_data.email,
+            User.tenant_id == tenant.id,
+        )
+    else:
+        query = select(User).where(User.email == login_data.email)
    result = await db.execute(query)
    user = result.scalar_one_or_none()

-    # 3. Verificar usuario y contraseña
+    # 3. Verificar usuario y contraseÃ±a
    if not user or not security.verify_password(login_data.password, user.password_hash):
        logger.warning(
            "Login failed - invalid credentials",
            email=login_data.email
        )
        
-        # Registrar intento fallido en auditoría (si el usuario existe)
+        # Registrar intento fallido en auditorÃa (si el usuario existe)
        if user:
            try:
                await AuditService.log(
@@ -167,7 +179,7 @@ async def login(
            detail="Invalid credentials",
        )
    
-    # 4. Verificar si está activo
+    # 4. Verificar si estÃ¡ activo
    if not user.is_active:
        logger.warning(
            "Login failed - user inactive",
@@ -178,19 +190,19 @@ async def login(
            detail="User inactive",
        )

-    # 5. Verificar 2FA si está habilitado
+    # 5. Verificar 2FA si estÃ¡ habilitado
    if user.totp_enabled:
        if not login_data.totp_code:
-            # Indicar al frontend que debe pedir el código TOTP
+            # Indicar al frontend que debe pedir el cÃ³digo TOTP
            raise HTTPException(
                status_code=status.HTTP_401_UNAUTHORIZED,
-                detail="Se requiere autenticación de dos factores (2FA). Ingresa tu código."
+                detail="Se requiere autenticaciÃ³n de dos factores (2FA). Ingresa tu cÃ³digo."
            )
        if not security.verify_totp(user.totp_secret, login_data.totp_code):
            logger.warning("Login failed - invalid 2FA code", email=login_data.email)
            raise HTTPException(
                status_code=status.HTTP_401_UNAUTHORIZED,
-                detail="Código 2FA inválido o expirado"
+                detail="CÃ³digo 2FA invÃ¡lido o expirado"
            )

    # Create tokens
@@ -222,7 +234,7 @@ async def login(
            detail="Service temporarily unavailable",
        )
    
-    # Registrar login exitoso en auditoría
+    # Registrar login exitoso en auditorÃa
    try:
        await AuditService.log(
            db=db,
@@ -247,7 +259,20 @@ async def login(
    # Best-effort: clear per-identity limiter on success.
    if ident_key:
        await cache.delete(ident_key)
-    
+
+    # Cookie diferenciada por rol para aislar sesiones entre frontends
+    cookie_name = _cookie_name_for_role(
+        user.role.value if hasattr(user.role, "value") else user.role
+    )
+    response.set_cookie(
+        key=cookie_name,
+        value=access_token,
+        httponly=True,
+        secure=settings.is_production(),
+        samesite="strict" if settings.is_production() else "lax",
+        max_age=settings.ACCESS_TOKEN_EXPIRE_MINUTES * 60,
+    )
+
    return LoginResponse(
        access_token=access_token,
        refresh_token=refresh_token,
@@ -330,6 +355,7 @@ async def refresh_token(

@router.post("/logout")
 async def logout(
+    response: Response,
    token: str = Depends(oauth2_scheme),
    db: AsyncSession = Depends(get_db)
 ):
@@ -367,7 +393,7 @@ async def logout(
    except Exception as e:
        logger.warning("Failed to revoke refresh tokens on logout", error=str(e))
    
-    # Registrar logout en auditoría
+    # Registrar logout en auditorÃa
    try:
        import uuid
        user_id = uuid.UUID(payload["sub"])
@@ -387,7 +413,10 @@ async def logout(
        logger.warning("Failed to log audit entry", error=str(e))
    
    logger.info("Logout successful", user_id=payload["sub"])
-    
+
+    # Borrar la cookie correcta segÃºn el rol del usuario
+    cookie_name = _cookie_name_for_role(payload.get("role", ""))
+    response.delete_cookie(key=cookie_name)
    return {"message": "Successfully logged out"}


@@ -474,7 +503,7 @@ async def get_2fa_status(
    current_user: User = Depends(get_current_user),
 ):
    """
-    Consultar si el 2FA está habilitado para el usuario actual.
+    Consultar si el 2FA estÃ¡ habilitado para el usuario actual.

    Returns:
        Estado de 2FA del usuario autenticado.
@@ -488,10 +517,10 @@ async def setup_2fa(
    db: AsyncSession = Depends(get_db),
 ):
    """
-    Iniciar configuración de 2FA: genera un nuevo TOTP secret y QR URI.
+    Iniciar configuraciÃ³n de 2FA: genera un nuevo TOTP secret y QR URI.

-    El secret se guarda en BD pero 2FA NO se activa todavía.
-    Se necesita llamar a /2fa/enable con un código válido para activarlo.
+    El secret se guarda en BD pero 2FA NO se activa todavÃa.
+    Se necesita llamar a /2fa/enable con un cÃ³digo vÃ¡lido para activarlo.

    Returns:
        Secret y QR URI para escanear con la app autenticadora.
@@ -499,7 +528,7 @@ async def setup_2fa(
    new_secret = security.generate_totp_secret()
    qr_uri = security.generate_totp_uri(new_secret, current_user.email)

-    # Guardar el secret (sin habilitar aún)
+    # Guardar el secret (sin habilitar aÃºn)
    current_user.totp_secret = new_secret
    await db.commit()

@@ -515,29 +544,29 @@ async def enable_2fa(
    db: AsyncSession = Depends(get_db),
 ):
    """
-    Activar 2FA verificando que el usuario escaneó correctamente el QR.
+    Activar 2FA verificando que el usuario escaneÃ³ correctamente el QR.

    Requiere que /2fa/setup haya sido llamado previamente.

    Args:
-        data: Código TOTP generado por la app autenticadora.
+        data: CÃ³digo TOTP generado por la app autenticadora.

    Returns:
-        Confirmación y lista de códigos de respaldo.
+        ConfirmaciÃ³n y lista de cÃ³digos de respaldo.
    """
    if not current_user.totp_secret:
        raise HTTPException(
            status_code=status.HTTP_400_BAD_REQUEST,
-            detail="Primero inicia el proceso de configuración con /2fa/setup"
+            detail="Primero inicia el proceso de configuraciÃ³n con /2fa/setup"
        )

    if not security.verify_totp(current_user.totp_secret, data.totp_code):
        raise HTTPException(
            status_code=status.HTTP_400_BAD_REQUEST,
-            detail="Código TOTP inválido. Verifica la hora de tu dispositivo e intenta de nuevo."
+            detail="CÃ³digo TOTP invÃ¡lido. Verifica la hora de tu dispositivo e intenta de nuevo."
        )

-    # Activar 2FA y generar códigos de respaldo
+    # Activar 2FA y generar cÃ³digos de respaldo
    backup_codes = security.generate_backup_codes()
    current_user.totp_enabled = True
    current_user.backup_codes = backup_codes
@@ -565,21 +594,21 @@ async def disable_2fa(
    db: AsyncSession = Depends(get_db),
 ):
    """
-    Deshabilitar 2FA verificando con código TOTP o código de respaldo.
+    Deshabilitar 2FA verificando con cÃ³digo TOTP o cÃ³digo de respaldo.

    Args:
        data: totp_code o backup_code para verificar identidad.

    Returns:
-        Mensaje de confirmación.
+        Mensaje de confirmaciÃ³n.
    """
    if not current_user.totp_enabled:
        raise HTTPException(
            status_code=status.HTTP_400_BAD_REQUEST,
-            detail="El 2FA no está habilitado en esta cuenta"
+            detail="El 2FA no estÃ¡ habilitado en esta cuenta"
        )

-    # Verificar con TOTP o código de respaldo
+    # Verificar con TOTP o cÃ³digo de respaldo
    verified = False

    if data.totp_code:
@@ -587,7 +616,7 @@ async def disable_2fa(
    elif data.backup_code and current_user.backup_codes:
        if data.backup_code in current_user.backup_codes:
            verified = True
-            # Invalidar el código de respaldo usado
+            # Invalidar el cÃ³digo de respaldo usado
            current_user.backup_codes = [
                c for c in current_user.backup_codes if c != data.backup_code
            ]
@@ -595,7 +624,7 @@ async def disable_2fa(
    if not verified:
        raise HTTPException(
            status_code=status.HTTP_400_BAD_REQUEST,
-            detail="Verificación fallida. Proporciona un código TOTP o un código de respaldo válido."
+            detail="VerificaciÃ³n fallida. Proporciona un cÃ³digo TOTP o un cÃ³digo de respaldo vÃ¡lido."
        )

    # Deshabilitar 2FA
@@ -616,7 +645,7 @@ async def disable_2fa(

    logger.info("2FA disabled", user_id=str(current_user.id))

-    return {"message": "Autenticación de dos factores deshabilitada correctamente"}
+    return {"message": "AutenticaciÃ³n de dos factores deshabilitada correctamente"}


@router.post("/change-password", status_code=status.HTTP_200_OK)
@@ -626,32 +655,32 @@ async def change_password(
    db: AsyncSession = Depends(get_db),
 ):
    """
-    Cambiar la contraseña del usuario autenticado.
+    Cambiar la contraseÃ±a del usuario autenticado.

-    Verifica la contraseña actual antes de actualizar.
-    Requiere autenticación activa.
+    Verifica la contraseÃ±a actual antes de actualizar.
+    Requiere autenticaciÃ³n activa.
    """
    from datetime import datetime

-    # Validar longitud mínima
+    # Validar longitud mÃnima
    if len(data.new_password) < 8:
        raise HTTPException(
            status_code=status.HTTP_400_BAD_REQUEST,
-            detail="La nueva contraseña debe tener al menos 8 caracteres"
+            detail="La nueva contraseÃ±a debe tener al menos 8 caracteres"
        )

-    # Verificar que la contraseña actual sea correcta
+    # Verificar que la contraseÃ±a actual sea correcta
    if not security.verify_password(data.current_password, current_user.password_hash):
        raise HTTPException(
            status_code=status.HTTP_400_BAD_REQUEST,
-            detail="La contraseña actual es incorrecta"
+            detail="La contraseÃ±a actual es incorrecta"
        )

    # No permitir que la nueva sea igual a la actual
    if security.verify_password(data.new_password, current_user.password_hash):
        raise HTTPException(
            status_code=status.HTTP_400_BAD_REQUEST,
-            detail="La nueva contraseña no puede ser igual a la actual"
+            detail="La nueva contraseÃ±a no puede ser igual a la actual"
        )

    current_user.password_hash = security.hash_password(data.new_password)
@@ -669,11 +698,11 @@ async def change_password(
    await db.commit()

    logger.info("Password changed", user_id=str(current_user.id))
-    return {"message": "Contraseña actualizada correctamente"}
+    return {"message": "ContraseÃ±a actualizada correctamente"}


 # ============================================================
-# Recuperación de contraseña (forgot / reset)
+# RecuperaciÃ³n de contraseÃ±a (forgot / reset)
 # ============================================================

 _RESET_TOKEN_TTL = 1800  # 30 minutos en segundos
@@ -681,15 +710,17 @@ _RESET_KEY_PREFIX = "pwd_reset:"


@router.post("/forgot-password", status_code=status.HTTP_200_OK)
+@limiter.limit("5/minute")
 async def forgot_password(
+    request: Request,
    data: ForgotPasswordRequest,
    db: AsyncSession = Depends(get_db),
 ):
    """
-    Solicitar reseteo de contraseña.
+    Solicitar reseteo de contraseÃ±a.

    Siempre retorna 200 aunque el email no exista, para no revelar
-    si una dirección está registrada en el sistema.
+    si una direcciÃ³n estÃ¡ registrada en el sistema.
    """
    import secrets
    from redis.asyncio import from_url as redis_from_url
@@ -705,9 +736,9 @@ async def forgot_password(
    user = result.scalar_one_or_none()

    if not user:
-        # Respuesta idéntica — no revelar existencia
+        # Respuesta idÃ©ntica â€” no revelar existencia
        logger.info("Forgot password: email not found", email=data.email)
-        return {"message": "Si el correo está registrado recibirás un enlace en breve."}
+        return {"message": "Si el correo estÃ¡ registrado recibirÃ¡s un enlace en breve."}

    # Generar token seguro
    token = secrets.token_urlsafe(32)
@@ -727,7 +758,7 @@ async def forgot_password(

    await send_email(
        to_email=user.email,
-        subject="Restablece tu contraseña — ServiceManager",
+        subject="Restablece tu contraseÃ±a â€” ServiceManager",
        html_content=html,
        text_content=text,
    )
@@ -744,16 +775,18 @@ async def forgot_password(
    await db.commit()

    logger.info("Password reset email sent", user_id=str(user.id))
-    return {"message": "Si el correo está registrado recibirás un enlace en breve."}
+    return {"message": "Si el correo estÃ¡ registrado recibirÃ¡s un enlace en breve."}


@router.post("/reset-password", status_code=status.HTTP_200_OK)
+@limiter.limit("5/minute")
 async def reset_password(
+    request: Request,
    data: ResetPasswordRequest,
    db: AsyncSession = Depends(get_db),
 ):
    """
-    Aplicar nueva contraseña usando el token recibido por email.
+    Aplicar nueva contraseÃ±a usando el token recibido por email.

    El token es de un solo uso: se elimina de Redis al usarse.
    """
@@ -764,7 +797,7 @@ async def reset_password(
    if len(data.new_password) < 8:
        raise HTTPException(
            status_code=status.HTTP_400_BAD_REQUEST,
-            detail="La contraseña debe tener al menos 8 caracteres"
+            detail="La contraseÃ±a debe tener al menos 8 caracteres"
        )

    redis_key = f"{_RESET_KEY_PREFIX}{data.token}"
@@ -775,7 +808,7 @@ async def reset_password(
        if not user_id_str:
            raise HTTPException(
                status_code=status.HTTP_400_BAD_REQUEST,
-                detail="El enlace de reseteo es inválido o ya expiró. Solicita uno nuevo."
+                detail="El enlace de reseteo es invÃ¡lido o ya expirÃ³. Solicita uno nuevo."
            )

        # Eliminar token inmediatamente (un solo uso)
@@ -806,4 +839,4 @@ async def reset_password(
    await db.commit()

    logger.info("Password reset completed", user_id=str(user.id))
-    return {"message": "Contraseña actualizada correctamente. Ya puedes iniciar sesión."}
+    return {"message": "ContraseÃ±a actualizada correctamente. Ya puedes iniciar sesiÃ³n."}
--- a/backend/app/api/v1/endpoints/reports.py
+++ b/backend/app/api/v1/endpoints/reports.py
@@ -7,7 +7,7 @@ Accesible por ADMIN y SUPPORT_MANAGER.

 from fastapi import APIRouter, Depends, Query, HTTPException, status
 from sqlalchemy.ext.asyncio import AsyncSession
-from sqlalchemy import select, func, and_, case, text
+from sqlalchemy import select, func, and_, case, text, literal_column
 from typing import Optional, List
 from datetime import datetime, timedelta, timezone
 import uuid
@@ -505,20 +505,23 @@ async def get_report_trends(
    tenant_filter = Ticket.tenant_id == current_user.tenant_id

    # Tickets creados por día
+    # literal_column("'day'") evita que SQLAlchemy genere múltiples parámetros
+    # ($1, $4, $5) para 'day', lo que confunde a PostgreSQL en el GROUP BY.
+    _day_lit = literal_column("'day'")
    created_rows = (await db.execute(
        select(
-            func.date_trunc("day", Ticket.created_at).label("day"),
+            func.date_trunc(_day_lit, Ticket.created_at).label("day"),
            func.count(Ticket.id).label("cnt"),
        )
        .where(and_(tenant_filter, Ticket.created_at >= period_start))
-        .group_by(func.date_trunc("day", Ticket.created_at))
-        .order_by(func.date_trunc("day", Ticket.created_at))
+        .group_by(func.date_trunc(_day_lit, Ticket.created_at))
+        .order_by(func.date_trunc(_day_lit, Ticket.created_at))
    )).all()

    # Tickets resueltos por día (según resolved_at)
    resolved_rows = (await db.execute(
        select(
-            func.date_trunc("day", Ticket.resolved_at).label("day"),
+            func.date_trunc(_day_lit, Ticket.resolved_at).label("day"),
            func.count(Ticket.id).label("cnt"),
        )
        .where(and_(
@@ -526,8 +529,8 @@ async def get_report_trends(
            Ticket.resolved_at >= period_start,
            Ticket.resolved_at.isnot(None),
        ))
-        .group_by(func.date_trunc("day", Ticket.resolved_at))
-        .order_by(func.date_trunc("day", Ticket.resolved_at))
+        .group_by(func.date_trunc(_day_lit, Ticket.resolved_at))
+        .order_by(func.date_trunc(_day_lit, Ticket.resolved_at))
    )).all()

    created_map: dict[str, int] = {r.day.strftime("%Y-%m-%d"): r.cnt for r in created_rows}
--- a/backend/app/api/v1/endpoints/tickets.py
+++ b/backend/app/api/v1/endpoints/tickets.py
@@ -11,7 +11,7 @@ import uuid
 from app.core.database import get_db
 from app.api.deps import get_current_user, get_current_tenant
 from app.models.ticket import Ticket, TicketStatus, TicketPriority
-from app.models.user import User
+from app.models.user import User, UserRole
 from app.models.tenant import Tenant
 from app.models.category import Category
 from app.models.system import System
@@ -28,92 +28,27 @@ from app.api.v1.helpers import (
    safe_audit_log, generate_next_ticket_number, calculate_sla_deadlines, ticket_to_dict
 )
 from app.services.audit_service import AuditService
+from app.services.ticket_service import TicketService, get_ticket_service

 router = APIRouter()

@router.post("/", response_model=TicketResponse, status_code=status.HTTP_201_CREATED)
-async def create_ticket(ticket: TicketCreate, db: AsyncSession = Depends(get_db), current_user: User = Depends(get_current_user)):
+async def create_ticket(
+    ticket: TicketCreate,
+    current_user: User = Depends(get_current_user),
+    ticket_service: TicketService = Depends(get_ticket_service),
+):
    """Crear un nuevo ticket"""
-    max_retries = 3
-    last_error = None
-    
-    for attempt in range(max_retries):
-        try:
-            ticket_number = await generate_next_ticket_number(db, current_user.tenant_id)
-            category_uuid = uuid.UUID(ticket.category_id) if ticket.category_id else None
-            system_uuid = uuid.UUID(ticket.affected_system_id) if ticket.affected_system_id else None
-            
-            category = None
-            if category_uuid:
-                category = await db.get(Category, category_uuid)
-                if not category:
-                    raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=f"La categoría con ID {ticket.category_id} no existe.")
-            
-            if system_uuid:
-                system = await db.get(System, system_uuid)
-                if not system:
-                    raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=f"El sistema con ID {ticket.affected_system_id} no existe.")
-            
-            sla_response_due, sla_resolution_due = calculate_sla_deadlines(category)
-            assigned_to_user = category.auto_assign_to if category and category.auto_assign_to else None
-            
-            db_ticket = Ticket(
-                id=uuid.uuid4(), tenant_id=current_user.tenant_id, ticket_number=ticket_number,
-                subject=ticket.subject, description=ticket.description, category_id=category_uuid,
-                affected_system_id=system_uuid, priority=TicketPriority[ticket.priority.upper()],
-                created_by=current_user.id, assigned_to=assigned_to_user, status=TicketStatus.NEW,
-                sla_response_due=sla_response_due, sla_resolution_due=sla_resolution_due,
-                created_at=datetime.utcnow(), updated_at=datetime.utcnow()
-            )
-            
-            db.add(db_ticket)
-            await db.commit()
-            await db.refresh(db_ticket)
-            
-            await safe_audit_log(db=db, tenant_id=current_user.tenant_id, user_id=current_user.id,
-                action="ticket.create", resource_type="ticket", resource_id=db_ticket.id,
-                new_values={"ticket_number": db_ticket.ticket_number, "subject": db_ticket.subject,
-                           "priority": db_ticket.priority.value, "status": db_ticket.status.value})
-            
-            return {
-                "id": str(db_ticket.id), "ticket_number": db_ticket.ticket_number, "subject": db_ticket.subject,
-                "title": db_ticket.subject, "description": db_ticket.description, "status": db_ticket.status.value,
-                "priority": db_ticket.priority.value, "category_id": str(db_ticket.category_id) if db_ticket.category_id else None,
-                "affected_system_id": str(db_ticket.affected_system_id) if db_ticket.affected_system_id else None,
-                "system_id": str(db_ticket.affected_system_id) if db_ticket.affected_system_id else None,
-                "contact_email": ticket.contact_email,
-                "contact_phone": ticket.contact_phone,
-                "created_by": str(db_ticket.created_by), "assigned_to": str(db_ticket.assigned_to) if db_ticket.assigned_to else None,
-                "created_at": db_ticket.created_at, "updated_at": db_ticket.updated_at,
-                "sla_response_due": db_ticket.sla_response_due,
-                "sla_resolution_due": db_ticket.sla_resolution_due,
-                "first_response_at": db_ticket.first_response_at,
-                "resolved_at": db_ticket.resolved_at,
-            }
-            
-        except ValueError as e:
-            await db.rollback()
-            raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=f"Invalid UUID format: {str(e)}")
-        except HTTPException:
-            await db.rollback()
-            raise
-        except Exception as e:
-            await db.rollback()
-            last_error = e
-            if "duplicate key" in str(e).lower() and "ticket_number" in str(e).lower():
-                if attempt < max_retries - 1:
-                    continue
-            raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=f"Error creating ticket: {str(e)}")
-    
-    raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-        detail=f"No se pudo crear el ticket después de {max_retries} intentos: {str(last_error)}")
+    return await ticket_service.create_ticket(ticket, current_user.tenant_id, current_user.id)

@router.get("/", response_model=List[TicketResponse])
 async def get_tickets(skip: int = 0, limit: int = 100, status: Optional[str] = None, priority: Optional[str] = None,
    db: AsyncSession = Depends(get_db), current_user: User = Depends(get_current_user)):
    """Obtener tickets con filtros opcionales"""
    query = select(Ticket).where(Ticket.tenant_id == current_user.tenant_id)
-    if current_user.role in ["CLIENT_USER", "CLIENT_ADMIN"]:
+    # Solo CLIENT_USER ve únicamente sus propios tickets.
+    # CLIENT_ADMIN ve todos los del tenant.
+    if current_user.role == UserRole.CLIENT_USER:
        query = query.where(Ticket.created_by == current_user.id)
    
    query = apply_enum_filter(query, Ticket.status, status, TicketStatus, "status")
@@ -136,14 +71,14 @@ async def get_all_tickets_admin(skip: int = 0, limit: int = 100, status_filter:
    assigned_to_filter: Optional[str] = None, search: Optional[str] = None, date_from: Optional[str] = None,
    date_to: Optional[str] = None, db: AsyncSession = Depends(get_db), current_user: User = Depends(get_current_user)):
    """Obtener todos los tickets del tenant del administrador (ADMIN/SUPPORT_MANAGER)."""
-    if current_user.role not in ["ADMIN", "SUPPORT_MANAGER"]:
+    if current_user.role not in (UserRole.ADMIN, UserRole.SUPPORT_MANAGER):
        raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="No tienes permisos para acceder a esta función")

    query = select(Ticket, Tenant, User).join(Tenant, Ticket.tenant_id == Tenant.id).join(User, Ticket.created_by == User.id)

    # SUPPORT_MANAGER solo ve su propio tenant.
    # ADMIN ve todos los tenants (es el administrador de la plataforma).
-    if current_user.role == "SUPPORT_MANAGER":
+    if current_user.role == UserRole.SUPPORT_MANAGER:
        query = query.where(Ticket.tenant_id == current_user.tenant_id)

    query = apply_enum_filter(query, Ticket.status, status_filter, TicketStatus, "status")
@@ -201,7 +136,7 @@ async def get_ticket(ticket_id: str, db: AsyncSession = Depends(get_db), current
    """Obtener un ticket por ID"""
    ticket_uuid = validate_uuid_param(ticket_id, "ticket ID")
    query = select(Ticket).where(Ticket.id == ticket_uuid, Ticket.tenant_id == current_user.tenant_id)
-    if current_user.role in ["CLIENT_USER", "CLIENT_ADMIN"]:
+    if current_user.role.is_client:
        query = query.where(Ticket.created_by == current_user.id)
    
    query = query.options(selectinload(Ticket.category), selectinload(Ticket.affected_system), selectinload(Ticket.assigned_to_user))
@@ -218,7 +153,7 @@ async def update_ticket(ticket_id: str, ticket: TicketUpdate, db: AsyncSession =
    """Actualizar un ticket"""
    ticket_uuid = validate_uuid_param(ticket_id, "ticket ID")
    query = select(Ticket).where(Ticket.id == ticket_uuid, Ticket.tenant_id == current_user.tenant_id)
-    if current_user.role in ["CLIENT_USER", "CLIENT_ADMIN"]:
+    if current_user.role.is_client:
        query = query.where(Ticket.created_by == current_user.id)
    
    result = await db.execute(query)
--- a/backend/app/api/v1/endpoints/tickets_backup.py
+++ b/backend/app/api/v1/endpoints/tickets_backup.py
--- a/backend/app/api/v1/endpoints/users.py
+++ b/backend/app/api/v1/endpoints/users.py
@@ -45,8 +45,12 @@ async def read_users(
    - role: filtrar por rol
    - is_active: filtrar por estado activo
    """
-    # ✅ CORREGIDO: Filtrar por tenant_id
-    query = select(User).where(User.tenant_id == current_user.tenant_id)
+    # ADMIN global ve todos los tenants; el resto solo ve su propio tenant
+    from app.models.user import UserRole as _UserRole
+    if current_user.role != _UserRole.ADMIN:
+        query = select(User).where(User.tenant_id == current_user.tenant_id)
+    else:
+        query = select(User)
    
    # Aplicar filtros opcionales
    if role:
--- a/backend/app/api/v1/helpers.py
+++ b/backend/app/api/v1/helpers.py
@@ -68,11 +68,11 @@ async def generate_next_ticket_number(db: AsyncSession, tenant_id: uuid.UUID) ->
    last_ticket_number = result.scalar_one_or_none()
    
    if last_ticket_number:
-        last_number = int(last_ticket_number.split('-')[1])
+        last_number = int(last_ticket_number.split('-')[-1])
        next_number = last_number + 1
    else:
        next_number = 1
-    
+
    return f"TK-{next_number:06d}"


--- a/backend/app/core/config.py
+++ b/backend/app/core/config.py
@@ -5,7 +5,6 @@ Configuración centralizada usando Pydantic Settings v2
 """

 from functools import lru_cache
-from typing import List, Optional
 from pydantic_settings import BaseSettings
 from pydantic import field_validator, Field
 import os
@@ -60,8 +59,8 @@ class Settings(BaseSettings):
    # ===================================
    SMTP_HOST: str = Field(default="localhost")
    SMTP_PORT: int = Field(default=587)
-    SMTP_USER: Optional[str] = Field(default=None)
-    SMTP_PASSWORD: Optional[str] = Field(default=None)
+    SMTP_USER: str | None = Field(default=None)
+    SMTP_PASSWORD: str | None = Field(default=None)
    SMTP_USE_TLS: bool = Field(default=True)
    SMTP_USE_SSL: bool = Field(default=False)
    
@@ -79,7 +78,7 @@ class Settings(BaseSettings):
    UPLOAD_PATH: str = Field(default="/app/uploads")
    
    @property
-    def ALLOWED_FILE_EXTENSIONS(self) -> List[str]:
+    def ALLOWED_FILE_EXTENSIONS(self) -> list[str]:
        """Parse the comma-separated file extensions."""
        return [ext.strip().lower() for ext in self.ALLOWED_FILE_EXTENSIONS_STR.split(",")]
    
@@ -102,7 +101,7 @@ class Settings(BaseSettings):
    # ===================================
    LOG_LEVEL: str = Field(default="INFO")
    LOG_FORMAT: str = Field(default="json")
-    LOG_FILE: Optional[str] = Field(default=None)
+    LOG_FILE: str | None = Field(default=None)
    
    # ===================================
    # FRONTEND URLS
--- a/backend/app/core/limiter.py
+++ b/backend/app/core/limiter.py
@@ -0,0 +1,20 @@
+"""
+Rate Limiter - ServiceManagerWeb
+
+Configura slowapi con Redis como storage backend.
+Respeta settings.RATE_LIMIT_ENABLED: si está desactivado usa memoria
+y el limiter queda en modo noop (enabled=False).
+"""
+
+from slowapi import Limiter
+from slowapi.util import get_remote_address
+
+from app.core.config import get_settings
+
+settings = get_settings()
+
+limiter = Limiter(
+    key_func=get_remote_address,
+    storage_uri=settings.REDIS_URL if settings.RATE_LIMIT_ENABLED else "memory://",
+    enabled=settings.RATE_LIMIT_ENABLED,
+)
--- a/backend/app/main.py
+++ b/backend/app/main.py
@@ -9,6 +9,9 @@ from fastapi.middleware.cors import CORSMiddleware
 from fastapi.middleware.gzip import GZipMiddleware
 from fastapi.responses import JSONResponse
 from contextlib import asynccontextmanager
+from slowapi import _rate_limit_exceeded_handler
+from slowapi.errors import RateLimitExceeded
+from slowapi.middleware import SlowAPIMiddleware
 import structlog
 import time
 import uuid
@@ -31,6 +34,7 @@ from app.api.v1.router import api_router
 from app.middleware.tenant import TenantMiddleware
 from app.middleware.correlation_id import CorrelationIDMiddleware
 from app.core.cache import cache
+from app.core.limiter import limiter

 settings = get_settings()
 setup_logging()
@@ -70,6 +74,11 @@ app = FastAPI(
    openapi_url=f"/{settings.API_VERSION}/openapi.json"
 )

+# SlowAPI rate limiting
+app.state.limiter = limiter
+app.add_exception_handler(RateLimitExceeded, _rate_limit_exceeded_handler)
+app.add_middleware(SlowAPIMiddleware)
+
 # ===================================
 # MIDDLEWARE
 # ===================================
@@ -87,8 +96,14 @@ if settings.is_production():
        "X-Correlation-ID",
    ]
 else:
-    cors_allow_methods = ["*"]
-    cors_allow_headers = ["*"]
+    cors_allow_methods = ["GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"]
+    cors_allow_headers = [
+        "Authorization",
+        "Content-Type",
+        "X-Tenant-ID",
+        "X-Tenant-Slug",
+        "X-Correlation-ID",
+    ]

 app.add_middleware(
    CORSMiddleware,
--- a/backend/app/middleware/tenant.py
+++ b/backend/app/middleware/tenant.py
@@ -42,6 +42,8 @@ class TenantMiddleware(BaseHTTPMiddleware):
        "/v1/auth/refresh",
        "/api/v1/auth/logout",
        "/v1/auth/logout",
+        "/api/v1/auth/me",
+        "/v1/auth/me",
        "/api/v1/auth/forgot-password",
        "/v1/auth/forgot-password",
        "/api/v1/auth/reset-password",
--- a/backend/app/models/roles.py
+++ b/backend/app/models/roles.py
@@ -0,0 +1,63 @@
+"""
+Definición y helpers de roles para el sistema multi-tenant.
+
+Fuente única: UserRole en app.models.user.
+Este módulo expone conjuntos de roles y helpers de verificación
+para usarse en deps.py y en los endpoints.
+
+Roles globales (staff interno — alcance multi-tenant):
+    ADMIN           → control total sobre todos los tenants
+    SUPPORT_MANAGER → gestiona equipos y SLAs de todos los tenants
+    AGENT           → atiende tickets de cualquier tenant
+    AUDITOR         → auditoría de solo lectura en todos los tenants
+
+Roles de cliente (alcance limitado al propio tenant):
+    CLIENT_ADMIN    → administra organización: usuarios, configuración, tickets
+    CLIENT_USER     → crea y sigue sus propios tickets
+"""
+
+from app.models.user import UserRole
+
+# ── Conjuntos de roles ──────────────────────────────────────────────────────
+
+GLOBAL_ROLES: frozenset[UserRole] = frozenset({
+    UserRole.ADMIN,
+    UserRole.SUPPORT_MANAGER,
+    UserRole.AGENT,
+    UserRole.AUDITOR,
+})
+
+CLIENT_ROLES: frozenset[UserRole] = frozenset({
+    UserRole.CLIENT_ADMIN,
+    UserRole.CLIENT_USER,
+})
+
+# ── Permisos por rol ────────────────────────────────────────────────────────
+
+ROLE_PERMISSIONS: dict[UserRole, list[str]] = {
+    # Staff global
+    UserRole.ADMIN:           ["manage_all", "view_all", "audit_all"],
+    UserRole.SUPPORT_MANAGER: ["manage_teams", "view_all_tickets", "manage_sla"],
+    UserRole.AGENT:           ["view_all_tickets", "update_any_ticket"],
+    UserRole.AUDITOR:         ["view_all", "audit_all"],
+    # Clientes (acotados al tenant)
+    UserRole.CLIENT_ADMIN:    ["manage_tenant", "manage_tenant_users", "view_tenant_tickets"],
+    UserRole.CLIENT_USER:     ["create_ticket", "view_own_tickets"],
+}
+
+# ── Helpers ─────────────────────────────────────────────────────────────────
+
+def is_global_staff(role: UserRole) -> bool:
+    """Retorna True si el rol tiene alcance global (staff interno)."""
+    return role.is_global
+
+
+def is_client_role(role: UserRole) -> bool:
+    """Retorna True si el rol está acotado al tenant del usuario."""
+    return role.is_client
+
+
+def has_permission(role: UserRole, permission: str) -> bool:
+    """Verifica si un rol tiene un permiso específico."""
+    return permission in ROLE_PERMISSIONS.get(role, [])
+
--- a/backend/app/models/user.py
+++ b/backend/app/models/user.py
@@ -27,6 +27,24 @@ class UserRole(str, enum.Enum):
    CLIENT_ADMIN = "CLIENT_ADMIN"      # Admin de organización cliente
    CLIENT_USER = "CLIENT_USER"        # Usuario final cliente

+    @property
+    def is_global(self) -> bool:
+        """True si el rol tiene alcance global (staff interno cross-tenant)."""
+        return self in (
+            UserRole.ADMIN,
+            UserRole.SUPPORT_MANAGER,
+            UserRole.AGENT,
+            UserRole.AUDITOR,
+        )
+
+    @property
+    def is_client(self) -> bool:
+        """True si el rol está acotado al tenant del usuario."""
+        return self in (
+            UserRole.CLIENT_ADMIN,
+            UserRole.CLIENT_USER,
+        )
+

 class User(Base):
    """Modelo de Usuario."""
@@ -113,11 +131,8 @@ class User(Base):
    
    @property
    def is_client(self) -> bool:
-        """Check if user is a client."""
-        return self.role in [
-            UserRole.CLIENT_ADMIN,
-            UserRole.CLIENT_USER
-        ]
+        """Check if user is a client (rol acotado al propio tenant)."""
+        return self.role.is_client
    
    @property
    def can_manage_users(self) -> bool:
@@ -125,7 +140,7 @@ class User(Base):
        return self.role in [
            UserRole.ADMIN,
            UserRole.SUPPORT_MANAGER,
-            UserRole.CLIENT_ADMIN
+            UserRole.CLIENT_ADMIN,
        ]
    
    @property
@@ -134,7 +149,7 @@ class User(Base):
        return self.role in [
            UserRole.ADMIN,
            UserRole.SUPPORT_MANAGER,
-            UserRole.AGENT
+            UserRole.AGENT,
        ]
    
    @property
--- a/backend/app/services/ticket_service.py
+++ b/backend/app/services/ticket_service.py
@@ -0,0 +1,170 @@
+"""
+Ticket Service - ServiceManagerWeb
+
+Lógica de negocio para creación y gestión de tickets.
+Inyectable vía Depends() en los endpoints de FastAPI.
+"""
+
+import uuid
+from datetime import datetime
+
+from fastapi import Depends, HTTPException, status
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.core.database import get_db
+from app.models.ticket import Ticket, TicketStatus, TicketPriority
+from app.models.category import Category
+from app.models.system import System
+from app.api.schemas.ticket import TicketCreate
+from app.api.v1.helpers import (
+    generate_next_ticket_number,
+    calculate_sla_deadlines,
+    safe_audit_log,
+)
+
+
+class TicketService:
+    """Servicio de tickets: encapsula lógica de negocio fuera del router."""
+
+    def __init__(self, db: AsyncSession = Depends(get_db)):
+        self.db = db
+
+    async def create_ticket(
+        self,
+        ticket: TicketCreate,
+        tenant_id: uuid.UUID,
+        user_id: uuid.UUID,
+    ) -> dict:
+        """
+        Crea un ticket con validación multi-tenant, cálculo de SLA y auto-asignación.
+
+        Args:
+            ticket:    Datos del ticket a crear.
+            tenant_id: Tenant del usuario autenticado.
+            user_id:   ID del usuario que crea el ticket.
+
+        Returns:
+            dict compatible con TicketResponse.
+
+        Raises:
+            HTTPException 400: UUID inválido, categoría/sistema no encontrado o de otro tenant.
+            HTTPException 500: Fallo persistente tras max_retries.
+        """
+        max_retries = 3
+        last_error = None
+
+        for attempt in range(max_retries):
+            try:
+                ticket_number = await generate_next_ticket_number(self.db, tenant_id)
+                category_uuid = uuid.UUID(ticket.category_id) if ticket.category_id else None
+                system_uuid = uuid.UUID(ticket.affected_system_id) if ticket.affected_system_id else None
+
+                category = None
+                if category_uuid:
+                    category = await self.db.get(Category, category_uuid)
+                    if not category or category.tenant_id != tenant_id:
+                        raise HTTPException(
+                            status_code=status.HTTP_400_BAD_REQUEST,
+                            detail=f"La categoría con ID {ticket.category_id} no existe.",
+                        )
+
+                if system_uuid:
+                    system = await self.db.get(System, system_uuid)
+                    if not system or system.tenant_id != tenant_id:
+                        raise HTTPException(
+                            status_code=status.HTTP_400_BAD_REQUEST,
+                            detail=f"El sistema con ID {ticket.affected_system_id} no existe.",
+                        )
+
+                sla_response_due, sla_resolution_due = calculate_sla_deadlines(category)
+                assigned_to_user = category.auto_assign_to if category and category.auto_assign_to else None
+
+                db_ticket = Ticket(
+                    id=uuid.uuid4(),
+                    tenant_id=tenant_id,
+                    ticket_number=ticket_number,
+                    subject=ticket.subject,
+                    description=ticket.description,
+                    category_id=category_uuid,
+                    affected_system_id=system_uuid,
+                    priority=TicketPriority[ticket.priority.upper()],
+                    created_by=user_id,
+                    assigned_to=assigned_to_user,
+                    status=TicketStatus.NEW,
+                    sla_response_due=sla_response_due,
+                    sla_resolution_due=sla_resolution_due,
+                    created_at=datetime.utcnow(),
+                    updated_at=datetime.utcnow(),
+                )
+
+                self.db.add(db_ticket)
+                await self.db.commit()
+                await self.db.refresh(db_ticket)
+
+                await safe_audit_log(
+                    db=self.db,
+                    tenant_id=tenant_id,
+                    user_id=user_id,
+                    action="ticket.create",
+                    resource_type="ticket",
+                    resource_id=db_ticket.id,
+                    new_values={
+                        "ticket_number": db_ticket.ticket_number,
+                        "subject": db_ticket.subject,
+                        "priority": db_ticket.priority.value,
+                        "status": db_ticket.status.value,
+                    },
+                )
+
+                return {
+                    "id": str(db_ticket.id),
+                    "ticket_number": db_ticket.ticket_number,
+                    "subject": db_ticket.subject,
+                    "title": db_ticket.subject,
+                    "description": db_ticket.description,
+                    "status": db_ticket.status.value,
+                    "priority": db_ticket.priority.value,
+                    "category_id": str(db_ticket.category_id) if db_ticket.category_id else None,
+                    "affected_system_id": str(db_ticket.affected_system_id) if db_ticket.affected_system_id else None,
+                    "system_id": str(db_ticket.affected_system_id) if db_ticket.affected_system_id else None,
+                    "contact_email": ticket.contact_email,
+                    "contact_phone": ticket.contact_phone,
+                    "created_by": str(db_ticket.created_by),
+                    "assigned_to": str(db_ticket.assigned_to) if db_ticket.assigned_to else None,
+                    "created_at": db_ticket.created_at,
+                    "updated_at": db_ticket.updated_at,
+                    "sla_response_due": db_ticket.sla_response_due,
+                    "sla_resolution_due": db_ticket.sla_resolution_due,
+                    "first_response_at": db_ticket.first_response_at,
+                    "resolved_at": db_ticket.resolved_at,
+                }
+
+            except ValueError as e:
+                await self.db.rollback()
+                raise HTTPException(
+                    status_code=status.HTTP_400_BAD_REQUEST,
+                    detail=f"Invalid UUID format: {str(e)}",
+                )
+            except HTTPException:
+                await self.db.rollback()
+                raise
+            except Exception as e:
+                await self.db.rollback()
+                last_error = e
+                if "duplicate key" in str(e).lower() and "ticket_number" in str(e).lower():
+                    if attempt < max_retries - 1:
+                        continue
+                raise HTTPException(
+                    status_code=status.HTTP_400_BAD_REQUEST,
+                    detail=f"Error creating ticket: {str(e)}",
+                )
+
+        raise HTTPException(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail=f"No se pudo crear el ticket después de {max_retries} intentos: {str(last_error)}",
+        )
+
+
+def get_ticket_service(db: AsyncSession = Depends(get_db)) -> TicketService:
+    """Factory function para inyectar TicketService vía Depends()."""
+    return TicketService(db)
--- a/backend/scripts/set_test_password.py
+++ b/backend/scripts/set_test_password.py
--- a/backend/app/tests/conftest.py
+++ b/backend/app/tests/conftest.py
@@ -0,0 +1,373 @@
+"""
+Integration Test Fixtures - ServiceManagerWeb (Docker / PostgreSQL)
+
+backend/app/tests/conftest.py
+
+Usa la BD Docker existente (servicemanager).
+Los fixtures leen datos reales ya seedeados — no crean ni eliminan nada.
+Los tests que inserten datos propios quedan aislados por rollback.
+
+Tenant de referencia : aduanasoft
+Usuarios de referencia:
+    admin@aduanasoft.com       → ADMIN
+    manager@aduanasoft.com     → SUPPORT_MANAGER
+    agente@aduanasoft.com      → AGENT
+    auditor1@test.com          → AUDITOR  (tenant aduanasoft)
+    admin-cliente@empresa-demo → CLIENT_ADMIN
+    test_user@aduanasoft.com   → CLIENT_USER
+"""
+
+import os
+import asyncio
+import pytest
+from typing import AsyncGenerator, Generator
+
+# ============================================================
+# ENV VARS — antes de importar la app
+# ============================================================
+os.environ.setdefault("ENVIRONMENT", "testing")
+os.environ.setdefault("TESTING", "true")
+os.environ.setdefault("DEBUG", "false")
+os.environ.setdefault("SECRET_KEY", "integration-secret-key-32chars!!!!")
+os.environ.setdefault("JWT_SECRET_KEY", "integration-jwt-secret-32chars!!!!")
+os.environ.setdefault(
+    "DATABASE_URL",
+    "postgresql+asyncpg://servicemanager:servicemanager123@localhost:5432/servicemanager",
+)
+os.environ.setdefault("REDIS_URL", "redis://localhost:6379/14")
+os.environ.setdefault("CELERY_BROKER_URL", "redis://localhost:6379/14")
+os.environ.setdefault("CELERY_RESULT_BACKEND", "redis://localhost:6379/14")
+os.environ.setdefault("CORS_ORIGINS", "http://localhost:3000")
+os.environ.setdefault("ALLOWED_FILE_EXTENSIONS", "pdf,jpg,jpeg,png,doc,docx,txt")
+
+
+# ============================================================
+# EVENT LOOP  (session-scoped)
+# ============================================================
+
+@pytest.fixture(scope="session")
+def event_loop() -> Generator:
+    """Event loop compartido para toda la sesión de tests."""
+    policy = asyncio.get_event_loop_policy()
+    loop = policy.new_event_loop()
+    yield loop
+    loop.close()
+
+
+# ============================================================
+# ENGINE  (session-scoped — reutiliza el pool toda la sesión)
+# ============================================================
+
+@pytest.fixture(scope="session")
+async def engine():
+    """
+    Conecta al PostgreSQL Docker existente (servicemanager).
+    NO crea ni destruye el schema — la BD ya está lista.
+    """
+    from sqlalchemy.ext.asyncio import create_async_engine
+    import app.models  # noqa: F401 — registra todos los modelos
+
+    _engine = create_async_engine(os.environ["DATABASE_URL"], echo=False)
+    yield _engine
+    await _engine.dispose()
+
+
+# ============================================================
+# DB  (function-scoped — rollback para datos creados en el test)
+# ============================================================
+
+@pytest.fixture
+async def db(engine) -> AsyncGenerator:
+    """
+    Sesión con transacción por test.
+    Los datos seedeados son visibles (ya están committed).
+    Cualquier INSERT hecho en el test se revierte al finalizar.
+    """
+    from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker
+
+    factory = async_sessionmaker(engine, class_=AsyncSession, expire_on_commit=False)
+
+    async with factory() as session:
+        await session.begin()
+        yield session
+        await session.rollback()
+
+
+# ============================================================
+# TENANT  (function-scoped — lee el registro existente)
+# ============================================================
+
+@pytest.fixture
+async def tenant_a(db):
+    """Tenant 'aduanasoft' ya existente en la BD."""
+    from sqlalchemy import select
+    from app.models.tenant import Tenant
+
+    result = await db.execute(select(Tenant).where(Tenant.slug == "aduanasoft"))
+    return result.scalar_one()
+
+
+# ============================================================
+# USUARIOS  (function-scoped — leen registros existentes)
+# ============================================================
+
+@pytest.fixture
+async def admin_user(db, tenant_a):
+    """ADMIN: admin@aduanasoft.com (tenant aduanasoft)."""
+    from sqlalchemy import select
+    from app.models.user import User
+
+    result = await db.execute(
+        select(User)
+        .where(User.email == "admin@aduanasoft.com")
+        .where(User.tenant_id == tenant_a.id)
+    )
+    return result.scalar_one()
+
+
+@pytest.fixture
+async def manager_user(db, tenant_a):
+    """SUPPORT_MANAGER: manager@aduanasoft.com (tenant aduanasoft)."""
+    from sqlalchemy import select
+    from app.models.user import User
+
+    result = await db.execute(
+        select(User)
+        .where(User.email == "manager@aduanasoft.com")
+        .where(User.tenant_id == tenant_a.id)
+    )
+    return result.scalar_one()
+
+
+@pytest.fixture
+async def agent_user(db, tenant_a):
+    """AGENT: agente@aduanasoft.com (tenant aduanasoft)."""
+    from sqlalchemy import select
+    from app.models.user import User
+
+    result = await db.execute(
+        select(User)
+        .where(User.email == "agente@aduanasoft.com")
+        .where(User.tenant_id == tenant_a.id)
+    )
+    return result.scalar_one()
+
+
+@pytest.fixture
+async def user_tenant_a(db, tenant_a):
+    """CLIENT_USER: test_user@aduanasoft.com (tenant aduanasoft)."""
+    from sqlalchemy import select
+    from app.models.user import User
+
+    result = await db.execute(
+        select(User)
+        .where(User.email == "test_user@aduanasoft.com")
+        .where(User.tenant_id == tenant_a.id)
+    )
+    return result.scalar_one()
+
+
+# ============================================================
+# HTTP CLIENT  (function-scoped)
+# ============================================================
+
+@pytest.fixture
+async def client(db) -> AsyncGenerator:
+    """
+    httpx.AsyncClient contra la app FastAPI en memoria (sin red).
+    get_db queda sobreescrito para inyectar la sesión de test.
+    Los cambios del test se revierten al terminar (rollback en db).
+    """
+    import httpx
+    from httpx import ASGITransport
+    from app.main import app
+    from app.core.database import get_db
+
+    async def _override_get_db():
+        yield db
+
+    app.dependency_overrides[get_db] = _override_get_db
+
+    async with httpx.AsyncClient(
+        transport=ASGITransport(app=app),
+        base_url="http://test",
+    ) as ac:
+        yield ac
+
+    app.dependency_overrides.pop(get_db, None)
+
+
+# ============================================================
+# FIXTURES DE AISLAMIENTO MULTI-TENANT
+# ============================================================
+
+@pytest.fixture
+def make_token():
+    """Factory de JWT tokens para autenticar clientes HTTP en tests."""
+    from app.core.security import security
+
+    def _make(user):
+        return security.create_access_token(data={"sub": str(user.id)})
+
+    return _make
+
+
+@pytest.fixture
+async def app_with_db(db):
+    """
+    Override de get_db compartido para todos los HTTP clients de un mismo test.
+    Garantiza que todos los clients usen la misma sesión (y el mismo rollback).
+    """
+    from app.main import app as _app
+    from app.core.database import get_db
+
+    async def _override():
+        yield db
+
+    _app.dependency_overrides[get_db] = _override
+    yield _app
+    _app.dependency_overrides.pop(get_db, None)
+
+
+@pytest.fixture
+async def tenant_b(db):
+    """Tenant 'empresa-test' creado en la transacción del test (se revierte al final)."""
+    from app.models.tenant import Tenant
+
+    t = Tenant(name="Empresa Test", slug="empresa-test")
+    db.add(t)
+    await db.flush()
+    return t
+
+
+@pytest.fixture
+async def user_b(db, tenant_b):
+    """CLIENT_ADMIN en tenant_b — puede gestionar recursos de su tenant."""
+    from app.models.user import User, UserRole
+    from app.core.security import security
+
+    u = User(
+        tenant_id=tenant_b.id,
+        email="admin@empresa-test.com",
+        first_name="Admin",
+        last_name="Test",
+        password_hash=security.hash_password("Test1234!"),
+        role=UserRole.CLIENT_ADMIN,
+        is_active=True,
+        email_verified=True,
+    )
+    db.add(u)
+    await db.flush()
+    return u
+
+
+@pytest.fixture
+async def client_tenant_a(app_with_db, manager_user, make_token):
+    """HTTP client autenticado como SUPPORT_MANAGER de tenant_a (aduanasoft).
+    Usa manager_user en lugar de admin_user para mantener el aislamiento de
+    tenant en GET /users/ (el ADMIN global bypasa el filtro de tenant).
+    """
+    import httpx
+    from httpx import ASGITransport
+
+    token = make_token(manager_user)
+    async with httpx.AsyncClient(
+        transport=ASGITransport(app=app_with_db),
+        base_url="http://test",
+        headers={"Authorization": f"Bearer {token}"},
+    ) as ac:
+        yield ac
+
+
+@pytest.fixture
+async def client_tenant_b(app_with_db, user_b, make_token):
+    """HTTP client autenticado como CLIENT_ADMIN de tenant_b (empresa-test)."""
+    import httpx
+    from httpx import ASGITransport
+
+    token = make_token(user_b)
+    async with httpx.AsyncClient(
+        transport=ASGITransport(app=app_with_db),
+        base_url="http://test",
+        headers={"Authorization": f"Bearer {token}"},
+    ) as ac:
+        yield ac
+
+
+@pytest.fixture
+async def client_admin(app_with_db, admin_user, make_token):
+    """HTTP client autenticado como ADMIN global."""
+    import httpx
+    from httpx import ASGITransport
+
+    token = make_token(admin_user)
+    async with httpx.AsyncClient(
+        transport=ASGITransport(app=app_with_db),
+        base_url="http://test",
+        headers={"Authorization": f"Bearer {token}"},
+    ) as ac:
+        yield ac
+
+
+@pytest.fixture
+def create_ticket_tenant_a(client_tenant_a):
+    """Factory: crea un ticket en tenant_a vía HTTP y retorna el JSON de respuesta."""
+    async def _create(subject="Ticket Tenant A", priority="MEDIUM"):
+        resp = await client_tenant_a.post("/v1/tickets/", json={
+            "subject": subject,
+            "description": "Test de aislamiento tenant A",
+            "priority": priority,
+        })
+        assert resp.status_code in (200, 201), f"Error creando ticket A: {resp.text}"
+        return resp.json()
+
+    return _create
+
+
+@pytest.fixture
+def create_ticket_tenant_b(client_tenant_b):
+    """Factory: crea un ticket en tenant_b vía HTTP y retorna el JSON de respuesta."""
+    async def _create(subject="Ticket Tenant B", priority="MEDIUM"):
+        resp = await client_tenant_b.post("/v1/tickets/", json={
+            "subject": subject,
+            "description": "Test de aislamiento tenant B",
+            "priority": priority,
+        })
+        assert resp.status_code in (200, 201), f"Error creando ticket B: {resp.text}"
+        return resp.json()
+
+    return _create
+
+
+@pytest.fixture
+def create_user_tenant_a(client_tenant_a):
+    """Factory: crea un usuario en tenant_a vía HTTP y retorna el JSON de respuesta."""
+    async def _create(email="nuevo_user_a@test.com"):
+        resp = await client_tenant_a.post("/v1/users/", json={
+            "email": email,
+            "first_name": "Usuario",
+            "last_name": "TenantA",
+            "password": "Test1234!",
+            "role": "CLIENT_USER",
+        })
+        assert resp.status_code in (200, 201), f"Error creando user A: {resp.text}"
+        return resp.json()
+
+    return _create
+
+
+@pytest.fixture
+def create_user_tenant_b(client_tenant_b):
+    """Factory: crea un usuario en tenant_b vía HTTP y retorna el JSON de respuesta."""
+    async def _create(email="nuevo_user_b@test.com"):
+        resp = await client_tenant_b.post("/v1/users/", json={
+            "email": email,
+            "first_name": "Usuario",
+            "last_name": "TenantB",
+            "password": "Test1234!",
+            "role": "CLIENT_USER",
+        })
+        assert resp.status_code in (200, 201), f"Error creando user B: {resp.text}"
+        return resp.json()
+
+    return _create
--- a/backend/app/tests/test_smoke.py
+++ b/backend/app/tests/test_smoke.py
@@ -0,0 +1,137 @@
+"""
+Smoke Tests - ServiceManagerWeb
+
+Verifican que el stack completo funciona:
+  - Conexión a BD Docker
+  - Fixtures de tenant y usuarios
+  - Login vía HTTP (httpx + FastAPI en memoria)
+  - Endpoint protegido con token
+"""
+
+import pytest
+
+
+# ============================================================
+# BD + FIXTURES
+# ============================================================
+
+@pytest.mark.asyncio
+async def test_db_connected(db):
+    """La sesión de BD está activa y responde."""
+    from sqlalchemy import text
+    result = await db.execute(text("SELECT 1"))
+    assert result.scalar() == 1
+
+
+@pytest.mark.asyncio
+async def test_tenant_a_existe(tenant_a):
+    """El tenant 'aduanasoft' existe y tiene datos válidos."""
+    assert tenant_a.slug == "aduanasoft"
+    assert tenant_a.name is not None
+
+
+@pytest.mark.asyncio
+async def test_admin_user_existe(admin_user):
+    """El usuario ADMIN existe y pertenece al tenant correcto."""
+    from app.models.user import UserRole
+    assert admin_user.email == "admin@aduanasoft.com"
+    assert admin_user.role == UserRole.ADMIN
+    assert admin_user.is_active is True
+
+
+@pytest.mark.asyncio
+async def test_manager_user_existe(manager_user):
+    """El usuario SUPPORT_MANAGER existe."""
+    from app.models.user import UserRole
+    assert manager_user.email == "manager@aduanasoft.com"
+    assert manager_user.role == UserRole.SUPPORT_MANAGER
+
+
+@pytest.mark.asyncio
+async def test_agent_user_existe(agent_user):
+    """El usuario AGENT existe."""
+    from app.models.user import UserRole
+    assert agent_user.email == "agente@aduanasoft.com"
+    assert agent_user.role == UserRole.AGENT
+
+
+@pytest.mark.asyncio
+async def test_client_user_existe(user_tenant_a):
+    """El CLIENT_USER existe."""
+    from app.models.user import UserRole
+    assert user_tenant_a.email == "test_user@aduanasoft.com"
+    assert user_tenant_a.role == UserRole.CLIENT_USER
+
+
+# ============================================================
+# HTTP — LOGIN
+# ============================================================
+
+@pytest.mark.asyncio
+async def test_login_admin_ok(client):
+    """Login con credenciales de admin devuelve access_token."""
+    response = await client.post(
+        "/v1/auth/login",
+        json={
+            "email": "admin@aduanasoft.com",
+            "password": "admin123",
+            "tenant_slug": "aduanasoft",
+        },
+    )
+    assert response.status_code == 200
+    data = response.json()
+    assert "access_token" in data
+    assert data["token_type"] == "bearer"
+
+
+@pytest.mark.asyncio
+async def test_login_credenciales_invalidas(client):
+    """Login con contraseña incorrecta devuelve 401."""
+    response = await client.post(
+        "/v1/auth/login",
+        json={
+            "email": "admin@aduanasoft.com",
+            "password": "wrongpassword",
+            "tenant_slug": "aduanasoft",
+        },
+    )
+    assert response.status_code == 401
+
+
+@pytest.mark.asyncio
+async def test_endpoint_sin_token_devuelve_401(client):
+    """Acceder a un endpoint protegido sin token devuelve 401."""
+    response = await client.get(
+        "/v1/users/me",
+        headers={"X-Tenant-Slug": "aduanasoft"},
+    )
+    assert response.status_code == 401
+
+
+@pytest.mark.asyncio
+async def test_login_y_me(client):
+    """Login exitoso → /users/me devuelve el usuario correcto."""
+    # Login
+    login = await client.post(
+        "/v1/auth/login",
+        json={
+            "email": "admin@aduanasoft.com",
+            "password": "admin123",
+            "tenant_slug": "aduanasoft",
+        },
+    )
+    assert login.status_code == 200
+    token = login.json()["access_token"]
+
+    # Endpoint protegido
+    me = await client.get(
+        "/v1/users/me",
+        headers={
+            "Authorization": f"Bearer {token}",
+            "X-Tenant-Slug": "aduanasoft",
+        },
+    )
+    assert me.status_code == 200
+    data = me.json()
+    assert data["email"] == "admin@aduanasoft.com"
+    assert data["role"] == "ADMIN"
--- a/backend/app/tests/test_tenant_isolation.py
+++ b/backend/app/tests/test_tenant_isolation.py
@@ -0,0 +1,123 @@
+"""
+Pruebas de aislamiento multi-tenant para tickets y usuarios.
+Usa solo los fixtures definidos en conftest.py.
+
+Roles en juego:
+  client_tenant_a  → SUPPORT_MANAGER (aduanasoft) — restringido a su tenant
+  client_tenant_b  → CLIENT_ADMIN   (empresa-test) — restringido a su tenant
+  client_admin     → ADMIN global   (aduanasoft)   — acceso a todos los tenants
+"""
+import pytest
+
+
+@pytest.mark.asyncio
+async def test_tenant_a_cannot_see_tenant_b_tickets(
+    client_tenant_a, create_ticket_tenant_b
+):
+    """
+    El usuario del tenant B crea un ticket.
+    El usuario del tenant A (SUPPORT_MANAGER) lista sus tickets.
+    El ticket de tenant B NO debe aparecer en la respuesta.
+    """
+    # El usuario del tenant B crea un ticket
+    ticket_b = await create_ticket_tenant_b()
+    ticket_b_id = ticket_b["id"]
+
+    # El usuario del tenant A lista sus tickets
+    response = await client_tenant_a.get("/v1/tickets/")
+    assert response.status_code == 200
+
+    ids_visibles = {t["id"] for t in response.json()}
+
+    # El ticket de tenant B no debe ser visible para tenant A
+    assert ticket_b_id not in ids_visibles, (
+        f"Fallo de aislamiento: ticket de tenant B ({ticket_b_id}) "
+        f"visible para usuario de tenant A"
+    )
+
+
+@pytest.mark.asyncio
+async def test_tenant_b_cannot_edit_tenant_a_ticket(
+    create_ticket_tenant_a, client_tenant_b
+):
+    """
+    El usuario del tenant A crea un ticket.
+    El usuario del tenant B intenta editar ese ticket vía PATCH.
+    Debe recibir 403 (prohibido) o 404 (no encontrado).
+    """
+    # El usuario del tenant A crea un ticket
+    ticket_a = await create_ticket_tenant_a()
+    ticket_a_id = ticket_a["id"]
+
+    # El usuario del tenant B intenta editar el ticket de tenant A
+    response = await client_tenant_b.patch(
+        f"/v1/tickets/{ticket_a_id}",
+        json={"status": "CLOSED"},
+    )
+
+    # Debe recibir 403 o 404 — nunca 200
+    assert response.status_code in (403, 404), (
+        f"Fallo de aislamiento: tenant B pudo editar ticket de tenant A "
+        f"(HTTP {response.status_code})"
+    )
+
+
+@pytest.mark.asyncio
+async def test_tenant_a_cannot_see_tenant_b_users(
+    client_tenant_a, create_user_tenant_b
+):
+    """
+    El usuario del tenant B crea un usuario nuevo.
+    El usuario del tenant A (SUPPORT_MANAGER) lista los usuarios.
+    El usuario de tenant B NO debe aparecer en la respuesta.
+    """
+    # El usuario del tenant B crea un usuario
+    user_b = await create_user_tenant_b()
+    user_b_id = user_b["id"]
+
+    # El usuario del tenant A lista los usuarios de su tenant
+    response = await client_tenant_a.get("/v1/users/")
+    assert response.status_code == 200
+
+    ids_visibles = {u["id"] for u in response.json()}
+
+    # El usuario de tenant B no debe ser visible para tenant A
+    assert user_b_id not in ids_visibles, (
+        f"Fallo de aislamiento: usuario de tenant B ({user_b_id}) "
+        f"visible para usuario de tenant A"
+    )
+
+
+@pytest.mark.asyncio
+async def test_admin_sees_all_tenant_data(
+    client_admin,
+    create_ticket_tenant_a,
+    create_ticket_tenant_b,
+    create_user_tenant_a,
+    create_user_tenant_b,
+):
+    """
+    El ADMIN global debe poder ver tickets y usuarios de TODOS los tenants.
+    - Tickets: vía /v1/tickets/admin/all (endpoint multi-tenant).
+    - Usuarios: vía /v1/users/ (ADMIN bypasa el filtro de tenant).
+    """
+    # Crear datos en ambos tenants
+    ticket_a = await create_ticket_tenant_a()
+    ticket_b = await create_ticket_tenant_b()
+    user_a = await create_user_tenant_a()
+    user_b = await create_user_tenant_b()
+
+    # El admin lista todos los tickets (endpoint multi-tenant)
+    resp_tickets = await client_admin.get("/v1/tickets/admin/all")
+    assert resp_tickets.status_code == 200
+    ids_tickets = {t["id"] for t in resp_tickets.json()}
+    assert ticket_a["id"] in ids_tickets, "El ADMIN no ve el ticket de tenant A"
+    assert ticket_b["id"] in ids_tickets, "El ADMIN no ve el ticket de tenant B"
+
+    # El admin lista todos los usuarios (ADMIN bypasa filtro de tenant)
+    resp_users = await client_admin.get("/v1/users/")
+    assert resp_users.status_code == 200
+    ids_users = {u["id"] for u in resp_users.json()}
+    assert user_a["id"] in ids_users, "El ADMIN no ve el usuario de tenant A"
+    assert user_b["id"] in ids_users, "El ADMIN no ve el usuario de tenant B"
+
--- a/backend/migrations/versions/b7c8d9e0f1a2_add_ticket_indexes.py
+++ b/backend/migrations/versions/b7c8d9e0f1a2_add_ticket_indexes.py
@@ -0,0 +1,43 @@
+"""add_ticket_indexes
+
+Revision ID: b7c8d9e0f1a2
+Revises: fix_client_timestamps
+Create Date: 2026-03-03 00:00:00.000000
+
+Agrega índices a la tabla tickets para optimizar queries frecuentes:
+  - idx_tickets_status            → filtros por estado
+  - idx_tickets_priority          → filtros por prioridad
+  - idx_tickets_assigned_to       → tickets por agente asignado
+  - idx_tickets_tenant_status     → compuesto multi-tenant (tenant_id, status)
+"""
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = 'b7c8d9e0f1a2'
+down_revision = 'fix_client_timestamps'
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.execute(
+        "CREATE INDEX IF NOT EXISTS idx_tickets_status ON tickets (status)"
+    )
+    op.execute(
+        "CREATE INDEX IF NOT EXISTS idx_tickets_priority ON tickets (priority)"
+    )
+    op.execute(
+        "CREATE INDEX IF NOT EXISTS idx_tickets_assigned_to "
+        "ON tickets (assigned_to) WHERE assigned_to IS NOT NULL"
+    )
+    op.execute(
+        "CREATE INDEX IF NOT EXISTS idx_tickets_tenant_status "
+        "ON tickets (tenant_id, status)"
+    )
+
+
+def downgrade() -> None:
+    op.execute("DROP INDEX IF EXISTS idx_tickets_tenant_status")
+    op.execute("DROP INDEX IF EXISTS idx_tickets_assigned_to")
+    op.execute("DROP INDEX IF EXISTS idx_tickets_priority")
+    op.execute("DROP INDEX IF EXISTS idx_tickets_status")
--- a/backend/migrations/versions/c1d2e3f4a5b6_add_client_roles_to_user_role_enum.py
+++ b/backend/migrations/versions/c1d2e3f4a5b6_add_client_roles_to_user_role_enum.py
@@ -0,0 +1,35 @@
+"""Add CLIENT_MANAGER, CLIENT_AGENT, CLIENT_AUDITOR to user_role_enum
+
+Revision ID: c1d2e3f4a5b6
+Revises: b7c8d9e0f1a2
+Create Date: 2026-03-03 10:00:00.000000
+
+Agrega tres nuevos roles de cliente al enum PostgreSQL:
+  - CLIENT_MANAGER  → gestiona tickets y usuarios del tenant
+  - CLIENT_AGENT    → atiende tickets del tenant
+  - CLIENT_AUDITOR  → auditoría de solo lectura del tenant
+"""
+from alembic import op
+
+
+# revision identifiers, used by Alembic.
+revision = 'c1d2e3f4a5b6'
+down_revision = 'b7c8d9e0f1a2'
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # PostgreSQL permite agregar valores a un enum con ADD VALUE.
+    # IF NOT EXISTS evita error si la migración se aplica dos veces.
+    op.execute("ALTER TYPE user_role_enum ADD VALUE IF NOT EXISTS 'CLIENT_MANAGER'")
+    op.execute("ALTER TYPE user_role_enum ADD VALUE IF NOT EXISTS 'CLIENT_AGENT'")
+    op.execute("ALTER TYPE user_role_enum ADD VALUE IF NOT EXISTS 'CLIENT_AUDITOR'")
+
+
+def downgrade() -> None:
+    # PostgreSQL no permite eliminar valores de un enum con ALTER TYPE DROP VALUE.
+    # Para revertir habría que recrear el tipo completo desde cero, lo que requiere
+    # actualizar todas las columnas que lo usan. Se documenta como no reversible
+    # automáticamente — usar con precaución.
+    pass
--- a/backend/migrations/versions/d2e3f4a5b6c7_remove_intermediate_client_roles.py
+++ b/backend/migrations/versions/d2e3f4a5b6c7_remove_intermediate_client_roles.py
@@ -0,0 +1,92 @@
+"""Remove CLIENT_MANAGER, CLIENT_AGENT, CLIENT_AUDITOR from user_role_enum
+
+Revision ID: d2e3f4a5b6c7
+Revises: c1d2e3f4a5b6
+Create Date: 2026-03-03 14:00:00.000000
+
+Consolida 9 roles → 6 roles migrando datos primero y luego recreando
+el tipo enum de PostgreSQL (única forma de eliminar valores en PG).
+
+Mapeo de datos:
+  CLIENT_MANAGER  → CLIENT_ADMIN   (conserva nivel de gestión)
+  CLIENT_AGENT    → CLIENT_USER    (acceso básico de cliente)
+  CLIENT_AUDITOR  → CLIENT_USER    (acceso básico de cliente)
+
+ADVERTENCIA DOWNGRADE: La migración inversa restaura los valores del
+enum pero NO puede recuperar la distinción original entre CLIENT_AGENT
+y CLIENT_AUDITOR (ambos quedaron como CLIENT_USER). El downgrade es
+seguro a nivel de integridad de datos, pero irreversible en semántica.
+"""
+from alembic import op
+
+
+# revision identifiers, used by Alembic.
+revision = 'd2e3f4a5b6c7'
+down_revision = 'c1d2e3f4a5b6'
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ── Paso 1: Migrar datos ANTES de modificar el tipo ────────────────────
+    # CLIENT_MANAGER → CLIENT_ADMIN (conserva acceso de gestión)
+    op.execute("UPDATE users SET role = 'CLIENT_ADMIN' WHERE role = 'CLIENT_MANAGER'")
+    # CLIENT_AGENT   → CLIENT_USER  (acceso básico de cliente)
+    op.execute("UPDATE users SET role = 'CLIENT_USER'  WHERE role = 'CLIENT_AGENT'")
+    # CLIENT_AUDITOR → CLIENT_USER  (acceso básico de cliente)
+    op.execute("UPDATE users SET role = 'CLIENT_USER'  WHERE role = 'CLIENT_AUDITOR'")
+
+    # ── Paso 2: Soltar la restricción de tipo para poder recrear el enum ───
+    # PostgreSQL no permite DROP VALUE en un enum; hay que recrear el tipo.
+    op.execute("ALTER TABLE users ALTER COLUMN role TYPE TEXT")
+
+    # ── Paso 3: Eliminar tipo actual y recrearlo solo con los 6 roles ──────
+    op.execute("DROP TYPE user_role_enum")
+    op.execute("""
+        CREATE TYPE user_role_enum AS ENUM (
+            'ADMIN',
+            'SUPPORT_MANAGER',
+            'AGENT',
+            'AUDITOR',
+            'CLIENT_ADMIN',
+            'CLIENT_USER'
+        )
+    """)
+
+    # ── Paso 4: Restaurar columna al tipo enum ──────────────────────────────
+    op.execute(
+        "ALTER TABLE users ALTER COLUMN role TYPE user_role_enum "
+        "USING role::user_role_enum"
+    )
+
+
+def downgrade() -> None:
+    # ── Paso 1: Soltar la restricción de tipo para recrear el enum ─────────
+    op.execute("ALTER TABLE users ALTER COLUMN role TYPE TEXT")
+
+    # ── Paso 2: Recrear enum con los 9 valores originales ──────────────────
+    op.execute("DROP TYPE user_role_enum")
+    op.execute("""
+        CREATE TYPE user_role_enum AS ENUM (
+            'ADMIN',
+            'SUPPORT_MANAGER',
+            'AGENT',
+            'AUDITOR',
+            'CLIENT_ADMIN',
+            'CLIENT_MANAGER',
+            'CLIENT_AGENT',
+            'CLIENT_AUDITOR',
+            'CLIENT_USER'
+        )
+    """)
+
+    # ── Paso 3: Restaurar columna al tipo enum ──────────────────────────────
+    op.execute(
+        "ALTER TABLE users ALTER COLUMN role TYPE user_role_enum "
+        "USING role::user_role_enum"
+    )
+
+    # ── Nota sobre pérdida de datos ─────────────────────────────────────────
+    # Los usuarios que eran CLIENT_MANAGER ahora son CLIENT_ADMIN.
+    # Los usuarios que eran CLIENT_AGENT o CLIENT_AUDITOR ahora son CLIENT_USER.
+    # No es posible restaurar la distinción original automáticamente.
--- a/backend/requirements.txt
+++ b/backend/requirements.txt
@@ -31,6 +31,7 @@ pyotp==2.9.0             # TOTP/2FA support
 # ===================================
 celery==5.3.4
 redis==5.0.1
+slowapi==0.1.9          # Rate limiting middleware

 # ===================================
 # EMAIL
--- a/backend/scripts/reset_passwords.py
+++ b/backend/scripts/reset_passwords.py
@@ -0,0 +1,49 @@
+"""
+Script para resetear contraseñas de todos los usuarios a valores conocidos.
+Ejecutar con: python -m scripts.reset_passwords (desde /app en el contenedor)
+"""
+import asyncio
+from sqlalchemy import select, update
+from app.core.database import AsyncSessionLocal
+from app.core.security import security
+from app.models.user import User
+
+# Mapa email -> nueva contraseña
+PASSWORD_MAP = {
+    "admin@aduanasoft.com":           "admin123",
+    "admin@test.com":                 "admin123",
+    "manager@aduanasoft.com":         "manager123",
+    "agente@aduanasoft.com":          "agente123",
+    "auditor1@test.com":              "auditor123",
+    "admin-cliente@empresa-demo.com": "clienteadmin123",
+    "cliente@empresa-demo.com":       "cliente123",
+    "test_user@aduanasoft.com":       "test123",
+}
+
+async def reset_all_passwords():
+    async with AsyncSessionLocal() as db:
+        result = await db.execute(select(User))
+        users = result.scalars().all()
+
+        updated = 0
+        skipped = 0
+        for user in users:
+            if user.email in PASSWORD_MAP:
+                plain = PASSWORD_MAP[user.email]
+                user.password_hash = security.hash_password(plain)
+                user.email_verified = True
+                user.is_active = True
+                updated += 1
+                print(f"  ✅ {user.email}  →  {plain}")
+            else:
+                skipped += 1
+                print(f"  ⚠️  {user.email}  (sin contraseña definida, se omite)")
+
+        await db.commit()
+        print(f"\nResumen: {updated} actualizados, {skipped} omitidos")
+        print("\n📋 Credenciales listas:")
+        for email, pwd in PASSWORD_MAP.items():
+            print(f"   {email}  /  {pwd}")
+
+if __name__ == "__main__":
+    asyncio.run(reset_all_passwords())
--- a/db/schema.sql
+++ b/db/schema.sql
@@ -415,18 +415,19 @@ INSERT INTO tenants (name, slug, contact_email) VALUES
 ('Aduanasoft Demo', 'aduanasoft-demo', 'demo@aduanasoft.com');

 -- Usuario admin por defecto (password: admin123)
-- Hash generado con Argon2: $argon2id$v=19$m=65536,t=3,p=4$...
+-- Hash Argon2id generado con m=65536,t=3,p=4
 INSERT INTO users (tenant_id, email, first_name, last_name, password_hash, role, is_active, email_verified) 
 SELECT 
    id,
    'admin@aduanasoft.com',
    'Admin', 
    'Sistema',
-    '$argon2id$v=19$m=65536,t=3,p=4$example_hash_here',
+    '$argon2id$v=19$m=65536,t=3,p=4$wpjz/t+bM4bQmtM6B6A0pg$ELwnGUL4S1Y6tywp0LS6cre0bvWEoVuJ845spZ9Z9IQ',
    'ADMIN',
    true,
    true
-FROM tenants WHERE slug = 'aduanasoft-demo';
+FROM tenants WHERE slug = 'aduanasoft-demo'
+ON CONFLICT (tenant_id, email) DO NOTHING;

 -- Categorías por defecto
 INSERT INTO ticket_categories (tenant_id, name, description, sla_response_hours, sla_resolution_hours)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,9 +13,9 @@ services:
      POSTGRES_INITDB_ARGS: "--encoding=UTF8 --locale=C"
    volumes:
      - postgres_data:/var/lib/postgresql/data
-      - ./db/schema.sql:/docker-entrypoint-initdb.d/01-schema.sql:ro
+      #- ./db/schema.sql:/docker-entrypoint-initdb.d/01-schema.sql:ro
    ports:
-      - "5432:5432"
+      - "5433:5432"
    healthcheck:
      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-servicemanager}"]
      interval: 10s
@@ -32,7 +32,7 @@ services:
    container_name: servicemanager-redis
    restart: unless-stopped
    command: redis-server --appendonly yes
-    volumes:
+    volumes:                                                                                                                                                                                                                                                                                                                                                                
      - redis_data:/data
    ports:
      - "6379:6379"
@@ -164,6 +164,8 @@ services:
      - NODE_ENV=${ENVIRONMENT:-development}
      - PUBLIC_API_URL=http://backend:8000
      - PUBLIC_APP_NAME=ServiceManager Cliente
+      - PORT=3000
+      - HMR_CLIENT_PORT=3000
    volumes:
      - ./frontend-client:/app
      - /app/node_modules
@@ -189,6 +191,8 @@ services:
      - NODE_ENV=${ENVIRONMENT:-development}
      - PUBLIC_API_URL=http://backend:8000
      - PUBLIC_APP_NAME=ServiceManager Admin
+      - PORT=3000
+      - HMR_CLIENT_PORT=3001
    volumes:
      - ./frontend-internal:/app
      - /app/node_modules
@@ -211,7 +215,7 @@ services:
      - ./docker/nginx/default.conf:/etc/nginx/conf.d/default.conf:ro
      - uploads_data:/var/www/uploads:ro
    ports:
-      - "80:80"
+      - "8088:80"
    depends_on:
      - backend
      - frontend-client
--- a/fix_login.py
+++ b/fix_login.py
@@ -0,0 +1,67 @@
+import re
+
+with open("/app/app/api/v1/endpoints/auth.py", "r") as f:
+    content = f.read()
+
+old = '''    # 1. Validar tenant
+    tenant_result = await db.execute(
+        select(Tenant).where(Tenant.slug == login_data.tenant_slug)
+    )
+    tenant = tenant_result.scalar_one_or_none()
+    if tenant is None:
+        logger.warning(
+            "Login failed - tenant not found",
+            email=login_data.email,
+            tenant_slug=login_data.tenant_slug,
+        )
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail="Tenant not found",
+        )'''
+
+new = '''    # 1. Validar tenant - por slug si viene, sino detectar por email
+    if login_data.tenant_slug:
+        tenant_result = await db.execute(
+            select(Tenant).where(Tenant.slug == login_data.tenant_slug)
+        )
+        tenant = tenant_result.scalar_one_or_none()
+        if tenant is None:
+            raise HTTPException(
+                status_code=status.HTTP_404_NOT_FOUND,
+                detail="Tenant not found",
+            )
+    else:
+        tenant = None'''
+
+if old in content:
+    content = content.replace(old, new)
+    print("OK: bloque tenant reemplazado")
+else:
+    print("ERROR: bloque no encontrado")
+
+# Tambien actualizar la query de usuario para usar tenant o no
+old2 = '''    # 2. Buscar usuario en base de datos (aislado por tenant)
+    query = select(User).where(
+        User.email == login_data.email,
+        User.tenant_id == tenant.id,
+    )'''
+
+new2 = '''    # 2. Buscar usuario - filtrar por tenant si se detecto, sino buscar por email
+    if tenant:
+        query = select(User).where(
+            User.email == login_data.email,
+            User.tenant_id == tenant.id,
+        )
+    else:
+        query = select(User).where(User.email == login_data.email)'''
+
+if old2 in content:
+    content = content.replace(old2, new2)
+    print("OK: bloque query reemplazado")
+else:
+    print("ERROR: bloque query no encontrado")
+
+with open("/app/app/api/v1/endpoints/auth.py", "w") as f:
+    f.write(content)
+
+print("Listo")
--- a/fix_ratelimit.py
+++ b/fix_ratelimit.py
@@ -0,0 +1,23 @@
+with open("/app/app/api/v1/endpoints/auth.py", "r") as f:
+    content = f.read()
+
+old = '''    # Rate limiting (best-effort): by (tenant,email) to slow brute force.
+    ident_key = None
+    if settings.RATE_LIMIT_ENABLED and not settings.TESTING:
+        email_norm = login_data.email.strip().lower()
+        ident_key = cache_key("rl", "login", "id", str(tenant.id), email_norm)'''
+
+new = '''    # Rate limiting (best-effort): by (tenant,email) to slow brute force.
+    ident_key = None
+    if settings.RATE_LIMIT_ENABLED and not settings.TESTING and tenant:
+        email_norm = login_data.email.strip().lower()
+        ident_key = cache_key("rl", "login", "id", str(tenant.id), email_norm)'''
+
+if old in content:
+    content = content.replace(old, new)
+    print("OK: rate limiting fix aplicado")
+else:
+    print("ERROR: bloque no encontrado")
+
+with open("/app/app/api/v1/endpoints/auth.py", "w") as f:
+    f.write(content)
--- a/frontend-client/src/app.d.ts
+++ b/frontend-client/src/app.d.ts
@@ -0,0 +1,11 @@
+import type { User } from '$lib/stores/auth';
+
+declare global {
+	namespace App {
+		interface Locals {
+			user: User | null;
+		}
+	}
+}
+
+export {};
--- a/frontend-client/src/app.html
+++ b/frontend-client/src/app.html
@@ -2,7 +2,7 @@
 <html lang="es">
 	<head>
 		<meta charset="utf-8" />
-		<link rel="icon" href="%sveltekit.assets%/favicon.png" />
+		<link rel="icon" href="%sveltekit.assets%/favicon.png" type="image/png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#3b82f6" />
 		
--- a/frontend-client/src/hooks.server.ts
+++ b/frontend-client/src/hooks.server.ts
@@ -0,0 +1,37 @@
+import type { Handle } from '@sveltejs/kit';
+export const handle: Handle = async ({ event, resolve }) => {
+        // No restaurar sesión en la página de login
+        if (event.url.pathname === '/login') {
+                event.locals.user = null;
+                return resolve(event);
+        }
+
+        const cookieHeader = event.request.headers.get('cookie') ?? '';
+        const cookieMatch = cookieHeader.match(/(?:client_access_token|internal_access_token)=([^;]+)/);
+        const token = cookieMatch?.[1];
+
+        if (token) {
+                try {
+                        const apiUrl = process.env.PUBLIC_API_URL ?? 'http://backend:8000';
+                        const response = await fetch(`${apiUrl}/v1/auth/me`, {
+                                headers: { 
+                                        'Authorization': `Bearer ${token}`,
+                                        'X-App': 'client',
+                                        'X-Tenant-Slug': 'aduanasoft'
+                                }
+                        });
+                        if (response.ok) {
+                                event.locals.user = await response.json();
+                        } else {
+                                event.locals.user = null;
+                                event.cookies.delete('client_access_token', { path: '/' });
+                                event.cookies.delete('internal_access_token', { path: '/' });
+                        }
+                } catch {
+                        event.locals.user = null;
+                }
+        } else {
+                event.locals.user = null;
+        }
+        return resolve(event);
+};
--- a/frontend-client/src/lib/stores/app.ts
+++ b/frontend-client/src/lib/stores/app.ts
@@ -29,15 +29,17 @@ const initialState: AppState = {
 // API helper function
 async function apiCall(endpoint: string, options: RequestInit = {}) {
  const authState = get(auth);
-  
+  const headers: Record<string, string> = {
+    'Content-Type': 'application/json',
+    'X-App': 'client',
+    ...(authState.user?.tenant_id ? { 'X-Tenant-ID': authState.user.tenant_id } : {}),
+    ...(options.headers as Record<string, string> ?? {})
+  };
+  if (authState.token) headers['Authorization'] = `Bearer ${authState.token}`;
  const response = await fetch(`/api/v1${endpoint}`, {
    ...options,
-    headers: {
-      'Content-Type': 'application/json',
-      'Authorization': `Bearer ${authState.token}`,
-      ...(authState.user?.tenant_id ? { 'X-Tenant-ID': authState.user.tenant_id } : {}),
-      ...options.headers
-    }
+    credentials: 'include',
+    headers
  });

  if (!response.ok) {
--- a/frontend-client/src/lib/stores/auth.ts
+++ b/frontend-client/src/lib/stores/auth.ts
@@ -1,7 +1,5 @@
 import type { Writable } from 'svelte/store';
 import { writable } from 'svelte/store';
-
-// Types
 export interface User {
  id: string;
  email: string;
@@ -13,129 +11,94 @@ export interface User {
  is_two_factor_enabled: boolean;
  created_at: string;
 }
-
 export interface AuthState {
  user: User | null;
  token: string | null;
  isAuthenticated: boolean;
  isLoading: boolean;
 }
-
 export interface LoginRequest {
  email: string;
  password: string;
  tenant_slug: string;
  totp_code?: string;
 }
-
 export interface LoginResponse {
  access_token: string;
  token_type: string;
  expires_in: number;
  user: User;
 }
-
-// Initial state
 const initialState: AuthState = {
  user: null,
  token: null,
  isAuthenticated: false,
  isLoading: false
 };
-
-// Create auth store
 function createAuthStore() {
  const { subscribe, set, update }: Writable<AuthState> = writable(initialState);
-
+  let _state = initialState;
+  subscribe(s => { _state = s; });
  return {
    subscribe,
-
-    // Initialize auth from localStorage
-    init: () => {
+    init: async () => {
      if (typeof window !== 'undefined') {
-        const token = localStorage.getItem('auth_token');
-        const user = localStorage.getItem('auth_user');
-
-        if (token && user) {
-          try {
-            const parsedUser = JSON.parse(user);
-            set({
-              user: parsedUser,
-              token,
-              isAuthenticated: true,
-              isLoading: false
-            });
-          } catch (error) {
-            console.error('Error parsing stored auth data:', error);
-            localStorage.removeItem('auth_token');
-            localStorage.removeItem('auth_user');
+        try {
+          const response = await fetch('/api/v1/auth/me', {
+            credentials: 'include',
+            headers: { 'X-App': 'client', 'X-Tenant-Slug': 'aduanasoft' }
+          });
+          if (response.ok) {
+            const user = await response.json();
+            set({ user, token: null, isAuthenticated: true, isLoading: false });
          }
-        }
+        } catch (error) {}
      }
    },
-
-    // Login
    login: async (credentials: LoginRequest): Promise<void> => {
      update(state => ({ ...state, isLoading: true }));
-
      try {
        const response = await fetch('/api/v1/auth/login', {
          method: 'POST',
+          credentials: 'include',
          headers: {
            'Content-Type': 'application/json',
+            'X-Tenant-Slug': credentials.tenant_slug,
          },
          body: JSON.stringify(credentials)
        });
-
        if (!response.ok) {
          const error = await response.json();
          throw new Error(error.detail || 'Login failed');
        }
-
        const data: LoginResponse = await response.json();
-
-        // Store auth data
-        if (typeof window !== 'undefined') {
-          localStorage.setItem('auth_token', data.access_token);
-          localStorage.setItem('auth_user', JSON.stringify(data.user));
-        }
-
-        set({
-          user: data.user,
-          token: data.access_token,
-          isAuthenticated: true,
-          isLoading: false
-        });
+        set({ user: data.user, token: data.access_token, isAuthenticated: true, isLoading: false });
      } catch (error) {
        update(state => ({ ...state, isLoading: false }));
        throw error;
      }
    },
-
-    // Logout
-    logout: () => {
+    logout: async () => {
+      try {
+        const token = _state.token;
+        await fetch('/api/v1/auth/logout', {
+          method: 'POST',
+          credentials: 'include',
+          headers: {
+            'X-App': 'client',
+            'X-Tenant-Slug': 'aduanasoft',
+            ...(token ? { 'Authorization': `Bearer ${token}` } : {})
+          }
+        });
+      } catch {}
+      set(initialState);
      if (typeof window !== 'undefined') {
-        localStorage.removeItem('auth_token');
-        localStorage.removeItem('auth_user');
-        // Immediate redirect after cleanup
        window.location.href = '/login';
      }
-      set(initialState);
    },
-
-    // Update user data
-    updateUser: (user: User) => {
-      update(state => ({ ...state, user }));
-      if (typeof window !== 'undefined') {
-        localStorage.setItem('auth_user', JSON.stringify(user));
-      }
-    },
-
-    // Set loading state
-    setLoading: (isLoading: boolean) => {
-      update(state => ({ ...state, isLoading }));
-    }
+    updateUser: (user: User) => { update(state => ({ ...state, user })); },
+    setUser: (user: User) => { set({ user, token: null, isAuthenticated: true, isLoading: false }); },
+    setLoading: (isLoading: boolean) => { update(state => ({ ...state, isLoading })); }
  };
 }
-
 export const auth = createAuthStore();
--- a/frontend-client/src/lib/stores/tickets.ts
+++ b/frontend-client/src/lib/stores/tickets.ts
@@ -80,18 +80,22 @@ const initialState: TicketsState = {
 async function apiCall(endpoint: string, options: RequestInit = {}) {
  const authState = get(auth);

-  if (!authState.token || !authState.user) {
+  if (!authState.user) {
    throw new Error('Not authenticated');
  }

+  const headers: Record<string, string> = {
+    'Content-Type': 'application/json',
+    'X-App': 'client',
+    ...(options.headers as Record<string, string>)
+  };
+  if (authState.token) headers['Authorization'] = `Bearer ${authState.token}`;
+  if (authState.user.tenant_id) headers['X-Tenant-ID'] = authState.user.tenant_id;
+
  const response = await fetch(`/api/v1${endpoint}`, {
    ...options,
-    headers: {
-      'Content-Type': 'application/json',
-      'Authorization': `Bearer ${authState.token}`,
-      'X-Tenant-ID': authState.user.tenant_id,
-      ...options.headers
-    }
+    credentials: 'include',
+    headers
  });

  if (!response.ok) {
@@ -259,16 +263,18 @@ function createTicketsStore() {

        const authState = get(auth);

-        if (!authState.token || !authState.user) {
+        if (!authState.user) {
          throw new Error('Not authenticated');
        }

+        const uploadHeaders: Record<string, string> = { 'X-App': 'client' };
+        if (authState.token) uploadHeaders['Authorization'] = `Bearer ${authState.token}`;
+        if (authState.user.tenant_id) uploadHeaders['X-Tenant-ID'] = authState.user.tenant_id;
+
        const response = await fetch(`/api/v1/tickets/${ticketId}/attachments`, {
          method: 'POST',
-          headers: {
-            'Authorization': `Bearer ${authState.token}`,
-            'X-Tenant-ID': authState.user.tenant_id
-          },
+          credentials: 'include',
+          headers: uploadHeaders,
          body: formData
        });

@@ -338,16 +344,18 @@ function createTicketsStore() {
    downloadAttachment: async (ticketId: string, attachmentId: string, filename: string) => {
      const authState = get(auth);

-      if (!authState.token || !authState.user) {
+      if (!authState.user) {
        throw new Error('Not authenticated');
      }

+      const dlHeaders: Record<string, string> = { 'X-App': 'client' };
+      if (authState.token) dlHeaders['Authorization'] = `Bearer ${authState.token}`;
+      if (authState.user.tenant_id) dlHeaders['X-Tenant-ID'] = authState.user.tenant_id;
+
      const response = await fetch(`/api/v1/tickets/${ticketId}/attachments/${attachmentId}/download`, {
        method: 'GET',
-        headers: {
-          'Authorization': `Bearer ${authState.token}`,
-          'X-Tenant-ID': authState.user.tenant_id
-        }
+        credentials: 'include',
+        headers: dlHeaders
      });

      if (!response.ok) {
--- a/frontend-client/src/lib/utils/api.ts
+++ b/frontend-client/src/lib/utils/api.ts
@@ -0,0 +1,116 @@
+import { auth } from '$lib/stores/auth';
+import { get } from 'svelte/store';
+
+const API_BASE = '/api/v1';
+const TENANT_SLUG = 'aduanasoft';
+
+interface RequestOptions extends RequestInit {
+  params?: Record<string, string>;
+}
+
+async function request<T>(endpoint: string, options: RequestOptions = {}): Promise<T> {
+  const { params, ...init } = options;
+
+  let url = `${API_BASE}${endpoint}`;
+  if (params) {
+    const filteredParams = Object.entries(params)
+      .filter(([, value]) => value !== undefined && value !== null && value !== '')
+      .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {});
+    if (Object.keys(filteredParams).length > 0) {
+      url += `?${new URLSearchParams(filteredParams).toString()}`;
+    }
+  }
+
+  const authState = get(auth);
+  const headers = new Headers(init.headers);
+
+  if (authState.token) {
+    headers.set('Authorization', `Bearer ${authState.token}`);
+  }
+  if (authState.user?.tenant_id && !headers.has('X-Tenant-ID')) {
+    headers.set('X-Tenant-ID', authState.user.tenant_id);
+  }
+  if (!headers.has('Content-Type')) {
+    headers.set('Content-Type', 'application/json');
+  }
+  headers.set('X-App', 'client');
+  headers.set('X-Tenant-Slug', TENANT_SLUG);
+
+  const response = await fetch(url, {
+    ...init,
+    credentials: 'include',
+    headers
+  });
+
+  if (response.status === 401) {
+    if (typeof window !== 'undefined') {
+      window.location.href = '/login';
+    }
+    throw new Error('Unauthorized');
+  }
+
+  if (!response.ok) {
+    const errorData = await response.json().catch(() => ({}));
+    throw new Error(errorData.detail || `API error: ${response.statusText}`);
+  }
+
+  if (response.status === 204) {
+    return {} as T;
+  }
+
+  return response.json();
+}
+
+async function downloadFile(endpoint: string, filename: string): Promise<void> {
+  const authState = get(auth);
+  const headers = new Headers();
+
+  if (authState.token) {
+    headers.set('Authorization', `Bearer ${authState.token}`);
+  }
+  if (authState.user?.tenant_id) {
+    headers.set('X-Tenant-ID', authState.user.tenant_id);
+  }
+  headers.set('X-App', 'client');
+  headers.set('X-Tenant-Slug', TENANT_SLUG);
+
+  const response = await fetch(`${API_BASE}${endpoint}`, {
+    method: 'GET',
+    credentials: 'include',
+    headers
+  });
+
+  if (response.status === 401) {
+    if (typeof window !== 'undefined') window.location.href = '/login';
+    throw new Error('Unauthorized');
+  }
+  if (!response.ok) {
+    const errorData = await response.json().catch(() => ({}));
+    throw new Error(errorData.detail || `Download error: ${response.statusText}`);
+  }
+
+  const blob = await response.blob();
+  const url = window.URL.createObjectURL(blob);
+  const a = document.createElement('a');
+  a.href = url;
+  a.download = filename;
+  document.body.appendChild(a);
+  a.click();
+  document.body.removeChild(a);
+  window.URL.revokeObjectURL(url);
+}
+
+export const api = {
+  get: <T>(endpoint: string, params?: Record<string, string>) =>
+    request<T>(endpoint, { method: 'GET', params }),
+  post: <T>(endpoint: string, body?: any) =>
+    request<T>(endpoint, { method: 'POST', body: body !== undefined ? JSON.stringify(body) : undefined }),
+  put: <T>(endpoint: string, body?: any) =>
+    request<T>(endpoint, { method: 'PUT', body: body !== undefined ? JSON.stringify(body) : undefined }),
+  patch: <T>(endpoint: string, body?: any) =>
+    request<T>(endpoint, { method: 'PATCH', body: body !== undefined ? JSON.stringify(body) : undefined }),
+  delete: <T>(endpoint: string) =>
+    request<T>(endpoint, { method: 'DELETE' }),
+  downloadFile: (endpoint: string, filename: string) =>
+    downloadFile(endpoint, filename)
+};
--- a/frontend-client/src/routes/+layout.server.ts
+++ b/frontend-client/src/routes/+layout.server.ts
@@ -0,0 +1,7 @@
+import type { LayoutServerLoad } from './$types';
+
+export const load: LayoutServerLoad = ({ locals }) => {
+	return {
+		user: locals.user ?? null
+	};
+};
--- a/frontend-client/src/routes/+layout.svelte
+++ b/frontend-client/src/routes/+layout.svelte
@@ -4,17 +4,39 @@
  import Toast from '$lib/components/Toast.svelte';
  import { onMount } from 'svelte';
  import { auth } from '$lib/stores/auth.js';
+  import { goto } from '$app/navigation';
  import { page } from '$app/stores';
+  import { browser } from '$app/environment';
  import '../app.css';

+  export let data;
+
+  let mounted = false;
+
  onMount(() => {
-    auth.init();
+    if (data.user && !$auth.isAuthenticated) {
+      auth.setUser(data.user);
+    }
+    mounted = true;
  });

-  $: showHeader = !$page.url.pathname.startsWith('/login') && !$page.url.pathname.startsWith('/register');
+  // Guard reactivo global: redirige a /login si no está autenticado en rutas protegidas
+  const publicRoutes = ['/login', '/register', '/forgot-password', '/reset-password'];
+  $: if (browser && mounted && !$auth.isAuthenticated &&
+       !publicRoutes.some(r => $page.url.pathname.startsWith(r))) {
+    goto('/login');
+  }
+
+  $: showHeader = !publicRoutes.some(r => $page.url.pathname.startsWith(r));
 </script>

 <div class="min-h-screen bg-gray-50 font-sans">
+  {#if !mounted}
+    <!-- Esperando inicialización de sesión -->
+    <div class="flex items-center justify-center min-h-screen bg-gray-50">
+      <div class="animate-spin rounded-full h-8 w-8 border-b-2 border-blue-600"></div>
+    </div>
+  {:else}
  {#if showHeader}
    <Header />
  {/if}
@@ -27,6 +49,7 @@
  <footer class="py-4 text-center border-t border-gray-200 bg-white">
    <p class="text-xs text-gray-400">ServiceManagerWeb v1.9.0 · © 2026 Aduanasoft</p>
  </footer>
+  {/if}
  
  <!-- Toast notifications -->
  {#each $toast.toasts as toastMessage (toastMessage.id)}
--- a/frontend-client/src/routes/login/+page.svelte
+++ b/frontend-client/src/routes/login/+page.svelte
@@ -125,7 +125,7 @@
          <div
            class="p-3 rounded-md bg-red-50 border border-red-100 flex items-center gap-3 animate-fade-in text-sm text-red-600"
          >
-            <Icon name="alert-circle" class="w-4 h-4 flex-shrink-0" />
+            <Icon name="alert-circle" className="w-4 h-4 flex-shrink-0" />
            {errorMessage}
          </div>
        {/if}
@@ -141,7 +141,7 @@
                <div class="absolute inset-y-0 left-0 pl-3 flex items-center pointer-events-none">
                  <Icon
                    name="mail"
-                    class="w-5 h-5 text-gray-400 group-focus-within:text-blue-600 transition-colors"
+                    className="w-5 h-5 text-gray-400 group-focus-within:text-blue-600 transition-colors"
                  />
                </div>
                <input
@@ -166,7 +166,7 @@
                <div class="absolute inset-y-0 left-0 pl-3 flex items-center pointer-events-none">
                  <Icon
                    name="lock"
-                    class="w-5 h-5 text-gray-400 group-focus-within:text-blue-600 transition-colors"
+                    className="w-5 h-5 text-gray-400 group-focus-within:text-blue-600 transition-colors"
                  />
                </div>
                {#if showPassword}
@@ -197,7 +197,7 @@
                  class="absolute inset-y-0 right-0 pr-3 flex items-center cursor-pointer text-gray-400 hover:text-gray-600 focus:outline-none"
                  on:click={() => (showPassword = !showPassword)}
                >
-                  <Icon name={showPassword ? 'eye-off' : 'eye'} class="w-5 h-5" />
+                  <Icon name={showPassword ? 'eye-off' : 'eye'} className="w-5 h-5" />
                </button>
              </div>
            </div>
@@ -216,12 +216,13 @@
                  >Recordar en este equipo</label
                >
              </div>
-              <a
-                href="/forgot-password"
-                class="text-sm font-medium text-blue-600 hover:text-blue-500"
+              <button
+                type="button"
+                class="text-sm font-medium text-blue-600 hover:text-blue-500 bg-transparent border-none p-0 cursor-pointer"
+                on:click={() => goto('/forgot-password')}
              >
-                Olvide mi clave
-              </a>
+                Olvidé mi clave
+              </button>
            </div>
          </div>
        {:else}
@@ -234,7 +235,7 @@

            <div class="relative">
              <div class="absolute inset-y-0 left-0 pl-3 flex items-center pointer-events-none">
-                <Icon name="shield-check" class="w-5 h-5 text-blue-500" />
+                <Icon name="shield-check" className="w-5 h-5 text-blue-500" />
              </div>
              <input
                id="code"
@@ -258,7 +259,7 @@
            disabled={isLoading}
          >
            {#if isLoading}
-              <Icon name="loader-2" class="w-5 h-5 animate-spin mr-2" />
+              <Icon name="loader-2" className="w-5 h-5 animate-spin mr-2" />
              Procesando...
            {:else}
              {showTwoFactor ? 'Verificar Acceso' : 'Acceder al Portal'}
--- a/frontend-client/src/routes/organization/+page.svelte
+++ b/frontend-client/src/routes/organization/+page.svelte
@@ -38,11 +38,14 @@
  async function loadProfile() {
    isLoading = true;
    try {
+      const headers: Record<string, string> = {
+        'X-App': 'client',
+        'X-Tenant-ID': $auth.user?.tenant_id ?? ''
+      };
+      if ($auth.token) headers['Authorization'] = `Bearer ${$auth.token}`;
      const response = await fetch('/api/v1/client-profile/', {
-        headers: {
-          Authorization: `Bearer ${$auth.token}`,
-          'X-Tenant-ID': $auth.user?.tenant_id ?? ''
-        }
+        credentials: 'include',
+        headers
      });
      if (!response.ok) throw new Error((await response.json()).detail);
      profile = await response.json();
@@ -62,13 +65,16 @@
  async function saveProfile() {
    isSaving = true;
    try {
+      const headers: Record<string, string> = {
+        'Content-Type': 'application/json',
+        'X-App': 'client',
+        'X-Tenant-ID': $auth.user?.tenant_id ?? ''
+      };
+      if ($auth.token) headers['Authorization'] = `Bearer ${$auth.token}`;
      const response = await fetch('/api/v1/client-profile/', {
        method: 'PUT',
-        headers: {
-          'Content-Type': 'application/json',
-          Authorization: `Bearer ${$auth.token}`,
-          'X-Tenant-ID': $auth.user?.tenant_id ?? ''
-        },
+        credentials: 'include',
+        headers,
        body: JSON.stringify(form)
      });
      if (!response.ok) throw new Error((await response.json()).detail);
--- a/frontend-client/src/routes/profile/+page.svelte
+++ b/frontend-client/src/routes/profile/+page.svelte
@@ -34,7 +34,11 @@
    try {
      const response = await fetch('/api/v1/auth/2fa/setup', {
        method: 'POST',
-        headers: { Authorization: `Bearer ${$auth.token}` }
+        credentials: 'include',
+        headers: {
+          'X-App': 'client',
+          ...($auth.token ? { Authorization: `Bearer ${$auth.token}` } : {})
+        }
      });
      if (!response.ok) throw new Error((await response.json()).detail);
      const data = await response.json();
@@ -57,7 +61,12 @@
    try {
      const response = await fetch('/api/v1/auth/2fa/enable', {
        method: 'POST',
-        headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${$auth.token}` },
+        credentials: 'include',
+        headers: {
+          'Content-Type': 'application/json',
+          'X-App': 'client',
+          ...($auth.token ? { Authorization: `Bearer ${$auth.token}` } : {})
+        },
        body: JSON.stringify({ totp_code: totpSetupCode })
      });
      if (!response.ok) throw new Error((await response.json()).detail);
@@ -84,7 +93,12 @@
    try {
      const response = await fetch('/api/v1/auth/2fa/disable', {
        method: 'POST',
-        headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${$auth.token}` },
+        credentials: 'include',
+        headers: {
+          'Content-Type': 'application/json',
+          'X-App': 'client',
+          ...($auth.token ? { Authorization: `Bearer ${$auth.token}` } : {})
+        },
        body: JSON.stringify({ totp_code: disableTotpCode })
      });
      if (!response.ok) throw new Error((await response.json()).detail);
@@ -157,16 +171,20 @@

  async function loadBusinessProfile() {
    try {
-      if (!$auth.token || !$auth.user) {
+      if (!$auth.user) {
        console.warn('Usuario no autenticado');
        return;
      }

+      const _lpHeaders: Record<string, string> = {
+        'X-App': 'client',
+        'X-Tenant-ID': $auth.user.tenant_id
+      };
+      if ($auth.token) _lpHeaders['Authorization'] = `Bearer ${$auth.token}`;
+
      const response = await fetch('/api/v1/client-profile/', {
-        headers: {
-          Authorization: `Bearer ${$auth.token}`,
-          'X-Tenant-ID': $auth.user.tenant_id
-        }
+        credentials: 'include',
+        headers: _lpHeaders
      });

      if (response.ok) {
@@ -267,9 +285,11 @@
    try {
      const response = await fetch('/api/v1/auth/profile', {
        method: 'PATCH',
+        credentials: 'include',
        headers: {
          'Content-Type': 'application/json',
-          Authorization: `Bearer ${$auth.token}`
+          'X-App': 'client',
+          ...($auth.token ? { Authorization: `Bearer ${$auth.token}` } : {})
        },
        body: JSON.stringify({
          first_name: firstName.trim(),
@@ -300,9 +320,11 @@
    try {
      const response = await fetch('/api/v1/auth/change-password', {
        method: 'POST',
+        credentials: 'include',
        headers: {
          'Content-Type': 'application/json',
-          Authorization: `Bearer ${$auth.token}`
+          'X-App': 'client',
+          ...($auth.token ? { Authorization: `Bearer ${$auth.token}` } : {})
        },
        body: JSON.stringify({
          current_password: currentPassword,
@@ -349,13 +371,16 @@
        profileData.credit_limit = parseFloat(profileData.credit_limit);
      }

+      const _bpHeaders: Record<string, string> = {
+        'Content-Type': 'application/json',
+        'X-App': 'client',
+        'X-Tenant-ID': $auth.user?.tenant_id ?? ''
+      };
+      if ($auth.token) _bpHeaders['Authorization'] = `Bearer ${$auth.token}`;
      const response = await fetch('/api/v1/client-profile/', {
        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-          Authorization: `Bearer ${$auth.token}`,
-          'X-Tenant-ID': $auth.user.tenant_id
-        },
+        credentials: 'include',
+        headers: _bpHeaders,
        body: JSON.stringify(profileData)
      });

--- a/frontend-client/static/favicon.png
+++ b/frontend-client/static/favicon.png
--- a/frontend-client/vite.config.js
+++ b/frontend-client/vite.config.js
@@ -1,28 +1,35 @@
 import { sveltekit } from '@sveltejs/kit/vite';
 import { defineConfig } from 'vite';
-
 export default defineConfig({
-	plugins: [sveltekit()],
-	server: {
-		port: 3000,
-		host: '0.0.0.0',
-		watch: {
-			usePolling: true,
-			interval: 500
-		},
-		proxy: {
-			'/api': {
-				target: process.env.PUBLIC_API_URL || 'http://localhost:8000',
-				changeOrigin: true,
-				rewrite: (path) => path.replace(/^\/api/, '')
-			}
-		}
-	},
-	preview: {
-		port: 3000,
-		host: '0.0.0.0'
-	},
-	build: {
-		target: 'esnext'
-	}
-});
+        plugins: [sveltekit()],
+        server: {
+                port: 3000,
+                host: '0.0.0.0',
+                watch: {
+                        usePolling: true,
+                        interval: 500
+                },
+                hmr: {
+                        host: 'localhost',
+                        clientPort: parseInt(process.env.HMR_CLIENT_PORT || '3000')
+                },
+                fs: {
+                        allow: ['/app', '.'],
+                        strict: false
+                },
+                proxy: {
+                        '/api': {
+                                target: process.env.PUBLIC_API_URL || 'http://backend:8000',
+                                changeOrigin: true,
+                                rewrite: (path) => path.replace(/^\/api/, '')
+                        }
+                }
+        },
+        preview: {
+                port: 3000,
+                host: '0.0.0.0'
+        },
+        build: {
+                target: 'esnext'
+        }
+});
--- a/frontend-internal/package.json
+++ b/frontend-internal/package.json
@@ -4,7 +4,7 @@
  "private": true,
  "type": "module",
  "scripts": {
-    "dev": "vite dev --port 3000 --host 0.0.0.0",
+    "dev": "vite dev --host 0.0.0.0",
    "build": "vite build",
    "preview": "vite preview --port 3000 --host 0.0.0.0",
    "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
--- a/frontend-internal/src/app.d.ts
+++ b/frontend-internal/src/app.d.ts
@@ -0,0 +1,11 @@
+import type { InternalUser } from '$lib/stores/auth';
+
+declare global {
+	namespace App {
+		interface Locals {
+			user: InternalUser | null;
+		}
+	}
+}
+
+export {};
--- a/frontend-internal/src/app.html
+++ b/frontend-internal/src/app.html
@@ -4,7 +4,7 @@
    <meta charset="utf-8" />
    <meta name="description" content="ServiceManager - Mesa de Ayuda Empresarial - Portal Interno" />
    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <link rel="icon" href="%sveltekit.assets%/favicon.ico" />
+    <link rel="icon" href="%sveltekit.assets%/favicon.png" type="image/png" />
    <link rel="preconnect" href="https://fonts.googleapis.com">
    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
    <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap" rel="stylesheet">
--- a/frontend-internal/src/hooks.server.ts
+++ b/frontend-internal/src/hooks.server.ts
@@ -0,0 +1,19 @@
+import type { Handle } from '@sveltejs/kit';
+
+export const handle: Handle = async ({ event, resolve }) => {
+	const cookie = event.request.headers.get('cookie') ?? '';
+	if (cookie) {
+		try {
+			const apiUrl = process.env.PUBLIC_API_URL ?? 'http://backend:8000';
+			const response = await fetch(`${apiUrl}/v1/auth/me`, {
+				headers: { cookie, 'X-App': 'internal' }
+			});
+			event.locals.user = response.ok ? await response.json() : null;
+		} catch {
+			event.locals.user = null;
+		}
+	} else {
+		event.locals.user = null;
+	}
+	return resolve(event);
+};
--- a/frontend-internal/src/lib/components/Sidebar.svelte
+++ b/frontend-internal/src/lib/components/Sidebar.svelte
@@ -72,6 +72,11 @@
          name: 'Seguridad',
          href: '/audit/security',
          icon: 'M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z'
+        },
+        {
+          name: 'Reporte Endpoints',
+          href: '/test-report',
+          icon: 'M9 3H5a2 2 0 00-2 2v4m6-6h10a2 2 0 012 2v4M9 3v18m0 0h10a2 2 0 002-2V9M9 21H5a2 2 0 01-2-2V9m0 0h18'
        }
      );
    }
--- a/frontend-internal/src/lib/stores/auth.ts
+++ b/frontend-internal/src/lib/stores/auth.ts
@@ -60,32 +60,34 @@ const initialState: AuthState = {
 function createAuthStore() {
  const { subscribe, set, update } = writable<AuthState>(initialState);

+  // Track current state for uso interno (evita dependencias circulares)
+  let _state = initialState;
+  subscribe(s => { _state = s; });
+
  return {
    subscribe,
    
-    // Initialize auth from localStorage
-    init: () => {
+    // Rehidrata sesión desde cookie HttpOnly (no toca localStorage)
+    init: async () => {
      if (typeof window !== 'undefined') {
-        const token = localStorage.getItem('internal_auth_token');
-        const refreshToken = localStorage.getItem('internal_auth_refresh_token');
-        const user = localStorage.getItem('internal_auth_user');
-        
-        if (token && user) {
-          try {
-            const parsedUser = JSON.parse(user);
+        try {
+          const response = await fetch('/api/v1/auth/me', {
+            credentials: 'include',
+            headers: { 'X-App': 'internal' }
+          });
+          if (response.ok) {
+            const user = await response.json();
            set({
-              user: parsedUser,
-              token,
-              refreshToken: refreshToken || null,
+              user,
+              token: null,
+              refreshToken: null,
              isAuthenticated: true,
              isLoading: false
            });
-          } catch (error) {
-            console.error('Error parsing stored auth data:', error);
-            localStorage.removeItem('internal_auth_token');
-            localStorage.removeItem('internal_auth_refresh_token');
-            localStorage.removeItem('internal_auth_user');
          }
+          // 401/400 es esperado cuando no hay sesión activa — no es un error
+        } catch (error) {
+          // Ignorar errores de red en init
        }
      }
    },
@@ -97,8 +99,10 @@ function createAuthStore() {
      try {
        const response = await fetch('/api/v1/auth/login', {
          method: 'POST',
+          credentials: 'include',
          headers: {
            'Content-Type': 'application/json',
+            'X-Tenant-Slug': credentials.tenant_slug,
          },
          body: JSON.stringify(credentials)
        });
@@ -109,15 +113,6 @@ function createAuthStore() {
        }

        const data: LoginResponse = await response.json();
-        
-        // Store auth data
-        if (typeof window !== 'undefined') {
-          localStorage.setItem('internal_auth_token', data.access_token);
-          if (data.refresh_token) {
-              localStorage.setItem('internal_auth_refresh_token', data.refresh_token);
-          }
-          localStorage.setItem('internal_auth_user', JSON.stringify(data.user));
-        }

        set({
          user: data.user,
@@ -134,21 +129,18 @@ function createAuthStore() {

    // Refresh Session
    refreshSession: async (): Promise<void> => {
-        // Need to get current state to access refresh token, logic simplified
-        let currentRefreshToken: string | null = null;
-        if (typeof window !== 'undefined') {
-            currentRefreshToken = localStorage.getItem('internal_auth_refresh_token');
-        }
+        const currentRefreshToken = _state.refreshToken;

        if (!currentRefreshToken) {
            throw new Error("No refresh token available");
        }

-        update (state => ({ ...state, isLoading: true }));
+        update(state => ({ ...state, isLoading: true }));

        try {
            const response = await fetch('/api/v1/auth/refresh', {
                method: 'POST',
+                credentials: 'include',
                headers: {
                    'Content-Type': 'application/json',
                },
@@ -166,11 +158,6 @@ function createAuthStore() {

            const data: TokenResponse = await response.json();

-            // Update token in storage and state
-            if (typeof window !== 'undefined') {
-                localStorage.setItem('internal_auth_token', data.access_token);
-            }
-
            update(state => ({
                ...state,
                token: data.access_token,
@@ -184,25 +171,29 @@ function createAuthStore() {
    },

    // Logout
-    logout: () => {
-      if (typeof window !== 'undefined') {
-        localStorage.removeItem('internal_auth_token');
-        localStorage.removeItem('internal_auth_refresh_token');
-        localStorage.removeItem('internal_auth_user');
-      }
+    logout: async () => {
+      // Llamar al backend para que borre la cookie HttpOnly
+      try {
+        await fetch('/api/v1/auth/logout', {
+          method: 'POST',
+          credentials: 'include',
+          headers: { 'X-App': 'internal' }
+        });
+      } catch { /* ignorar errores de red */ }
      set(initialState);
-      // Optional: Redirect to login
      if (typeof window !== 'undefined') {
-          window.location.href = '/login';
+        window.location.href = '/login';
      }
    },

    // Update user data
    updateUser: (user: InternalUser) => {
      update(state => ({ ...state, user }));
-      if (typeof window !== 'undefined') {
-        localStorage.setItem('internal_auth_user', JSON.stringify(user));
-      }
+    },
+
+    // Set user from SSR pre-load (no fetch required)
+    setUser: (user: InternalUser) => {
+      set({ user, token: null, refreshToken: null, isAuthenticated: true, isLoading: false });
    },

    // Set loading state
--- a/frontend-internal/src/lib/stores/dashboardConfig.ts
+++ b/frontend-internal/src/lib/stores/dashboardConfig.ts
@@ -0,0 +1,161 @@
+import { writable } from 'svelte/store';
+
+/** All available dashboard modules */
+export interface DashboardModule {
+  id: string;
+  title: string;
+  description: string;
+  icon: string;
+  href: string;
+  color: string;
+  /** Minimum role required to see this module */
+  roles: string[];
+}
+
+export const ALL_MODULES: DashboardModule[] = [
+  {
+    id: 'tenants',
+    title: 'Clientes',
+    description: 'Gestión de organizaciones y tenants',
+    icon: 'M19 21V5a2 2 0 00-2-2H7a2 2 0 00-2 2v16m14 0h2m-2 0h-5m-9 0H3m2 0h5M9 7h1m-1 4h1m4-4h1m-1 4h1m-5 10v-5a1 1 0 011-1h2a1 1 0 011 1v5m-4 0h4',
+    href: '/tenants',
+    color: 'bg-blue-600',
+    roles: ['ADMIN', 'SUPPORT_MANAGER']
+  },
+  {
+    id: 'users',
+    title: 'Usuarios',
+    description: 'Administración de usuarios y roles',
+    icon: 'M12 4.354a4 4 0 110 5.292M15 21H3v-1a6 6 0 0112 0v1zm0 0h6v-1a6 6 0 00-9-5.197M13 7a4 4 0 11-8 0 4 4 0 018 0z',
+    href: '/users',
+    color: 'bg-green-600',
+    roles: ['ADMIN', 'SUPPORT_MANAGER']
+  },
+  {
+    id: 'tickets',
+    title: 'Tickets',
+    description: 'Gestión y seguimiento de tickets de soporte',
+    icon: 'M9 5H7a2 2 0 00-2 2v10a2 2 0 002 2h8a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2',
+    href: '/tickets',
+    color: 'bg-indigo-600',
+    roles: ['ADMIN', 'SUPPORT_MANAGER', 'AGENT']
+  },
+  {
+    id: 'systems',
+    title: 'Sistemas',
+    description: 'Catálogo de sistemas soportados',
+    icon: 'M5 12h14M5 12a2 2 0 01-2-2V6a2 2 0 012-2h14a2 2 0 012 2v4a2 2 0 01-2 2M5 12a2 2 0 00-2 2v4a2 2 0 002 2h14a2 2 0 002-2v-4a2 2 0 00-2-2m-2-4h.01M17 16h.01',
+    href: '/systems',
+    color: 'bg-gray-700',
+    roles: ['ADMIN', 'SUPPORT_MANAGER']
+  },
+  {
+    id: 'categories',
+    title: 'Categorías',
+    description: 'Clasificación de tickets por área',
+    icon: 'M19 11H5m14 0a2 2 0 012 2v6a2 2 0 01-2 2H5a2 2 0 01-2-2v-6a2 2 0 012-2m14 0V9a2 2 0 00-2-2M5 11V9a2 2 0 012-2m0 0V5a2 2 0 012-2h6a2 2 0 012 2v2M7 7h10',
+    href: '/categories',
+    color: 'bg-orange-600',
+    roles: ['ADMIN', 'SUPPORT_MANAGER']
+  },
+  {
+    id: 'sla',
+    title: 'SLA Management',
+    description: 'Monitoreo de tiempos de respuesta y SLAs',
+    icon: 'M12 8v4l3 3m6-3a9 9 0 11-18 0 9 9 0 0118 0z',
+    href: '/sla',
+    color: 'bg-teal-600',
+    roles: ['ADMIN', 'SUPPORT_MANAGER']
+  },
+  {
+    id: 'reports',
+    title: 'Reportes',
+    description: 'Informes estadísticos y análisis de rendimiento',
+    icon: 'M9 19v-6a2 2 0 00-2-2H5a2 2 0 00-2 2v6a2 2 0 002 2h2a2 2 0 002-2zm0 0V9a2 2 0 012-2h2a2 2 0 012 2v10m-6 0a2 2 0 002 2h2a2 2 0 002-2m0 0V5a2 2 0 012-2h2a2 2 0 012 2v14a2 2 0 01-2 2h-2a2 2 0 01-2-2z',
+    href: '/reports',
+    color: 'bg-purple-600',
+    roles: ['ADMIN', 'SUPPORT_MANAGER']
+  },
+  {
+    id: 'audit',
+    title: 'Auditoría',
+    description: 'Bitácora de acciones y trazabilidad del sistema',
+    icon: 'M9 12l2 2 4-4m5.618-4.016A11.955 11.955 0 0112 2.944a11.955 11.955 0 01-8.618 3.04A12.02 12.02 0 003 9c0 5.591 3.824 10.29 9 11.622 5.176-1.332 9-6.03 9-11.622 0-1.042-.133-2.052-.382-3.016z',
+    href: '/audit',
+    color: 'bg-red-700',
+    roles: ['ADMIN', 'AUDITOR']
+  },
+  {
+    id: 'security',
+    title: 'Seguridad',
+    description: 'Análisis de amenazas y eventos de seguridad',
+    icon: 'M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z',
+    href: '/audit/security',
+    color: 'bg-yellow-600',
+    roles: ['ADMIN']
+  },
+  {
+    id: 'endpoints',
+    title: 'Reporte de Endpoints',
+    description: 'Estado y diagnóstico de todos los endpoints API',
+    icon: 'M9 3H5a2 2 0 00-2 2v4m6-6h10a2 2 0 012 2v4M9 3v18m0 0h10a2 2 0 002-2V9M9 21H5a2 2 0 01-2-2V9m0 0h18',
+    href: '/test-report',
+    color: 'bg-cyan-600',
+    roles: ['ADMIN']
+  }
+];
+
+const STORAGE_KEY = 'dashboard_module_visibility';
+
+function getInitialVisibility(): Record<string, boolean> {
+  if (typeof window === 'undefined') {
+    return Object.fromEntries(ALL_MODULES.map(m => [m.id, true]));
+  }
+  try {
+    const stored = localStorage.getItem(STORAGE_KEY);
+    if (stored) return JSON.parse(stored);
+  } catch { /* ignore */ }
+  return Object.fromEntries(ALL_MODULES.map(m => [m.id, true]));
+}
+
+function createDashboardConfig() {
+  const { subscribe, set, update } = writable<Record<string, boolean>>(getInitialVisibility());
+
+  return {
+    subscribe,
+    toggle(id: string) {
+      update(state => {
+        const next = { ...state, [id]: !state[id] };
+        if (typeof window !== 'undefined') {
+          localStorage.setItem(STORAGE_KEY, JSON.stringify(next));
+        }
+        return next;
+      });
+    },
+    setVisible(id: string, visible: boolean) {
+      update(state => {
+        const next = { ...state, [id]: visible };
+        if (typeof window !== 'undefined') {
+          localStorage.setItem(STORAGE_KEY, JSON.stringify(next));
+        }
+        return next;
+      });
+    },
+    showAll() {
+      const all = Object.fromEntries(ALL_MODULES.map(m => [m.id, true]));
+      if (typeof window !== 'undefined') {
+        localStorage.setItem(STORAGE_KEY, JSON.stringify(all));
+      }
+      set(all);
+    },
+    reset() {
+      const defaults = Object.fromEntries(ALL_MODULES.map(m => [m.id, true]));
+      if (typeof window !== 'undefined') {
+        localStorage.setItem(STORAGE_KEY, JSON.stringify(defaults));
+      }
+      set(defaults);
+    }
+  };
+}
+
+export const dashboardConfig = createDashboardConfig();
--- a/frontend-internal/src/lib/utils/api.ts
+++ b/frontend-internal/src/lib/utils/api.ts
@@ -24,16 +24,8 @@ async function request<T>(endpoint: string, options: RequestOptions = {}): Promi
  }

  const authState = get(auth);
-  const token = authState.token || (typeof window !== 'undefined' ? localStorage.getItem('internal_auth_token') : null);
-
-  // Resolve tenant_id from store or from the persisted user object in localStorage
-  let tenantId = authState.user?.tenant_id ?? null;
-  if (!tenantId && typeof window !== 'undefined') {
-    try {
-      const stored = localStorage.getItem('internal_auth_user');
-      if (stored) tenantId = JSON.parse(stored)?.tenant_id ?? null;
-    } catch { /* ignore */ }
-  }
+  const token = authState.token;
+  const tenantId = authState.user?.tenant_id ?? null;

  const headers = new Headers(init.headers);
  if (token) {
@@ -45,17 +37,18 @@ async function request<T>(endpoint: string, options: RequestOptions = {}): Promi
  if (!headers.has('Content-Type')) {
    headers.set('Content-Type', 'application/json');
  }
+  // Identifica este frontend para que el backend use la cookie correcta
+  headers.set('X-App', 'internal');

  const response = await fetch(url, {
    ...init,
+    credentials: 'include',
    headers
  });

  if (response.status === 401) {
    // Token expired or invalid
    if (typeof window !== 'undefined') {
-      localStorage.removeItem('internal_auth_token');
-      localStorage.removeItem('internal_auth_user');
      window.location.href = '/login';
    }
    throw new Error('Unauthorized');
@@ -76,15 +69,8 @@ async function request<T>(endpoint: string, options: RequestOptions = {}): Promi

 async function downloadFile(endpoint: string, filename: string): Promise<void> {
  const authState = get(auth);
-  const token = authState.token || (typeof window !== 'undefined' ? localStorage.getItem('internal_auth_token') : null);
-
-  let tenantId = authState.user?.tenant_id ?? null;
-  if (!tenantId && typeof window !== 'undefined') {
-    try {
-      const stored = localStorage.getItem('internal_auth_user');
-      if (stored) tenantId = JSON.parse(stored)?.tenant_id ?? null;
-    } catch { /* ignore */ }
-  }
+  const token = authState.token;
+  const tenantId = authState.user?.tenant_id ?? null;

  const headers = new Headers();
  if (token) {
@@ -93,16 +79,16 @@ async function downloadFile(endpoint: string, filename: string): Promise<void> {
  if (tenantId) {
    headers.set('X-Tenant-ID', tenantId);
  }
+  headers.set('X-App', 'internal');

  const response = await fetch(`${API_BASE}${endpoint}`, {
    method: 'GET',
+    credentials: 'include',
    headers
  });

  if (response.status === 401) {
    if (typeof window !== 'undefined') {
-      localStorage.removeItem('internal_auth_token');
-      localStorage.removeItem('internal_auth_user');
      window.location.href = '/login';
    }
    throw new Error('Unauthorized');
--- a/frontend-internal/src/routes/+layout.server.ts
+++ b/frontend-internal/src/routes/+layout.server.ts
@@ -0,0 +1,7 @@
+import type { LayoutServerLoad } from './$types';
+
+export const load: LayoutServerLoad = ({ locals }) => {
+	return {
+		user: locals.user ?? null
+	};
+};
--- a/frontend-internal/src/routes/+layout.svelte
+++ b/frontend-internal/src/routes/+layout.svelte
@@ -5,21 +5,40 @@
  import { toast } from '$lib/stores/toast.js';
  import { onMount } from 'svelte';
  import { auth } from '$lib/stores/auth.js';
+  import { goto } from '$app/navigation';
+  import { page } from '$app/stores';
+  import { browser } from '$app/environment';
  import '../app.css';

+  export let data;
+
  let sidebarOpen = false;
+  let mounted = false;

  onMount(() => {
-    auth.init();
+    if (data.user && !$auth.isAuthenticated) {
+      auth.setUser(data.user);
+    }
+    mounted = true;
  });

+  // Guard reactivo global: redirige a /login si no está autenticado
+  $: if (browser && mounted && !$auth.isAuthenticated && $page.url.pathname !== '/login') {
+    goto('/login');
+  }
+
  function toggleSidebar() {
    sidebarOpen = !sidebarOpen;
  }
 </script>

 <div class="min-h-screen bg-gray-50">
-  {#if $auth.isAuthenticated}
+  {#if !mounted}
+    <!-- Esperando inicialización de sesión -->
+    <div class="flex items-center justify-center min-h-screen bg-gray-50">
+      <div class="animate-spin rounded-full h-8 w-8 border-b-2 border-blue-600"></div>
+    </div>
+  {:else if $auth.isAuthenticated}
    <!-- Internal Layout with Sidebar -->
    <div class="flex h-screen overflow-hidden">
      <!-- Sidebar -->
--- a/frontend-internal/src/routes/+page.svelte
+++ b/frontend-internal/src/routes/+page.svelte
@@ -2,44 +2,27 @@
  import { onMount } from 'svelte';
  import { auth } from '$lib/stores/auth.js';
  import { goto } from '$app/navigation';
-  import Icon from '$lib/components/Icon.svelte';
-  
+  import { dashboardConfig, ALL_MODULES, type DashboardModule } from '$lib/stores/dashboardConfig.js';
+
+  let showSettings = false;
+
  onMount(() => {
    if (!$auth.isAuthenticated) {
      goto('/login');
    }
  });

-  const cards = [
-    {
-      title: 'Clientes',
-      description: 'Gestión de organizaciones y tenants',
-      icon: 'users',
-      href: '/tenants',
-      color: 'bg-blue-600'
-    },
-    {
-      title: 'Usuarios',
-      description: 'Administración de usuarios y roles',
-      icon: 'user-plus',
-      href: '/users',
-      color: 'bg-green-600'
-    },
-    {
-      title: 'Sistemas',
-      description: 'Catálogo de sistemas soportados',
-      icon: 'server',
-      href: '/systems',
-      color: 'bg-gray-700'
-    },
-    {
-      title: 'Categorías',
-      description: 'Clasificación de tickets',
-      icon: 'tag',
-      href: '/categories',
-      color: 'bg-orange-600'
-    }
-  ];
+  const role = $auth.user?.role ?? '';
+
+  /** Only modules the current role can access */
+  $: accessibleModules = ALL_MODULES.filter(m => m.roles.includes(role) || role === 'ADMIN');
+
+  /** Modules that are visible (enabled by user + accessible by role) */
+  $: visibleModules = accessibleModules.filter(m => $dashboardConfig[m.id] !== false);
+
+  function toggleSettings() {
+    showSettings = !showSettings;
+  }
 </script>

 <svelte:head>
@@ -47,40 +30,106 @@
 </svelte:head>

 <div class="px-4 py-8 mx-auto max-w-7xl sm:px-6 lg:px-8">
+  <!-- Header -->
  <div class="md:flex md:items-center md:justify-between">
    <div class="flex-1 min-w-0">
      <h2 class="text-2xl font-bold leading-7 text-gray-900 sm:text-3xl sm:truncate">
        Panel de Administración
      </h2>
      <p class="mt-1 text-sm text-gray-500">
-          Bienvenido al sistema de gestión interna.
+        Bienvenido al sistema de gestión interna.
      </p>
    </div>
+    <div class="mt-4 flex md:mt-0 md:ml-4 gap-2">
+      <button
+        on:click={toggleSettings}
+        class="inline-flex items-center gap-1.5 px-4 py-2 border border-gray-300 rounded-md shadow-sm text-sm font-medium text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500"
+      >
+        <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+          <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+            d="M10.325 4.317c.426-1.756 2.924-1.756 3.35 0a1.724 1.724 0 002.573 1.066c1.543-.94 3.31.826 2.37 2.37a1.724 1.724 0 001.065 2.572c1.756.426 1.756 2.924 0 3.35a1.724 1.724 0 00-1.066 2.573c.94 1.543-.826 3.31-2.37 2.37a1.724 1.724 0 00-2.572 1.065c-.426 1.756-2.924 1.756-3.35 0a1.724 1.724 0 00-2.573-1.066c-1.543.94-3.31-.826-2.37-2.37a1.724 1.724 0 00-1.065-2.572c-1.756-.426-1.756-2.924 0-3.35a1.724 1.724 0 001.066-2.573c-.94-1.543.826-3.31 2.37-2.37.996.608 2.296.07 2.572-1.065z" />
+          <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />
+        </svg>
+        Configurar
+      </button>
+    </div>
  </div>

-  <div class="mt-8 grid grid-cols-1 gap-5 sm:grid-cols-2 lg:grid-cols-4">
-    {#each cards as card}
-      <a href={card.href} class="bg-white overflow-hidden shadow rounded-lg hover:shadow-md transition-shadow duration-200 cursor-pointer group">
-        <div class="p-5">
-          <dl>
-            <dt class="text-sm font-medium text-gray-500 truncate">
-              {card.title}
-            </dt>
-            <dd>
-              <div class="text-xs text-gray-900 font-light mt-1">
-                {card.description}
-              </div>
-            </dd>
-          </dl>
+  <!-- Settings Panel -->
+  {#if showSettings}
+    <div class="mt-6 bg-white border border-gray-200 rounded-lg shadow-sm p-6">
+      <div class="flex items-center justify-between mb-4">
+        <h3 class="text-base font-semibold text-gray-900">Módulos visibles en el dashboard</h3>
+        <div class="flex gap-2">
+          <button
+            on:click={() => dashboardConfig.showAll()}
+            class="text-xs text-blue-600 hover:text-blue-800 underline"
+          >
+            Mostrar todos
+          </button>
        </div>
-        <div class="bg-gray-50 px-5 py-3">
-          <div class="text-sm">
-            <span class="font-medium text-blue-700 hover:text-blue-900">
-              Ver detalles
+      </div>
+      <div class="grid grid-cols-2 sm:grid-cols-3 lg:grid-cols-4 gap-3">
+        {#each accessibleModules as mod}
+          <label class="flex items-center gap-2 p-3 border rounded-lg cursor-pointer hover:bg-gray-50 {$dashboardConfig[mod.id] !== false ? 'border-blue-300 bg-blue-50' : 'border-gray-200'}">
+            <input
+              type="checkbox"
+              checked={$dashboardConfig[mod.id] !== false}
+              on:change={() => dashboardConfig.toggle(mod.id)}
+              class="rounded text-blue-600 focus:ring-blue-500"
+            />
+            <div class="min-w-0">
+              <div class="flex items-center gap-1.5">
+                <span class="w-2 h-2 rounded-full {mod.color} flex-shrink-0"></span>
+                <span class="text-sm font-medium text-gray-800 truncate">{mod.title}</span>
+              </div>
+            </div>
+          </label>
+        {/each}
+      </div>
+      <p class="mt-3 text-xs text-gray-400">Las preferencias se guardan automáticamente en este navegador.</p>
+    </div>
+  {/if}
+
+  <!-- Module Cards -->
+  {#if visibleModules.length === 0}
+    <div class="mt-10 text-center py-16 bg-white rounded-lg border-2 border-dashed border-gray-200">
+      <svg class="mx-auto h-10 w-10 text-gray-300" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+          d="M4 6a2 2 0 012-2h2a2 2 0 012 2v2a2 2 0 01-2 2H6a2 2 0 01-2-2V6zM14 6a2 2 0 012-2h2a2 2 0 012 2v2a2 2 0 01-2 2h-2a2 2 0 01-2-2V6zM4 16a2 2 0 012-2h2a2 2 0 012 2v2a2 2 0 01-2 2H6a2 2 0 01-2-2v-2zM14 16a2 2 0 012-2h2a2 2 0 012 2v2a2 2 0 01-2 2h-2a2 2 0 01-2-2v-2z" />
+      </svg>
+      <p class="mt-3 text-sm text-gray-500">No hay módulos visibles.</p>
+      <button on:click={() => dashboardConfig.showAll()} class="mt-3 text-sm text-blue-600 hover:underline">
+        Restaurar todos los módulos
+      </button>
+    </div>
+  {:else}
+    <div class="mt-8 grid grid-cols-1 gap-5 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4">
+      {#each visibleModules as mod}
+        <a
+          href={mod.href}
+          class="bg-white overflow-hidden shadow rounded-lg hover:shadow-md transition-all duration-200 cursor-pointer group flex flex-col"
+        >
+          <div class="p-5 flex-1">
+            <div class="flex items-center gap-3 mb-2">
+              <div class="w-9 h-9 rounded-lg {mod.color} flex items-center justify-center flex-shrink-0">
+                <svg class="w-5 h-5 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                  <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d={mod.icon} />
+                </svg>
+              </div>
+              <span class="text-sm font-semibold text-gray-800 group-hover:text-blue-700 transition-colors">
+                {mod.title}
+              </span>
+            </div>
+            <p class="text-xs text-gray-500 leading-relaxed">{mod.description}</p>
+          </div>
+          <div class="bg-gray-50 px-5 py-2.5 border-t border-gray-100">
+            <span class="text-xs font-medium text-blue-600 group-hover:text-blue-800 transition-colors">
+              Abrir módulo →
            </span>
          </div>
-        </div>
-      </a>
-    {/each}
-  </div>
+        </a>
+      {/each}
+    </div>
+  {/if}
 </div>
--- a/frontend-internal/src/routes/login/+page.svelte
+++ b/frontend-internal/src/routes/login/+page.svelte
@@ -1,46 +1,46 @@
 <script lang="ts">
+  import { goto } from '$app/navigation';
+  import Icon from '$lib/components/Icon.svelte';
  import { auth } from '$lib/stores/auth.js';
  import { toast } from '$lib/stores/toast.js';
-  import { goto } from '$app/navigation';
  import { onMount } from 'svelte';
-  import Icon from '$lib/components/Icon.svelte';
-  
+
  let email = '';
  let password = '';
  let totpCode = '';
  let isLoading = false;
  let showTwoFactor = false;
  let errorMessage = '';
-  
+
  onMount(() => {
    // Redirect if already authenticated
    if ($auth.isAuthenticated) {
      goto('/');
    }
  });
-  
+
  async function handleLogin() {
    if (!email || !password) {
      errorMessage = 'Por favor completa todos los campos';
      return;
    }
-    
+
    isLoading = true;
    errorMessage = '';
-    
+
    try {
      await auth.login({
        email,
        password,
-        tenant_slug: 'aduanasoft-demo',
+        tenant_slug: 'aduanasoft',
        totp_code: totpCode || undefined
      });
-      
+
      toast.success('¡Bienvenido! Has iniciado sesión correctamente');
      goto('/');
    } catch (error: any) {
      console.error('Login error:', error);
-      
+
      // Check if 2FA is required
      if (error.message.includes('two-factor') || error.message.includes('2FA')) {
        showTwoFactor = true;
@@ -53,7 +53,7 @@
      isLoading = false;
    }
  }
-  
+
  function handleKeyDown(event: KeyboardEvent) {
    if (event.key === 'Enter') {
      handleLogin();
@@ -61,44 +61,50 @@
  }
 </script>

-
 <svelte:head>
  <title>Acceso Admin - ServiceManager</title>
 </svelte:head>

-<div class="min-h-screen flex items-center justify-center bg-gray-100 dark:bg-gray-950 p-4 font-sans">
-  <div class="w-full max-w-5xl grid grid-cols-1 md:grid-cols-2 bg-white dark:bg-gray-900 rounded-lg shadow-xl overflow-hidden border border-gray-200 dark:border-gray-800">
-    
+<div
+  class="min-h-screen flex items-center justify-center bg-gray-100 dark:bg-gray-950 p-4 font-sans"
+>
+  <div
+    class="w-full max-w-5xl grid grid-cols-1 md:grid-cols-2 bg-white dark:bg-gray-900 rounded-lg shadow-xl overflow-hidden border border-gray-200 dark:border-gray-800"
+  >
    <!-- Left Side: Internal Branding -->
-    <div class="hidden md:flex flex-col justify-between p-12 bg-gray-900 text-white relative overflow-hidden">
+    <div
+      class="hidden md:flex flex-col justify-between p-12 bg-gray-900 text-white relative overflow-hidden"
+    >
      <!-- Grid pattern overlay -->
-      <div class="absolute inset-0 opacity-10" style="background-image: radial-gradient(white 1px, transparent 1px); background-size: 30px 30px;"></div>
-      
+      <div
+        class="absolute inset-0 opacity-10"
+        style="background-image: radial-gradient(white 1px, transparent 1px); background-size: 30px 30px;"
+      />
+
      <div class="relative z-10">
        <div class="flex items-center space-x-3 mb-6">
-           <div class="p-2 bg-blue-500/20 rounded border border-blue-500/30">
-             <Icon name="server" class="w-6 h-6 text-blue-400" />
-           </div>
-           <span class="text-sm font-mono tracking-wider text-blue-400">INTERNAL_ACCESS_V2</span>
+          <div class="p-2 bg-blue-500/20 rounded border border-blue-500/30">
+            <Icon name="server" className="w-6 h-6 text-blue-400" />
+          </div>
+          <span class="text-sm font-mono tracking-wider text-blue-400">INTERNAL_ACCESS_V2</span>
        </div>
-        
-        <h1 class="text-3xl font-bold tracking-tight mb-4">
-          Panel de Administración
-        </h1>
+
+        <h1 class="text-3xl font-bold tracking-tight mb-4">Panel de Administración</h1>
        <p class="text-gray-400 text-sm leading-relaxed max-w-sm">
-          Plataforma de gestión de servicios, monitoreo de tickets y administración de usuarios. Acceso restringido únicamente a personal autorizado.
+          Plataforma de gestión de servicios, monitoreo de tickets y administración de usuarios.
+          Acceso restringido únicamente a personal autorizado.
        </p>
      </div>

      <div class="relative z-10 mt-12">
        <div class="space-y-3">
          <div class="flex items-center space-x-3 text-xs text-gray-400 font-mono">
-             <Icon name="check-circle" class="w-4 h-4 text-green-500" />
-             <span>System Status: Operational</span>
+            <Icon name="check-circle" className="w-4 h-4 text-green-500" />
+            <span>System Status: Operational</span>
          </div>
          <div class="flex items-center space-x-3 text-xs text-gray-400 font-mono">
-             <Icon name="shield" class="w-4 h-4 text-blue-500" />
-             <span>256-bit Encryption Enabled</span>
+            <Icon name="shield" className="w-4 h-4 text-blue-500" />
+            <span>256-bit Encryption Enabled</span>
          </div>
        </div>
      </div>
@@ -106,106 +112,129 @@

    <!-- Right Side: Login Form -->
    <div class="p-8 md:p-12 flex flex-col justify-center">
-       
-       <div class="max-w-sm mx-auto w-full">
-         <div class="mb-8">
-           <h2 class="text-2xl font-bold text-gray-900 dark:text-white mb-1">Iniciar Sesión</h2>
-           <p class="text-sm text-gray-500 dark:text-gray-400">Acceso al sistema central</p>
-         </div>
+      <div class="max-w-sm mx-auto w-full">
+        <div class="mb-8">
+          <h2 class="text-2xl font-bold text-gray-900 dark:text-white mb-1">Iniciar Sesión</h2>
+          <p class="text-sm text-gray-500 dark:text-gray-400">Acceso al sistema central</p>
+        </div>

-         <form on:submit|preventDefault={handleLogin} class="space-y-5">
-           {#if errorMessage}
-             <div class="p-3 rounded-md bg-red-50 dark:bg-red-900/10 border border-red-200 dark:border-red-900 flex items-start gap-3">
-               <Icon name="alert-triangle" class="w-5 h-5 text-red-600 dark:text-red-500 flex-shrink-0 mt-0.5" />
-               <p class="text-sm text-red-600 dark:text-red-500">{errorMessage}</p>
-             </div>
-           {/if}
+        <form on:submit|preventDefault={handleLogin} class="space-y-5">
+          {#if errorMessage}
+            <div
+              class="p-3 rounded-md bg-red-50 dark:bg-red-900/10 border border-red-200 dark:border-red-900 flex items-start gap-3"
+            >
+              <Icon
+                name="alert-triangle"
+                className="w-5 h-5 text-red-600 dark:text-red-500 flex-shrink-0 mt-0.5"
+              />
+              <p class="text-sm text-red-600 dark:text-red-500">{errorMessage}</p>
+            </div>
+          {/if}

-           {#if !showTwoFactor}
-             <div class="space-y-4">
-               <div>
-                 <label for="email" class="block text-xs font-semibold uppercase tracking-wider text-gray-500 dark:text-gray-400 mb-1">Usuario / Correo</label>
-                 <div class="relative group">
-                   <div class="absolute inset-y-0 left-0 pl-3 flex items-center pointer-events-none text-gray-400 group-focus-within:text-blue-500 transition-colors">
-                     <Icon name="user" class="w-5 h-5" />
-                   </div>
-                   <input
-                     id="email"
-                     type="email"
-                     bind:value={email}
-                     on:keydown={handleKeyDown}
-                     class="form-input w-full pl-10 py-2.5 bg-gray-50 dark:bg-gray-800 border-gray-300 dark:border-gray-700 rounded focus:ring-2 focus:ring-blue-500 focus:border-blue-500 transition-all font-mono text-sm"
-                     placeholder="admin@aduanasoft.com"
-                     required
-                     disabled={isLoading}
-                   />
-                 </div>
-               </div>
+          {#if !showTwoFactor}
+            <div class="space-y-4">
+              <div>
+                <label
+                  for="email"
+                  class="block text-xs font-semibold uppercase tracking-wider text-gray-500 dark:text-gray-400 mb-1"
+                  >Usuario / Correo</label
+                >
+                <div class="relative group">
+                  <div
+                    class="absolute inset-y-0 left-0 pl-3 flex items-center pointer-events-none text-gray-400 group-focus-within:text-blue-500 transition-colors"
+                  >
+                    <Icon name="user" className="w-5 h-5" />
+                  </div>
+                  <input
+                    id="email"
+                    type="email"
+                    bind:value={email}
+                    on:keydown={handleKeyDown}
+                    class="form-input w-full pl-10 py-2.5 bg-gray-50 dark:bg-gray-800 border-gray-300 dark:border-gray-700 rounded focus:ring-2 focus:ring-blue-500 focus:border-blue-500 transition-all font-mono text-sm"
+                    placeholder="admin@aduanasoft.com"
+                    required
+                    disabled={isLoading}
+                  />
+                </div>
+              </div>

-               <div>
-                 <label for="password" class="block text-xs font-semibold uppercase tracking-wider text-gray-500 dark:text-gray-400 mb-1">Clave de Acceso</label>
-                 <div class="relative group">
-                   <div class="absolute inset-y-0 left-0 pl-3 flex items-center pointer-events-none text-gray-400 group-focus-within:text-blue-500 transition-colors">
-                     <Icon name="lock" class="w-5 h-5" />
-                   </div>
-                   <input
-                     id="password"
-                     type="password"
-                     bind:value={password}
-                     on:keydown={handleKeyDown}
-                     class="form-input w-full pl-10 py-2.5 bg-gray-50 dark:bg-gray-800 border-gray-300 dark:border-gray-700 rounded focus:ring-2 focus:ring-blue-500 focus:border-blue-500 transition-all font-mono text-sm"
-                     placeholder="••••••••••••"
-                     required
-                     disabled={isLoading}
-                   />
-                 </div>
-               </div>
-             </div>
-           
-           {:else}
-             <!-- 2FA Input -->
-             <div class="bg-blue-50 dark:bg-blue-900/10 p-4 rounded-lg border border-blue-100 dark:border-blue-800/30">
-               <label for="code" class="block text-xs font-semibold uppercase tracking-wider text-blue-800 dark:text-blue-300 mb-2 text-center">Verificación de Seguridad</label>
-               <div class="relative">
-                 <input
-                   id="code"
-                   type="text"
-                   bind:value={totpCode}
-                   on:keydown={handleKeyDown}
-                   class="form-input w-full py-3 rounded border-blue-300 dark:border-blue-700 focus:ring-blue-500 focus:border-blue-500 text-center tracking-[0.5em] font-mono text-lg bg-white dark:bg-gray-800"
-                   placeholder="000000"
-                   maxlength="6"
-                   required
-                   disabled={isLoading}
-                   autofocus
-                 />
-               </div>
-               <p class="text-xs text-blue-600 dark:text-blue-400 mt-2 text-center">
-                 Consulte su dispositivo autenticador
-               </p>
-             </div>
-           {/if}
+              <div>
+                <label
+                  for="password"
+                  class="block text-xs font-semibold uppercase tracking-wider text-gray-500 dark:text-gray-400 mb-1"
+                  >Clave de Acceso</label
+                >
+                <div class="relative group">
+                  <div
+                    class="absolute inset-y-0 left-0 pl-3 flex items-center pointer-events-none text-gray-400 group-focus-within:text-blue-500 transition-colors"
+                  >
+                    <Icon name="lock" className="w-5 h-5" />
+                  </div>
+                  <input
+                    id="password"
+                    type="password"
+                    bind:value={password}
+                    on:keydown={handleKeyDown}
+                    class="form-input w-full pl-10 py-2.5 bg-gray-50 dark:bg-gray-800 border-gray-300 dark:border-gray-700 rounded focus:ring-2 focus:ring-blue-500 focus:border-blue-500 transition-all font-mono text-sm"
+                    placeholder="••••••••••••"
+                    required
+                    disabled={isLoading}
+                  />
+                </div>
+              </div>
+            </div>
+          {:else}
+            <!-- 2FA Input -->
+            <div
+              class="bg-blue-50 dark:bg-blue-900/10 p-4 rounded-lg border border-blue-100 dark:border-blue-800/30"
+            >
+              <label
+                for="code"
+                class="block text-xs font-semibold uppercase tracking-wider text-blue-800 dark:text-blue-300 mb-2 text-center"
+                >Verificación de Seguridad</label
+              >
+              <div class="relative">
+                <input
+                  id="code"
+                  type="text"
+                  bind:value={totpCode}
+                  on:keydown={handleKeyDown}
+                  class="form-input w-full py-3 rounded border-blue-300 dark:border-blue-700 focus:ring-blue-500 focus:border-blue-500 text-center tracking-[0.5em] font-mono text-lg bg-white dark:bg-gray-800"
+                  placeholder="000000"
+                  maxlength="6"
+                  required
+                  disabled={isLoading}
+                  autofocus
+                />
+              </div>
+              <p class="text-xs text-blue-600 dark:text-blue-400 mt-2 text-center">
+                Consulte su dispositivo autenticador
+              </p>
+            </div>
+          {/if}

-           <div class="pt-4">
-             <button
-               type="submit"
-               class="w-full flex justify-center py-2.5 px-4 rounded bg-gray-900 dark:bg-gray-700 text-white font-medium hover:bg-gray-800 dark:hover:bg-gray-600 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-900 transition-colors disabled:opacity-50 disabled:cursor-not-allowed shadow-sm"
-               disabled={isLoading}
-             >
-               {#if isLoading}
-                 <Icon name="loader" class="w-4 h-4 animate-spin mr-2" />
-                 Autenticando...
-               {:else}
-                 {showTwoFactor ? 'Verificar Token' : 'Entrar al Panel'}
-               {/if}
-             </button>
-           </div>
-         </form>
-       </div>
-       
-       <div class="mt-8 pt-6 border-t border-gray-100 dark:border-gray-800">
-          <p class="text-[10px] text-gray-400 text-center uppercase tracking-widest">Aduanasoft Internal Systems © 2024</p>
-       </div>
+          <div class="pt-4">
+            <button
+              type="submit"
+              class="w-full flex justify-center py-2.5 px-4 rounded bg-gray-900 dark:bg-gray-700 text-white font-medium hover:bg-gray-800 dark:hover:bg-gray-600 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-900 transition-colors disabled:opacity-50 disabled:cursor-not-allowed shadow-sm"
+              disabled={isLoading}
+            >
+              {#if isLoading}
+                <Icon name="loader" className="w-4 h-4 animate-spin mr-2" />
+                Autenticando...
+              {:else}
+                {showTwoFactor ? 'Verificar Token' : 'Entrar al Panel'}
+              {/if}
+            </button>
+          </div>
+        </form>
+      </div>
+
+      <div class="mt-8 pt-6 border-t border-gray-100 dark:border-gray-800">
+        <p class="text-[10px] text-gray-400 text-center uppercase tracking-widest">
+          Aduanasoft Internal Systems © 2024
+        </p>
+      </div>
    </div>
  </div>
 </div>
--- a/frontend-internal/src/routes/test-report/+page.svelte
+++ b/frontend-internal/src/routes/test-report/+page.svelte
--- a/frontend-internal/static/favicon.png
+++ b/frontend-internal/static/favicon.png
--- a/frontend-internal/vite.config.js
+++ b/frontend-internal/vite.config.js
@@ -1,27 +1,34 @@
-import { sveltekit } from '@sveltejs/kit/vite';
+import { sveltekit } from '@sveltejs/kit/vite';
 import { defineConfig } from 'vite';
-
 export default defineConfig({
-	plugins: [sveltekit()],
-	server: {
-		port: 3000,
-		host: '0.0.0.0',
-		watch: {
-			usePolling: true,
-			interval: 500
-		},
-		proxy: {
-			'/api': {
-				target: process.env.PUBLIC_API_URL || 'http://localhost:8000',
-				changeOrigin: true,
-				rewrite: (path) => path.replace(/^\/api/, '')
-			}
-		}
-	},
-	preview: {
-		port: 3000,
-		host: '0.0.0.0'
-	},
+        plugins: [sveltekit()],
+        server: {
+                port: parseInt(process.env.PORT || '3001'),
+                host: '0.0.0.0',
+                watch: {
+                        usePolling: true,
+                        interval: 500
+                },
+                hmr: {
+                        host: 'localhost',
+                        clientPort: parseInt(process.env.HMR_CLIENT_PORT || '3001')
+                },
+                fs: {
+                        allow: ['/app', '.'],
+                        strict: false
+                },
+                proxy: {
+                        '/api': {
+                                target: process.env.PUBLIC_API_URL || 'http://backend:8000',
+                                changeOrigin: true,
+                                rewrite: (path) => path.replace(/^\/api/, '')
+                        }
+                }
+        },
+        preview: {
+                port: parseInt(process.env.PORT || '3001'),
+                host: '0.0.0.0'
+        },
        build: {
                target: 'esnext'
        }
--- a/migrations.sql
+++ b/migrations.sql
--- a/scripts/README-powershell.md
+++ b/scripts/README-powershell.md
@@ -0,0 +1,43 @@
+# Scripts PowerShell en ServiceManagerWeb
+
+## security-test-data.ps1
+- **Propósito:** Genera o limpia datos de prueba para análisis de seguridad.
+- **Uso:**
+  - `.	ools\security-test-data.ps1 generar` → Genera datos de prueba.
+  - `.	ools\security-test-data.ps1 limpiar` → Limpia los datos de prueba.
+- **Funcionamiento:** Verifica que el contenedor backend esté corriendo y ejecuta el script Python correspondiente dentro del contenedor.
+
+## test_critical_sync.ps1
+- **Propósito:** Verifica la sincronización de incidentes críticos entre Auditoría y Seguridad.
+- **Pasos:**
+  1. Login como admin y obtiene token.
+  2. Consulta estadísticas del módulo Auditoría.
+  3. Consulta estadísticas del módulo Seguridad.
+- **Resultado:** Muestra si los incidentes críticos están sincronizados.
+
+## test_tenant_update.ps1
+- **Propósito:** Prueba el endpoint de actualización de tenants.
+- **Pasos:**
+  1. Login como admin.
+  2. Obtiene lista de tenants.
+  3. Actualiza el tenant (ejemplo: teléfono y status).
+- **Resultado:** Verifica que la actualización funcione correctamente.
+
+## test_manual.ps1
+- **Propósito:** Pruebas manuales de endpoints clave.
+- **Pasos:**
+  1. Login y obtención de token.
+  2. Listar categorías.
+  3. Crear ticket con SLA automático.
+- **Resultado:** Permite validar manualmente el flujo de API.
+
+## test_frontend_integration.ps1
+- **Propósito:** Verifica la integración entre frontend y backend.
+- **Pasos:**
+  1. Verifica servicios Docker.
+  2. Login y obtención de token.
+  3. Verifica tickets con SLA.
+- **Resultado:** Confirma que el frontend puede consumir correctamente el backend.
+
+---
+**Recomendación:** Conserva estos scripts para testing e integración. Documenta cualquier script nuevo siguiendo este formato.
--- a/scripts/README-uso-rapido.md
+++ b/scripts/README-uso-rapido.md
@@ -0,0 +1,29 @@
+# Guía rápida de scripts esenciales
+
+## 1. setup-dev.sh
+Configura el entorno de desarrollo completo (servicios, dependencias).
+
+## 2. seed_data.py
+Inicializa categorías, sistemas y usuarios demo.
+
+## 3. seed_tickets.py
+Genera tickets de prueba (requiere seed_data.py ejecutado).
+
+## 4. run_tests.sh
+Ejecuta la suite de tests de integración.
+
+## 5. reset_passwords.py
+Resetea contraseñas de usuarios demo para pruebas de login.
+
+## 6. generate_sla_test_data.py
+Crea tickets con diferentes estados de SLA.
+
+## 7. generate_security_test_data.py
+Genera logs de auditoría de prueba.
+
+## 8. check_tenants.py
+Lista y audita los tenants existentes.
+
+---
+
+**Recomendación:** Ejecuta los scripts en este orden para tener un entorno funcional y datos de prueba completos. Elimina los scripts de debugging/manuales si no los necesitas para troubleshooting avanzado.
--- a/scripts/check_relations.py
+++ b/scripts/check_relations.py
@@ -1,7 +0,0 @@
-from app.models.ticket import Ticket
-from app.models import relationships  # ensure relationships are loaded
-from sqlalchemy import inspect
-
-mapper = inspect(Ticket)
-print("Relationships:", [r.key for r in mapper.relationships])
-print("Columns:", [c.key for c in mapper.columns])
--- a/scripts/check_sla.py
+++ b/scripts/check_sla.py
@@ -1,40 +0,0 @@
-"""Check SLA state of tickets and categories"""
-import asyncio
-import os
-import sys
-
-sys.path.insert(0, '/app')
-os.chdir('/app')
-
-from sqlalchemy.ext.asyncio import create_async_engine
-from sqlalchemy import text
-
-
-async def run():
-    database_url = os.environ.get('DATABASE_URL', 'postgresql+asyncpg://postgres:postgres@db:5432/servicemanager')
-    engine = create_async_engine(database_url)
-
-    async with engine.connect() as c:
-        print("=== CATEGORIES SLA HOURS ===")
-        r = await c.execute(text(
-            "SELECT name, sla_response_hours, sla_resolution_hours "
-            "FROM ticket_categories "
-            "ORDER BY name"
-        ))
-        for row in r.fetchall():
-            print(f"  {row[0]}: response={row[1]}h, resolution={row[2]}h")
-
-        print("\n=== TICKETS SLA DATES ===")
-        r2 = await c.execute(text(
-            "SELECT ticket_number, category_id, sla_response_due, sla_resolution_due "
-            "FROM tickets "
-            "ORDER BY created_at "
-            "LIMIT 10"
-        ))
-        for row in r2.fetchall():
-            print(f"  {row[0]}: cat={str(row[1])[:8] if row[1] else 'None'}, sla_resp={row[2]}, sla_res={row[3]}")
-
-    await engine.dispose()
-
-
-asyncio.run(run())
--- a/scripts/debug_category.py
+++ b/scripts/debug_category.py
@@ -1,41 +0,0 @@
-"""Debug: check if ticket's category_id maps to a valid category and what tenant it belongs to"""
-import asyncio
-import os
-import sys
-
-sys.path.insert(0, '/app')
-os.chdir('/app')
-
-from sqlalchemy.ext.asyncio import create_async_engine
-from sqlalchemy import text
-
-
-async def run():
-    database_url = os.environ.get('DATABASE_URL', 'postgresql+asyncpg://postgres:postgres@db:5432/servicemanager')
-    engine = create_async_engine(database_url)
-
-    async with engine.connect() as c:
-        # Check tickets and their category names via direct JOIN
-        r = await c.execute(text("""
-            SELECT t.ticket_number, t.category_id,
-                   cat.name as category_name, cat.tenant_id as cat_tenant,
-                   t.tenant_id as ticket_tenant
-            FROM tickets t
-            LEFT JOIN ticket_categories cat ON cat.id = t.category_id
-            WHERE t.category_id IS NOT NULL
-            LIMIT 10
-        """))
-        print("=== TICKET -> CATEGORY JOIN ===")
-        for row in r.fetchall():
-            match = "✓ SAME TENANT" if row[3] == row[4] else "✗ DIFFERENT TENANT"
-            print(f"  {row[0]}: cat_id={str(row[1])[:8]}, cat_name={row[2]}, {match}")
-
-        # Check what tenant aduanasoft-demo is
-        r2 = await c.execute(text("SELECT id, slug FROM tenants WHERE slug='aduanasoft-demo'"))
-        tenant = r2.fetchone()
-        print(f"\nTenant aduanasoft-demo: {tenant[0] if tenant else 'NOT FOUND'}")
-
-    await engine.dispose()
-
-
-asyncio.run(run())
--- a/scripts/debug_orm.py
+++ b/scripts/debug_orm.py
@@ -1,49 +0,0 @@
-"""Debug: check SQLAlchemy ORM category loading"""
-import asyncio
-import os
-import sys
-
-sys.path.insert(0, '/app')
-os.chdir('/app')
-
-from sqlalchemy.ext.asyncio import create_async_engine, AsyncSession
-from sqlalchemy.orm import sessionmaker, selectinload
-from sqlalchemy import select
-from app.models.ticket import Ticket
-from app.models.category import Category
-
-
-async def run():
-    database_url = os.environ.get('DATABASE_URL', 'postgresql+asyncpg://postgres:postgres@db:5432/servicemanager')
-    engine = create_async_engine(database_url, echo=True)
-    async_session = sessionmaker(engine, class_=AsyncSession, expire_on_commit=False)
-
-    async with async_session() as session:
-        # Test selectinload
-        result = await session.execute(
-            select(Ticket)
-            .options(selectinload(Ticket.category))
-            .where(Ticket.category_id != None)
-            .limit(3)
-        )
-        tickets = result.scalars().all()
-
-        print(f"\n=== ORM RESULTS ({len(tickets)} tickets) ===")
-        for t in tickets:
-            print(f"  {t.ticket_number}: category_id={t.category_id}, category={t.category}")
-            if t.category:
-                print(f"    -> category.name={t.category.name}")
-            else:
-                print(f"    -> category is None!")
-
-        # Check if Category model can be queried directly
-        r2 = await session.execute(select(Category).limit(3))
-        cats = r2.scalars().all()
-        print(f"\n=== DIRECT CATEGORY QUERY ({len(cats)} categories) ===")
-        for c in cats:
-            print(f"  id={c.id}, name={c.name}")
-
-    await engine.dispose()
-
-
-asyncio.run(run())
--- a/scripts/reset-fabrica.sh
+++ b/scripts/reset-fabrica.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+# Script para resetear datos a estado de fábrica (solo datos, no afecta estructura ni funcionalidad)
+
+set -e
+
+echo "🧹 Reseteando datos del sistema..."
+
+# 1. Eliminar datos de tickets, comentarios, logs, auditoría, uploads
+# (Ejemplo: usando comandos SQL directos desde el contenedor)
+docker-compose exec backend psql -U servicemanager -d servicemanager -c "TRUNCATE tickets, ticket_comments, audit_logs, uploads RESTART IDENTITY CASCADE;"
+
+echo "✅ Datos eliminados."
+
+# 2. Volver a poblar datos demo
+
+docker-compose exec backend python scripts/seed_data.py
+docker-compose exec backend python scripts/seed_tickets.py
+docker-compose exec backend python scripts/generate_sla_test_data.py
+docker-compose exec backend python scripts/generate_security_test_data.py
+docker-compose exec backend python scripts/reset_passwords.py
+
+echo "🎉 Sistema restaurado a estado de fábrica demo."
--- a/scripts/seed_data.py
+++ b/scripts/seed_data.py
@@ -216,15 +216,18 @@ async def main():
            if user_data["email"] in existing_emails:
                print(f"  ⏭  Ya existe: {user_data['email']}")
                continue
-            pwd = user_data.pop("password")
+            # Usar copia para no mutar el dict original (permite re-ejecutar el script)
+            ud = user_data.copy()
+            pwd = ud.pop("password")
            hashed_pwd = security.hash_password(pwd)
            user = User(
                tenant_id=tenant_id,
                password_hash=hashed_pwd,
-                **user_data,
+                email_verified=True,   # Marcar como verificado para permitir login
+                **ud,
            )
            session.add(user)
-            print(f"  ✓  {user_data['email']}  [{user_data['role'].value}]  pwd={pwd}")
+            print(f"  ✓  {ud['email']}  [{ud['role'].value}]  pwd={pwd}")
            created_users += 1

        await session.commit()
--- a/workers/app/core/database.py
+++ b/workers/app/core/database.py
@@ -7,11 +7,42 @@ Async database session management para Celery workers
 from sqlalchemy.ext.asyncio import create_async_engine, AsyncSession, async_sessionmaker
 from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
 from sqlalchemy import DateTime, func
+from sqlalchemy import types as sa_types
+from sqlalchemy.types import TypeDecorator, CHAR
+from sqlalchemy.dialects.postgresql import UUID as PG_UUID
 from contextlib import asynccontextmanager
 from typing import AsyncGenerator
 import uuid
 from datetime import datetime

+
+class GUID(TypeDecorator):
+    """UUID portable: UUID nativo en Postgres, CHAR(36) en otros dialectos (SQLite para tests)."""
+
+    impl = CHAR
+    cache_ok = True
+
+    def load_dialect_impl(self, dialect):
+        if dialect.name == "postgresql":
+            return dialect.type_descriptor(PG_UUID(as_uuid=True))
+        return dialect.type_descriptor(CHAR(36))
+
+    def process_bind_param(self, value, dialect):
+        if value is None:
+            return None
+        if dialect.name == "postgresql":
+            return value
+        if isinstance(value, uuid.UUID):
+            return str(value)
+        return str(uuid.UUID(str(value)))
+
+    def process_result_value(self, value, dialect):
+        if value is None:
+            return None
+        if not isinstance(value, uuid.UUID):
+            return uuid.UUID(str(value))
+        return value
+
 from app.core.config import get_settings

 settings = get_settings()
Author	SHA1	Message	Date
icamarillo	e141701567	limpieza de scipts	2026-03-09 13:47:20 -06:00
icamarillo	7003e5cd80	limpieza de scipts	2026-03-09 13:40:28 -06:00
icamarillo	d8232fda7c	tenant arreglado	2026-03-05 14:04:04 -07:00
Alonso	16b3dc5d47	Sesiones correctas	2026-03-04 13:31:38 -07:00
icamarillo	3b46f48655	Roles	2026-03-03 14:02:18 -07:00
icamarillo	f10b15d91b	Mejora de fromts	2026-03-03 11:25:37 -07:00
icamarillo	49dfb3ef24	Mejora de seguridad	2026-03-03 09:29:53 -07:00
icamarillo	b187aa1b46	minimo	2026-02-27 10:24:06 -07:00
icamarillo	cd3d7e816f	Recuperar implementado	2026-02-27 10:08:30 -07:00
icamarillo	63925fe305	Login resuelto	2026-02-27 09:16:08 -07:00
icamarillo	c146a6c3c3	funcion dashboard y reporte de endpoints v1.16.0	2026-02-26 12:48:28 -07:00
icamarillo	ba779bde55	docs: guardar README original como README.legacy.md	2026-02-26 09:13:29 -07:00
icamarillo	ba94152074	docs: README completo para Windows/Linux/macOS + fix conflicto de puertos - README.md reescrito con instrucciones detalladas para principiantes y expertos * Tabla de contenidos con 14 secciones * Inicio rápido con Docker (Windows, Linux, macOS) * Configuración de variables de entorno con explicaciones * Sección de desarrollo local sin Docker * Comandos útiles (Docker, Alembic, calidad de código, testing) * Solución de problemas extensa (puertos, módulos, tenant, migraciones, Node.js) * Historial de versiones - Fix: conflicto de puertos cuando ambos frontends corren en local * frontend-internal/vite.config.js: usa PORT=3001 por defecto (3000 en Docker) * frontend-internal/package.json: dev script sin puerto hardcodeado * docker-compose.yml: frontend-internal recibe PORT=3000 como variable de env	2026-02-26 09:02:04 -07:00