ci: guard deploy preflight contract mounts

Integra el saneamiento F4 validado por CI completa: flujo Acta → INF → GEDO/IF, lifecycle documental, contratos WEB/Android, migraciones reversibles, seguimiento append-only y cierre de observaciones de revisión.

.env.example

@@ -21,10 +21,20 @@ ACCESS_COOKIE_NAME=dhv2_access
 REFRESH_COOKIE_NAME=dhv2_refresh
 CSRF_COOKIE_NAME=dhv2_csrf
 
+INSPECTION_SIGNATURE_ROOT=/app/storage/asset-media/inspection-signatures
 INSPECTION_REPORT_WORD_ROOT=/app/storage/asset-media/inspection-reports-word
 INSPECTION_REPORT_REVISION_ROOT=/app/storage/asset-media/inspection-report-revisions
-
 INSPECTION_ACT_PDF_ROOT=/app/storage/asset-media/inspection-acts-pdf
+
+# Enlace público de un solo uso para firma/manifestación de empresa.
+# En producción: https://dhv2.korexlabs.com/firma-acta
+# En entorno de prueba: https://prueba.dhv2.korexlabs.com/firma-acta
+COMPANY_SIGNATURE_PUBLIC_BASE_URL=https://dhv2.korexlabs.com/firma-acta
+
+# Clave maestra de 32 bytes (64 hex o base64) para cifrar la contraseña SMTP guardada por Superadmin.
+SMTP_SETTINGS_MASTER_KEY=CHANGE_ME_WITH_32_RANDOM_BYTES
+
+# Fallback SMTP. Se usa sólo hasta que Superadmin guarde una configuración en la base de datos.
 SMTP_HOST=
 SMTP_PORT=587
 SMTP_SECURE=false

.github/workflows/android.yml

@@ -1,9 +1,14 @@
 name: Android APK
+# F3.2: genera la APK debug verificable antes de promover la integración multi-Acta.
 
 on:
   push:
     branches:
       - 'feature/f2-2*'
+      - 'feature/f2-3*'
+      - 'feature/f2-4*'
+      - 'feature/f3-1*'
+      - 'feature/f3-2*'
     paths:
       - 'android-app/**'
       - '.github/workflows/android.yml'
@@ -53,7 +58,7 @@ jobs:
       - name: Upload APK
         uses: actions/upload-artifact@v4
         with:
-          name: DH-Inspeccion-F2.2.1-0.10.1-debug
+          name: DH-Inspeccion-F3.2-0.12.0-debug
           path: android-app/app/build/outputs/apk/debug/app-debug.apk
           if-no-files-found: error
           retention-days: 14

.github/workflows/ci.yml

@@ -47,6 +47,8 @@ jobs:
           cache-dependency-path: web-v2/package-lock.json
       - run: npm ci
       - run: npm run typecheck
+      - name: F3.1 WEB contract
+        run: bash ../scripts/check-f3-1-web-contract.sh
       - run: npm run build
 
   contract:
@@ -60,7 +62,25 @@ jobs:
           while IFS= read -r -d '' script; do
             bash -n "$script"
           done < <(find scripts -type f -name '*.sh' -print0)
+      - name: Validate deploy preflight parity
+        run: |
+          grep -Fq -- '$STAGE/docker-compose.yml:/docker-compose.yml:ro' scripts/deploy-github.sh
+          grep -Fq -- '$STAGE/web-v2:/web-v2:ro' scripts/deploy-github.sh
+          grep -Fq -- '$STAGE/android-app:/android-app:ro' scripts/deploy-github.sh
       - name: Validate Compose
         run: docker compose --env-file .env.example config >/dev/null
+      - name: VPS-equivalent isolated API preflight
+        run: |
+          set -Eeuo pipefail
+          image="dhv2-api:ci-vps-preflight-${GITHUB_SHA::12}"
+          docker build --target builder -t "$image" api-v3
+          docker run --rm \
+            -v "$PWD/api-v3/test:/app/test:ro" \
+            -v "$PWD/api-v3/tsconfig.test.json:/app/tsconfig.test.json:ro" \
+            -v "$PWD/docker-compose.yml:/docker-compose.yml:ro" \
+            -v "$PWD/web-v2:/web-v2:ro" \
+            -v "$PWD/android-app:/android-app:ro" \
+            "$image" npm test
+          docker image rm "$image" >/dev/null 2>&1 || true
       - name: Build production images
         run: docker compose --env-file .env.example build api migrate web

.github/workflows/f2-3-ci.yml

@@ -0,0 +1,62 @@
+name: F2.3 Field Finding CI
+
+on:
+  push:
+    branches:
+      - 'feature/f2-3*'
+    paths:
+      - 'api-v3/**'
+      - '.github/workflows/f2-3-ci.yml'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  api:
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    defaults:
+      run:
+        working-directory: api-v3
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Node 24
+        uses: actions/setup-node@v4
+        with:
+          node-version: '24'
+          cache: npm
+          cache-dependency-path: api-v3/package-lock.json
+      - name: Install
+        run: npm ci
+      - name: Typecheck
+        run: npm run typecheck 2>&1 | tee typecheck.log
+      - name: Upload TypeScript diagnostic
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: f2-3-typecheck-diagnostic
+          path: api-v3/typecheck.log
+          if-no-files-found: warn
+          retention-days: 3
+      - name: Tests
+        run: npm test 2>&1 | tee test.log
+      - name: Upload test diagnostic
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: f2-3-test-diagnostic
+          path: api-v3/test.log
+          if-no-files-found: warn
+          retention-days: 3
+      - name: Build
+        run: npm run build 2>&1 | tee build.log
+      - name: Upload build diagnostic
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: f2-3-build-diagnostic
+          path: api-v3/build.log
+          if-no-files-found: warn
+          retention-days: 3

.github/workflows/f3-1-ci.yml

@@ -0,0 +1,205 @@
+name: F3.1 Inventory CI
+
+on:
+  push:
+    branches:
+      - 'feature/f3-1*'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  api:
+    runs-on: ubuntu-latest
+    timeout-minutes: 25
+    defaults:
+      run:
+        working-directory: api-v3
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '24'
+          cache: npm
+          cache-dependency-path: api-v3/package-lock.json
+      - run: npm ci
+      - name: Typecheck
+        run: npm run typecheck 2>&1 | tee typecheck.log
+      - name: Tests
+        run: npm test 2>&1 | tee test.log
+      - name: Build
+        run: npm run build 2>&1 | tee build.log
+      - name: Diagnostics
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: f3-1-api-diagnostics
+          path: |
+            api-v3/typecheck.log
+            api-v3/test.log
+            api-v3/build.log
+          if-no-files-found: warn
+          retention-days: 3
+
+  migrations:
+    name: DB · F3.1 on PostgreSQL 16/PostGIS
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    services:
+      postgres:
+        image: postgis/postgis:16-3.4
+        env:
+          POSTGRES_USER: dhv2_owner
+          POSTGRES_PASSWORD: owner_test_password
+          POSTGRES_DB: dhv2_ci
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd "pg_isready -U dhv2_owner -d dhv2_ci"
+          --health-interval 5s
+          --health-timeout 5s
+          --health-retries 20
+    env:
+      DB_HOST: 127.0.0.1
+      DB_PORT: 5432
+      DB_NAME: dhv2_ci
+      DB_MIGRATION_USER: dhv2_owner
+      DB_MIGRATION_PASSWORD: owner_test_password
+      DB_APP_USER: dhv2_app
+    defaults:
+      run:
+        working-directory: api-v3
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '24'
+          cache: npm
+          cache-dependency-path: api-v3/package-lock.json
+      - name: PostgreSQL client
+        run: |
+          command -v psql >/dev/null || {
+            sudo apt-get update
+            sudo apt-get install -y postgresql-client
+          }
+      - name: Prepare roles and extensions
+        env:
+          PGPASSWORD: owner_test_password
+        run: |
+          psql -v ON_ERROR_STOP=1 -h 127.0.0.1 -U dhv2_owner -d dhv2_ci <<'SQL'
+          CREATE EXTENSION IF NOT EXISTS postgis;
+          CREATE EXTENSION IF NOT EXISTS pgcrypto;
+          DO $$
+          BEGIN
+            IF NOT EXISTS (SELECT 1 FROM pg_roles WHERE rolname='dhv2_app') THEN
+              CREATE ROLE dhv2_app LOGIN PASSWORD 'app_test_password';
+            END IF;
+          END
+          $$;
+          GRANT CONNECT ON DATABASE dhv2_ci TO dhv2_app;
+          GRANT USAGE ON SCHEMA public TO dhv2_app;
+
+          CREATE TABLE IF NOT EXISTS typeorm_migrations (
+            id SERIAL PRIMARY KEY,
+            timestamp bigint NOT NULL,
+            name varchar NOT NULL
+          );
+          INSERT INTO typeorm_migrations (timestamp,name)
+          VALUES (1788652800000,'ResetProductionOperationalData1788652800000');
+          SQL
+      - run: npm ci
+      - run: npm run build
+      - name: Run every pending migration
+        run: npm run migration:run
+      - name: Assert no pending migrations
+        run: |
+          npm run migration:show | tee /tmp/migrations.txt
+          grep -Fq 'Pending migrations: no' /tmp/migrations.txt
+      - name: Assert F3.1 structure, merges and Inspector profile
+        env:
+          PGPASSWORD: owner_test_password
+        run: |
+          set -Eeuo pipefail
+
+          query() {
+            psql -At -v ON_ERROR_STOP=1 \
+              -h 127.0.0.1 \
+              -U dhv2_owner \
+              -d dhv2_ci \
+              -c "$1"
+          }
+
+          assert_eq() {
+            local expected="$1"
+            local sql="$2"
+            local actual
+            actual="$(query "$sql")"
+            if [ "$actual" != "$expected" ]; then
+              echo "ASSERT FAILED"
+              echo "SQL: $sql"
+              echo "Expected: $expected"
+              echo "Actual:   $actual"
+              exit 1
+            fi
+          }
+
+          assert_eq 15 "SELECT count(*) FROM inventory_families WHERE level='INSTALLATION' AND is_active=true"
+          assert_eq 124 "SELECT count(*) FROM inventory_families WHERE level='SUBINSTALLATION' AND is_active=true"
+          assert_eq 16 "SELECT count(*) FROM inventory_families WHERE source_reference LIKE 'SYSTEM:F3.1:OTHER%'"
+          assert_eq 1 "SELECT count(*) FROM finding_categories WHERE lower(code)='app26r2' AND is_active=true"
+          assert_eq 1 "SELECT count(*) FROM finding_categories WHERE lower(code)='app26' AND is_active=false"
+
+          assert_eq 1 "SELECT count(*) FROM information_schema.tables WHERE table_name='asset_merges'"
+          assert_eq 1 "SELECT count(*) FROM pg_trigger WHERE tgname='trg_asset_merges_append_only' AND NOT tgisinternal"
+          assert_eq 1 "SELECT count(*) FROM information_schema.tables WHERE table_name='finding_catalog_item_merges'"
+          assert_eq 1 "SELECT count(*) FROM pg_trigger WHERE tgname='trg_finding_catalog_item_merges_append_only' AND NOT tgisinternal"
+
+          assert_eq 4 "SELECT count(*) FROM information_schema.columns WHERE table_name='users' AND column_name IN ('dni','phone','job_title','employee_number')"
+          assert_eq 2 "SELECT count(*) FROM pg_trigger WHERE tgname IN ('trg_user_roles_inspector_email','trg_users_inspector_email') AND NOT tgisinternal"
+          assert_eq 1 "SELECT count(*) FROM information_schema.columns WHERE table_name='inspection_document_deliveries' AND column_name='recipient_user_id'"
+          assert_eq 1 "SELECT count(*) FROM pg_constraint WHERE conname='chk_inspection_document_deliveries_recipient_kind' AND pg_get_constraintdef(oid) LIKE '%INSPECTOR%'"
+          assert_eq 1 "SELECT count(*) FROM pg_constraint WHERE conname='fk_inspection_document_deliveries_recipient_user'"
+
+          assert_eq 230 "SELECT count(*) FROM assets a JOIN asset_types t ON t.id=a.asset_type_id WHERE a.data_origin='IMPORT' AND a.source_name='Tablas de yacimiento(1).xlsx' AND lower(t.code)='yacimiento'"
+          assert_eq 0 "SELECT count(*) FROM assets WHERE (operational_area_id IS NULL) <> (operator_company_id IS NULL)"
+
+  web:
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    defaults:
+      run:
+        working-directory: web-v2
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '24'
+          cache: npm
+          cache-dependency-path: web-v2/package-lock.json
+      - run: npm ci
+      - name: Typecheck
+        run: npm run typecheck 2>&1 | tee typecheck.log
+      - name: Build
+        run: npm run build 2>&1 | tee build.log
+      - name: Diagnostics
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: f3-1-web-diagnostics
+          path: |
+            web-v2/typecheck.log
+            web-v2/build.log
+          if-no-files-found: warn
+          retention-days: 3
+
+  docker:
+    needs: [api, web, migrations]
+    runs-on: ubuntu-latest
+    timeout-minutes: 25
+    steps:
+      - uses: actions/checkout@v4
+      - name: Validate Compose
+        run: docker compose --env-file .env.example config >/dev/null
+      - name: Build production images
+        run: docker compose --env-file .env.example build api migrate web

.github/workflows/f3-2-ci.yml

@@ -0,0 +1,80 @@
+name: F3.2 Multi-Acta CI
+
+on:
+  push:
+    branches:
+      - 'feature/f3-2*'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  api:
+    name: API · F3.2
+    runs-on: ubuntu-latest
+    timeout-minutes: 25
+    defaults:
+      run:
+        working-directory: api-v3
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '24'
+          cache: npm
+          cache-dependency-path: api-v3/package-lock.json
+      - run: npm ci
+      - name: Typecheck
+        run: npm run typecheck
+      - name: Tests
+        run: npm test
+      - name: Build
+        run: npm run build
+
+  web:
+    name: WEB · regression
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    defaults:
+      run:
+        working-directory: web-v2
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '24'
+          cache: npm
+          cache-dependency-path: web-v2/package-lock.json
+      - run: npm ci
+      - run: npm run typecheck
+      - name: F3.1 structural WEB contract
+        run: bash ../scripts/check-f3-1-web-contract.sh
+      - run: npm run build
+
+  deploy-preflight:
+    name: VPS-equivalent preflight / Docker
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    needs: [api, web]
+    steps:
+      - uses: actions/checkout@v4
+      - name: Validate shell scripts
+        run: |
+          while IFS= read -r -d '' script; do
+            bash -n "$script"
+          done < <(find scripts -type f -name '*.sh' -print0)
+      - name: Validate Compose
+        run: docker compose --env-file .env.example config >/dev/null
+      - name: VPS-equivalent isolated API tests
+        run: |
+          set -Eeuo pipefail
+          image="dhv2-api:f3-2-preflight-${GITHUB_SHA::12}"
+          docker build --target builder -t "$image" api-v3
+          docker run --rm \
+            -v "$PWD/api-v3/test:/app/test:ro" \
+            -v "$PWD/api-v3/tsconfig.test.json:/app/tsconfig.test.json:ro" \
+            "$image" npm test
+          docker image rm "$image" >/dev/null 2>&1 || true
+      - name: Build production images
+        run: docker compose --env-file .env.example build api migrate web

README.md

@@ -1,35 +1,10 @@
-# DH Inspección V2 · D5.6.2
-
-Hotfix de mantenimiento de Fase D para accesos Android y contrato de regresión de cierre.
-
 # DH Inspección V2
 
-Versión: **0.19.5-1**  
-Fase: **D5.5.1 · Corrección de staging de planificación**
+Repositorio del sistema DH Inspección V2.
 
-D5.5.1 conserva íntegramente D5.5 y corrige únicamente el contrato de pruebas de staging. D5.5 consolida la preparación de visitas desde oficina antes del trabajo de campo. La visita queda anclada explícitamente a Área y Organización operadora, y el sistema genera un checklist auditable con antecedentes, respuestas vencidas, controles vencidos y próximos controles.
+## Estructura
 
-## Alcance D5.5
-
-- selección web Área → Organización operadora vigente;
-- fecha y equipo inspector dentro del plan;
-- checklist automático versionado y append-only;
-- respuestas de empresa vencidas y controles de verificación vencidos;
-- próximos controles dentro de 30 días de la fecha planificada;
-- antecedentes históricos del mismo contexto;
-- incorporación automática de registros accionables;
-- alta manual de registros preventivos del mismo Área/Operadora;
-- exclusiones sólo mediante motivo auditable;
-- reincorporación sin borrar la exclusión histórica;
-- visitas de verificación integradas al mismo contrato de planificación;
-- cambio de contexto o fecha invalida el checklist hasta regeneración explícita;
-- inicio de visita exclusivamente desde APK mediante la política móvil ya existente.
-
-## Migración
-
-`1789063200000-phase-d5-5-web-planning-checklist.ts`  
-`PhaseD55WebPlanningChecklist1789063200000`
-
-## Despliegue
-
-El despliegue debe partir exactamente de API/WEB **0.19.4-1** y ejecutar `scripts/deploy-phase-d5-5.sh`. Antes de modificar producción, el script compila API y web en staging y exige **252 tests** aprobados.
+- `api-v3/`: API v3.
+- `web-v2/`: aplicación web.
+- `scripts/`: utilidades operativas y de despliegue.
+- `docs/`: documentación técnica.

android-app/app/build.gradle.kts

@@ -12,8 +12,8 @@ android {
         applicationId = "com.korexlabs.dhinspeccion"
         minSdk = 26
         targetSdk = 36
-        versionCode = 15
-        versionName = "0.10.1"
+        versionCode = 19
+        versionName = "0.12.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true

android-app/app/src/main/java/com/korexlabs/dhinspeccion/MainViewModel.kt

@@ -6,11 +6,21 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.viewModelScope
+import com.korexlabs.dhinspeccion.data.CreateFieldFindingRequest
 import com.korexlabs.dhinspeccion.data.CreateFieldInventoryRequest
 import com.korexlabs.dhinspeccion.data.DhRepository
 import com.korexlabs.dhinspeccion.data.FieldAssetDetail
+import com.korexlabs.dhinspeccion.data.FieldFindingEvidence
+import com.korexlabs.dhinspeccion.data.FieldFindingItem
+import com.korexlabs.dhinspeccion.data.FieldFindingOptionsResponse
+import com.korexlabs.dhinspeccion.data.FieldFindingsRepository
 import com.korexlabs.dhinspeccion.data.FieldInventoryItem
 import com.korexlabs.dhinspeccion.data.FieldType
+import com.korexlabs.dhinspeccion.data.MobileActClosure
+import com.korexlabs.dhinspeccion.data.MobileActDetail
+import com.korexlabs.dhinspeccion.data.MobileActSummary
+import com.korexlabs.dhinspeccion.data.MobileActsRepository
+import com.korexlabs.dhinspeccion.data.MobileResponsibleRequest
 import com.korexlabs.dhinspeccion.data.StoredSession
 import com.korexlabs.dhinspeccion.data.VisitDetail
 import com.korexlabs.dhinspeccion.data.VisitSummary
@@ -20,6 +30,8 @@ import java.time.Instant
 
 class MainViewModel(application: Application) : AndroidViewModel(application) {
     private val repository = DhRepository(application)
+    private val findingsRepository = FieldFindingsRepository(application)
+    private val actsRepository = MobileActsRepository(application)
 
     var session: StoredSession? by mutableStateOf(repository.currentSession())
         private set
@@ -42,6 +54,20 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
     var selectedFieldAsset: FieldAssetDetail? by mutableStateOf(null)
         private set
 
+    var acts: List<MobileActSummary> by mutableStateOf(emptyList())
+        private set
+    var selectedAct: MobileActDetail? by mutableStateOf(null)
+        private set
+    var actClosure: MobileActClosure? by mutableStateOf(null)
+        private set
+
+    var fieldFindingOptions: FieldFindingOptionsResponse? by mutableStateOf(null)
+        private set
+    var lastCreatedFinding: FieldFindingItem? by mutableStateOf(null)
+        private set
+    var fieldFindingEvidence: Map<String, List<FieldFindingEvidence>> by mutableStateOf(emptyMap())
+        private set
+
     init {
         if (session != null) loadVisits()
     }
@@ -72,6 +98,8 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
             inventory = emptyList()
             fieldTypes = emptyList()
             selectedFieldAsset = null
+            clearActState()
+            clearFindingState()
         }
     }
 
@@ -86,6 +114,8 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         inventory = emptyList()
         fieldTypes = emptyList()
         selectedFieldAsset = null
+        clearFindingState()
+        loadActsInternal(id, selectDraft = true)
     }
 
     fun closeVisitView() {
@@ -93,6 +123,8 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         inventory = emptyList()
         fieldTypes = emptyList()
         selectedFieldAsset = null
+        clearActState()
+        clearFindingState()
         loadVisits()
     }
 
@@ -101,10 +133,61 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         launchBusy {
             visit = repository.startVisit(id)
             notice = "Inspección iniciada."
+            loadActsInternal(id, selectDraft = true)
             loadVisitsInternal()
         }
     }
 
+    fun reloadActs() {
+        val visitId = visit?.id ?: return
+        launchBusy { loadActsInternal(visitId, selectDraft = selectedAct == null) }
+    }
+
+    fun selectAct(actId: String) {
+        launchBusy {
+            selectedAct = actsRepository.get(actId)
+            actClosure = actsRepository.closure(actId)
+            clearFindingState()
+        }
+    }
+
+    fun createActForSelectedInventory(urgency: String = "NON_URGENT") {
+        val currentVisit = visit ?: return
+        val asset = selectedFieldAsset?.asset
+        if (currentVisit.status != "IN_PROGRESS") {
+            error = "La Inspección debe estar en curso para crear un Acta."
+            return
+        }
+        if (urgency !in setOf("URGENT", "NON_URGENT")) {
+            error = "Elegí si el Acta es urgente o no urgente."
+            return
+        }
+        if (asset == null) {
+            error = "Seleccioná primero una Instalación o Subinstalación para iniciar el Acta."
+            return
+        }
+        if (acts.any { it.status == "DRAFT" }) {
+            error = "Ya existe un Acta en borrador. Bloqueala o cancelala antes de crear la siguiente."
+            return
+        }
+        launchBusy {
+            val created = actsRepository.create(
+                currentVisit.id,
+                asset.id,
+                currentVisit.code,
+                urgency,
+            )
+            selectedAct = created
+            actClosure = actsRepository.closure(created.id)
+            loadActsInternal(currentVisit.id, selectDraft = false)
+            val urgencyLabel = if (urgency == "URGENT") "urgente" else "no urgente"
+            notice = "${created.code} creada como $urgencyLabel. Los Hallazgos nuevos quedarán vinculados explícitamente a esta Acta."
+            if (selectedFieldAsset?.capture?.readyForFinding == true) {
+                loadFindingOptionsInternal(currentVisit.id, asset.id, created.id)
+            }
+        }
+    }
+
     fun searchInventory(search: String, parentId: String? = null) {
         val id = visit?.id ?: return
         launchBusy {
@@ -123,14 +206,23 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         val visitId = visit?.id ?: return
         launchBusy {
             selectedFieldAsset = repository.selectFieldAsset(visitId, item.id)
-            notice = "Inventario agregado a la inspección."
+            notice = "Inventario agregado a la Inspección."
             inventory = repository.fieldInventory(visitId, null, null).data
+            val draft = selectedDraftAct()
+            if (selectedFieldAsset?.capture?.readyForFinding == true && draft != null) {
+                selectedAct = actsRepository.ensureAsset(draft.id, item.id)
+                loadActsInternal(visitId, selectDraft = false)
+                loadFindingOptionsInternal(visitId, item.id, draft.id)
+            } else if (selectedFieldAsset?.capture?.readyForFinding == true) {
+                notice = "Inventario listo. Creá o seleccioná un Acta antes de registrar Hallazgos."
+            }
         }
     }
 
     fun createFieldAsset(
         type: FieldType,
         parentId: String?,
+        familyId: String?,
         name: String,
         commonName: String?,
         attributes: Map<String, Any?>,
@@ -140,13 +232,18 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
     ) {
         val visitId = visit?.id ?: return
         if (visit?.status != "IN_PROGRESS") {
-            error = "La inspección debe estar en curso para dar de alta Inventario."
+            error = "La Inspección debe estar en curso para dar de alta Inventario."
+            return
+        }
+        if (type.familyRequired && familyId == null) {
+            error = "Elegí una familia técnica o la opción Otro / no catalogado."
             return
         }
         launchBusy {
             val request = CreateFieldInventoryRequest(
                 typeId = type.id,
                 parentId = parentId,
+                familyId = familyId,
                 name = name.trim(),
                 commonName = commonName?.trim()?.takeIf { it.isNotBlank() },
                 attributes = attributes,
@@ -156,11 +253,41 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
                 deviceCapturedAt = Instant.now().toString(),
             )
             selectedFieldAsset = repository.createFieldAsset(visitId, request)
-            notice = "Inventario creado con GPS. Falta la fotografía obligatoria."
+            notice = "Inventario creado con GPS. Falta la fotografía obligatoria. Si ya existía, podés fusionarlo antes de continuar."
             inventory = repository.fieldInventory(visitId, null, null).data
         }
     }
 
+    fun mergeCreatedFieldAsset(canonicalAssetId: String, reason: String) {
+        val visitId = visit?.id ?: return
+        val source = selectedFieldAsset?.asset ?: return
+        if (canonicalAssetId.isBlank()) {
+            error = "Elegí el registro existente que se conservará."
+            return
+        }
+        if (reason.trim().length < 8) {
+            error = "Explicá brevemente por qué se trata de un duplicado."
+            return
+        }
+        launchBusy {
+            val result = repository.mergeFieldAsset(
+                visitId = visitId,
+                assetId = source.id,
+                canonicalAssetId = canonicalAssetId,
+                reason = reason,
+            )
+            selectedFieldAsset = repository.selectFieldAsset(visitId, result.canonical.id)
+            notice = "Fusión registrada. Se conserva ${result.canonical.code} y la historia de ${result.source.code} permanece trazable."
+            inventory = repository.fieldInventory(visitId, null, null).data
+            val draft = selectedDraftAct()
+            if (selectedFieldAsset?.capture?.readyForFinding == true && draft != null) {
+                selectedAct = actsRepository.ensureAsset(draft.id, result.canonical.id)
+                loadActsInternal(visitId, selectDraft = false)
+                loadFindingOptionsInternal(visitId, result.canonical.id, draft.id)
+            }
+        }
+    }
+
     fun uploadFieldPhoto(
         file: File,
         latitude: Double,
@@ -185,11 +312,315 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
                 "Fotografía registrada."
             }
             inventory = repository.fieldInventory(visitId, null, null).data
+            val draft = selectedDraftAct()
+            if (response.capture.readyForFinding && draft != null) {
+                selectedAct = actsRepository.ensureAsset(draft.id, asset.id)
+                loadActsInternal(visitId, selectDraft = false)
+                loadFindingOptionsInternal(visitId, asset.id, draft.id)
+            } else if (response.capture.readyForFinding) {
+                notice = "Inventario listo. Creá o seleccioná un Acta antes de registrar Hallazgos."
+            }
         }
     }
 
+    fun openFindingForSelected() {
+        val visitId = visit?.id ?: return
+        val assetId = selectedFieldAsset?.asset?.id ?: return
+        val draft = selectedDraftAct()
+        if (draft == null) {
+            error = "Creá o seleccioná el Acta en borrador antes de registrar Hallazgos."
+            return
+        }
+        launchBusy {
+            selectedAct = actsRepository.ensureAsset(draft.id, assetId)
+            loadActsInternal(visitId, selectDraft = false)
+            loadFindingOptionsInternal(visitId, assetId, draft.id)
+        }
+    }
+
+    fun createFieldFinding(
+        catalogItemId: String?,
+        customTitle: String?,
+        customLegalBasis: String?,
+        description: String,
+        severity: Int?,
+        correctionDueOn: String?,
+    ) {
+        val visitId = visit?.id ?: return
+        val assetId = selectedFieldAsset?.asset?.id ?: return
+        val actId = selectedDraftAct()?.id
+        if (actId == null) {
+            error = "No hay un Acta en borrador seleccionada."
+            return
+        }
+        if (description.isBlank()) {
+            error = "Describí el Hallazgo antes de guardarlo."
+            return
+        }
+        if (catalogItemId == null && customTitle.isNullOrBlank()) {
+            error = "Para OTROS, indicá un título para el Hallazgo."
+            return
+        }
+        if (severity != null && severity !in 1..10) {
+            error = "La gravedad debe estar entre 1 y 10."
+            return
+        }
+        launchBusy {
+            selectedAct = actsRepository.ensureAsset(actId, assetId)
+            val response = findingsRepository.create(
+                visitId,
+                assetId,
+                CreateFieldFindingRequest(
+                    actId = actId,
+                    catalogItemId = catalogItemId,
+                    customTitle = customTitle?.trim()?.takeIf { it.isNotBlank() },
+                    customLegalBasis = customLegalBasis?.trim()?.takeIf { it.isNotBlank() },
+                    description = description.trim(),
+                    severity = severity,
+                    correctionDueOn = correctionDueOn?.trim()?.takeIf { it.isNotBlank() },
+                ),
+            )
+            lastCreatedFinding = response.finding
+            notice = "Hallazgo ${response.finding.code} registrado en ${response.act.code}. Podés agregar evidencia fotográfica."
+            loadFindingOptionsInternal(visitId, assetId, actId, keepLastCreated = true)
+            loadActsInternal(visitId, selectDraft = false)
+        }
+    }
+
+    fun uploadFindingPhoto(
+        findingId: String,
+        file: File,
+        latitude: Double,
+        longitude: Double,
+        accuracyM: Double?,
+        title: String? = null,
+        description: String? = null,
+    ) {
+        launchBusy {
+            findingsRepository.uploadObservationPhoto(
+                findingId = findingId,
+                file = file,
+                latitude = latitude,
+                longitude = longitude,
+                accuracyM = accuracyM,
+                title = title,
+                description = description,
+            )
+            loadEvidenceInternal(findingId)
+            notice = "Evidencia fotográfica registrada con GPS."
+        }
+    }
+
+    fun reloadFindingEvidence(findingId: String) {
+        launchBusy { loadEvidenceInternal(findingId) }
+    }
+
+    fun setCompanyResponsiblePresent(
+        fullName: String,
+        documentType: String,
+        documentNumber: String,
+        position: String,
+        email: String?,
+        phone: String?,
+    ) {
+        val actId = selectedAct?.id ?: return
+        if (fullName.isBlank() || documentNumber.isBlank() || position.isBlank()) {
+            error = "Completá nombre, documento y cargo del responsable de la empresa."
+            return
+        }
+        launchBusy {
+            actClosure = actsRepository.setResponsible(
+                actId,
+                MobileResponsibleRequest(
+                    attendanceStatus = "PRESENT",
+                    fullName = fullName.trim(),
+                    documentType = documentType,
+                    documentNumber = documentNumber.trim(),
+                    position = position.trim(),
+                    email = email?.trim()?.takeIf { it.isNotBlank() },
+                    phone = phone?.trim()?.takeIf { it.isNotBlank() },
+                ),
+            )
+            notice = "Responsable de empresa registrado para el Acta."
+        }
+    }
+
+    fun setCompanyResponsibleAbsent(reason: String) {
+        val actId = selectedAct?.id ?: return
+        if (reason.trim().length < 10) {
+            error = "Indicá un motivo de ausencia de al menos 10 caracteres."
+            return
+        }
+        launchBusy {
+            actClosure = actsRepository.setResponsible(
+                actId,
+                MobileResponsibleRequest(
+                    attendanceStatus = "ABSENT",
+                    absenceReason = reason.trim(),
+                ),
+            )
+            notice = "Ausencia del responsable registrada. La manifestación de empresa quedará pendiente y deberá resolverse antes de sellar el Acta."
+        }
+    }
+
+    fun prepareSelectedAct() {
+        val actId = selectedAct?.id ?: return
+        launchBusy {
+            actClosure = actsRepository.lock(actId)
+            refreshSelectedActInternal(actId)
+            notice = "Acta bloqueada. Su contenido quedó inmutable; ahora deben resolverse las firmas y manifestaciones."
+        }
+    }
+
+    fun reopenSelectedAct() {
+        error = "Un Acta bloqueada es inmutable y no puede volver a borrador."
+    }
+
+    fun signSelectedActAsInspector(
+        png: File,
+        latitude: Double?,
+        longitude: Double?,
+        accuracyM: Double?,
+    ) {
+        val actId = selectedAct?.id ?: return
+        launchBusy {
+            actClosure = actsRepository.signInspector(actId, png, latitude, longitude, accuracyM)
+            notice = "Firma del inspector incorporada al Acta."
+        }
+    }
+
+    fun signSelectedActAsCompany(
+        png: File,
+        latitude: Double?,
+        longitude: Double?,
+        accuracyM: Double?,
+        manifestation: String,
+        statement: String?,
+    ) {
+        val actId = selectedAct?.id ?: return
+        launchBusy {
+            actClosure = actsRepository.signCompany(
+                actId, png, latitude, longitude, accuracyM, manifestation, statement,
+            )
+            notice = if (manifestation == "DISSENT") {
+                "Firma de empresa registrada con disidencia."
+            } else {
+                "Firma de empresa registrada."
+            }
+        }
+    }
+
+    fun recordCompanyOutcome(status: String, reason: String) {
+        val actId = selectedAct?.id ?: return
+        if (status != "REFUSED") {
+            error = "La ausencia no resuelve la manifestación de la empresa. Registrá una firma o una negativa."
+            return
+        }
+        if (reason.trim().length < 10) {
+            error = "Indicá un motivo de al menos 10 caracteres."
+            return
+        }
+        launchBusy {
+            actClosure = actsRepository.companyOutcome(actId, status, reason)
+            notice = "Negativa a firmar asentada."
+        }
+    }
+
+    fun closeSelectedAct() {
+        val currentVisit = visit ?: return
+        val actId = selectedAct?.id ?: return
+        launchBusy {
+            actClosure = actsRepository.seal(actId)
+            refreshSelectedActInternal(actId)
+            loadActsInternal(currentVisit.id, selectDraft = false)
+            clearFindingState()
+            notice = "${selectedAct?.code ?: "Acta"} SELLADA e inmutable. Podés crear otra Acta o continuar hacia el cierre de la Inspección."
+        }
+    }
+
+    fun closeInspection() {
+        val visitId = visit?.id ?: return
+        launchBusy {
+            visit = actsRepository.closeVisit(visitId)
+            loadVisitsInternal()
+            notice = "Inspección cerrada. Todas sus Actas quedaron SELLADAS y disponibles para el circuito de oficina."
+        }
+    }
+
+    fun clearFindingFlow() {
+        fieldFindingOptions = null
+        lastCreatedFinding = null
+        fieldFindingEvidence = emptyMap()
+        error = null
+    }
+
     fun clearSelectedFieldAsset() {
         selectedFieldAsset = null
+        clearFindingState()
+    }
+
+    private fun selectedDraftAct(): MobileActDetail? =
+        selectedAct?.takeIf { it.status == "DRAFT" }
+            ?: acts.firstOrNull { it.status == "DRAFT" }?.let { summary ->
+                selectedAct?.takeIf { it.id == summary.id && it.status == "DRAFT" }
+            }
+
+    private suspend fun loadActsInternal(visitId: String, selectDraft: Boolean) {
+        acts = actsRepository.list(visitId).data
+        val currentId = selectedAct?.id
+        val current = currentId?.let { id -> acts.firstOrNull { it.id == id } }
+        val target = when {
+            current != null -> current.id
+            selectDraft -> acts.firstOrNull { it.status == "DRAFT" }?.id
+            else -> null
+        }
+        if (target != null) {
+            selectedAct = actsRepository.get(target)
+            actClosure = actsRepository.closure(target)
+        } else if (current == null) {
+            selectedAct = null
+            actClosure = null
+        }
+    }
+
+    private suspend fun refreshSelectedActInternal(actId: String) {
+        selectedAct = actsRepository.get(actId)
+        actClosure = actsRepository.closure(actId)
+        visit?.id?.let { loadActsInternal(it, selectDraft = false) }
+    }
+
+    private suspend fun loadFindingOptionsInternal(
+        visitId: String,
+        assetId: String,
+        actId: String,
+        keepLastCreated: Boolean = false,
+    ) {
+        val options = findingsRepository.options(visitId, assetId, actId)
+        fieldFindingOptions = options
+        if (!keepLastCreated) lastCreatedFinding = null
+        val loaded = linkedMapOf<String, List<FieldFindingEvidence>>()
+        for (finding in options.findings) {
+            loaded[finding.id] = findingsRepository.evidence(finding.id).data
+        }
+        fieldFindingEvidence = loaded
+    }
+
+    private suspend fun loadEvidenceInternal(findingId: String) {
+        fieldFindingEvidence = fieldFindingEvidence + (
+            findingId to findingsRepository.evidence(findingId).data
+        )
+    }
+
+    private fun clearActState() {
+        acts = emptyList()
+        selectedAct = null
+        actClosure = null
+    }
+
+    private fun clearFindingState() {
+        fieldFindingOptions = null
+        lastCreatedFinding = null
+        fieldFindingEvidence = emptyMap()
     }
 
     private fun launchBusy(block: suspend () -> Unit) {

android-app/app/src/main/java/com/korexlabs/dhinspeccion/data/DhMobile.kt

@@ -90,7 +90,6 @@ data class PersonSummary(
 data class VisitSummary(
     val id: String,
     val code: String,
-    val title: String? = null,
     val objective: String? = null,
     val status: String,
     val scopeAsset: AssetSummary? = null,
@@ -153,7 +152,6 @@ data class ChecklistSummary(
 data class VisitDetail(
     val id: String,
     val code: String,
-    val title: String? = null,
     val objective: String? = null,
     val status: String,
     val operationalArea: AssetSummary? = null,
@@ -214,11 +212,24 @@ data class FieldAttributeDefinition(
     val sortOrder: Int = 0,
 )
 
+data class FieldInventoryFamily(
+    val id: String,
+    val code: String,
+    val name: String,
+    val level: String,
+    val informationLabels: List<String> = emptyList(),
+    val sourceReference: String? = null,
+    val isOther: Boolean = false,
+)
+
 data class FieldType(
     val id: String,
     val code: String,
     val name: String,
     val description: String? = null,
+    val structuralKind: String? = null,
+    val families: List<FieldInventoryFamily> = emptyList(),
+    val familyRequired: Boolean = false,
     val attributes: List<FieldAttributeDefinition> = emptyList(),
 )
 
@@ -246,6 +257,7 @@ data class FieldAssetDetail(
 data class CreateFieldInventoryRequest(
     val typeId: String,
     val parentId: String? = null,
+    val familyId: String? = null,
     val code: String? = null,
     val name: String,
     val commonName: String? = null,
@@ -263,6 +275,19 @@ data class FieldPhotoResponse(
     val capture: CaptureStatus,
 )
 
+data class MergeFieldInventoryRequest(
+    val canonicalAssetId: String,
+    val reason: String,
+)
+
+data class FieldInventoryMergeResult(
+    val source: AssetSummary,
+    val canonical: AssetSummary,
+    val sourceVersionNumber: Int,
+    val reparentedChildIds: List<String> = emptyList(),
+    val historyPolicy: String,
+)
+
 interface DhApi {
     @POST("auth/mobile/login")
     suspend fun login(@Body request: LoginRequest): MobileSessionResponse
@@ -322,6 +347,14 @@ interface DhApi {
         @Body request: CreateFieldInventoryRequest,
     ): FieldAssetDetail
 
+    @POST("inspection-visits/{visitId}/field-inventory/{assetId}/merge")
+    suspend fun mergeFieldAsset(
+        @Header("Authorization") authorization: String,
+        @Path("visitId") visitId: String,
+        @Path("assetId") assetId: String,
+        @Body request: MergeFieldInventoryRequest,
+    ): FieldInventoryMergeResult
+
     @Multipart
     @POST("inspection-visits/{visitId}/field-inventory/{assetId}/photos")
     suspend fun uploadFieldPhoto(
@@ -465,6 +498,20 @@ class DhRepository(context: Context) {
         api.createFieldAsset("Bearer ${session.accessToken}", visitId, request)
     }
 
+    suspend fun mergeFieldAsset(
+        visitId: String,
+        assetId: String,
+        canonicalAssetId: String,
+        reason: String,
+    ): FieldInventoryMergeResult = authorized { session ->
+        api.mergeFieldAsset(
+            "Bearer ${session.accessToken}",
+            visitId,
+            assetId,
+            MergeFieldInventoryRequest(canonicalAssetId, reason.trim()),
+        )
+    }
+
     suspend fun uploadFieldPhoto(
         visitId: String,
         assetId: String,

android-app/app/src/main/java/com/korexlabs/dhinspeccion/data/FieldFindingsMobile.kt

@@ -0,0 +1,258 @@
+package com.korexlabs.dhinspeccion.data
+
+import android.content.Context
+import com.korexlabs.dhinspeccion.BuildConfig
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.MultipartBody
+import okhttp3.OkHttpClient
+import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.asRequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
+import retrofit2.HttpException
+import retrofit2.Retrofit
+import retrofit2.converter.moshi.MoshiConverterFactory
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.Header
+import retrofit2.http.Multipart
+import retrofit2.http.POST
+import retrofit2.http.Part
+import retrofit2.http.Path
+import retrofit2.http.Query
+import java.io.File
+import java.time.Instant
+
+data class FieldFindingAct(
+    val id: String,
+    val code: String,
+    val status: String,
+)
+
+data class FieldFindingCatalogItem(
+    val id: String,
+    val categoryId: String,
+    val code: String,
+    val sourceNumber: Int,
+    val title: String,
+    val legalBasis: String? = null,
+    val glossary: String? = null,
+    val suggestedSeverity: Int? = null,
+    val revision: Int = 1,
+    val categoryName: String? = null,
+)
+
+data class FieldFindingOther(
+    val enabled: Boolean = true,
+    val code: String = "OTHER",
+    val label: String = "OTROS",
+    val help: String? = null,
+)
+
+data class FieldFindingCatalog(
+    val typeConfigured: Boolean = false,
+    val configurationReason: String? = null,
+    val items: List<FieldFindingCatalogItem> = emptyList(),
+    val other: FieldFindingOther = FieldFindingOther(),
+)
+
+data class FieldFindingItem(
+    val id: String,
+    val actId: String,
+    val assetId: String,
+    val catalogItemId: String? = null,
+    val findingNumber: Int,
+    val code: String,
+    val status: String,
+    val title: String,
+    val description: String,
+    val severity: Int? = null,
+    val suggestedSeverity: Int? = null,
+    val correctionDueOn: String? = null,
+)
+
+data class FieldFindingEvidence(
+    val id: String,
+    val findingId: String,
+    val kind: String,
+    val purpose: String,
+    val originalName: String,
+    val mimeType: String,
+    val sizeBytes: Long,
+    val sha256: String,
+    val title: String? = null,
+    val description: String? = null,
+    val capturedAt: String? = null,
+    val latitude: Double? = null,
+    val longitude: Double? = null,
+    val accuracyM: Double? = null,
+    val deviceLabel: String? = null,
+    val source: String,
+    val createdAt: String,
+)
+
+data class FieldFindingEvidenceListResponse(
+    val data: List<FieldFindingEvidence> = emptyList(),
+)
+
+data class FieldFindingOptionsResponse(
+    val act: FieldFindingAct,
+    val capture: CaptureStatus = CaptureStatus(),
+    val assetIncludedInAct: Boolean = true,
+    val catalog: FieldFindingCatalog,
+    val findings: List<FieldFindingItem> = emptyList(),
+    val canAddAnother: Boolean = true,
+    val actSelectionMode: String = "EXPLICIT",
+)
+
+data class CreateFieldFindingRequest(
+    val actId: String,
+    val catalogItemId: String? = null,
+    val customTitle: String? = null,
+    val customLegalBasis: String? = null,
+    val description: String,
+    val severity: Int? = null,
+    val correctionDueOn: String? = null,
+)
+
+data class FieldFindingCreateResponse(
+    val act: FieldFindingAct,
+    val capture: CaptureStatus = CaptureStatus(),
+    val finding: FieldFindingItem,
+    val canAddAnother: Boolean = true,
+    val actSelectionMode: String = "EXPLICIT",
+)
+
+private interface FieldFindingsApi {
+    @GET("inspection-visits/{visitId}/field-findings/{assetId}/options")
+    suspend fun options(
+        @Header("Authorization") authorization: String,
+        @Path("visitId") visitId: String,
+        @Path("assetId") assetId: String,
+        @Query("actId") actId: String,
+    ): FieldFindingOptionsResponse
+
+    @POST("inspection-visits/{visitId}/field-findings/{assetId}")
+    suspend fun create(
+        @Header("Authorization") authorization: String,
+        @Path("visitId") visitId: String,
+        @Path("assetId") assetId: String,
+        @Body request: CreateFieldFindingRequest,
+    ): FieldFindingCreateResponse
+
+    @GET("inspection-findings/{findingId}/evidence")
+    suspend fun evidence(
+        @Header("Authorization") authorization: String,
+        @Path("findingId") findingId: String,
+    ): FieldFindingEvidenceListResponse
+
+    @Multipart
+    @POST("inspection-findings/{findingId}/evidence")
+    suspend fun uploadEvidence(
+        @Header("Authorization") authorization: String,
+        @Path("findingId") findingId: String,
+        @Part file: MultipartBody.Part,
+        @Part("kind") kind: RequestBody,
+        @Part("purpose") purpose: RequestBody,
+        @Part("title") title: RequestBody?,
+        @Part("description") description: RequestBody?,
+        @Part("capturedAt") capturedAt: RequestBody,
+        @Part("latitude") latitude: RequestBody,
+        @Part("longitude") longitude: RequestBody,
+        @Part("accuracyM") accuracyM: RequestBody?,
+        @Part("deviceLabel") deviceLabel: RequestBody,
+    ): FieldFindingEvidence
+
+    @POST("auth/mobile/refresh")
+    suspend fun refresh(@Body request: RefreshRequest): MobileSessionResponse
+}
+
+/**
+ * Cliente de campo para Hallazgos y sus evidencias append-only.
+ * F3.2 exige que la APK identifique explícitamente el Acta activa.
+ */
+class FieldFindingsRepository(context: Context) {
+    private val store = SecureSessionStore(context.applicationContext)
+    private val refreshMutex = Mutex()
+    private val moshi = Moshi.Builder().addLast(KotlinJsonAdapterFactory()).build()
+    private val api: FieldFindingsApi = Retrofit.Builder()
+        .baseUrl(BuildConfig.API_BASE_URL)
+        .client(OkHttpClient.Builder().build())
+        .addConverterFactory(MoshiConverterFactory.create(moshi))
+        .build()
+        .create(FieldFindingsApi::class.java)
+
+    suspend fun options(visitId: String, assetId: String, actId: String): FieldFindingOptionsResponse =
+        authorized { session ->
+            api.options("Bearer ${session.accessToken}", visitId, assetId, actId)
+        }
+
+    suspend fun create(
+        visitId: String,
+        assetId: String,
+        request: CreateFieldFindingRequest,
+    ): FieldFindingCreateResponse = authorized { session ->
+        api.create("Bearer ${session.accessToken}", visitId, assetId, request)
+    }
+
+    suspend fun evidence(findingId: String): FieldFindingEvidenceListResponse = authorized { session ->
+        api.evidence("Bearer ${session.accessToken}", findingId)
+    }
+
+    suspend fun uploadObservationPhoto(
+        findingId: String,
+        file: File,
+        latitude: Double,
+        longitude: Double,
+        accuracyM: Double?,
+        title: String? = null,
+        description: String? = null,
+        capturedAt: String = Instant.now().toString(),
+    ): FieldFindingEvidence = authorized { session ->
+        val text = "text/plain".toMediaType()
+        val part = MultipartBody.Part.createFormData(
+            "file",
+            file.name,
+            file.asRequestBody("image/jpeg".toMediaType()),
+        )
+        api.uploadEvidence(
+            authorization = "Bearer ${session.accessToken}",
+            findingId = findingId,
+            file = part,
+            kind = "PHOTO".toRequestBody(text),
+            purpose = "OBSERVATION".toRequestBody(text),
+            title = title?.trim()?.takeIf { it.isNotBlank() }?.toRequestBody(text),
+            description = description?.trim()?.takeIf { it.isNotBlank() }?.toRequestBody(text),
+            capturedAt = capturedAt.toRequestBody(text),
+            latitude = latitude.toString().toRequestBody(text),
+            longitude = longitude.toString().toRequestBody(text),
+            accuracyM = accuracyM?.toString()?.toRequestBody(text),
+            deviceLabel = "DH Android".toRequestBody(text),
+        )
+    }
+
+    private suspend fun <T> authorized(block: suspend (StoredSession) -> T): T {
+        var session = store.load() ?: throw IllegalStateException("Sesión no iniciada")
+        try {
+            return block(session)
+        } catch (error: HttpException) {
+            if (error.code() != 401) throw error
+        }
+        session = refresh(session.refreshToken)
+        return block(session)
+    }
+
+    private suspend fun refresh(previousRefreshToken: String): StoredSession = refreshMutex.withLock {
+        val latest = store.load() ?: throw IllegalStateException("Sesión no iniciada")
+        if (latest.refreshToken != previousRefreshToken) return@withLock latest
+        try {
+            store.save(api.refresh(RefreshRequest(previousRefreshToken)))
+        } catch (error: Throwable) {
+            store.clear()
+            throw error
+        }
+    }
+}

android-app/app/src/main/java/com/korexlabs/dhinspeccion/data/MobileActs.kt

@@ -0,0 +1,471 @@
+package com.korexlabs.dhinspeccion.data
+
+import android.content.Context
+import com.korexlabs.dhinspeccion.BuildConfig
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.MultipartBody
+import okhttp3.OkHttpClient
+import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.asRequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
+import retrofit2.HttpException
+import retrofit2.Retrofit
+import retrofit2.converter.moshi.MoshiConverterFactory
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.Header
+import retrofit2.http.Multipart
+import retrofit2.http.PATCH
+import retrofit2.http.POST
+import retrofit2.http.PUT
+import retrofit2.http.Part
+import retrofit2.http.Path
+import retrofit2.http.Query
+import java.io.File
+import java.time.Instant
+
+data class MobileActSummary(
+    val id: String,
+    val visitId: String,
+    val code: String,
+    val status: String,
+    val occurredAt: String,
+    val title: String,
+    val summary: String,
+    val observations: String? = null,
+    val urgency: String = "NON_URGENT",
+    val deadlineDays: Int? = null,
+    val deadlineDayType: String? = null,
+    val deadlineBasis: String? = null,
+    val deadlineBaseAt: String? = null,
+    val deadlineAt: String? = null,
+    val lockedAt: String? = null,
+    val lockedSha256: String? = null,
+    val sealedAt: String? = null,
+    val currentVersion: Int = 0,
+    val closedAt: String? = null,
+    val closureSha256: String? = null,
+    val assetCount: Int = 0,
+    val findingCount: Int = 0,
+)
+
+data class MobileActDetail(
+    val id: String,
+    val visitId: String,
+    val code: String,
+    val status: String,
+    val occurredAt: String,
+    val title: String,
+    val summary: String,
+    val observations: String? = null,
+    val urgency: String = "NON_URGENT",
+    val deadlineDays: Int? = null,
+    val deadlineDayType: String? = null,
+    val deadlineBasis: String? = null,
+    val deadlineBaseAt: String? = null,
+    val deadlineAt: String? = null,
+    val lockedAt: String? = null,
+    val lockedSha256: String? = null,
+    val sealedAt: String? = null,
+    val currentVersion: Int = 0,
+    val closedAt: String? = null,
+    val closureSha256: String? = null,
+    val assetCount: Int = 0,
+    val findingCount: Int = 0,
+    val assets: List<AssetSummary> = emptyList(),
+)
+
+data class MobileActListMeta(
+    val page: Int = 1,
+    val pageSize: Int = 100,
+    val total: Int = 0,
+    val totalPages: Int = 0,
+)
+
+data class MobileActListResponse(
+    val data: List<MobileActSummary> = emptyList(),
+    val meta: MobileActListMeta = MobileActListMeta(),
+)
+
+data class CreateMobileActRequest(
+    val occurredAt: String,
+    val urgency: String,
+    val title: String,
+    val summary: String,
+    val observations: String? = null,
+    val assetIds: List<String>,
+)
+
+data class UpdateMobileActRequest(
+    val assetIds: List<String>,
+)
+
+data class MobileResponsibleRequest(
+    val attendanceStatus: String,
+    val fullName: String? = null,
+    val documentType: String? = null,
+    val documentNumber: String? = null,
+    val position: String? = null,
+    val email: String? = null,
+    val phone: String? = null,
+    val absenceReason: String? = null,
+)
+
+data class MobileResponsible(
+    val actId: String,
+    val attendanceStatus: String,
+    val fullName: String? = null,
+    val documentType: String? = null,
+    val documentNumber: String? = null,
+    val position: String? = null,
+    val email: String? = null,
+    val phone: String? = null,
+    val absenceReason: String? = null,
+)
+
+data class MobileActClosureHeader(
+    val id: String,
+    val code: String,
+    val status: String,
+    val visitId: String,
+    val urgency: String = "NON_URGENT",
+    val deadlineDays: Int? = null,
+    val deadlineDayType: String? = null,
+    val deadlineBasis: String? = null,
+    val deadlineBaseAt: String? = null,
+    val deadlineAt: String? = null,
+    val lockedAt: String? = null,
+    val lockedSha256: String? = null,
+    val sealedAt: String? = null,
+    val currentVersion: Int = 0,
+    val closedAt: String? = null,
+    val closureSha256: String? = null,
+)
+
+data class MobileVisitClosureHeader(
+    val id: String,
+    val code: String,
+    val status: String,
+    val actualClosedAt: String? = null,
+)
+
+data class MobileSignature(
+    val id: String,
+    val signerType: String,
+    val signerUserId: String? = null,
+    val signerName: String,
+    val status: String,
+    val reason: String? = null,
+    val companyManifestation: String? = null,
+    val companyStatement: String? = null,
+    val signedAt: String? = null,
+    val imageSha256: String? = null,
+)
+
+data class MobileClosureRecord(
+    val schemaVersion: String,
+    val preparedSha256: String,
+    val preparedAt: String,
+    val finalSha256: String? = null,
+    val deviceClosedAt: String? = null,
+    val serverClosedAt: String? = null,
+    val uploadMode: String? = null,
+    val isCurrent: Boolean = true,
+)
+
+data class MobileClosureConsents(
+    val version: String = "",
+    val inspector: String = "",
+    val company: String = "",
+)
+
+data class MobileActClosure(
+    val act: MobileActClosureHeader,
+    val visit: MobileVisitClosureHeader,
+    val responsible: MobileResponsible? = null,
+    val closure: MobileClosureRecord? = null,
+    val signatures: List<MobileSignature> = emptyList(),
+    val consents: MobileClosureConsents = MobileClosureConsents(),
+)
+
+data class MobileCompanyOutcomeRequest(
+    val status: String,
+    val reason: String,
+)
+
+data class MobileSealActRequest(
+    val clientClosedAt: String = Instant.now().toString(),
+    val uploadMode: String = "ONLINE",
+)
+
+data class MobileCloseVisitRequest(
+    val clientClosedAt: String = Instant.now().toString(),
+)
+
+private interface MobileActsApi {
+    @GET("inspection-visits/{visitId}/acts")
+    suspend fun listActs(
+        @Header("Authorization") authorization: String,
+        @Path("visitId") visitId: String,
+        @Query("pageSize") pageSize: Int = 100,
+    ): MobileActListResponse
+
+    @GET("inspection-acts/{actId}")
+    suspend fun act(
+        @Header("Authorization") authorization: String,
+        @Path("actId") actId: String,
+    ): MobileActDetail
+
+    @POST("inspection-visits/{visitId}/acts")
+    suspend fun createAct(
+        @Header("Authorization") authorization: String,
+        @Path("visitId") visitId: String,
+        @Body request: CreateMobileActRequest,
+    ): MobileActDetail
+
+    @PATCH("inspection-acts/{actId}")
+    suspend fun updateAct(
+        @Header("Authorization") authorization: String,
+        @Path("actId") actId: String,
+        @Body request: UpdateMobileActRequest,
+    ): MobileActDetail
+
+    @GET("inspection-acts/{actId}/closure")
+    suspend fun closure(
+        @Header("Authorization") authorization: String,
+        @Path("actId") actId: String,
+    ): MobileActClosure
+
+    @PUT("inspection-acts/{actId}/responsible")
+    suspend fun responsible(
+        @Header("Authorization") authorization: String,
+        @Path("actId") actId: String,
+        @Body request: MobileResponsibleRequest,
+    ): MobileActClosure
+
+    @POST("inspection-acts/{actId}/lock")
+    suspend fun lock(
+        @Header("Authorization") authorization: String,
+        @Path("actId") actId: String,
+    ): MobileActClosure
+
+    @Multipart
+    @POST("inspection-acts/{actId}/signatures/inspector")
+    suspend fun signInspector(
+        @Header("Authorization") authorization: String,
+        @Path("actId") actId: String,
+        @Part file: MultipartBody.Part,
+        @Part("consentAccepted") consentAccepted: RequestBody,
+        @Part("clientSignedAt") clientSignedAt: RequestBody,
+        @Part("latitude") latitude: RequestBody?,
+        @Part("longitude") longitude: RequestBody?,
+        @Part("accuracyM") accuracyM: RequestBody?,
+        @Part("deviceLabel") deviceLabel: RequestBody,
+    ): MobileActClosure
+
+    @Multipart
+    @POST("inspection-acts/{actId}/signatures/company")
+    suspend fun signCompany(
+        @Header("Authorization") authorization: String,
+        @Path("actId") actId: String,
+        @Part file: MultipartBody.Part,
+        @Part("consentAccepted") consentAccepted: RequestBody,
+        @Part("clientSignedAt") clientSignedAt: RequestBody,
+        @Part("latitude") latitude: RequestBody?,
+        @Part("longitude") longitude: RequestBody?,
+        @Part("accuracyM") accuracyM: RequestBody?,
+        @Part("deviceLabel") deviceLabel: RequestBody,
+        @Part("manifestation") manifestation: RequestBody?,
+        @Part("statement") statement: RequestBody?,
+    ): MobileActClosure
+
+    @POST("inspection-acts/{actId}/company-outcome")
+    suspend fun companyOutcome(
+        @Header("Authorization") authorization: String,
+        @Path("actId") actId: String,
+        @Body request: MobileCompanyOutcomeRequest,
+    ): MobileActClosure
+
+    @POST("inspection-acts/{actId}/seal")
+    suspend fun sealAct(
+        @Header("Authorization") authorization: String,
+        @Path("actId") actId: String,
+        @Body request: MobileSealActRequest,
+    ): MobileActClosure
+
+    @POST("inspection-visits/{visitId}/close")
+    suspend fun closeVisit(
+        @Header("Authorization") authorization: String,
+        @Path("visitId") visitId: String,
+        @Body request: MobileCloseVisitRequest,
+    ): VisitDetail
+
+    @POST("auth/mobile/refresh")
+    suspend fun refresh(@Body request: RefreshRequest): MobileSessionResponse
+}
+
+class MobileActsRepository(context: Context) {
+    private val store = SecureSessionStore(context.applicationContext)
+    private val refreshMutex = Mutex()
+    private val moshi = Moshi.Builder().addLast(KotlinJsonAdapterFactory()).build()
+    private val api: MobileActsApi = Retrofit.Builder()
+        .baseUrl(BuildConfig.API_BASE_URL)
+        .client(OkHttpClient.Builder().build())
+        .addConverterFactory(MoshiConverterFactory.create(moshi))
+        .build()
+        .create(MobileActsApi::class.java)
+
+    suspend fun list(visitId: String): MobileActListResponse = authorized { session ->
+        api.listActs("Bearer ${session.accessToken}", visitId)
+    }
+
+    suspend fun get(actId: String): MobileActDetail = authorized { session ->
+        api.act("Bearer ${session.accessToken}", actId)
+    }
+
+    suspend fun create(
+        visitId: String,
+        assetId: String,
+        visitCode: String,
+        urgency: String = "NON_URGENT",
+    ): MobileActDetail = authorized { session ->
+        api.createAct(
+            "Bearer ${session.accessToken}",
+            visitId,
+            CreateMobileActRequest(
+                occurredAt = Instant.now().toString(),
+                urgency = urgency,
+                title = "Acta de inspección $visitCode",
+                summary = "Acta de inspección en curso. Los Hallazgos y observaciones se incorporan de forma trazable durante la inspección.",
+                assetIds = listOf(assetId),
+            ),
+        )
+    }
+
+    suspend fun ensureAsset(actId: String, assetId: String): MobileActDetail {
+        val detail = get(actId)
+        if (detail.assets.any { it.id == assetId }) return detail
+        val ids = (detail.assets.map { it.id } + assetId).distinct()
+        return authorized { session ->
+            api.updateAct("Bearer ${session.accessToken}", actId, UpdateMobileActRequest(ids))
+        }
+    }
+
+    suspend fun closure(actId: String): MobileActClosure = authorized { session ->
+        api.closure("Bearer ${session.accessToken}", actId)
+    }
+
+    suspend fun setResponsible(actId: String, request: MobileResponsibleRequest): MobileActClosure = authorized { session ->
+        api.responsible("Bearer ${session.accessToken}", actId, request)
+    }
+
+    suspend fun lock(actId: String): MobileActClosure = authorized { session ->
+        api.lock("Bearer ${session.accessToken}", actId)
+    }
+
+    suspend fun signInspector(
+        actId: String,
+        png: File,
+        latitude: Double?,
+        longitude: Double?,
+        accuracyM: Double?,
+    ): MobileActClosure = signature(actId, png, latitude, longitude, accuracyM, company = false)
+
+    suspend fun signCompany(
+        actId: String,
+        png: File,
+        latitude: Double?,
+        longitude: Double?,
+        accuracyM: Double?,
+        manifestation: String = "CONFORMITY",
+        statement: String? = null,
+    ): MobileActClosure = signature(
+        actId = actId,
+        png = png,
+        latitude = latitude,
+        longitude = longitude,
+        accuracyM = accuracyM,
+        company = true,
+        manifestation = manifestation,
+        statement = statement,
+    )
+
+    suspend fun companyOutcome(actId: String, status: String, reason: String): MobileActClosure = authorized { session ->
+        api.companyOutcome(
+            "Bearer ${session.accessToken}",
+            actId,
+            MobileCompanyOutcomeRequest(status, reason.trim()),
+        )
+    }
+
+    suspend fun seal(actId: String): MobileActClosure = authorized { session ->
+        api.sealAct("Bearer ${session.accessToken}", actId, MobileSealActRequest())
+    }
+
+    suspend fun closeVisit(visitId: String): VisitDetail = authorized { session ->
+        api.closeVisit("Bearer ${session.accessToken}", visitId, MobileCloseVisitRequest())
+    }
+
+    private suspend fun signature(
+        actId: String,
+        png: File,
+        latitude: Double?,
+        longitude: Double?,
+        accuracyM: Double?,
+        company: Boolean,
+        manifestation: String? = null,
+        statement: String? = null,
+    ): MobileActClosure = authorized { session ->
+        val text = "text/plain".toMediaType()
+        val file = MultipartBody.Part.createFormData(
+            "file",
+            png.name,
+            png.asRequestBody("image/png".toMediaType()),
+        )
+        val consent = "true".toRequestBody(text)
+        val signedAt = Instant.now().toString().toRequestBody(text)
+        val device = "DH Android".toRequestBody(text)
+        val lat = latitude?.toString()?.toRequestBody(text)
+        val lon = longitude?.toString()?.toRequestBody(text)
+        val accuracy = accuracyM?.toString()?.toRequestBody(text)
+        if (company) {
+            api.signCompany(
+                "Bearer ${session.accessToken}", actId, file, consent, signedAt,
+                lat, lon, accuracy, device,
+                manifestation?.toRequestBody(text),
+                statement?.trim()?.takeIf { it.isNotBlank() }?.toRequestBody(text),
+            )
+        } else {
+            api.signInspector(
+                "Bearer ${session.accessToken}", actId, file, consent, signedAt,
+                lat, lon, accuracy, device,
+            )
+        }
+    }
+
+    private suspend fun <T> authorized(block: suspend (StoredSession) -> T): T {
+        var session = store.load() ?: throw IllegalStateException("Sesión no iniciada")
+        try {
+            return block(session)
+        } catch (error: HttpException) {
+            if (error.code() != 401) throw error
+        }
+        session = refresh(session.refreshToken)
+        return block(session)
+    }
+
+    private suspend fun refresh(previousRefreshToken: String): StoredSession = refreshMutex.withLock {
+        val latest = store.load() ?: throw IllegalStateException("Sesión no iniciada")
+        if (latest.refreshToken != previousRefreshToken) return@withLock latest
+        try {
+            store.save(api.refresh(RefreshRequest(previousRefreshToken)))
+        } catch (error: Throwable) {
+            store.clear()
+            throw error
+        }
+    }
+}

android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/F3VisitRoot.kt

@@ -0,0 +1,762 @@
+package com.korexlabs.dhinspeccion.ui
+
+import android.Manifest
+import android.content.Context
+import android.content.pm.PackageManager
+import android.net.Uri
+import android.os.Environment
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.AssistChip
+import androidx.compose.material3.Button
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateMapOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.unit.dp
+import androidx.core.content.ContextCompat
+import androidx.core.content.FileProvider
+import androidx.exifinterface.media.ExifInterface
+import com.google.android.gms.location.LocationServices
+import com.google.android.gms.location.Priority
+import com.google.android.gms.tasks.CancellationTokenSource
+import com.korexlabs.dhinspeccion.MainViewModel
+import com.korexlabs.dhinspeccion.data.FieldAttributeDefinition
+import com.korexlabs.dhinspeccion.data.FieldInventoryItem
+import com.korexlabs.dhinspeccion.data.FieldType
+import com.korexlabs.dhinspeccion.data.VisitDetail
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.suspendCancellableCoroutine
+import java.io.File
+import java.time.Instant
+import java.time.ZoneId
+import java.time.format.DateTimeFormatter
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
+
+private data class F3GeoSnapshot(
+    val latitude: Double,
+    val longitude: Double,
+    val accuracyM: Double?,
+)
+
+@Composable
+fun F3VisitRoot(model: MainViewModel) {
+    var inventoryMode by rememberSaveable(model.visit?.id) { mutableStateOf(false) }
+    var actsMode by rememberSaveable(model.visit?.id) { mutableStateOf(false) }
+    when {
+        actsMode -> MobileActsScreen(
+            model = model,
+            onBack = { actsMode = false },
+            onGoInventory = {
+                actsMode = false
+                inventoryMode = true
+            },
+        )
+        inventoryMode -> F3FieldInventoryScreen(model, onBack = { inventoryMode = false })
+        else -> F3VisitOverview(
+            model = model,
+            onInventory = { inventoryMode = true },
+            onActs = { actsMode = true },
+        )
+    }
+}
+
+@Composable
+private fun F3VisitOverview(
+    model: MainViewModel,
+    onInventory: () -> Unit,
+    onActs: () -> Unit,
+) {
+    val visit = model.visit ?: return
+    Column(
+        Modifier
+            .fillMaxSize()
+            .verticalScroll(rememberScrollState())
+            .padding(top = 28.dp, start = 16.dp, end = 16.dp, bottom = 30.dp),
+        verticalArrangement = Arrangement.spacedBy(12.dp),
+    ) {
+        Row(
+            Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            OutlinedButton(onClick = { model.closeVisitView() }) { Text("Volver") }
+            Text(statusLabel(visit.status), fontWeight = FontWeight.Bold)
+        }
+        Text(visit.code, style = MaterialTheme.typography.headlineMedium, fontWeight = FontWeight.Bold)
+        Text("${visit.operatorCompany?.name ?: "Sin operadora"} · ${visit.operationalArea?.name ?: "Sin área"}")
+        visit.plannedStartAt?.let {
+            Text("Planificada: ${f3ShortDate(it)}", style = MaterialTheme.typography.bodySmall)
+        }
+        visit.instructions?.takeIf { it.isNotBlank() }?.let {
+            Card(Modifier.fillMaxWidth()) {
+                Column(Modifier.padding(12.dp)) {
+                    Text("Instrucciones", fontWeight = FontWeight.Bold)
+                    Text(it)
+                }
+            }
+        }
+        F3MessageStrip(model)
+
+        if (visit.status == "PLANNED") {
+            Card(
+                Modifier.fillMaxWidth(),
+                colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer),
+            ) {
+                Column(Modifier.padding(14.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
+                    Text("La inspección todavía no comenzó", fontWeight = FontWeight.Bold)
+                    Text("Iniciarla registra fecha/hora real y tu usuario como actor de campo.")
+                    Button(
+                        onClick = { model.startVisit() },
+                        enabled = !model.busy,
+                        modifier = Modifier.fillMaxWidth(),
+                    ) { Text(if (model.busy) "Iniciando…" else "Iniciar inspección") }
+                }
+            }
+        }
+
+        if (visit.status == "IN_PROGRESS") {
+            Button(onClick = onInventory, modifier = Modifier.fillMaxWidth()) {
+                Text("Abrir Inventario de campo")
+            }
+            OutlinedButton(onClick = onActs, modifier = Modifier.fillMaxWidth()) {
+                val open = model.acts.count { it.status == "DRAFT" || it.status == "READY" }
+                Text("Actas de la inspección · ${model.acts.size}${if (open > 0) " · $open abiertas" else ""}")
+            }
+        } else if (visit.status == "CLOSED") {
+            OutlinedButton(onClick = onActs, modifier = Modifier.fillMaxWidth()) {
+                Text("Ver Actas · ${model.acts.size}")
+            }
+        } else if (visit.status == "PLANNED") {
+            Text(
+                "Primero iniciá la inspección para habilitar altas, fotografías, Actas y Hallazgos.",
+                style = MaterialTheme.typography.bodySmall,
+            )
+        }
+
+        F3ChecklistCard(visit)
+
+        Text("Inventario planificado", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
+        if (visit.planningAssets.none { it.included }) {
+            Text("Sin elementos planificados.")
+        }
+        visit.planningAssets.filter { it.included }.forEach { asset ->
+            Card(Modifier.fillMaxWidth()) {
+                Column(Modifier.padding(10.dp)) {
+                    Text(asset.name, fontWeight = FontWeight.SemiBold)
+                    Text("${asset.code} · ${asset.typeName.orEmpty()}", style = MaterialTheme.typography.bodySmall)
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun F3ChecklistCard(visit: VisitDetail) {
+    val checklist = visit.checklist
+    Card(Modifier.fillMaxWidth()) {
+        Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) {
+            Text("Antecedentes antes de salir", fontWeight = FontWeight.Bold)
+            Text("Vencidos empresa: ${checklist.companyOverdue} · Verificaciones vencidas: ${checklist.verificationOverdue}")
+            Text("Antecedentes: ${checklist.antecedents} · Próximos controles: ${checklist.upcomingControls}")
+            if (checklist.stale) {
+                Text("El checklist requiere revisión/actualización.", color = MaterialTheme.colorScheme.error)
+            }
+        }
+    }
+}
+
+@Composable
+private fun F3FieldInventoryScreen(model: MainViewModel, onBack: () -> Unit) {
+    val context = LocalContext.current
+    val scope = rememberCoroutineScope()
+    val visit = model.visit ?: return
+
+    var search by rememberSaveable(visit.id) { mutableStateOf("") }
+    var showCreate by rememberSaveable(visit.id) { mutableStateOf(false) }
+    var parentId by rememberSaveable(visit.id) { mutableStateOf<String?>(null) }
+    var parentLabel by rememberSaveable(visit.id) { mutableStateOf("Área de la inspección") }
+    var name by rememberSaveable(visit.id) { mutableStateOf("") }
+    var commonName by rememberSaveable(visit.id) { mutableStateOf("") }
+    var selectedTypeId by rememberSaveable(visit.id) { mutableStateOf<String?>(null) }
+    var selectedFamilyId by rememberSaveable(visit.id) { mutableStateOf<String?>(null) }
+    val attributeValues = remember { mutableStateMapOf<String, String>() }
+
+    var mergeSearch by rememberSaveable(visit.id) { mutableStateOf("") }
+    var mergeCandidateId by rememberSaveable(visit.id) { mutableStateOf<String?>(null) }
+    var mergeReason by rememberSaveable(visit.id) { mutableStateOf("") }
+
+    LaunchedEffect(visit.id) {
+        model.searchInventory("")
+        model.loadFieldTypes(null)
+    }
+    LaunchedEffect(model.fieldTypes) {
+        if (model.fieldTypes.none { it.id == selectedTypeId }) {
+            selectedTypeId = model.fieldTypes.firstOrNull()?.id
+            selectedFamilyId = null
+            attributeValues.clear()
+        }
+    }
+
+    val selectedType = model.fieldTypes.firstOrNull { it.id == selectedTypeId }
+    val selectedFamily = selectedType?.families?.firstOrNull { it.id == selectedFamilyId }
+
+    fun resetCreateForm() {
+        name = ""
+        commonName = ""
+        selectedFamilyId = null
+        attributeValues.clear()
+    }
+
+    val createWithLocation: () -> Unit = {
+        val type = selectedType
+        if (type != null) {
+            scope.launch {
+                runCatching { currentF3Geo(context) }
+                    .onSuccess { geo ->
+                        model.createFieldAsset(
+                            type = type,
+                            parentId = parentId,
+                            familyId = selectedFamilyId,
+                            name = name,
+                            commonName = commonName,
+                            attributes = buildF3Attributes(type, attributeValues),
+                            latitude = geo.latitude,
+                            longitude = geo.longitude,
+                            accuracyM = geo.accuracyM,
+                        )
+                    }
+            }
+        }
+    }
+    val locationPermissionLauncher = rememberLauncherForActivityResult(
+        ActivityResultContracts.RequestMultiplePermissions(),
+    ) { result ->
+        val allowed = result[Manifest.permission.ACCESS_FINE_LOCATION] == true ||
+            result[Manifest.permission.ACCESS_COARSE_LOCATION] == true
+        if (allowed) createWithLocation()
+    }
+
+    var pendingPhotoFile by remember { mutableStateOf<File?>(null) }
+    var pendingPhotoGeo by remember { mutableStateOf<F3GeoSnapshot?>(null) }
+    val takePicture = rememberLauncherForActivityResult(ActivityResultContracts.TakePicture()) { success ->
+        val file = pendingPhotoFile
+        val geo = pendingPhotoGeo
+        if (success && file != null && geo != null) {
+            runCatching { writeF3Exif(file, geo) }
+            model.uploadFieldPhoto(file, geo.latitude, geo.longitude, geo.accuracyM)
+        }
+        pendingPhotoFile = null
+        pendingPhotoGeo = null
+    }
+    val beginPhoto: () -> Unit = {
+        scope.launch {
+            runCatching { currentF3Geo(context) }.onSuccess { geo ->
+                val (file, uri) = newF3Photo(context)
+                pendingPhotoFile = file
+                pendingPhotoGeo = geo
+                takePicture.launch(uri)
+            }
+        }
+    }
+    val photoPermissionLauncher = rememberLauncherForActivityResult(
+        ActivityResultContracts.RequestMultiplePermissions(),
+    ) { result ->
+        val camera = result[Manifest.permission.CAMERA] == true || f3HasPermission(context, Manifest.permission.CAMERA)
+        val location = result[Manifest.permission.ACCESS_FINE_LOCATION] == true ||
+            result[Manifest.permission.ACCESS_COARSE_LOCATION] == true || f3HasLocation(context)
+        if (camera && location) beginPhoto()
+    }
+
+    val selectedCapture = model.selectedFieldAsset
+    val mergeSource = selectedCapture?.takeIf {
+        it.capture.captureRequired &&
+            it.asset.type?.let { type -> f3TypeCode(type) in setOf("instalacion", "subinstalacion") } == true
+    }
+    val mergeCandidates = remember(model.inventory, mergeSource) {
+        if (mergeSource == null) emptyList() else model.inventory.filter { candidate ->
+            candidate.id != mergeSource.asset.id &&
+                candidate.informationStatus != "INACTIVE" &&
+                candidate.type?.id == mergeSource.asset.type?.id &&
+                candidate.parent?.id == mergeSource.asset.parent?.id &&
+                !candidate.captureRequired
+        }
+    }
+
+    Column(Modifier.fillMaxSize().padding(top = 28.dp)) {
+        Row(
+            Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp),
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            OutlinedButton(onClick = onBack) { Text("Volver") }
+            Column(horizontalAlignment = Alignment.End) {
+                Text("Inventario de campo", style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.Bold)
+                Text("Área → Yacimiento → Instalación → Subinstalación", style = MaterialTheme.typography.bodySmall)
+            }
+        }
+        Column(Modifier.padding(horizontal = 16.dp)) { F3MessageStrip(model) }
+
+        if (selectedCapture != null) {
+            F3CaptureCard(
+                detailName = selectedCapture.asset.name,
+                captureRequired = selectedCapture.capture.captureRequired,
+                gps = selectedCapture.capture.creationGpsCaptured,
+                photos = selectedCapture.capture.fieldPhotoCount,
+                ready = selectedCapture.capture.readyForFinding,
+                onPhoto = {
+                    val permissions = arrayOf(
+                        Manifest.permission.CAMERA,
+                        Manifest.permission.ACCESS_FINE_LOCATION,
+                        Manifest.permission.ACCESS_COARSE_LOCATION,
+                    )
+                    if (f3HasPermission(context, Manifest.permission.CAMERA) && f3HasLocation(context)) beginPhoto()
+                    else photoPermissionLauncher.launch(permissions)
+                },
+                onClose = { model.clearSelectedFieldAsset() },
+            )
+        }
+
+        if (mergeSource != null) {
+            Card(
+                Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 6.dp),
+                colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.secondaryContainer),
+            ) {
+                Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
+                    Text("¿Lo acabás de crear y ya existía?", fontWeight = FontWeight.Bold)
+                    Text(
+                        "Podés fusionar esta alta de campo con el registro existente. La ficha nueva no se borra: queda como alias histórico con fecha, inspector e inspección.",
+                        style = MaterialTheme.typography.bodySmall,
+                    )
+                    Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
+                        OutlinedTextField(
+                            value = mergeSearch,
+                            onValueChange = { mergeSearch = it },
+                            label = { Text("Buscar posible duplicado") },
+                            modifier = Modifier.weight(1f),
+                            singleLine = true,
+                        )
+                        Spacer(Modifier.width(8.dp))
+                        OutlinedButton(onClick = {
+                            mergeCandidateId = null
+                            model.searchInventory(mergeSearch, mergeSource.asset.parent?.id)
+                        }) { Text("Buscar") }
+                    }
+                    if (mergeCandidates.isEmpty()) {
+                        Text("No hay coincidencias compatibles en esta búsqueda.", style = MaterialTheme.typography.bodySmall)
+                    } else {
+                        mergeCandidates.take(8).forEach { candidate ->
+                            AssistChip(
+                                onClick = { mergeCandidateId = candidate.id },
+                                label = {
+                                    Text(
+                                        if (mergeCandidateId == candidate.id) "✓ ${candidate.code} · ${candidate.name}"
+                                        else "${candidate.code} · ${candidate.name}",
+                                    )
+                                },
+                            )
+                        }
+                    }
+                    OutlinedTextField(
+                        value = mergeReason,
+                        onValueChange = { mergeReason = it },
+                        label = { Text("Motivo de la fusión") },
+                        minLines = 2,
+                        modifier = Modifier.fillMaxWidth(),
+                    )
+                    Button(
+                        onClick = {
+                            val target = mergeCandidateId ?: return@Button
+                            model.mergeCreatedFieldAsset(target, mergeReason)
+                        },
+                        enabled = mergeCandidateId != null && mergeReason.trim().length >= 8 && !model.busy,
+                        modifier = Modifier.fillMaxWidth(),
+                    ) { Text("Fusionar y conservar el registro existente") }
+                }
+            }
+        }
+
+        Row(
+            Modifier.fillMaxWidth().padding(horizontal = 16.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            OutlinedTextField(
+                value = search,
+                onValueChange = { search = it },
+                label = { Text("Buscar por nombre o código") },
+                modifier = Modifier.weight(1f),
+                singleLine = true,
+            )
+            Spacer(Modifier.width(8.dp))
+            Button(onClick = { model.searchInventory(search) }, enabled = !model.busy) { Text("Buscar") }
+        }
+
+        Row(
+            Modifier.fillMaxWidth().padding(16.dp),
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Column {
+                Text("Alta en campo", fontWeight = FontWeight.Bold)
+                Text("Padre: $parentLabel", style = MaterialTheme.typography.bodySmall)
+            }
+            OutlinedButton(onClick = {
+                showCreate = !showCreate
+                if (showCreate) model.loadFieldTypes(parentId)
+            }) { Text(if (showCreate) "Ocultar" else "Agregar") }
+        }
+
+        if (showCreate) {
+            Column(
+                Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 16.dp)
+                    .verticalScroll(rememberScrollState())
+                    .weight(1f, fill = false),
+                verticalArrangement = Arrangement.spacedBy(10.dp),
+            ) {
+                if (parentId != null) {
+                    OutlinedButton(onClick = {
+                        parentId = null
+                        parentLabel = "Área de la inspección"
+                        resetCreateForm()
+                        selectedTypeId = null
+                        model.loadFieldTypes(null)
+                    }) { Text("Volver al Área") }
+                }
+
+                if (model.fieldTypes.isEmpty()) {
+                    Text("Este nivel no admite más hijos estructurales.")
+                } else {
+                    Text("Vas a crear", style = MaterialTheme.typography.bodySmall)
+                    LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                        items(model.fieldTypes, key = { it.id }) { type ->
+                            AssistChip(
+                                onClick = {
+                                    selectedTypeId = type.id
+                                    selectedFamilyId = null
+                                    attributeValues.clear()
+                                },
+                                label = { Text(if (type.id == selectedTypeId) "✓ ${type.name}" else type.name) },
+                            )
+                        }
+                    }
+                }
+
+                if (selectedType?.familyRequired == true) {
+                    Text("Familia técnica", fontWeight = FontWeight.Bold)
+                    Text(
+                        "Elegí la que corresponda al Excel. Si no existe, usá Otro / no catalogado; nunca quedás bloqueado.",
+                        style = MaterialTheme.typography.bodySmall,
+                    )
+                    LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                        items(selectedType.families, key = { it.id }) { family ->
+                            AssistChip(
+                                onClick = { selectedFamilyId = family.id },
+                                label = {
+                                    val prefix = when {
+                                        selectedFamilyId == family.id -> "✓ "
+                                        family.isOther -> "+ "
+                                        else -> ""
+                                    }
+                                    Text(prefix + family.name)
+                                },
+                            )
+                        }
+                    }
+                    selectedFamily?.let { family ->
+                        if (family.isOther) {
+                            Text(
+                                "Se registrará como familia no catalogada para revisión posterior en oficina.",
+                                color = MaterialTheme.colorScheme.secondary,
+                                style = MaterialTheme.typography.bodySmall,
+                            )
+                        }
+                        if (family.informationLabels.isNotEmpty()) {
+                            Text(
+                                "Información esperada: ${family.informationLabels.joinToString(" · ")}",
+                                style = MaterialTheme.typography.bodySmall,
+                            )
+                        }
+                    }
+                }
+
+                OutlinedTextField(
+                    value = name,
+                    onValueChange = { name = it },
+                    label = { Text("Nombre identificable *") },
+                    modifier = Modifier.fillMaxWidth(),
+                )
+                OutlinedTextField(
+                    value = commonName,
+                    onValueChange = { commonName = it },
+                    label = { Text("Nombre habitual") },
+                    modifier = Modifier.fillMaxWidth(),
+                )
+
+                selectedType?.attributes?.forEach { definition ->
+                    OutlinedTextField(
+                        value = attributeValues[definition.code].orEmpty(),
+                        onValueChange = { attributeValues[definition.code] = it },
+                        label = { Text(definition.name + if (definition.isRequired) " *" else "") },
+                        supportingText = {
+                            val details = listOfNotNull(definition.unit, definition.options?.toString()).joinToString(" · ")
+                            if (details.isNotBlank()) Text(details)
+                        },
+                        keyboardOptions = KeyboardOptions(
+                            keyboardType = if (
+                                definition.dataType.uppercase() in setOf("NUMBER", "DECIMAL", "INTEGER", "FLOAT")
+                            ) KeyboardType.Decimal else KeyboardType.Text,
+                        ),
+                        modifier = Modifier.fillMaxWidth(),
+                    )
+                }
+
+                val attributesReady = selectedType?.attributes
+                    ?.filter { it.isRequired }
+                    ?.all { attributeValues[it.code].orEmpty().isNotBlank() }
+                    ?: false
+                val familyReady = selectedType?.familyRequired != true || selectedFamilyId != null
+                Button(
+                    onClick = {
+                        if (f3HasLocation(context)) createWithLocation()
+                        else locationPermissionLauncher.launch(
+                            arrayOf(
+                                Manifest.permission.ACCESS_FINE_LOCATION,
+                                Manifest.permission.ACCESS_COARSE_LOCATION,
+                            ),
+                        )
+                    },
+                    enabled = selectedType != null && name.isNotBlank() && attributesReady && familyReady && !model.busy,
+                    modifier = Modifier.fillMaxWidth(),
+                ) { Text("Capturar GPS y crear") }
+                HorizontalDivider()
+            }
+        }
+
+        Text("Estructura disponible", modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp), fontWeight = FontWeight.Bold)
+        LazyColumn(
+            Modifier.fillMaxSize().padding(horizontal = 16.dp),
+            verticalArrangement = Arrangement.spacedBy(8.dp),
+        ) {
+            items(model.inventory, key = { it.id }) { item ->
+                F3InventoryCard(
+                    item = item,
+                    onInspect = { model.selectExisting(item) },
+                    onUseParent = {
+                        parentId = item.id
+                        parentLabel = "${item.name} (${item.code})"
+                        showCreate = true
+                        selectedTypeId = null
+                        resetCreateForm()
+                        model.loadFieldTypes(item.id)
+                    },
+                )
+            }
+            item { Spacer(Modifier.height(30.dp)) }
+        }
+    }
+}
+
+@Composable
+private fun F3CaptureCard(
+    detailName: String,
+    captureRequired: Boolean,
+    gps: Boolean,
+    photos: Int,
+    ready: Boolean,
+    onPhoto: () -> Unit,
+    onClose: () -> Unit,
+) {
+    Card(Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 6.dp)) {
+        Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) {
+            Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
+                Text(detailName, fontWeight = FontWeight.Bold)
+                OutlinedButton(onClick = onClose) { Text("Cerrar") }
+            }
+            if (captureRequired) {
+                Text("GPS de alta: ${if (gps) "OK" else "pendiente"} · Fotos: $photos")
+                if (!ready) {
+                    Text("Antes de registrar Hallazgos, completá GPS + foto.", color = MaterialTheme.colorScheme.error)
+                    Button(onClick = onPhoto, modifier = Modifier.fillMaxWidth()) { Text("Tomar foto obligatoria") }
+                } else {
+                    Text("Captura completa · listo para Hallazgos", color = MaterialTheme.colorScheme.primary)
+                }
+            } else {
+                Text("Registro existente seleccionado.", style = MaterialTheme.typography.bodySmall)
+            }
+        }
+    }
+}
+
+@Composable
+private fun F3InventoryCard(
+    item: FieldInventoryItem,
+    onInspect: () -> Unit,
+    onUseParent: () -> Unit,
+) {
+    val typeCode = item.type?.let(::f3TypeCode).orEmpty()
+    val canHaveFinding = typeCode in setOf("instalacion", "subinstalacion")
+    val canHaveChild = typeCode in setOf("yacimiento", "instalacion")
+    val childLabel = if (typeCode == "yacimiento") "Agregar instalación aquí" else "Agregar subinstalación aquí"
+
+    Card(Modifier.fillMaxWidth()) {
+        Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(5.dp)) {
+            Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
+                Text(item.name, fontWeight = FontWeight.SemiBold)
+                Text(structureLabel(typeCode), style = MaterialTheme.typography.bodySmall)
+            }
+            Text(item.code, style = MaterialTheme.typography.bodySmall)
+            item.commonName?.takeIf { it.isNotBlank() }?.let {
+                Text(it, style = MaterialTheme.typography.bodySmall)
+            }
+            if (canHaveFinding) {
+                Text(
+                    if (item.readyForFinding) "Disponible para Hallazgos" else "GPS/foto pendiente",
+                    color = if (item.readyForFinding) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.error,
+                    style = MaterialTheme.typography.bodySmall,
+                )
+                OutlinedButton(onClick = onInspect, modifier = Modifier.fillMaxWidth()) {
+                    Text(if (item.selectedInInspection) "Abrir Hallazgos" else "Usar en esta inspección")
+                }
+            }
+            if (canHaveChild) {
+                OutlinedButton(onClick = onUseParent, modifier = Modifier.fillMaxWidth()) { Text(childLabel) }
+            }
+        }
+    }
+}
+
+@Composable
+private fun F3MessageStrip(model: MainViewModel) {
+    val error = model.error
+    val notice = model.notice
+    if (error != null || notice != null) {
+        Card(
+            modifier = Modifier.fillMaxWidth().padding(bottom = 10.dp),
+            colors = CardDefaults.cardColors(
+                containerColor = if (error != null) MaterialTheme.colorScheme.errorContainer
+                else MaterialTheme.colorScheme.secondaryContainer,
+            ),
+            onClick = { model.clearMessages() },
+        ) {
+            Text(error ?: notice.orEmpty(), Modifier.padding(12.dp))
+        }
+    }
+}
+
+private fun f3TypeCode(summary: com.korexlabs.dhinspeccion.data.AssetSummary): String =
+    (summary.typeName ?: summary.name).trim().lowercase()
+        .replace('ó', 'o').replace('í', 'i').replace('á', 'a').replace('é', 'e').replace('ú', 'u')
+
+private fun structureLabel(typeCode: String): String = when (typeCode) {
+    "area" -> "Área"
+    "yacimiento" -> "Yacimiento"
+    "instalacion" -> "Instalación"
+    "subinstalacion" -> "Subinstalación"
+    else -> typeCode.ifBlank { "Inventario" }
+}
+
+private fun statusLabel(status: String): String = when (status) {
+    "PLANNED" -> "Planificada"
+    "IN_PROGRESS" -> "En curso"
+    "CLOSED" -> "Cerrada"
+    "CANCELLED" -> "Cancelada"
+    else -> status
+}
+
+private fun buildF3Attributes(type: FieldType, values: Map<String, String>): Map<String, Any?> =
+    type.attributes.mapNotNull { definition ->
+        val raw = values[definition.code]?.trim().orEmpty()
+        if (raw.isBlank()) return@mapNotNull null
+        definition.code to coerceF3Attribute(definition, raw)
+    }.toMap()
+
+private fun coerceF3Attribute(definition: FieldAttributeDefinition, raw: String): Any = when (definition.dataType.uppercase()) {
+    "INTEGER", "INT" -> raw.toLongOrNull() ?: raw
+    "NUMBER", "DECIMAL", "FLOAT", "DOUBLE" -> raw.replace(',', '.').toDoubleOrNull() ?: raw
+    "BOOLEAN", "BOOL" -> raw.lowercase() in setOf("true", "1", "si", "sí", "yes")
+    else -> raw
+}
+
+private fun f3HasPermission(context: Context, permission: String): Boolean =
+    ContextCompat.checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED
+
+private fun f3HasLocation(context: Context): Boolean =
+    f3HasPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) ||
+        f3HasPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION)
+
+private suspend fun currentF3Geo(context: Context): F3GeoSnapshot = suspendCancellableCoroutine { continuation ->
+    if (!f3HasLocation(context)) {
+        continuation.resumeWithException(SecurityException("Se necesita permiso de ubicación."))
+        return@suspendCancellableCoroutine
+    }
+    val source = CancellationTokenSource()
+    val client = LocationServices.getFusedLocationProviderClient(context)
+    client.getCurrentLocation(Priority.PRIORITY_HIGH_ACCURACY, source.token)
+        .addOnSuccessListener { location ->
+            if (!continuation.isActive) return@addOnSuccessListener
+            if (location == null) {
+                continuation.resumeWithException(IllegalStateException("No se pudo obtener una ubicación GPS actual."))
+            } else {
+                continuation.resume(F3GeoSnapshot(location.latitude, location.longitude, location.accuracy.toDouble()))
+            }
+        }
+        .addOnFailureListener { if (continuation.isActive) continuation.resumeWithException(it) }
+    continuation.invokeOnCancellation { source.cancel() }
+}
+
+private fun newF3Photo(context: Context): Pair<File, Uri> {
+    val directory = context.getExternalFilesDir(Environment.DIRECTORY_PICTURES)
+        ?: throw IllegalStateException("No se pudo acceder al almacenamiento de fotografías.")
+    directory.mkdirs()
+    val file = File.createTempFile("DH_F3_${System.currentTimeMillis()}_", ".jpg", directory)
+    val uri = FileProvider.getUriForFile(context, "${context.packageName}.files", file)
+    return file to uri
+}
+
+private fun writeF3Exif(file: File, geo: F3GeoSnapshot) {
+    val now = Instant.now()
+    val exif = ExifInterface(file)
+    exif.setLatLong(geo.latitude, geo.longitude)
+    val formatter = DateTimeFormatter.ofPattern("yyyy:MM:dd HH:mm:ss").withZone(ZoneId.systemDefault())
+    exif.setAttribute(ExifInterface.TAG_DATETIME_ORIGINAL, formatter.format(now))
+    exif.setAttribute(ExifInterface.TAG_DATETIME_DIGITIZED, formatter.format(now))
+    exif.saveAttributes()
+}
+
+private fun f3ShortDate(value: String): String = value.replace('T', ' ').take(16)

android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/FieldFindingScreen.kt

@@ -0,0 +1,421 @@
+package com.korexlabs.dhinspeccion.ui
+
+import android.Manifest
+import android.content.Context
+import android.content.pm.PackageManager
+import android.net.Uri
+import android.os.Environment
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.Button
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.unit.dp
+import androidx.core.content.ContextCompat
+import androidx.core.content.FileProvider
+import androidx.exifinterface.media.ExifInterface
+import com.google.android.gms.location.LocationServices
+import com.google.android.gms.location.Priority
+import com.google.android.gms.tasks.CancellationTokenSource
+import com.korexlabs.dhinspeccion.MainViewModel
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.suspendCancellableCoroutine
+import java.io.File
+import java.time.Instant
+import java.time.ZoneId
+import java.time.format.DateTimeFormatter
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
+
+private data class FindingGeoSnapshot(
+    val latitude: Double,
+    val longitude: Double,
+    val accuracyM: Double?,
+)
+
+@Composable
+fun FieldFindingScreen(model: MainViewModel) {
+    val options = model.fieldFindingOptions ?: return
+    val asset = model.selectedFieldAsset?.asset ?: return
+    val context = LocalContext.current
+    val scope = rememberCoroutineScope()
+    var search by rememberSaveable(asset.id) { mutableStateOf("") }
+    var selectedCatalogId by rememberSaveable(asset.id) { mutableStateOf<String?>(null) }
+    var other by rememberSaveable(asset.id) { mutableStateOf(false) }
+    var customTitle by rememberSaveable(asset.id) { mutableStateOf("") }
+    var customLegalBasis by rememberSaveable(asset.id) { mutableStateOf("") }
+    var description by rememberSaveable(asset.id) { mutableStateOf("") }
+    var severityText by rememberSaveable(asset.id) { mutableStateOf("") }
+    var correctionDueOn by rememberSaveable(asset.id) { mutableStateOf("") }
+
+    var requestedFindingId by remember { mutableStateOf<String?>(null) }
+    var pendingPhotoFile by remember { mutableStateOf<File?>(null) }
+    var pendingPhotoGeo by remember { mutableStateOf<FindingGeoSnapshot?>(null) }
+    var pendingPhotoFindingId by remember { mutableStateOf<String?>(null) }
+
+    val takePicture = rememberLauncherForActivityResult(ActivityResultContracts.TakePicture()) { success ->
+        val file = pendingPhotoFile
+        val geo = pendingPhotoGeo
+        val findingId = pendingPhotoFindingId
+        if (success && file != null && geo != null && findingId != null) {
+            runCatching { writeFindingExif(file, geo) }
+            model.uploadFindingPhoto(
+                findingId = findingId,
+                file = file,
+                latitude = geo.latitude,
+                longitude = geo.longitude,
+                accuracyM = geo.accuracyM,
+                title = "Evidencia fotográfica de campo",
+            )
+        }
+        pendingPhotoFile = null
+        pendingPhotoGeo = null
+        pendingPhotoFindingId = null
+    }
+
+    fun beginPhoto(findingId: String) {
+        scope.launch {
+            runCatching { currentFindingGeo(context) }
+                .onSuccess { geo ->
+                    val (file, uri) = newFindingPhoto(context)
+                    pendingPhotoFile = file
+                    pendingPhotoGeo = geo
+                    pendingPhotoFindingId = findingId
+                    takePicture.launch(uri)
+                }
+        }
+    }
+
+    val photoPermissionLauncher = rememberLauncherForActivityResult(
+        ActivityResultContracts.RequestMultiplePermissions(),
+    ) { result ->
+        val camera = result[Manifest.permission.CAMERA] == true || findingHasPermission(context, Manifest.permission.CAMERA)
+        val location = result[Manifest.permission.ACCESS_FINE_LOCATION] == true ||
+            result[Manifest.permission.ACCESS_COARSE_LOCATION] == true || findingHasLocation(context)
+        val findingId = requestedFindingId
+        requestedFindingId = null
+        if (camera && location && findingId != null) beginPhoto(findingId)
+    }
+
+    fun requestPhoto(findingId: String) {
+        requestedFindingId = findingId
+        if (findingHasPermission(context, Manifest.permission.CAMERA) && findingHasLocation(context)) {
+            requestedFindingId = null
+            beginPhoto(findingId)
+        } else {
+            photoPermissionLauncher.launch(
+                arrayOf(
+                    Manifest.permission.CAMERA,
+                    Manifest.permission.ACCESS_FINE_LOCATION,
+                    Manifest.permission.ACCESS_COARSE_LOCATION,
+                ),
+            )
+        }
+    }
+
+    val selected = options.catalog.items.firstOrNull { it.id == selectedCatalogId }
+    val filtered = options.catalog.items.filter {
+        search.isBlank() ||
+            it.title.contains(search, ignoreCase = true) ||
+            it.code.contains(search, ignoreCase = true) ||
+            it.categoryName.orEmpty().contains(search, ignoreCase = true)
+    }
+
+    LaunchedEffect(selectedCatalogId, other) {
+        if (!other && selected != null && severityText.isBlank() && selected.suggestedSeverity != null) {
+            severityText = selected.suggestedSeverity.toString()
+        }
+    }
+    LaunchedEffect(model.lastCreatedFinding?.id) {
+        if (model.lastCreatedFinding != null) {
+            selectedCatalogId = null
+            other = false
+            customTitle = ""
+            customLegalBasis = ""
+            description = ""
+            severityText = ""
+            correctionDueOn = ""
+            search = ""
+        }
+    }
+
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .verticalScroll(rememberScrollState())
+            .padding(top = 30.dp, start = 16.dp, end = 16.dp, bottom = 36.dp),
+        verticalArrangement = Arrangement.spacedBy(12.dp),
+    ) {
+        Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
+            OutlinedButton(onClick = { model.clearFindingFlow() }, enabled = !model.busy) {
+                Text("Volver")
+            }
+            Text("Hallazgo de campo", style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.Bold)
+        }
+
+        Card(Modifier.fillMaxWidth()) {
+            Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(4.dp)) {
+                Text(asset.name, fontWeight = FontWeight.Bold)
+                Text("${asset.code} · Acta ${options.act.code}", style = MaterialTheme.typography.bodySmall)
+                Text(
+                    "GPS + foto del Inventario: ${if (options.capture.readyForFinding) "OK" else "pendiente"}",
+                    color = if (options.capture.readyForFinding) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.error,
+                    style = MaterialTheme.typography.bodySmall,
+                )
+            }
+        }
+
+        model.error?.let {
+            Card(colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.errorContainer)) {
+                Text(it, Modifier.padding(12.dp))
+            }
+        }
+        model.notice?.let {
+            Card(colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.secondaryContainer)) {
+                Text(it, Modifier.padding(12.dp))
+            }
+        }
+
+        if (options.findings.isNotEmpty()) {
+            Text("Hallazgos registrados en este Inventario", fontWeight = FontWeight.Bold)
+            options.findings.forEach { finding ->
+                val evidence = model.fieldFindingEvidence[finding.id].orEmpty()
+                Card(Modifier.fillMaxWidth()) {
+                    Column(Modifier.padding(10.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) {
+                        Text("${finding.code} · ${finding.title}", fontWeight = FontWeight.SemiBold)
+                        Text("Gravedad: ${finding.severity ?: "s/d"} · ${finding.status}", style = MaterialTheme.typography.bodySmall)
+                        Text(
+                            "Evidencias: ${evidence.size} · Fotos: ${evidence.count { it.kind == "PHOTO" }}",
+                            style = MaterialTheme.typography.bodySmall,
+                        )
+                        evidence.take(3).forEach { item ->
+                            Text(
+                                "• ${item.title ?: item.originalName}${item.capturedAt?.let { " · ${shortFindingDate(it)}" }.orEmpty()}",
+                                style = MaterialTheme.typography.bodySmall,
+                            )
+                        }
+                        Button(
+                            onClick = { requestPhoto(finding.id) },
+                            enabled = !model.busy,
+                            modifier = Modifier.fillMaxWidth(),
+                        ) {
+                            Text("Tomar foto con GPS")
+                        }
+                    }
+                }
+            }
+            HorizontalDivider()
+        }
+
+        Text("1. Elegí el tipo de Hallazgo", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
+        if (!options.catalog.typeConfigured) {
+            Text(
+                options.catalog.configurationReason
+                    ?: "Este tipo de Inventario todavía no tiene un catálogo contextual configurado. Podés usar OTROS.",
+                color = MaterialTheme.colorScheme.secondary,
+            )
+        }
+        OutlinedTextField(
+            value = search,
+            onValueChange = { search = it },
+            label = { Text("Buscar en catálogo") },
+            modifier = Modifier.fillMaxWidth(),
+            singleLine = true,
+        )
+
+        filtered.forEach { item ->
+            val chosen = !other && selectedCatalogId == item.id
+            Card(
+                modifier = Modifier.fillMaxWidth().clickable {
+                    selectedCatalogId = item.id
+                    other = false
+                    severityText = item.suggestedSeverity?.toString().orEmpty()
+                },
+                colors = if (chosen) {
+                    CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer)
+                } else {
+                    CardDefaults.cardColors()
+                },
+            ) {
+                Column(Modifier.padding(10.dp), verticalArrangement = Arrangement.spacedBy(3.dp)) {
+                    Text(if (chosen) "✓ ${item.title}" else item.title, fontWeight = FontWeight.SemiBold)
+                    Text(
+                        listOfNotNull(item.categoryName, item.code, item.suggestedSeverity?.let { "Gravedad sugerida $it" })
+                            .joinToString(" · "),
+                        style = MaterialTheme.typography.bodySmall,
+                    )
+                }
+            }
+        }
+
+        OutlinedButton(
+            onClick = {
+                other = true
+                selectedCatalogId = null
+                severityText = ""
+            },
+            modifier = Modifier.fillMaxWidth(),
+        ) {
+            Text(if (other) "✓ OTROS · Hallazgo no catalogado" else "OTROS · No está en el catálogo")
+        }
+        if (other) {
+            options.catalog.other.help?.let { Text(it, style = MaterialTheme.typography.bodySmall) }
+            OutlinedTextField(
+                value = customTitle,
+                onValueChange = { customTitle = it },
+                label = { Text("Título del nuevo Hallazgo *") },
+                modifier = Modifier.fillMaxWidth(),
+            )
+            OutlinedTextField(
+                value = customLegalBasis,
+                onValueChange = { customLegalBasis = it },
+                label = { Text("Base legal / normativa (opcional)") },
+                modifier = Modifier.fillMaxWidth(),
+            )
+        }
+
+        Text("2. Describí lo observado", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
+        selected?.let {
+            Card(Modifier.fillMaxWidth()) {
+                Column(Modifier.padding(10.dp), verticalArrangement = Arrangement.spacedBy(3.dp)) {
+                    Text(it.title, fontWeight = FontWeight.SemiBold)
+                    it.legalBasis?.takeIf(String::isNotBlank)?.let { basis -> Text(basis, style = MaterialTheme.typography.bodySmall) }
+                    it.glossary?.takeIf(String::isNotBlank)?.let { glossary -> Text(glossary, style = MaterialTheme.typography.bodySmall) }
+                }
+            }
+        }
+        OutlinedTextField(
+            value = description,
+            onValueChange = { description = it },
+            label = { Text("Descripción del Hallazgo *") },
+            modifier = Modifier.fillMaxWidth(),
+            minLines = 3,
+        )
+        OutlinedTextField(
+            value = severityText,
+            onValueChange = { value -> severityText = value.filter(Char::isDigit).take(2) },
+            label = { Text("Gravedad 1 a 10") },
+            modifier = Modifier.fillMaxWidth(),
+            keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
+            singleLine = true,
+        )
+        OutlinedTextField(
+            value = correctionDueOn,
+            onValueChange = { correctionDueOn = it },
+            label = { Text("Fecha de corrección AAAA-MM-DD (opcional)") },
+            modifier = Modifier.fillMaxWidth(),
+            singleLine = true,
+        )
+
+        val severity = severityText.toIntOrNull()
+        val choiceReady = selectedCatalogId != null || (other && customTitle.isNotBlank())
+        Button(
+            onClick = {
+                model.createFieldFinding(
+                    catalogItemId = if (other) null else selectedCatalogId,
+                    customTitle = if (other) customTitle else null,
+                    customLegalBasis = if (other) customLegalBasis else null,
+                    description = description,
+                    severity = severity,
+                    correctionDueOn = correctionDueOn,
+                )
+            },
+            enabled = choiceReady && description.isNotBlank() && (severity == null || severity in 1..10) && !model.busy,
+            modifier = Modifier.fillMaxWidth(),
+        ) {
+            Text(if (model.busy) "Guardando…" else "Guardar Hallazgo")
+        }
+
+        model.lastCreatedFinding?.let { finding ->
+            Card(
+                Modifier.fillMaxWidth(),
+                colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer),
+            ) {
+                Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) {
+                    Text("Hallazgo registrado", fontWeight = FontWeight.Bold)
+                    Text("${finding.code} · ${finding.title}")
+                    Button(
+                        onClick = { requestPhoto(finding.id) },
+                        enabled = !model.busy,
+                        modifier = Modifier.fillMaxWidth(),
+                    ) {
+                        Text("Tomar foto con GPS")
+                    }
+                    Text("También podés registrar otro Hallazgo sobre el mismo Inventario.", style = MaterialTheme.typography.bodySmall)
+                }
+            }
+        }
+    }
+}
+
+private fun findingHasPermission(context: Context, permission: String): Boolean =
+    ContextCompat.checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED
+
+private fun findingHasLocation(context: Context): Boolean =
+    findingHasPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) ||
+        findingHasPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION)
+
+private suspend fun currentFindingGeo(context: Context): FindingGeoSnapshot = suspendCancellableCoroutine { continuation ->
+    if (!findingHasLocation(context)) {
+        continuation.resumeWithException(SecurityException("Se necesita permiso de ubicación."))
+        return@suspendCancellableCoroutine
+    }
+    val source = CancellationTokenSource()
+    val client = LocationServices.getFusedLocationProviderClient(context)
+    client.getCurrentLocation(Priority.PRIORITY_HIGH_ACCURACY, source.token)
+        .addOnSuccessListener { location ->
+            if (!continuation.isActive) return@addOnSuccessListener
+            if (location == null) continuation.resumeWithException(IllegalStateException("No se pudo obtener una ubicación GPS actual."))
+            else continuation.resume(FindingGeoSnapshot(location.latitude, location.longitude, location.accuracy.toDouble()))
+        }
+        .addOnFailureListener { if (continuation.isActive) continuation.resumeWithException(it) }
+    continuation.invokeOnCancellation { source.cancel() }
+}
+
+private fun newFindingPhoto(context: Context): Pair<File, Uri> {
+    val directory = context.getExternalFilesDir(Environment.DIRECTORY_PICTURES)
+        ?: throw IllegalStateException("No se pudo acceder al almacenamiento de fotografías.")
+    directory.mkdirs()
+    val file = File.createTempFile("DH_HALLAZGO_${System.currentTimeMillis()}_", ".jpg", directory)
+    val uri = FileProvider.getUriForFile(context, "${context.packageName}.files", file)
+    return file to uri
+}
+
+private fun writeFindingExif(file: File, geo: FindingGeoSnapshot) {
+    val now = Instant.now()
+    val exif = ExifInterface(file)
+    exif.setLatLong(geo.latitude, geo.longitude)
+    val formatter = DateTimeFormatter.ofPattern("yyyy:MM:dd HH:mm:ss").withZone(ZoneId.systemDefault())
+    exif.setAttribute(ExifInterface.TAG_DATETIME_ORIGINAL, formatter.format(now))
+    exif.setAttribute(ExifInterface.TAG_DATETIME_DIGITIZED, formatter.format(now))
+    exif.saveAttributes()
+}
+
+private fun shortFindingDate(value: String): String = value.replace('T', ' ').take(16)

android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/LegacyFieldInventoryCompat.kt

@@ -0,0 +1,30 @@
+package com.korexlabs.dhinspeccion.ui
+
+import com.korexlabs.dhinspeccion.MainViewModel
+import com.korexlabs.dhinspeccion.data.FieldType
+
+/**
+ * Compatibilidad transitoria con la pantalla F2.x que queda compilada pero ya no
+ * será la ruta activa en F3.1. El flujo nuevo siempre envía familyId cuando el
+ * nivel estructural lo requiere.
+ */
+fun MainViewModel.createFieldAsset(
+    type: FieldType,
+    parentId: String?,
+    name: String,
+    commonName: String?,
+    attributes: Map<String, Any?>,
+    latitude: Double,
+    longitude: Double,
+    accuracyM: Double?,
+) = createFieldAsset(
+    type = type,
+    parentId = parentId,
+    familyId = null,
+    name = name,
+    commonName = commonName,
+    attributes = attributes,
+    latitude = latitude,
+    longitude = longitude,
+    accuracyM = accuracyM,
+)

android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/LoginGate.kt

@@ -90,6 +90,8 @@ fun DhRoot(model: MainViewModel, activity: FragmentActivity) {
                         model.logout()
                     },
                 )
+                model.fieldFindingOptions != null -> FieldFindingScreen(model)
+                model.visit != null -> F3VisitRoot(model)
                 else -> DhApp(model)
             }
         }
@@ -191,7 +193,11 @@ private fun BiometricUnlockScreen(
     LaunchedEffect(Unit) { authenticate() }
 
     Box(Modifier.fillMaxSize().padding(24.dp), contentAlignment = Alignment.Center) {
-        Column(Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(14.dp), horizontalAlignment = Alignment.CenterHorizontally) {
+        Column(
+            Modifier.fillMaxWidth(),
+            verticalArrangement = Arrangement.spacedBy(14.dp),
+            horizontalAlignment = Alignment.CenterHorizontally,
+        ) {
             Text("DH Inspección", style = MaterialTheme.typography.headlineMedium, fontWeight = FontWeight.Bold)
             Text("Ingresá con tu huella")
             error?.let { Text(it, color = MaterialTheme.colorScheme.error) }

android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/MobileActsScreen.kt

@@ -0,0 +1,443 @@
+package com.korexlabs.dhinspeccion.ui
+
+import android.Manifest
+import android.content.Context
+import android.content.pm.PackageManager
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.AssistChip
+import androidx.compose.material3.Button
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.core.content.ContextCompat
+import com.google.android.gms.location.LocationServices
+import com.google.android.gms.location.Priority
+import com.google.android.gms.tasks.CancellationTokenSource
+import com.korexlabs.dhinspeccion.MainViewModel
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.suspendCancellableCoroutine
+import java.io.File
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
+
+private data class ActSignatureGeo(
+    val latitude: Double,
+    val longitude: Double,
+    val accuracyM: Double?,
+)
+
+@Composable
+fun MobileActsScreen(
+    model: MainViewModel,
+    onBack: () -> Unit,
+    onGoInventory: () -> Unit,
+) {
+    val visit = model.visit ?: return
+    val selected = model.selectedAct
+    val closure = model.actClosure
+    val context = LocalContext.current
+    val scope = rememberCoroutineScope()
+
+    var newActUrgency by rememberSaveable(visit.id) { mutableStateOf("NON_URGENT") }
+    var attendance by rememberSaveable(selected?.id) {
+        mutableStateOf(closure?.responsible?.attendanceStatus ?: "PRESENT")
+    }
+    var fullName by rememberSaveable(selected?.id) {
+        mutableStateOf(closure?.responsible?.fullName.orEmpty())
+    }
+    var documentType by rememberSaveable(selected?.id) {
+        mutableStateOf(closure?.responsible?.documentType ?: "DNI")
+    }
+    var documentNumber by rememberSaveable(selected?.id) {
+        mutableStateOf(closure?.responsible?.documentNumber.orEmpty())
+    }
+    var position by rememberSaveable(selected?.id) {
+        mutableStateOf(closure?.responsible?.position.orEmpty())
+    }
+    var email by rememberSaveable(selected?.id) {
+        mutableStateOf(closure?.responsible?.email.orEmpty())
+    }
+    var phone by rememberSaveable(selected?.id) {
+        mutableStateOf(closure?.responsible?.phone.orEmpty())
+    }
+    var absenceReason by rememberSaveable(selected?.id) {
+        mutableStateOf(closure?.responsible?.absenceReason.orEmpty())
+    }
+    var refusalReason by rememberSaveable(selected?.id) { mutableStateOf("") }
+    var manifestation by rememberSaveable(selected?.id) { mutableStateOf("CONFORMITY") }
+    var dissentStatement by rememberSaveable(selected?.id) { mutableStateOf("") }
+
+    LaunchedEffect(visit.id) { model.reloadActs() }
+
+    fun signWithGeo(file: File, company: Boolean) {
+        scope.launch {
+            val geo = runCatching { currentActSignatureGeo(context) }.getOrNull()
+            if (company) {
+                model.signSelectedActAsCompany(
+                    png = file,
+                    latitude = geo?.latitude,
+                    longitude = geo?.longitude,
+                    accuracyM = geo?.accuracyM,
+                    manifestation = manifestation,
+                    statement = dissentStatement.takeIf { manifestation == "DISSENT" },
+                )
+            } else {
+                model.signSelectedActAsInspector(
+                    png = file,
+                    latitude = geo?.latitude,
+                    longitude = geo?.longitude,
+                    accuracyM = geo?.accuracyM,
+                )
+            }
+        }
+    }
+
+    Column(
+        Modifier
+            .fillMaxSize()
+            .verticalScroll(rememberScrollState())
+            .padding(top = 28.dp, start = 16.dp, end = 16.dp, bottom = 36.dp),
+        verticalArrangement = Arrangement.spacedBy(12.dp),
+    ) {
+        Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
+            OutlinedButton(onClick = onBack, enabled = !model.busy) { Text("Volver") }
+            Text("Actas", style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.Bold)
+        }
+        Text("${visit.code} · ${visit.operatorCompany?.name.orEmpty()}")
+        F32ActMessage(model)
+
+        Card(Modifier.fillMaxWidth()) {
+            Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
+                Text("Actas de esta Inspección", fontWeight = FontWeight.Bold)
+                if (model.acts.isEmpty()) {
+                    Text("Todavía no hay Actas. La primera se inicia sobre una Instalación/Subinstalación seleccionada.")
+                }
+                model.acts.forEach { act ->
+                    val active = selected?.id == act.id
+                    val urgency = if (act.urgency == "URGENT") "URGENTE" else "No urgente"
+                    OutlinedButton(
+                        onClick = { model.selectAct(act.id) },
+                        modifier = Modifier.fillMaxWidth(),
+                    ) {
+                        Text(
+                            (if (active) "✓ " else "") +
+                                "${act.code} · ${actStatusLabel(act.status)} · $urgency · ${act.findingCount} Hallazgo${if (act.findingCount == 1) "" else "s"}",
+                        )
+                    }
+                }
+            }
+        }
+
+        val hasDraftAct = model.acts.any { it.status == "DRAFT" }
+        if (visit.status == "IN_PROGRESS" && !hasDraftAct) {
+            Card(
+                Modifier.fillMaxWidth(),
+                colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer),
+            ) {
+                Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
+                    Text("Nueva Acta", fontWeight = FontWeight.Bold)
+                    if (model.acts.any { it.status == "LOCKED" }) {
+                        Text(
+                            "Podés abrir una nueva Acta aunque otra esté BLOQUEADA esperando firmas. Sólo se permite un borrador a la vez.",
+                            style = MaterialTheme.typography.bodySmall,
+                        )
+                    }
+                    Text("Urgencia del Acta", fontWeight = FontWeight.Bold)
+                    Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                        AssistChip(
+                            onClick = { newActUrgency = "NON_URGENT" },
+                            label = { Text(if (newActUrgency == "NON_URGENT") "✓ No urgente" else "No urgente") },
+                        )
+                        AssistChip(
+                            onClick = { newActUrgency = "URGENT" },
+                            label = { Text(if (newActUrgency == "URGENT") "✓ Urgente" else "Urgente") },
+                        )
+                    }
+                    Text(
+                        if (newActUrgency == "URGENT") {
+                            "El plazo urgente se computará desde el Acta según la política institucional vigente al bloquearla."
+                        } else {
+                            "El plazo no urgente se computará desde la oficialización GEDO según la política institucional vigente al bloquearla."
+                        },
+                        style = MaterialTheme.typography.bodySmall,
+                    )
+                    val selectedInventory = model.selectedFieldAsset?.asset
+                    if (selectedInventory == null) {
+                        Text("Primero elegí una Instalación o Subinstalación desde Inventario de campo. Ese registro será el primer elemento del Acta.")
+                        Button(onClick = onGoInventory, modifier = Modifier.fillMaxWidth()) {
+                            Text("Ir a Inventario y elegir")
+                        }
+                    } else {
+                        Text("Inventario inicial: ${selectedInventory.name} · ${selectedInventory.code}")
+                        Button(
+                            onClick = { model.createActForSelectedInventory(newActUrgency) },
+                            enabled = !model.busy,
+                            modifier = Modifier.fillMaxWidth(),
+                        ) { Text("Crear nueva Acta") }
+                    }
+                }
+            }
+        }
+
+        if (selected != null) {
+            HorizontalDivider()
+            Card(Modifier.fillMaxWidth()) {
+                Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(5.dp)) {
+                    Text(selected.code, style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
+                    Text(actStatusLabel(selected.status))
+                    Text(if (selected.urgency == "URGENT") "Urgente" else "No urgente")
+                    Text("${selected.findingCount} Hallazgo${if (selected.findingCount == 1) "" else "s"} · ${selected.assetCount} elemento${if (selected.assetCount == 1) "" else "s"} de Inventario")
+                    selected.deadlineAt?.let { Text("Vencimiento calculado: $it", style = MaterialTheme.typography.bodySmall) }
+                    if (selected.deadlineAt == null && selected.deadlineBasis == "GEDO_DATE") {
+                        Text("Vencimiento pendiente de fecha GEDO.", style = MaterialTheme.typography.bodySmall)
+                    }
+                    selected.lockedSha256?.let { Text("Hash bloqueado: $it", style = MaterialTheme.typography.bodySmall) }
+                    selected.closureSha256?.let { Text("Hash sellado: $it", style = MaterialTheme.typography.bodySmall) }
+                }
+            }
+
+            when (selected.status) {
+                "DRAFT" -> {
+                    Text("1. Responsable de la empresa", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
+                    Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                        AssistChip(onClick = { attendance = "PRESENT" }, label = { Text(if (attendance == "PRESENT") "✓ Presente" else "Presente") })
+                        AssistChip(onClick = { attendance = "ABSENT" }, label = { Text(if (attendance == "ABSENT") "✓ Ausente" else "Ausente") })
+                    }
+                    if (attendance == "PRESENT") {
+                        OutlinedTextField(fullName, { fullName = it }, label = { Text("Nombre y apellido *") }, modifier = Modifier.fillMaxWidth())
+                        Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(6.dp)) {
+                            listOf("DNI", "CUIL", "PASSPORT", "OTHER").forEach { kind ->
+                                AssistChip(onClick = { documentType = kind }, label = { Text(if (documentType == kind) "✓ $kind" else kind) })
+                            }
+                        }
+                        OutlinedTextField(documentNumber, { documentNumber = it }, label = { Text("Documento *") }, modifier = Modifier.fillMaxWidth())
+                        OutlinedTextField(position, { position = it }, label = { Text("Cargo *") }, modifier = Modifier.fillMaxWidth())
+                        OutlinedTextField(email, { email = it }, label = { Text("Email") }, modifier = Modifier.fillMaxWidth())
+                        OutlinedTextField(phone, { phone = it }, label = { Text("Teléfono") }, modifier = Modifier.fillMaxWidth())
+                        Button(
+                            onClick = {
+                                model.setCompanyResponsiblePresent(fullName, documentType, documentNumber, position, email, phone)
+                            },
+                            enabled = !model.busy && fullName.isNotBlank() && documentNumber.isNotBlank() && position.isNotBlank(),
+                            modifier = Modifier.fillMaxWidth(),
+                        ) { Text("Guardar responsable") }
+                    } else {
+                        OutlinedTextField(
+                            absenceReason,
+                            { absenceReason = it },
+                            label = { Text("Motivo de ausencia *") },
+                            minLines = 2,
+                            modifier = Modifier.fillMaxWidth(),
+                        )
+                        Button(
+                            onClick = { model.setCompanyResponsibleAbsent(absenceReason) },
+                            enabled = !model.busy && absenceReason.trim().length >= 10,
+                            modifier = Modifier.fillMaxWidth(),
+                        ) { Text("Guardar ausencia") }
+                    }
+
+                    HorizontalDivider()
+                    Text("2. Hallazgos / verificaciones", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
+                    Text("Los Hallazgos se cargan desde Inventario y quedan vinculados explícitamente a ${selected.code}. El Acta también puede finalizar sin Hallazgos cuando corresponde dejar constancia de una inspección o verificación sin nuevos incumplimientos.")
+                    Button(onClick = onGoInventory, modifier = Modifier.fillMaxWidth()) { Text("Ir a Inventario / Hallazgos") }
+
+                    HorizontalDivider()
+                    Text("3. Finalizar contenido", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
+                    Text("Al BLOQUEAR el Acta, el contenido y los Hallazgos quedan inmutables. Esta acción no se puede deshacer.")
+                    Button(
+                        onClick = { model.prepareSelectedAct() },
+                        enabled = !model.busy && closure?.responsible != null,
+                        modifier = Modifier.fillMaxWidth(),
+                    ) { Text("Finalizar y BLOQUEAR Acta") }
+                }
+
+                "LOCKED" -> {
+                    val signatures = closure?.signatures.orEmpty()
+                    val inspectorSigned = signatures.any { it.signerType == "INSPECTOR" && it.status == "SIGNED" }
+                    val companyOutcome = signatures.firstOrNull { it.signerType == "COMPANY_RESPONSIBLE" }
+                    val companyResolved = companyOutcome?.status == "SIGNED" || companyOutcome?.status == "REFUSED"
+
+                    Text("Acta BLOQUEADA", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
+                    Text("El contenido ya es inmutable. Sólo resta resolver firmas y manifestaciones para poder SELLARLA.")
+                    closure?.closure?.preparedSha256?.let { Text("Hash bloqueado: $it", style = MaterialTheme.typography.bodySmall) }
+
+                    HorizontalDivider()
+                    Text("Firma del inspector", fontWeight = FontWeight.Bold)
+                    if (inspectorSigned) {
+                        Text("✓ Firma del inspector registrada", color = MaterialTheme.colorScheme.primary)
+                    } else {
+                        Text(closure?.consents?.inspector.orEmpty(), style = MaterialTheme.typography.bodySmall)
+                        SignaturePad(
+                            label = "Firmá como inspector/a",
+                            enabled = !model.busy,
+                            onCaptured = { file -> signWithGeo(file, company = false) },
+                        )
+                    }
+
+                    HorizontalDivider()
+                    Text("Manifestación de la empresa", fontWeight = FontWeight.Bold)
+                    if (companyOutcome != null && companyResolved) {
+                        val detail = when (companyOutcome.status) {
+                            "SIGNED" -> if (companyOutcome.companyManifestation == "DISSENT") "Firma en disidencia" else "Firma en conformidad"
+                            "REFUSED" -> "Negativa a firmar"
+                            else -> companyOutcome.status
+                        }
+                        Text("✓ $detail", color = MaterialTheme.colorScheme.primary)
+                        companyOutcome.reason?.let { Text(it, style = MaterialTheme.typography.bodySmall) }
+                        companyOutcome.companyStatement?.let { Text(it, style = MaterialTheme.typography.bodySmall) }
+                    } else if (closure?.responsible?.attendanceStatus == "ABSENT") {
+                        Text(
+                            "El responsable fue registrado como ausente. La ausencia NO resuelve la manifestación: deberá obtenerse firma o negativa posteriormente antes de SELLAR el Acta.",
+                            style = MaterialTheme.typography.bodyMedium,
+                        )
+                    } else {
+                        Text(closure?.consents?.company.orEmpty(), style = MaterialTheme.typography.bodySmall)
+                        Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                            AssistChip(onClick = { manifestation = "CONFORMITY" }, label = { Text(if (manifestation == "CONFORMITY") "✓ Conforme" else "Conforme") })
+                            AssistChip(onClick = { manifestation = "DISSENT" }, label = { Text(if (manifestation == "DISSENT") "✓ En disidencia" else "En disidencia") })
+                        }
+                        if (manifestation == "DISSENT") {
+                            OutlinedTextField(
+                                dissentStatement,
+                                { dissentStatement = it },
+                                label = { Text("Manifestación de disidencia *") },
+                                minLines = 2,
+                                modifier = Modifier.fillMaxWidth(),
+                            )
+                        }
+                        SignaturePad(
+                            label = "Firma del responsable de empresa",
+                            enabled = !model.busy && inspectorSigned && (manifestation != "DISSENT" || dissentStatement.trim().length >= 10),
+                            onCaptured = { file -> signWithGeo(file, company = true) },
+                        )
+                        Text("Si la persona presente se niega a firmar, asentá el motivo en lugar de dibujar una firma.", style = MaterialTheme.typography.bodySmall)
+                        OutlinedTextField(
+                            refusalReason,
+                            { refusalReason = it },
+                            label = { Text("Motivo de negativa") },
+                            minLines = 2,
+                            modifier = Modifier.fillMaxWidth(),
+                        )
+                        OutlinedButton(
+                            onClick = { model.recordCompanyOutcome("REFUSED", refusalReason) },
+                            enabled = !model.busy && inspectorSigned && refusalReason.trim().length >= 10,
+                            modifier = Modifier.fillMaxWidth(),
+                        ) { Text("Registrar negativa a firmar") }
+                    }
+
+                    HorizontalDivider()
+                    if (inspectorSigned && companyResolved) {
+                        Button(
+                            onClick = { model.closeSelectedAct() },
+                            enabled = !model.busy,
+                            modifier = Modifier.fillMaxWidth(),
+                        ) { Text("SELLAR Acta definitivamente") }
+                    } else {
+                        Text(
+                            "Esta Acta bloquea el cierre de la Inspección hasta tener firma de inspector y firma o negativa válida de la empresa.",
+                            style = MaterialTheme.typography.bodySmall,
+                        )
+                    }
+                }
+
+                "SEALED" -> {
+                    Card(
+                        Modifier.fillMaxWidth(),
+                        colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer),
+                    ) {
+                        Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(5.dp)) {
+                            Text("Acta SELLADA e inmutable", fontWeight = FontWeight.Bold)
+                            Text("Desde este sellado se genera el PDF del Acta y el INF Word editable para el Inspector.")
+                            closure?.closure?.finalSha256?.let { Text("SHA-256: $it", style = MaterialTheme.typography.bodySmall) }
+                        }
+                    }
+                }
+
+                "CANCELLED" -> Text("Esta Acta fue cancelada y permanece sólo como antecedente.")
+            }
+        }
+
+        if (visit.status == "IN_PROGRESS" && model.acts.isNotEmpty()) {
+            HorizontalDivider()
+            val activeActs = model.acts.filter { it.status != "CANCELLED" }
+            val pendingActs = activeActs.filter { it.status != "SEALED" }
+            Text("Finalizar Inspección", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
+            if (pendingActs.isEmpty()) {
+                Text("Todas las Actas están SELLADAS. La Inspección ya puede cerrarse.")
+            } else {
+                Text("No puede cerrarse todavía. Falta SELLAR: ${pendingActs.joinToString { it.code }}")
+            }
+            Button(
+                onClick = { model.closeInspection() },
+                enabled = !model.busy && activeActs.isNotEmpty() && pendingActs.isEmpty(),
+                modifier = Modifier.fillMaxWidth(),
+            ) { Text("Cerrar Inspección y salir de la empresa") }
+        }
+    }
+}
+
+@Composable
+private fun F32ActMessage(model: MainViewModel) {
+    val text = model.error ?: model.notice ?: return
+    Card(
+        modifier = Modifier.fillMaxWidth(),
+        colors = CardDefaults.cardColors(
+            containerColor = if (model.error != null) MaterialTheme.colorScheme.errorContainer
+            else MaterialTheme.colorScheme.secondaryContainer,
+        ),
+        onClick = { model.clearMessages() },
+    ) {
+        Text(text, Modifier.padding(12.dp))
+    }
+}
+
+private fun actStatusLabel(status: String): String = when (status) {
+    "DRAFT" -> "Borrador"
+    "LOCKED" -> "BLOQUEADA"
+    "SEALED" -> "SELLADA"
+    "CANCELLED" -> "Cancelada"
+    else -> status
+}
+
+private fun hasActLocation(context: Context): Boolean =
+    ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED ||
+        ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED
+
+private suspend fun currentActSignatureGeo(context: Context): ActSignatureGeo = suspendCancellableCoroutine { continuation ->
+    if (!hasActLocation(context)) {
+        continuation.resumeWithException(SecurityException("Ubicación no autorizada"))
+        return@suspendCancellableCoroutine
+    }
+    val source = CancellationTokenSource()
+    LocationServices.getFusedLocationProviderClient(context)
+        .getCurrentLocation(Priority.PRIORITY_HIGH_ACCURACY, source.token)
+        .addOnSuccessListener { location ->
+            if (!continuation.isActive) return@addOnSuccessListener
+            if (location == null) continuation.resumeWithException(IllegalStateException("Ubicación no disponible"))
+            else continuation.resume(ActSignatureGeo(location.latitude, location.longitude, location.accuracy.toDouble()))
+        }
+        .addOnFailureListener { if (continuation.isActive) continuation.resumeWithException(it) }
+    continuation.invokeOnCancellation { source.cancel() }
+}

android-app/app/src/main/java/com/korexlabs/dhinspeccion/ui/SignaturePad.kt

@@ -0,0 +1,137 @@
+package com.korexlabs.dhinspeccion.ui
+
+import android.graphics.Bitmap
+import android.graphics.Canvas as AndroidCanvas
+import android.graphics.Color as AndroidColor
+import android.graphics.Paint
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.background
+import androidx.compose.foundation.gestures.detectDragGestures
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Button
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.StrokeCap
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.layout.onSizeChanged
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.unit.IntSize
+import androidx.compose.ui.unit.dp
+import java.io.File
+import java.io.FileOutputStream
+
+@Composable
+fun SignaturePad(
+    label: String,
+    enabled: Boolean = true,
+    onCaptured: (File) -> Unit,
+) {
+    val context = LocalContext.current
+    val strokes = remember { mutableStateListOf<List<Offset>>() }
+    var currentStroke by remember { mutableStateOf<List<Offset>>(emptyList()) }
+    var canvasSize by remember { mutableStateOf(IntSize.Zero) }
+
+    Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
+        Text(label, fontWeight = androidx.compose.ui.text.font.FontWeight.SemiBold)
+        Text(
+            "Firmá dentro del recuadro. La imagen se guarda como PNG y se incorpora al hash del Acta.",
+            style = MaterialTheme.typography.bodySmall,
+        )
+        Canvas(
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(190.dp)
+                .background(Color.White)
+                .onSizeChanged { canvasSize = it }
+                .pointerInput(enabled) {
+                    if (!enabled) return@pointerInput
+                    detectDragGestures(
+                        onDragStart = { position -> currentStroke = listOf(position) },
+                        onDrag = { change, _ ->
+                            change.consume()
+                            currentStroke = currentStroke + change.position
+                        },
+                        onDragEnd = {
+                            if (currentStroke.size > 1) strokes.add(currentStroke)
+                            currentStroke = emptyList()
+                        },
+                        onDragCancel = { currentStroke = emptyList() },
+                    )
+                },
+        ) {
+            val all = strokes + listOf(currentStroke)
+            all.forEach { stroke ->
+                stroke.zipWithNext().forEach { (start, end) ->
+                    drawLine(
+                        color = Color.Black,
+                        start = start,
+                        end = end,
+                        strokeWidth = 4.dp.toPx(),
+                        cap = StrokeCap.Round,
+                    )
+                }
+            }
+        }
+        Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+            OutlinedButton(
+                onClick = { strokes.clear(); currentStroke = emptyList() },
+                enabled = enabled && (strokes.isNotEmpty() || currentStroke.isNotEmpty()),
+                modifier = Modifier.weight(1f),
+            ) { Text("Limpiar") }
+            Button(
+                onClick = {
+                    val width = canvasSize.width.coerceAtLeast(1)
+                    val height = canvasSize.height.coerceAtLeast(1)
+                    val targetWidth = 1000
+                    val targetHeight = 400
+                    val scaleX = targetWidth.toFloat() / width.toFloat()
+                    val scaleY = targetHeight.toFloat() / height.toFloat()
+                    val bitmap = Bitmap.createBitmap(targetWidth, targetHeight, Bitmap.Config.ARGB_8888)
+                    val native = AndroidCanvas(bitmap)
+                    native.drawColor(AndroidColor.WHITE)
+                    val paint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+                        color = AndroidColor.BLACK
+                        strokeWidth = 7f
+                        strokeCap = Paint.Cap.ROUND
+                        strokeJoin = Paint.Join.ROUND
+                        style = Paint.Style.STROKE
+                    }
+                    strokes.forEach { stroke ->
+                        stroke.zipWithNext().forEach { (start, end) ->
+                            native.drawLine(
+                                start.x * scaleX,
+                                start.y * scaleY,
+                                end.x * scaleX,
+                                end.y * scaleY,
+                                paint,
+                            )
+                        }
+                    }
+                    val file = File.createTempFile("DH_FIRMA_", ".png", context.cacheDir)
+                    FileOutputStream(file).use { stream ->
+                        check(bitmap.compress(Bitmap.CompressFormat.PNG, 100, stream))
+                    }
+                    bitmap.recycle()
+                    onCaptured(file)
+                },
+                enabled = enabled && strokes.isNotEmpty(),
+                modifier = Modifier.weight(1f),
+            ) { Text("Usar firma") }
+        }
+    }
+}

api-v3/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dhv2-api",
-  "version": "0.22.1-1",
+  "version": "0.25.0-1",
   "private": true,
   "license": "UNLICENSED",
   "scripts": {
@@ -43,4 +43,4 @@
     "tsx": "^4.20.6",
     "typescript": "^5.9.0"
   }
-}
+}

api-v3/src/act-administration/act-administration.service.ts

@@ -49,7 +49,7 @@ export class ActAdministrationService {
                  COUNT(*) FILTER (WHERE f.status = 'OPEN' AND f.next_control_on IS NOT NULL) AS scheduled_control_count
           FROM inspection_findings f WHERE f.act_id = ia.id
         ) fc ON true
-        WHERE ia.status IN ('CLOSED', 'RECTIFIED')
+        WHERE ia.status IN ('SEALED', 'CLOSED', 'RECTIFIED')
       ), classified AS (
         SELECT *, CASE
           WHEN "findingCount" > 0 AND "openFindingCount" = 0 THEN 'REGULARIZED'
@@ -110,7 +110,7 @@ export class ActAdministrationService {
     const rows = await this.dataSource.query(`SELECT id, code, status FROM inspection_acts WHERE id = $1`, [actId]);
     const act = rows[0];
     if (!act) throw new NotFoundException({ code: 'ACT_NOT_FOUND', message: 'Acta inexistente.' });
-    if (!['CLOSED', 'RECTIFIED'].includes(act.status)) throw new BadRequestException({ code: 'ACT_ADMIN_REQUIRES_CLOSED', message: 'El seguimiento administrativo comienza cuando el Acta está cerrada.' });
+    if (!['SEALED', 'CLOSED', 'RECTIFIED'].includes(act.status)) throw new BadRequestException({ code: 'ACT_ADMIN_REQUIRES_SEALED', message: 'El seguimiento administrativo comienza cuando el Acta está sellada.' });
     return act;
   }
 

api-v3/src/act-administration/field-briefing.service.ts

@@ -129,7 +129,7 @@ export class FieldBriefingService {
           ORDER BY company_response.received_on DESC, company_response.created_at DESC, company_response.id DESC
           LIMIT 1
         ) response ON true
-        WHERE act.status IN ('CLOSED', 'RECTIFIED')
+        WHERE act.status IN ('SEALED', 'CLOSED', 'RECTIFIED')
           AND source_visit.id <> $1
           AND source_visit.operational_area_id = $2::uuid
           AND source_visit.operator_company_id = $3::uuid

api-v3/src/administration/users/dto/create-user.dto.ts

@@ -12,6 +12,9 @@ import {
   MinLength,
 } from 'class-validator';
 
+const optionalText = ({ value }: { value: unknown }) =>
+  typeof value === 'string' && value.trim() ? value.trim() : null;
+
 export class CreateUserDto {
   @Transform(({ value }) =>
     typeof value === 'string' ? value.trim().toLowerCase() : value,
@@ -23,13 +26,38 @@ export class CreateUserDto {
   username!: string;
 
   @Transform(({ value }) =>
-    typeof value === 'string' ? value.trim().toLowerCase() : value,
+    typeof value === 'string' && value.trim() ? value.trim().toLowerCase() : null,
   )
   @IsOptional()
   @IsEmail()
   @MaxLength(320)
   email?: string | null;
 
+  @Transform(({ value }) =>
+    typeof value === 'string' && value.trim() ? value.replace(/\D/g, '') : null,
+  )
+  @IsOptional()
+  @Matches(/^\d{7,11}$/)
+  dni?: string | null;
+
+  @Transform(optionalText)
+  @IsOptional()
+  @IsString()
+  @MaxLength(40)
+  phone?: string | null;
+
+  @Transform(optionalText)
+  @IsOptional()
+  @IsString()
+  @MaxLength(160)
+  jobTitle?: string | null;
+
+  @Transform(optionalText)
+  @IsOptional()
+  @IsString()
+  @MaxLength(80)
+  employeeNumber?: string | null;
+
   @IsString()
   @MinLength(12)
   @MaxLength(128)

api-v3/src/administration/users/dto/update-user.dto.ts

@@ -8,6 +8,9 @@ import {
   MinLength,
 } from 'class-validator';
 
+const optionalText = ({ value }: { value: unknown }) =>
+  typeof value === 'string' && value.trim() ? value.trim() : null;
+
 export class UpdateUserDto {
   @Transform(({ value }) =>
     typeof value === 'string' ? value.trim().toLowerCase() : value,
@@ -20,13 +23,38 @@ export class UpdateUserDto {
   username?: string;
 
   @Transform(({ value }) =>
-    typeof value === 'string' ? value.trim().toLowerCase() : value,
+    typeof value === 'string' && value.trim() ? value.trim().toLowerCase() : null,
   )
   @IsOptional()
   @IsEmail()
   @MaxLength(320)
   email?: string | null;
 
+  @Transform(({ value }) =>
+    typeof value === 'string' && value.trim() ? value.replace(/\D/g, '') : null,
+  )
+  @IsOptional()
+  @Matches(/^\d{7,11}$/)
+  dni?: string | null;
+
+  @Transform(optionalText)
+  @IsOptional()
+  @IsString()
+  @MaxLength(40)
+  phone?: string | null;
+
+  @Transform(optionalText)
+  @IsOptional()
+  @IsString()
+  @MaxLength(160)
+  jobTitle?: string | null;
+
+  @Transform(optionalText)
+  @IsOptional()
+  @IsString()
+  @MaxLength(80)
+  employeeNumber?: string | null;
+
   @Transform(({ value }) => (typeof value === 'string' ? value.trim() : value))
   @IsOptional()
   @IsString()

api-v3/src/administration/users/users.service.ts

@@ -41,6 +41,10 @@ export interface AdministrativeUserView {
   id: string;
   username: string;
   email: string | null;
+  dni: string | null;
+  phone: string | null;
+  jobTitle: string | null;
+  employeeNumber: string | null;
   firstName: string;
   lastName: string;
   status: UserStatus;
@@ -72,6 +76,13 @@ function roleSelectionInvalid(): BadRequestException {
   });
 }
 
+function inspectorEmailRequired(): BadRequestException {
+  return new BadRequestException({
+    code: 'INSPECTOR_EMAIL_REQUIRED',
+    message: 'Los usuarios con rol Inspector deben tener un email válido para recibir la documentación de sus inspecciones',
+  });
+}
+
 @Injectable()
 export class UsersService {
   constructor(
@@ -96,6 +107,10 @@ export class UsersService {
           OR user_account.email ILIKE $${parameters.length}
           OR user_account.first_name ILIKE $${parameters.length}
           OR user_account.last_name ILIKE $${parameters.length}
+          OR user_account.dni ILIKE $${parameters.length}
+          OR user_account.phone ILIKE $${parameters.length}
+          OR user_account.job_title ILIKE $${parameters.length}
+          OR user_account.employee_number ILIKE $${parameters.length}
         )
       `);
     }
@@ -115,6 +130,10 @@ export class UsersService {
           user_account.id,
           user_account.username,
           user_account.email,
+          user_account.dni,
+          user_account.phone,
+          user_account.job_title AS "jobTitle",
+          user_account.employee_number AS "employeeNumber",
           user_account.first_name AS "firstName",
           user_account.last_name AS "lastName",
           user_account.status,
@@ -176,9 +195,14 @@ export class UsersService {
     try {
       return await this.dataSource.transaction(async (manager) => {
         const roles = await this.resolveRoles(manager, dto.roleIds);
+        this.assertInspectorHasEmail(roles, dto.email ?? null);
         const user = manager.getRepository(User).create({
           username: dto.username.trim().toLowerCase(),
           email: dto.email?.trim().toLowerCase() || null,
+          dni: dto.dni ?? null,
+          phone: dto.phone ?? null,
+          jobTitle: dto.jobTitle ?? null,
+          employeeNumber: dto.employeeNumber ?? null,
           passwordHash,
           firstName: dto.firstName.trim(),
           lastName: dto.lastName.trim(),
@@ -227,6 +251,10 @@ export class UsersService {
     if (
       dto.username === undefined &&
       dto.email === undefined &&
+      dto.dni === undefined &&
+      dto.phone === undefined &&
+      dto.jobTitle === undefined &&
+      dto.employeeNumber === undefined &&
       dto.firstName === undefined &&
       dto.lastName === undefined
     ) {
@@ -240,6 +268,9 @@ export class UsersService {
       return await this.dataSource.transaction(async (manager) => {
         const user = await this.lockUser(manager, id);
         const before = await this.loadUserView(manager, id);
+        if (dto.email !== undefined && !dto.email && before.roles.some((role) => role.code === 'inspector')) {
+          throw inspectorEmailRequired();
+        }
 
         if (dto.username !== undefined) {
           user.username = dto.username.trim().toLowerCase();
@@ -247,6 +278,10 @@ export class UsersService {
         if (dto.email !== undefined) {
           user.email = dto.email?.trim().toLowerCase() || null;
         }
+        if (dto.dni !== undefined) user.dni = dto.dni ?? null;
+        if (dto.phone !== undefined) user.phone = dto.phone ?? null;
+        if (dto.jobTitle !== undefined) user.jobTitle = dto.jobTitle ?? null;
+        if (dto.employeeNumber !== undefined) user.employeeNumber = dto.employeeNumber ?? null;
         if (dto.firstName !== undefined) user.firstName = dto.firstName.trim();
         if (dto.lastName !== undefined) user.lastName = dto.lastName.trim();
         user.updatedBy = principal.userId;
@@ -379,6 +414,7 @@ export class UsersService {
       await this.lockUser(manager, id);
       const roles = await this.resolveRoles(manager, dto.roleIds);
       const before = await this.loadUserView(manager, id);
+      this.assertInspectorHasEmail(roles, before.email);
       const beforeIds = before.roles.map((role) => role.id).sort();
       const afterIds = roles.map((role) => role.id).sort();
       if (beforeIds.join(',') === afterIds.join(',')) return before;
@@ -417,6 +453,12 @@ export class UsersService {
     return roles;
   }
 
+  private assertInspectorHasEmail(roles: Role[], email: string | null | undefined): void {
+    if (roles.some((role) => role.code === 'inspector') && !email?.trim()) {
+      throw inspectorEmailRequired();
+    }
+  }
+
   private async insertUserRoles(
     manager: EntityManager,
     userId: string,
@@ -455,6 +497,10 @@ export class UsersService {
           user_account.id,
           user_account.username,
           user_account.email,
+          user_account.dni,
+          user_account.phone,
+          user_account.job_title AS "jobTitle",
+          user_account.employee_number AS "employeeNumber",
           user_account.first_name AS "firstName",
           user_account.last_name AS "lastName",
           user_account.status,
@@ -491,7 +537,7 @@ export class UsersService {
   private userConflict(): ConflictException {
     return new ConflictException({
       code: 'USER_ALREADY_EXISTS',
-      message: 'El usuario o email ya está registrado',
+      message: 'El usuario, email o DNI ya está registrado',
     });
   }
 }

api-v3/src/app.module.ts

@@ -15,8 +15,6 @@ import { HealthController } from './health.controller';
 import { HealthService } from './health.service';
 import { DashboardModule } from './dashboard/dashboard.module';
 import { AssetMasterModule } from './asset-master/asset-master.module';
-import { SurveyPlanningModule } from './survey-planning/survey-planning.module';
-import { SurveyExecutionModule } from './survey-execution/survey-execution.module';
 import { InspectionVisitsModule } from './inspection-visits/inspection-visits.module';
 import { InspectionActsModule } from './inspection-acts/inspection-acts.module';
 import { InspectionFindingsModule } from './inspection-findings/inspection-findings.module';
@@ -69,8 +67,6 @@ function required(config: ConfigService, key: string): string {
     AdministrationModule,
     DashboardModule,
     AssetMasterModule,
-    SurveyPlanningModule,
-    SurveyExecutionModule,
     InspectionVisitsModule,
     InspectionActsModule,
     InspectionFindingsModule,

api-v3/src/asset-master/asset-history.service.ts

@@ -41,14 +41,14 @@ export interface AssetVersionDetail extends AssetVersionSummary {
 function assetNotFound(): NotFoundException {
   return new NotFoundException({
     code: 'ASSET_NOT_FOUND',
-    message: 'Activo no encontrado',
+    message: 'Inventario no encontrado',
   });
 }
 
 function versionNotFound(): NotFoundException {
   return new NotFoundException({
     code: 'ASSET_VERSION_NOT_FOUND',
-    message: 'Versión de activo no encontrada',
+    message: 'Versión de Inventario no encontrada',
   });
 }
 
@@ -79,7 +79,7 @@ export class AssetHistoryService {
 
     const versionNumber = Number(versionRow.current_version);
     if (!Number.isInteger(versionNumber) || versionNumber < 1) {
-      throw new Error(`Versión de activo inválida después de incrementar: ${versionRow.current_version}`);
+      throw new Error(`Versión de Inventario inválida después de incrementar: ${versionRow.current_version}`);
     }
 
     const snapshot = await this.loadCurrentSnapshot(manager, assetId);
@@ -101,17 +101,8 @@ export class AssetHistoryService {
          asset_id, version_number, change_type, changed_fields, snapshot,
          actor_user_id, actor_username, source, request_id
        ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)`,
-      [
-        assetId,
-        versionNumber,
-        changeType,
-        changedFields,
-        snapshot,
-        principal.userId,
-        principal.username,
-        source,
-        request.requestId,
-      ],
+      [assetId, versionNumber, changeType, changedFields, snapshot,
+        principal.userId, principal.username, source, request.requestId],
     );
     return versionNumber;
   }
@@ -123,38 +114,21 @@ export class AssetHistoryService {
       parameters.push(value);
       return `$${parameters.length}`;
     };
-
     if (query.search?.trim()) {
       const search = add(`%${query.search.trim()}%`);
-      conditions.push(`(
-        version.snapshot->>'code' ILIKE ${search}
-        OR version.snapshot->>'name' ILIKE ${search}
-        OR version.actor_username ILIKE ${search}
-      )`);
-    }
-    if (query.typeId) {
-      conditions.push(`version.snapshot #>> '{type,id}' = ${add(query.typeId)}`);
-    }
-    if (query.status) {
-      conditions.push(`version.snapshot->>'informationStatus' = ${add(query.status)}`);
-    }
-    if (query.changeType) {
-      conditions.push(`version.change_type = ${add(query.changeType)}`);
+      conditions.push(`(version.snapshot->>'code' ILIKE ${search} OR version.snapshot->>'name' ILIKE ${search} OR version.actor_username ILIKE ${search})`);
     }
+    if (query.typeId) conditions.push(`version.snapshot #>> '{type,id}' = ${add(query.typeId)}`);
+    if (query.status) conditions.push(`version.snapshot->>'informationStatus' = ${add(query.status)}`);
+    if (query.changeType) conditions.push(`version.change_type = ${add(query.changeType)}`);
     if (query.from) conditions.push(`version.occurred_at >= ${add(new Date(query.from))}`);
     if (query.to) conditions.push(`version.occurred_at <= ${add(new Date(query.to))}`);
-
     return this.listWithConditions(query.page, query.pageSize, conditions, parameters);
   }
 
   async listForAsset(assetId: string, query: AssetVersionPageQueryDto) {
     await this.requireAsset(assetId);
-    return this.listWithConditions(
-      query.page,
-      query.pageSize,
-      ['version.asset_id = $1'],
-      [assetId],
-    );
+    return this.listWithConditions(query.page, query.pageSize, ['version.asset_id = $1'], [assetId]);
   }
 
   async getVersion(assetId: string, versionNumber: number): Promise<AssetVersionDetail> {
@@ -170,17 +144,9 @@ export class AssetHistoryService {
     return row;
   }
 
-  private async listWithConditions(
-    page: number,
-    pageSize: number,
-    conditions: string[],
-    parameters: unknown[],
-  ) {
+  private async listWithConditions(page: number, pageSize: number, conditions: string[], parameters: unknown[]) {
     const where = conditions.length ? `WHERE ${conditions.join(' AND ')}` : '';
-    const [countRow] = (await this.dataSource.query(
-      `SELECT COUNT(*)::integer AS total FROM asset_versions version ${where}`,
-      parameters,
-    )) as Array<{ total: number }>;
+    const [countRow] = (await this.dataSource.query(`SELECT COUNT(*)::integer AS total FROM asset_versions version ${where}`, parameters)) as Array<{ total: number }>;
     const total = Number(countRow?.total ?? 0);
     const paginated = [...parameters, pageSize, (page - 1) * pageSize];
     const limit = `$${parameters.length + 1}`;
@@ -194,51 +160,29 @@ export class AssetHistoryService {
        LIMIT ${limit} OFFSET ${offset}`,
       paginated,
     )) as AssetVersionSummary[];
-
-    return {
-      data,
-      meta: {
-        page,
-        pageSize,
-        total,
-        totalPages: total === 0 ? 0 : Math.ceil(total / pageSize),
-      },
-    };
+    return { data, meta: { page, pageSize, total, totalPages: total === 0 ? 0 : Math.ceil(total / pageSize) } };
   }
 
   private selectSummary(): string {
     return `SELECT
-      version.id,
-      version.asset_id AS "assetId",
-      version.snapshot->>'code' AS "assetCode",
-      version.snapshot->>'name' AS "assetName",
-      version.snapshot #>> '{type,id}' AS "typeId",
-      version.snapshot #>> '{type,name}' AS "typeName",
+      version.id, version.asset_id AS "assetId",
+      version.snapshot->>'code' AS "assetCode", version.snapshot->>'name' AS "assetName",
+      version.snapshot #>> '{type,id}' AS "typeId", version.snapshot #>> '{type,name}' AS "typeName",
       version.snapshot->>'informationStatus' AS "informationStatus",
       version.snapshot->>'operationalStatus' AS "operationalStatus",
-      version.version_number AS "versionNumber",
-      version.change_type AS "changeType",
-      version.changed_fields AS "changedFields",
-      version.occurred_at AS "occurredAt",
-      version.actor_user_id AS "actorUserId",
-      version.actor_username AS "actorUsername",
-      version.source,
-      version.request_id AS "requestId",
+      version.version_number AS "versionNumber", version.change_type AS "changeType",
+      version.changed_fields AS "changedFields", version.occurred_at AS "occurredAt",
+      version.actor_user_id AS "actorUserId", version.actor_username AS "actorUsername",
+      version.source, version.request_id AS "requestId",
       (version.version_number = current_asset.current_version) AS "isCurrent"`;
   }
 
   private async requireAsset(assetId: string): Promise<void> {
-    const [row] = (await this.dataSource.query(
-      'SELECT 1 FROM assets WHERE id = $1',
-      [assetId],
-    )) as unknown[];
+    const [row] = (await this.dataSource.query('SELECT 1 FROM assets WHERE id = $1', [assetId])) as unknown[];
     if (!row) throw assetNotFound();
   }
 
-  private async loadCurrentSnapshot(
-    manager: EntityManager,
-    assetId: string,
-  ): Promise<Record<string, unknown>> {
+  private async loadCurrentSnapshot(manager: EntityManager, assetId: string): Promise<Record<string, unknown>> {
     const [row] = (await manager.query(
       `SELECT JSONB_BUILD_OBJECT(
          'id', asset.id,
@@ -246,82 +190,49 @@ export class AssetHistoryService {
          'name', asset.name,
          'commonName', asset.common_name,
          'description', asset.description,
-         'type', JSONB_BUILD_OBJECT(
-           'id', asset_type.id,
-           'code', asset_type.code,
-           'name', asset_type.name,
-           'operationalRole', asset_type.operational_role
-         ),
-         'parent', CASE WHEN parent.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
-           'id', parent.id,
-           'code', parent.code,
-           'name', parent.name
-         ) END,
-         'operationalArea', CASE WHEN operational_area.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
-           'id', operational_area.id,
-           'code', operational_area.code,
-           'name', operational_area.name
-         ) END,
-         'operatorCompany', CASE WHEN operator_company.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
-           'id', operator_company.id,
-           'code', operator_company.code,
-           'name', operator_company.name
-         ) END,
+         'type', JSONB_BUILD_OBJECT('id', asset_type.id,'code', asset_type.code,'name', asset_type.name,'operationalRole', asset_type.operational_role),
+         'parent', CASE WHEN parent.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id', parent.id,'code', parent.code,'name', parent.name) END,
+         'operationalArea', CASE WHEN operational_area.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id', operational_area.id,'code', operational_area.code,'name', operational_area.name) END,
+         'operatorCompany', CASE WHEN operator_company.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id', operator_company.id,'code', operator_company.code,'name', operator_company.name) END,
          'informationStatus', asset.information_status,
          'operationalStatus', asset.operational_status,
+         'currentFunction', (
+           SELECT JSONB_BUILD_OBJECT(
+             'assignmentId', assignment.id,
+             'id', fn.id,
+             'code', fn.code,
+             'name', fn.name,
+             'validFrom', assignment.valid_from,
+             'reason', assignment.change_reason
+           )
+           FROM inventory_function_assignments assignment
+           JOIN inventory_functions fn ON fn.id=assignment.function_id
+           WHERE assignment.asset_id=asset.id AND assignment.valid_until IS NULL
+           ORDER BY assignment.valid_from DESC LIMIT 1
+         ),
          'attributes', COALESCE((
            SELECT JSONB_AGG(JSONB_BUILD_OBJECT(
-             'definitionId', definition.id,
-             'code', definition.code,
-             'name', definition.name,
-             'dataType', definition.data_type,
-             'isRequired', definition.is_required,
-             'unit', definition.unit,
-             'options', definition.options,
-             'sortOrder', definition.sort_order,
-             'value', value.value
+             'definitionId', definition.id,'code', definition.code,'name', definition.name,
+             'dataType', definition.data_type,'isRequired', definition.is_required,
+             'unit', definition.unit,'options', definition.options,'sortOrder', definition.sort_order,'value', value.value
            ) ORDER BY definition.sort_order, definition.name)
            FROM asset_attribute_definitions definition
-           LEFT JOIN asset_attribute_values value
-             ON value.definition_id = definition.id
-            AND value.asset_id = asset.id
-           WHERE definition.asset_type_id = asset.asset_type_id
-             AND definition.is_active = true
+           LEFT JOIN asset_attribute_values value ON value.definition_id = definition.id AND value.asset_id = asset.id
+           WHERE definition.asset_type_id = asset.asset_type_id AND definition.is_active = true
          ), '[]'::jsonb),
          'geometry', CASE WHEN geometry.asset_id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
-           'assetId', geometry.asset_id,
-           'geometry', ST_AsGeoJSON(geometry.geometry)::jsonb,
-           'geometryType', geometry.geometry_type,
-           'source', geometry.source,
-           'accuracyM', geometry.accuracy_m::double precision,
-           'capturedAt', geometry.captured_at,
-           'deviceLabel', geometry.device_label,
-           'createdAt', geometry.created_at,
-           'updatedAt', geometry.updated_at,
-           'updatedBy', geometry.updated_by
+           'assetId', geometry.asset_id,'geometry', ST_AsGeoJSON(geometry.geometry)::jsonb,'geometryType', geometry.geometry_type,
+           'source', geometry.source,'accuracyM', geometry.accuracy_m::double precision,'capturedAt', geometry.captured_at,
+           'deviceLabel', geometry.device_label,'createdAt', geometry.created_at,'updatedAt', geometry.updated_at,'updatedBy', geometry.updated_by
          ) END,
          'media', COALESCE((
            SELECT JSONB_AGG(JSONB_BUILD_OBJECT(
-             'id', media.id,
-             'kind', media.kind,
-             'originalName', media.original_name,
-             'mimeType', media.mime_type,
-             'sizeBytes', media.size_bytes,
-             'sha256', media.sha256,
-             'title', media.title,
-             'description', media.description,
-             'capturedAt', media.captured_at,
-             'latitude', media.latitude,
-             'longitude', media.longitude,
-             'accuracyM', media.accuracy_m,
-             'source', media.source,
-             'uploadedBy', media.uploaded_by,
-             'createdAt', media.created_at,
-             'updatedAt', media.updated_at
+             'id', media.id,'kind', media.kind,'originalName', media.original_name,'mimeType', media.mime_type,
+             'sizeBytes', media.size_bytes,'sha256', media.sha256,'title', media.title,'description', media.description,
+             'capturedAt', media.captured_at,'latitude', media.latitude,'longitude', media.longitude,'accuracyM', media.accuracy_m,
+             'source', media.source,'uploadedBy', media.uploaded_by,'createdAt', media.created_at,'updatedAt', media.updated_at
            ) ORDER BY media.created_at, media.id)
-           FROM asset_media media
-           WHERE media.asset_id = asset.id
-             AND media.deleted_at IS NULL
+           FROM asset_media media WHERE media.asset_id = asset.id AND media.deleted_at IS NULL
          ), '[]'::jsonb),
          'organizationProfile', (SELECT TO_JSONB(profile) - 'created_at' - 'updated_at' FROM organization_profiles profile WHERE profile.asset_id=asset.id),
          'organizationMemberships', COALESCE((
@@ -337,22 +248,8 @@ export class AssetHistoryService {
          'legalRights', COALESCE((
            SELECT JSONB_AGG(JSONB_BUILD_OBJECT('id',r.id,'rightType',r.right_type,'name',r.name,'instrumentNumber',r.instrument_number,'validFrom',r.valid_from,'validUntil',r.valid_until,'status',r.status,'sourceDocumentId',r.source_document_id,'notes',r.notes,'organizations',COALESCE((SELECT JSONB_AGG(JSONB_BUILD_OBJECT('id',o.id,'organizationId',o.organization_id,'role',o.role,'participationPercent',o.participation_percent::double precision,'validFrom',o.valid_from,'validUntil',o.valid_until,'notes',o.notes,'endReason',o.end_reason) ORDER BY o.valid_until NULLS FIRST,o.valid_from DESC) FROM area_legal_right_organizations o WHERE o.right_id=r.id),'[]'::jsonb)) ORDER BY r.valid_until DESC NULLS FIRST,r.valid_from DESC NULLS LAST) FROM area_legal_rights r WHERE r.area_id=asset.id
          ),'[]'::jsonb),
-         'provenance', JSONB_BUILD_OBJECT(
-           'origin', asset.data_origin,
-           'sourceName', asset.source_name,
-           'sourceReference', asset.source_reference,
-           'observedAt', asset.source_observed_at,
-           'notes', asset.source_notes,
-           'verifiedAt', asset.provenance_verified_at,
-           'verifiedBy', asset.provenance_verified_by,
-           'updatedAt', asset.provenance_updated_at,
-           'updatedBy', asset.provenance_updated_by
-         ),
-         'createdAt', asset.created_at,
-         'updatedAt', asset.updated_at,
-         'createdBy', asset.created_by,
-         'updatedBy', asset.updated_by,
-         'currentVersion', asset.current_version
+         'provenance', JSONB_BUILD_OBJECT('origin', asset.data_origin,'sourceName', asset.source_name,'sourceReference', asset.source_reference,'observedAt', asset.source_observed_at,'notes', asset.source_notes,'verifiedAt', asset.provenance_verified_at,'verifiedBy', asset.provenance_verified_by,'updatedAt', asset.provenance_updated_at,'updatedBy', asset.provenance_updated_by),
+         'createdAt', asset.created_at,'updatedAt', asset.updated_at,'createdBy', asset.created_by,'updatedBy', asset.updated_by,'currentVersion', asset.current_version
        ) AS snapshot
        FROM assets asset
        INNER JOIN asset_types asset_type ON asset_type.id = asset.asset_type_id

api-v3/src/asset-master/asset-master.module.ts

@@ -22,12 +22,26 @@ import { AssetOperationalRelationsService } from './asset-operational-relations.
 import { AssetRegistryController } from './asset-registry.controller';
 import { AssetRegistryService } from './asset-registry.service';
 import { FieldDiscoveryInspectionLinkService } from '../inspection-operations/field-discovery-inspection-link.service';
+import { InventoryStructureController } from './inventory-structure.controller';
+import { InventoryStructureService } from './inventory-structure.service';
+import { InventoryFamilyCatalogController } from './inventory-family-catalog.controller';
+import { InventoryFamilyCatalogService } from './inventory-family-catalog.service';
+import { FieldInventoryMergeController, InventoryMergeController } from './inventory-merge.controller';
+import { InventoryMergeService } from './inventory-merge.service';
+import { MergedInventoryDossierService } from './merged-inventory-dossier.service';
+import { InventoryFunctionController } from './inventory-function.controller';
+import { InventoryFunctionService } from './inventory-function.service';
 
 @Module({
   imports: [AuditModule],
   controllers: [
     AssetTypesController,
     AssetsController,
+    InventoryStructureController,
+    InventoryFamilyCatalogController,
+    InventoryFunctionController,
+    InventoryMergeController,
+    FieldInventoryMergeController,
     AssetGeometriesController,
     MapAssetsController,
     AssetHistoryController,
@@ -40,6 +54,11 @@ import { FieldDiscoveryInspectionLinkService } from '../inspection-operations/fi
   providers: [
     AssetTypesService,
     AssetsService,
+    InventoryStructureService,
+    InventoryFamilyCatalogService,
+    InventoryFunctionService,
+    InventoryMergeService,
+    MergedInventoryDossierService,
     AssetGeometriesService,
     AssetHistoryService,
     AssetMediaService,
@@ -52,6 +71,9 @@ import { FieldDiscoveryInspectionLinkService } from '../inspection-operations/fi
   exports: [
     AssetHistoryService,
     AssetsService,
+    InventoryFunctionService,
+    InventoryMergeService,
+    MergedInventoryDossierService,
     AssetGeometriesService,
     AssetMediaService,
     FieldDiscoveryInspectionLinkService,

api-v3/src/asset-master/assets.controller.ts

@@ -16,6 +16,7 @@ import type {
   RequestWithContext,
 } from '../common/http/request-context';
 import { AssetsService } from './assets.service';
+import { MergedInventoryDossierService } from './merged-inventory-dossier.service';
 import { ChangeAssetStatusDto } from './dto/change-asset-status.dto';
 import { ChangeAssetOperationalStatusDto } from './dto/change-asset-operational-status.dto';
 import { CreateAssetDto } from './dto/create-asset.dto';
@@ -31,7 +32,10 @@ import { ChangeAssetContextDto } from './dto/change-asset-context.dto';
 
 @Controller('assets')
 export class AssetsController {
-  constructor(private readonly assets: AssetsService) {}
+  constructor(
+    private readonly assets: AssetsService,
+    private readonly mergedDossier: MergedInventoryDossierService,
+  ) {}
 
   @Get()
   @RequirePermissions('assets.read')
@@ -131,8 +135,8 @@ export class AssetsController {
     'inspection_evidence.read',
     'inspection_communications.read',
   )
-  dossier(@Param('id', new ParseUUIDPipe({ version: '4' })) id: string) {
-    return this.assets.dossier(id);
+  dossier(@Param('id', new ParseUUIDPipe({ version: '4' })) id: string): Promise<unknown> {
+    return this.mergedDossier.dossier(id);
   }
 
   @Get(':id/context-history')

api-v3/src/asset-master/assets.service.ts

@@ -298,7 +298,7 @@ export class AssetsService {
 
     const [visits, acts, findings, evidence, communications, verificationResults, documents, inspectionReports, media, versions] = await Promise.all([
       this.dataSource.query(
-        `SELECT DISTINCT visit.id, visit.code, visit.title, visit.status,
+        `SELECT DISTINCT visit.id, visit.code, visit.status,
                 visit.planned_start_at AS "plannedStartAt",
                 visit.actual_started_at AS "actualStartedAt",
                 visit.actual_closed_at AS "actualClosedAt",
@@ -322,7 +322,7 @@ export class AssetsService {
         `SELECT DISTINCT act.id, act.visit_id AS "visitId", act.code, act.status,
                 act.occurred_at AS "occurredAt", act.title, act.summary,
                 act.closed_at AS "closedAt", act.current_version AS "currentVersion",
-                visit.code AS "visitCode", visit.title AS "visitTitle"
+                visit.code AS "visitCode"
          FROM inspection_acts act
          JOIN inspection_visits visit ON visit.id = act.visit_id
          LEFT JOIN inspection_act_assets act_asset
@@ -342,7 +342,7 @@ export class AssetsService {
                 finding.closed_at AS "closedAt", finding.closure_notes AS "closureNotes",
                 finding.created_at AS "createdAt", finding.updated_at AS "updatedAt",
                 act.code AS "actCode", act.occurred_at AS "actOccurredAt",
-                visit.id AS "visitId", visit.code AS "visitCode", visit.title AS "visitTitle"
+                visit.id AS "visitId", visit.code AS "visitCode"
          FROM inspection_findings finding
          JOIN inspection_acts act ON act.id = finding.act_id
          JOIN inspection_visits visit ON visit.id = act.visit_id
@@ -389,7 +389,7 @@ export class AssetsService {
                 verification_link.result_recorded_at AS "resultRecordedAt",
                 verification_link.rescheduled_control_on AS "rescheduledControlOn",
                 finding.code AS "findingCode", finding.title AS "findingTitle",
-                visit.code AS "visitCode", visit.title AS "visitTitle", visit.status AS "visitStatus",
+                visit.code AS "visitCode", visit.status AS "visitStatus",
                 (SELECT COUNT(*)::integer
                  FROM inspection_finding_evidence verification_evidence
                  WHERE verification_evidence.finding_id = finding.id
@@ -484,7 +484,7 @@ export class AssetsService {
       kind: 'INSPECTION',
       occurredAt: visit.actualStartedAt ?? visit.plannedStartAt ?? visit.createdAt,
       title: `Inspección ${String(visit.code)}`,
-      description: visit.title,
+      description: null,
       href: `/inspecciones/${String(visit.id)}`,
       meta: { status: visit.status },
     }));
@@ -867,7 +867,7 @@ export class AssetsService {
   private fieldDiscoverySelect(): string {
     return `SELECT discovery.id, discovery.status, discovery.discovery_notes AS "discoveryNotes", discovery.observed_at AS "observedAt", discovery.reviewed_at AS "reviewedAt", discovery.review_notes AS "reviewNotes", discovery.created_at AS "createdAt",
       JSONB_BUILD_OBJECT('id',asset.id,'code',asset.code,'name',asset.name,'commonName',asset.common_name,'informationStatus',asset.information_status,'typeId',asset.asset_type_id,'typeName',asset_type.name,'parentId',asset.parent_id,'operationalAreaId',asset.operational_area_id,'operatorCompanyId',asset.operator_company_id) AS asset,
-      JSONB_BUILD_OBJECT('id',visit.id,'code',visit.code,'title',visit.title,'status',visit.status) AS visit,
+      JSONB_BUILD_OBJECT('id',visit.id,'code',visit.code,'status',visit.status) AS visit,
       JSONB_BUILD_OBJECT('id',creator.id,'username',creator.username,'firstName',creator.first_name,'lastName',creator.last_name) AS creator,
       CASE WHEN reviewer.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id',reviewer.id,'username',reviewer.username,'firstName',reviewer.first_name,'lastName',reviewer.last_name) END AS reviewer,
       CASE WHEN matched.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id',matched.id,'code',matched.code,'name',matched.name,'commonName',matched.common_name) END AS "matchedAsset"

api-v3/src/asset-master/dto/create-asset.dto.ts

@@ -42,6 +42,10 @@ export class CreateAssetDto {
   @IsUUID('4')
   parentId?: string | null;
 
+  @IsOptional()
+  @IsUUID('4')
+  inventoryFamilyId?: string | null;
+
   @IsOptional()
   @IsUUID('4')
   operationalAreaId?: string | null;

api-v3/src/asset-master/dto/create-inventory-structure.dto.ts

@@ -0,0 +1,56 @@
+import { Transform } from 'class-transformer';
+import {
+  IsIn,
+  IsOptional,
+  IsString,
+  IsUUID,
+  Matches,
+  MaxLength,
+  MinLength,
+} from 'class-validator';
+
+export const INVENTORY_STRUCTURE_KINDS = [
+  'AREA',
+  'YACIMIENTO',
+  'INSTALACION',
+  'SUBINSTALACION',
+] as const;
+export type InventoryStructureKind = typeof INVENTORY_STRUCTURE_KINDS[number];
+
+export class CreateInventoryStructureDto {
+  @IsIn(INVENTORY_STRUCTURE_KINDS)
+  kind!: InventoryStructureKind;
+
+  @IsOptional()
+  @Transform(({ value }) => typeof value === 'string' && value.trim() ? value.trim().toUpperCase() : null)
+  @IsString()
+  @MaxLength(120)
+  @Matches(/^[A-Z0-9][A-Z0-9._/-]*$/)
+  code?: string | null;
+
+  @Transform(({ value }) => typeof value === 'string' ? value.trim() : value)
+  @IsString()
+  @MinLength(1)
+  @MaxLength(200)
+  name!: string;
+
+  @IsOptional()
+  @Transform(({ value }) => typeof value === 'string' && value.trim() ? value.trim() : null)
+  @IsString()
+  @MaxLength(200)
+  commonName?: string | null;
+
+  @IsOptional()
+  @IsUUID('4')
+  parentId?: string | null;
+
+  @IsOptional()
+  @IsUUID('4')
+  familyId?: string | null;
+
+  @IsOptional()
+  @Transform(({ value }) => typeof value === 'string' && value.trim() ? value.trim() : null)
+  @IsString()
+  @MaxLength(4000)
+  description?: string | null;
+}

api-v3/src/asset-master/dto/inventory-function.dto.ts

@@ -0,0 +1,79 @@
+import { Transform } from 'class-transformer';
+import {
+  IsBoolean,
+  IsISO8601,
+  IsInt,
+  IsOptional,
+  IsString,
+  IsUUID,
+  Max,
+  MaxLength,
+  Min,
+  MinLength,
+} from 'class-validator';
+
+export class CreateInventoryFunctionDto {
+  @Transform(({ value }) => typeof value === 'string' ? value.trim().toUpperCase().replace(/[^A-Z0-9]+/g, '_').replace(/^_+|_+$/g, '') : value)
+  @IsString()
+  @MinLength(2)
+  @MaxLength(120)
+  code!: string;
+
+  @Transform(({ value }) => typeof value === 'string' ? value.trim() : value)
+  @IsString()
+  @MinLength(2)
+  @MaxLength(240)
+  name!: string;
+
+  @IsOptional()
+  @Transform(({ value }) => typeof value === 'string' && value.trim() ? value.trim() : null)
+  @IsString()
+  @MaxLength(4000)
+  description?: string | null;
+
+  @IsOptional()
+  @IsInt()
+  @Min(0)
+  @Max(100000)
+  sortOrder?: number;
+}
+
+export class UpdateInventoryFunctionDto {
+  @IsOptional()
+  @Transform(({ value }) => typeof value === 'string' ? value.trim() : value)
+  @IsString()
+  @MinLength(2)
+  @MaxLength(240)
+  name?: string;
+
+  @IsOptional()
+  @Transform(({ value }) => typeof value === 'string' && value.trim() ? value.trim() : null)
+  @IsString()
+  @MaxLength(4000)
+  description?: string | null;
+
+  @IsOptional()
+  @IsBoolean()
+  isActive?: boolean;
+
+  @IsOptional()
+  @IsInt()
+  @Min(0)
+  @Max(100000)
+  sortOrder?: number;
+}
+
+export class ChangeInventoryFunctionDto {
+  @IsUUID('4')
+  functionId!: string;
+
+  @IsOptional()
+  @IsISO8601({ strict: true })
+  effectiveAt?: string;
+
+  @IsOptional()
+  @Transform(({ value }) => typeof value === 'string' && value.trim() ? value.trim() : null)
+  @IsString()
+  @MaxLength(4000)
+  reason?: string | null;
+}

api-v3/src/asset-master/dto/merge-inventory-asset.dto.ts

@@ -0,0 +1,13 @@
+import { Transform } from 'class-transformer';
+import { IsString, IsUUID, MaxLength, MinLength } from 'class-validator';
+
+export class MergeInventoryAssetDto {
+  @IsUUID('4')
+  canonicalAssetId!: string;
+
+  @Transform(({ value }) => (typeof value === 'string' ? value.trim() : value))
+  @IsString()
+  @MinLength(8)
+  @MaxLength(2000)
+  reason!: string;
+}

api-v3/src/asset-master/inventory-family-catalog.controller.ts

@@ -0,0 +1,14 @@
+import { Controller, Get, Param, ParseUUIDPipe } from '@nestjs/common';
+import { RequirePermissions } from '../authorization/decorators/require-permissions.decorator';
+import { InventoryFamilyCatalogService } from './inventory-family-catalog.service';
+
+@Controller('inventory-families')
+export class InventoryFamilyCatalogController {
+  constructor(private readonly families: InventoryFamilyCatalogService) {}
+
+  @Get(':familyId/findings')
+  @RequirePermissions('assets.read')
+  findings(@Param('familyId', new ParseUUIDPipe({ version: '4' })) familyId: string) {
+    return this.families.findings(familyId);
+  }
+}

api-v3/src/asset-master/inventory-family-catalog.service.ts

@@ -0,0 +1,39 @@
+import { Injectable, NotFoundException } from '@nestjs/common';
+import { DataSource } from 'typeorm';
+
+@Injectable()
+export class InventoryFamilyCatalogService {
+  constructor(private readonly dataSource: DataSource) {}
+
+  async findings(familyId: string) {
+    const [family] = await this.dataSource.query(`
+      SELECT id,code,name,level,information_labels AS "informationLabels"
+      FROM inventory_families
+      WHERE id=$1::uuid AND is_active=true
+    `, [familyId]) as Array<{
+      id: string;
+      code: string;
+      name: string;
+      level: string;
+      informationLabels: string[];
+    }>;
+    if (!family) {
+      throw new NotFoundException({
+        code: 'INVENTORY_FAMILY_NOT_FOUND',
+        message: 'La familia técnica no existe',
+      });
+    }
+    const items = await this.dataSource.query(`
+      SELECT item.id,item.code,item.source_number AS "sourceNumber",item.title,
+        item.legal_basis AS "legalBasis",item.glossary,item.suggested_severity AS "suggestedSeverity",
+        category.id AS "categoryId",category.code AS "categoryCode",category.name AS "categoryName"
+      FROM finding_catalog_item_inventory_families mapping
+      JOIN finding_catalog_items item ON item.id=mapping.catalog_item_id
+      JOIN finding_categories category ON category.id=item.category_id
+      WHERE mapping.inventory_family_id=$1::uuid
+        AND item.is_active=true AND category.is_active=true
+      ORDER BY category.sort_order,item.source_number,item.title
+    `, [familyId]);
+    return { family, items, count: items.length };
+  }
+}

api-v3/src/asset-master/inventory-function.controller.ts

@@ -0,0 +1,69 @@
+import {
+  Body,
+  Controller,
+  Get,
+  Param,
+  ParseUUIDPipe,
+  Patch,
+  Post,
+  Query,
+  Req,
+} from '@nestjs/common';
+import { CurrentAuth } from '../auth/decorators/current-auth.decorator';
+import { RequirePermissions } from '../authorization/decorators/require-permissions.decorator';
+import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
+import {
+  ChangeInventoryFunctionDto,
+  CreateInventoryFunctionDto,
+  UpdateInventoryFunctionDto,
+} from './dto/inventory-function.dto';
+import { InventoryFunctionService } from './inventory-function.service';
+
+@Controller()
+export class InventoryFunctionController {
+  constructor(private readonly functions: InventoryFunctionService) {}
+
+  @Get('inventory-functions')
+  @RequirePermissions('assets.read')
+  list(@Query('includeInactive') includeInactive?: string) {
+    return this.functions.list(includeInactive === 'true');
+  }
+
+  @Post('inventory-functions')
+  @RequirePermissions('asset_types.manage')
+  create(
+    @Body() dto: CreateInventoryFunctionDto,
+    @CurrentAuth() principal: AuthPrincipal,
+    @Req() request: RequestWithContext,
+  ) {
+    return this.functions.create(dto, principal, request);
+  }
+
+  @Patch('inventory-functions/:id')
+  @RequirePermissions('asset_types.manage')
+  update(
+    @Param('id', new ParseUUIDPipe({ version: '4' })) id: string,
+    @Body() dto: UpdateInventoryFunctionDto,
+    @CurrentAuth() principal: AuthPrincipal,
+    @Req() request: RequestWithContext,
+  ) {
+    return this.functions.update(id, dto, principal, request);
+  }
+
+  @Get('assets/:id/function-history')
+  @RequirePermissions('assets.read_history')
+  history(@Param('id', new ParseUUIDPipe({ version: '4' })) id: string) {
+    return this.functions.getForAsset(id);
+  }
+
+  @Post('assets/:id/function')
+  @RequirePermissions('assets.update')
+  change(
+    @Param('id', new ParseUUIDPipe({ version: '4' })) id: string,
+    @Body() dto: ChangeInventoryFunctionDto,
+    @CurrentAuth() principal: AuthPrincipal,
+    @Req() request: RequestWithContext,
+  ) {
+    return this.functions.changeForAsset(id, dto, principal, request);
+  }
+}

api-v3/src/asset-master/inventory-function.service.ts

@@ -0,0 +1,186 @@
+import {
+  BadRequestException,
+  ConflictException,
+  Injectable,
+  NotFoundException,
+} from '@nestjs/common';
+import { DataSource, EntityManager } from 'typeorm';
+import { administrationAuditContext } from '../administration/common/administration-audit';
+import { AuditService } from '../audit/audit.service';
+import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
+import { AssetVersionChangeType, AuditAction } from '../database/entities';
+import type {
+  ChangeInventoryFunctionDto,
+  CreateInventoryFunctionDto,
+  UpdateInventoryFunctionDto,
+} from './dto/inventory-function.dto';
+import { AssetHistoryService } from './asset-history.service';
+
+export interface InventoryFunctionRow {
+  id: string; code: string; name: string; description: string | null;
+  isActive: boolean; sortOrder: number; createdAt: Date; updatedAt: Date;
+}
+
+export interface FunctionAssignmentRow {
+  id: string; assetId: string; functionId: string; functionCode: string; functionName: string;
+  validFrom: Date; validUntil: Date | null; reason: string | null;
+  changedBy: string | null; changedByUsername: string | null; createdAt: Date;
+}
+
+interface FunctionEligibleAsset {
+  id: string; code: string; name: string; typeCode: string; typeName: string;
+  familyCode: string | null; familyName: string | null;
+}
+
+function normalized(value: string | null): string {
+  return (value ?? '').normalize('NFD').replace(/[\u0300-\u036f]/g, '').toLowerCase().replace(/[^a-z0-9]+/g, ' ').trim();
+}
+
+@Injectable()
+export class InventoryFunctionService {
+  constructor(
+    private readonly dataSource: DataSource,
+    private readonly audit: AuditService,
+    private readonly history: AssetHistoryService,
+  ) {}
+
+  async list(includeInactive = false): Promise<{ data: InventoryFunctionRow[] }> {
+    const data = await this.dataSource.query(`
+      SELECT id,code,name,description,is_active AS "isActive",sort_order AS "sortOrder",
+        created_at AS "createdAt",updated_at AS "updatedAt"
+      FROM inventory_functions
+      ${includeInactive ? '' : 'WHERE is_active=true'}
+      ORDER BY sort_order,name,code
+    `) as InventoryFunctionRow[];
+    return { data };
+  }
+
+  async create(dto: CreateInventoryFunctionDto, principal: AuthPrincipal, request: RequestWithContext): Promise<InventoryFunctionRow> {
+    return this.dataSource.transaction(async (manager) => {
+      const [duplicate] = await manager.query('SELECT 1 FROM inventory_functions WHERE lower(code)=lower($1) LIMIT 1', [dto.code]) as unknown[];
+      if (duplicate) throw new ConflictException({ code: 'INVENTORY_FUNCTION_CODE_EXISTS', message: 'Ya existe una función con ese código' });
+      const [created] = await manager.query(`
+        INSERT INTO inventory_functions(code,name,description,is_active,sort_order,created_by,updated_by)
+        VALUES($1,$2,$3,true,$4,$5,$5)
+        RETURNING id,code,name,description,is_active AS "isActive",sort_order AS "sortOrder",
+          created_at AS "createdAt",updated_at AS "updatedAt"
+      `, [dto.code, dto.name, dto.description ?? null, dto.sortOrder ?? 0, principal.userId]) as InventoryFunctionRow[];
+      await this.audit.record({ ...administrationAuditContext(principal, request), action: AuditAction.INVENTORY_FUNCTION_CREATED,
+        entityType: 'inventory_function', entityId: created.id, afterData: created as unknown as Record<string, unknown> }, manager);
+      return created;
+    });
+  }
+
+  async update(id: string, dto: UpdateInventoryFunctionDto, principal: AuthPrincipal, request: RequestWithContext): Promise<InventoryFunctionRow> {
+    if (Object.keys(dto).length === 0) throw new BadRequestException({ code: 'NO_CHANGES', message: 'No se recibieron cambios' });
+    return this.dataSource.transaction(async (manager) => {
+      const before = await this.requireFunction(manager, id, false);
+      const [updated] = await manager.query(`
+        UPDATE inventory_functions SET
+          name=COALESCE($2,name), description=CASE WHEN $3::boolean THEN $4 ELSE description END,
+          is_active=COALESCE($5,is_active), sort_order=COALESCE($6,sort_order),
+          updated_by=$7,updated_at=CURRENT_TIMESTAMP
+        WHERE id=$1
+        RETURNING id,code,name,description,is_active AS "isActive",sort_order AS "sortOrder",
+          created_at AS "createdAt",updated_at AS "updatedAt"
+      `, [id, dto.name ?? null, dto.description !== undefined, dto.description ?? null, dto.isActive ?? null, dto.sortOrder ?? null, principal.userId]) as InventoryFunctionRow[];
+      await this.audit.record({ ...administrationAuditContext(principal, request), action: AuditAction.INVENTORY_FUNCTION_UPDATED,
+        entityType: 'inventory_function', entityId: id, beforeData: before as unknown as Record<string, unknown>,
+        afterData: updated as unknown as Record<string, unknown> }, manager);
+      return updated;
+    });
+  }
+
+  async getForAsset(assetId: string) {
+    return this.dataSource.transaction((manager) => this.getForAssetWithManager(manager, assetId));
+  }
+
+  async changeForAsset(assetId: string, dto: ChangeInventoryFunctionDto, principal: AuthPrincipal, request: RequestWithContext) {
+    return this.dataSource.transaction(async (manager) => {
+      const asset = await this.requireEligibleAsset(manager, assetId, true);
+      const nextFunction = await this.requireFunction(manager, dto.functionId, true);
+      const effectiveAt = dto.effectiveAt ? new Date(dto.effectiveAt) : new Date();
+      if (!Number.isFinite(effectiveAt.getTime())) throw new BadRequestException({ code: 'INVENTORY_FUNCTION_EFFECTIVE_DATE_INVALID', message: 'La fecha efectiva del cambio de función no es válida' });
+      if (effectiveAt.getTime() > Date.now() + 60_000) throw new BadRequestException({ code: 'INVENTORY_FUNCTION_FUTURE_DATE_NOT_ALLOWED', message: 'El cambio de función no puede registrarse con fecha futura' });
+
+      const current = await this.currentAssignment(manager, assetId, true);
+      if (current?.functionId === nextFunction.id) return this.getForAssetWithManager(manager, assetId);
+      if (current && effectiveAt.getTime() <= new Date(current.validFrom).getTime()) {
+        throw new ConflictException({ code: 'INVENTORY_FUNCTION_EFFECTIVE_DATE_OVERLAP', message: 'La fecha efectiva debe ser posterior al inicio de la función vigente' });
+      }
+      if (current) await manager.query(`UPDATE inventory_function_assignments SET valid_until=$2 WHERE id=$1 AND valid_until IS NULL`, [current.id, effectiveAt]);
+      await manager.query(`INSERT INTO inventory_function_assignments(asset_id,function_id,valid_from,change_reason,changed_by) VALUES($1,$2,$3,$4,$5)`,
+        [assetId, nextFunction.id, effectiveAt, dto.reason ?? null, principal.userId]);
+      await manager.query(`UPDATE assets SET updated_by=$2,updated_at=CURRENT_TIMESTAMP WHERE id=$1`, [assetId, principal.userId]);
+
+      const versionNumber = await this.history.capture(manager, assetId, AssetVersionChangeType.FUNCTION_CHANGED, principal, request);
+      const after = await this.getForAssetWithManager(manager, assetId);
+      await this.audit.record({
+        ...administrationAuditContext(principal, request), action: AuditAction.ASSET_FUNCTION_CHANGED,
+        entityType: 'asset', entityId: assetId,
+        beforeData: current ? { functionId: current.functionId, functionCode: current.functionCode, functionName: current.functionName, validFrom: current.validFrom } : { functionId: null },
+        afterData: { functionId: nextFunction.id, functionCode: nextFunction.code, functionName: nextFunction.name, effectiveAt, reason: dto.reason ?? null, versionNumber },
+        metadata: { inventoryCode: asset.code, inventoryName: asset.name, temporal: true, historySource: 'inventory_function_assignments', assetVersionChangeType: AssetVersionChangeType.FUNCTION_CHANGED },
+      }, manager);
+      return after;
+    });
+  }
+
+  private async getForAssetWithManager(manager: EntityManager, assetId: string) {
+    const asset = await this.requireEligibleAsset(manager, assetId, false);
+    const currentFunction = await this.currentAssignment(manager, assetId, false);
+    const history = await manager.query(`
+      SELECT assignment.id,assignment.asset_id AS "assetId",assignment.function_id AS "functionId",
+        fn.code AS "functionCode",fn.name AS "functionName",
+        assignment.valid_from AS "validFrom",assignment.valid_until AS "validUntil",
+        assignment.change_reason AS reason,assignment.changed_by AS "changedBy",
+        actor.username AS "changedByUsername",assignment.created_at AS "createdAt"
+      FROM inventory_function_assignments assignment
+      JOIN inventory_functions fn ON fn.id=assignment.function_id
+      LEFT JOIN users actor ON actor.id=assignment.changed_by
+      WHERE assignment.asset_id=$1
+      ORDER BY assignment.valid_from DESC,assignment.created_at DESC
+    `, [assetId]) as FunctionAssignmentRow[];
+    return { asset: { id: asset.id, code: asset.code, name: asset.name, typeCode: asset.typeCode, typeName: asset.typeName, familyCode: asset.familyCode, familyName: asset.familyName }, currentFunction, history };
+  }
+
+  private async currentAssignment(manager: EntityManager, assetId: string, lock: boolean): Promise<FunctionAssignmentRow | null> {
+    const [row] = await manager.query(`
+      SELECT assignment.id,assignment.asset_id AS "assetId",assignment.function_id AS "functionId",
+        fn.code AS "functionCode",fn.name AS "functionName",
+        assignment.valid_from AS "validFrom",assignment.valid_until AS "validUntil",
+        assignment.change_reason AS reason,assignment.changed_by AS "changedBy",
+        actor.username AS "changedByUsername",assignment.created_at AS "createdAt"
+      FROM inventory_function_assignments assignment
+      JOIN inventory_functions fn ON fn.id=assignment.function_id
+      LEFT JOIN users actor ON actor.id=assignment.changed_by
+      WHERE assignment.asset_id=$1 AND assignment.valid_until IS NULL
+      ${lock ? 'FOR UPDATE OF assignment' : ''}
+    `, [assetId]) as FunctionAssignmentRow[];
+    return row ?? null;
+  }
+
+  private async requireFunction(manager: EntityManager, id: string, active: boolean): Promise<InventoryFunctionRow> {
+    const [row] = await manager.query(`
+      SELECT id,code,name,description,is_active AS "isActive",sort_order AS "sortOrder",created_at AS "createdAt",updated_at AS "updatedAt"
+      FROM inventory_functions WHERE id=$1 ${active ? 'AND is_active=true' : ''}
+    `, [id]) as InventoryFunctionRow[];
+    if (!row) throw new NotFoundException({ code: 'INVENTORY_FUNCTION_NOT_FOUND', message: active ? 'La función seleccionada no existe o está inactiva' : 'Función no encontrada' });
+    return row;
+  }
+
+  private async requireEligibleAsset(manager: EntityManager, assetId: string, lock: boolean): Promise<FunctionEligibleAsset> {
+    const [asset] = await manager.query(`
+      SELECT asset.id,asset.code,asset.name,asset_type.code AS "typeCode",asset_type.name AS "typeName",
+        family.code AS "familyCode",family.name AS "familyName"
+      FROM assets asset JOIN asset_types asset_type ON asset_type.id=asset.asset_type_id
+      LEFT JOIN inventory_families family ON family.id=asset.inventory_family_id
+      WHERE asset.id=$1 ${lock ? 'FOR UPDATE OF asset' : ''}
+    `, [assetId]) as FunctionEligibleAsset[];
+    if (!asset) throw new NotFoundException({ code: 'ASSET_NOT_FOUND', message: 'Inventario no encontrado' });
+    const values = [asset.typeCode, asset.typeName, asset.familyCode, asset.familyName].map(normalized);
+    const eligible = values.some((value) => value === 'estacion' || value === 'subestacion' || value.includes('estacion ') || value.includes('subestacion ') || value.endsWith(' estacion') || value.endsWith(' subestacion'));
+    if (!eligible) throw new ConflictException({ code: 'INVENTORY_FUNCTION_CHANGE_NOT_ALLOWED', message: 'El cambio de función sólo está habilitado para Inventarios de Estación o Subestación' });
+    return asset;
+  }
+}

api-v3/src/asset-master/inventory-merge.controller.ts

@@ -0,0 +1,53 @@
+import {
+  Body,
+  Controller,
+  Get,
+  Param,
+  ParseUUIDPipe,
+  Post,
+  Req,
+} from '@nestjs/common';
+import { CurrentAuth } from '../auth/decorators/current-auth.decorator';
+import { RequirePermissions } from '../authorization/decorators/require-permissions.decorator';
+import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
+import { MergeInventoryAssetDto } from './dto/merge-inventory-asset.dto';
+import { InventoryMergeService } from './inventory-merge.service';
+
+@Controller('assets')
+export class InventoryMergeController {
+  constructor(private readonly merges: InventoryMergeService) {}
+
+  @Get(':id/merge-status')
+  @RequirePermissions('assets.read')
+  status(@Param('id', new ParseUUIDPipe({ version: '4' })) id: string) {
+    return this.merges.status(id);
+  }
+
+  @Post(':id/merge')
+  @RequirePermissions('assets.update')
+  merge(
+    @Param('id', new ParseUUIDPipe({ version: '4' })) id: string,
+    @Body() dto: MergeInventoryAssetDto,
+    @CurrentAuth() principal: AuthPrincipal,
+    @Req() request: RequestWithContext,
+  ) {
+    return this.merges.merge(id, dto, principal, request);
+  }
+}
+
+@Controller('inspection-visits/:visitId/field-inventory')
+export class FieldInventoryMergeController {
+  constructor(private readonly merges: InventoryMergeService) {}
+
+  @Post(':assetId/merge')
+  @RequirePermissions('assets.create', 'inspections.execute')
+  mergeFieldDiscovery(
+    @Param('visitId', new ParseUUIDPipe({ version: '4' })) visitId: string,
+    @Param('assetId', new ParseUUIDPipe({ version: '4' })) assetId: string,
+    @Body() dto: MergeInventoryAssetDto,
+    @CurrentAuth() principal: AuthPrincipal,
+    @Req() request: RequestWithContext,
+  ) {
+    return this.merges.mergeFromVisit(visitId, assetId, dto, principal, request);
+  }
+}

api-v3/src/asset-master/inventory-merge.service.ts

@@ -0,0 +1,432 @@
+import {
+  BadRequestException,
+  ConflictException,
+  Injectable,
+  NotFoundException,
+} from '@nestjs/common';
+import { DataSource, EntityManager } from 'typeorm';
+import { administrationAuditContext } from '../administration/common/administration-audit';
+import { AuditService } from '../audit/audit.service';
+import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
+import {
+  AssetVersionChangeType,
+  AuditAction,
+} from '../database/entities';
+import { assertMobileInspector } from '../inspection-operations/mobile-inspector-policy';
+import type { MergeInventoryAssetDto } from './dto/merge-inventory-asset.dto';
+import { AssetHistoryService } from './asset-history.service';
+
+type MergeableAssetRow = {
+  id: string;
+  code: string;
+  name: string;
+  typeCode: string;
+  parentId: string | null;
+  operationalAreaId: string | null;
+  operatorCompanyId: string | null;
+  inventoryFamilyId: string | null;
+  informationStatus: string;
+};
+
+type MergeRow = {
+  id: string;
+  sourceAssetId: string;
+  canonicalAssetId: string;
+  reason: string;
+  mergedAt: Date;
+  mergedBy: string | null;
+  source: string;
+  requestId: string | null;
+};
+
+const MERGEABLE_TYPES = new Set(['instalacion', 'subinstalacion']);
+
+@Injectable()
+export class InventoryMergeService {
+  constructor(
+    private readonly dataSource: DataSource,
+    private readonly audit: AuditService,
+    private readonly history: AssetHistoryService,
+  ) {}
+
+  async status(assetId: string) {
+    const requested = await this.loadAsset(this.dataSource.manager, assetId, false);
+    const canonicalId = await this.resolveCanonicalId(this.dataSource.manager, assetId);
+    const canonical = canonicalId === assetId
+      ? requested
+      : await this.loadAsset(this.dataSource.manager, canonicalId, false);
+    const chain = await this.mergeChain(assetId);
+    const aliases = await this.aliasesFor(canonicalId);
+    return {
+      requested,
+      isMerged: canonicalId !== assetId,
+      canonical,
+      chain,
+      aliases,
+    };
+  }
+
+  async merge(
+    sourceAssetId: string,
+    dto: MergeInventoryAssetDto,
+    principal: AuthPrincipal,
+    request: RequestWithContext,
+  ) {
+    return this.dataSource.transaction((manager) =>
+      this.mergeInTransaction(manager, sourceAssetId, dto, principal, request),
+    );
+  }
+
+  async mergeFromVisit(
+    visitId: string,
+    sourceAssetId: string,
+    dto: MergeInventoryAssetDto,
+    principal: AuthPrincipal,
+    request: RequestWithContext,
+  ) {
+    assertMobileInspector(principal);
+    const [gate] = (await this.dataSource.query(`
+      SELECT
+        visit.status,
+        EXISTS (
+          SELECT 1 FROM inspection_visit_members member
+          WHERE member.visit_id=visit.id
+            AND member.user_id=$3::uuid
+            AND member.included=true
+        ) OR visit.lead_inspector_user_id=$3::uuid AS assigned,
+        EXISTS (
+          SELECT 1 FROM asset_field_discoveries discovery
+          WHERE discovery.visit_id=visit.id
+            AND discovery.asset_id=$2::uuid
+        ) AS "createdInVisit"
+      FROM inspection_visits visit
+      WHERE visit.id=$1::uuid
+    `, [visitId, sourceAssetId, principal.userId])) as Array<{
+      status: string;
+      assigned: boolean;
+      createdInVisit: boolean;
+    }>;
+    if (!gate) throw new NotFoundException({ code: 'INSPECTION_VISIT_NOT_FOUND', message: 'Inspección no encontrada' });
+    if (gate.status !== 'IN_PROGRESS') throw new ConflictException({
+      code: 'FIELD_MERGE_VISIT_NOT_IN_PROGRESS',
+      message: 'Sólo se puede conciliar Inventario mientras la inspección está en curso',
+    });
+    if (!gate.assigned) throw new ConflictException({
+      code: 'FIELD_MERGE_INSPECTOR_NOT_ASSIGNED',
+      message: 'El inspector no está asignado a esta inspección',
+    });
+    if (!gate.createdInVisit) throw new ConflictException({
+      code: 'FIELD_MERGE_SOURCE_MUST_BE_DISCOVERY',
+      message: 'Desde la APK sólo se puede fusionar un alta nacida en esta inspección',
+    });
+    return this.merge(sourceAssetId, dto, principal, request);
+  }
+
+  private async mergeInTransaction(
+    manager: EntityManager,
+    sourceAssetId: string,
+    dto: MergeInventoryAssetDto,
+    principal: AuthPrincipal,
+    request: RequestWithContext,
+  ) {
+    const existing = await this.currentMerge(manager, sourceAssetId);
+    if (existing) throw new ConflictException({
+      code: 'INVENTORY_ALREADY_MERGED',
+      message: 'Este registro ya fue fusionado',
+      canonicalAssetId: existing.canonicalAssetId,
+    });
+
+    const canonicalAssetId = await this.resolveCanonicalId(manager, dto.canonicalAssetId);
+    if (canonicalAssetId === sourceAssetId) throw new BadRequestException({
+      code: 'INVENTORY_MERGE_CYCLE',
+      message: 'La fusión generaría un ciclo entre registros',
+    });
+
+    const ids = [sourceAssetId, canonicalAssetId].sort();
+    const locked = (await manager.query(`
+      SELECT asset.id,asset.code,asset.name,type.code AS "typeCode",
+        asset.parent_id AS "parentId",
+        asset.operational_area_id AS "operationalAreaId",
+        asset.operator_company_id AS "operatorCompanyId",
+        asset.inventory_family_id AS "inventoryFamilyId",
+        asset.information_status AS "informationStatus"
+      FROM assets asset
+      JOIN asset_types type ON type.id=asset.asset_type_id
+      WHERE asset.id=ANY($1::uuid[])
+      ORDER BY asset.id
+      FOR UPDATE OF asset
+    `, [ids])) as MergeableAssetRow[];
+    const source = locked.find((row) => row.id === sourceAssetId);
+    const canonical = locked.find((row) => row.id === canonicalAssetId);
+    if (!source || !canonical) throw new NotFoundException({ code: 'ASSET_NOT_FOUND', message: 'Registro de Inventario no encontrado' });
+
+    this.validatePair(source, canonical);
+    const sourceParentCanonical = source.parentId
+      ? await this.resolveCanonicalId(manager, source.parentId)
+      : null;
+    const targetParentCanonical = canonical.parentId
+      ? await this.resolveCanonicalId(manager, canonical.parentId)
+      : null;
+    if (sourceParentCanonical !== targetParentCanonical) throw new BadRequestException({
+      code: 'INVENTORY_MERGE_PARENT_MISMATCH',
+      message: 'Los duplicados deben pertenecer al mismo padre estructural (considerando fusiones previas)',
+    });
+
+    if (source.typeCode.toLowerCase() === 'instalacion') {
+      const invalidChildren = await manager.query(`
+        SELECT child.id,child.code,child.name
+        FROM assets child
+        WHERE child.parent_id=$1::uuid
+          AND child.information_status<>'INACTIVE'
+          AND (
+            child.inventory_family_id IS NULL
+            OR $2::uuid IS NULL
+            OR NOT EXISTS (
+              SELECT 1 FROM inventory_family_parent_rules rule
+              WHERE rule.child_family_id=child.inventory_family_id
+                AND rule.parent_family_id=$2::uuid
+            )
+          )
+        ORDER BY child.name,child.code
+        LIMIT 20
+      `, [source.id, canonical.inventoryFamilyId]) as Array<{ id: string; code: string; name: string }>;
+      if (invalidChildren.length > 0) throw new ConflictException({
+        code: 'INVENTORY_MERGE_CHILD_FAMILY_CONFLICT',
+        message: 'Hay Subinstalaciones que no son compatibles con la familia de la Instalación canónica',
+        data: invalidChildren,
+      });
+    }
+
+    const [sourceSnapshot, canonicalSnapshot] = await Promise.all([
+      this.snapshot(manager, source.id),
+      this.snapshot(manager, canonical.id),
+    ]);
+    const sourceLabel = principal.transport === 'bearer' ? 'ANDROID' : 'WEB';
+    const [mergeRecord] = (await manager.query(`
+      INSERT INTO asset_merges (
+        source_asset_id,canonical_asset_id,reason,merged_by,source,request_id,
+        source_snapshot,canonical_snapshot
+      ) VALUES ($1::uuid,$2::uuid,$3::text,$4::uuid,$5::varchar,$6::varchar,$7::jsonb,$8::jsonb)
+      RETURNING id,source_asset_id AS "sourceAssetId",canonical_asset_id AS "canonicalAssetId",
+        reason,merged_at AS "mergedAt",merged_by AS "mergedBy",source,request_id AS "requestId"
+    `, [
+      source.id,
+      canonical.id,
+      dto.reason,
+      principal.userId,
+      sourceLabel,
+      request.requestId,
+      sourceSnapshot,
+      canonicalSnapshot,
+    ])) as MergeRow[];
+
+    const children = (await manager.query(`
+      SELECT id FROM assets
+      WHERE parent_id=$1::uuid AND information_status<>'INACTIVE'
+      ORDER BY id FOR UPDATE
+    `, [source.id])) as Array<{ id: string }>;
+    const reparentedChildIds: string[] = [];
+    for (const child of children) {
+      await manager.query(`
+        UPDATE asset_context_history
+        SET valid_until=CURRENT_TIMESTAMP,
+            end_reason=$2::text,
+            ended_by=$3::uuid,
+            ended_at=CURRENT_TIMESTAMP
+        WHERE asset_id=$1::uuid AND valid_until IS NULL
+      `, [child.id, `Reparentado por fusión cronológica ${source.code} → ${canonical.code}`, principal.userId]);
+      await manager.query(`
+        UPDATE assets
+        SET parent_id=$2::uuid,updated_by=$3::uuid,updated_at=CURRENT_TIMESTAMP
+        WHERE id=$1::uuid
+      `, [child.id, canonical.id, principal.userId]);
+      const versionNumber = await this.history.capture(
+        manager,
+        child.id,
+        AssetVersionChangeType.UPDATED,
+        principal,
+        request,
+      );
+      await manager.query(`
+        INSERT INTO asset_context_history (
+          asset_id,parent_id,operational_area_id,operator_company_id,valid_from,
+          change_reason,asset_version_number,source,request_id,created_by
+        )
+        SELECT id,parent_id,operational_area_id,operator_company_id,CURRENT_TIMESTAMP,
+          $2::text,$3::integer,$4::varchar,$5::varchar,$6::uuid
+        FROM assets WHERE id=$1::uuid
+      `, [
+        child.id,
+        `Reparentado por fusión cronológica ${source.code} → ${canonical.code}`,
+        versionNumber,
+        sourceLabel,
+        request.requestId,
+        principal.userId,
+      ]);
+      reparentedChildIds.push(child.id);
+    }
+
+    await manager.query(`
+      UPDATE assets
+      SET information_status='INACTIVE',updated_by=$2::uuid,updated_at=CURRENT_TIMESTAMP
+      WHERE id=$1::uuid
+    `, [source.id, principal.userId]);
+    const sourceVersionNumber = await this.history.capture(
+      manager,
+      source.id,
+      AssetVersionChangeType.STATUS_CHANGED,
+      principal,
+      request,
+    );
+
+    const result = {
+      merge: mergeRecord,
+      source: { id: source.id, code: source.code, name: source.name },
+      canonical: { id: canonical.id, code: canonical.code, name: canonical.name },
+      sourceVersionNumber,
+      reparentedChildIds,
+      historyPolicy: 'HISTORICAL_REFERENCES_PRESERVED',
+    };
+    await this.audit.record({
+      ...administrationAuditContext(principal, request),
+      action: AuditAction.ASSET_UPDATED,
+      entityType: 'asset_merge',
+      entityId: mergeRecord.id,
+      beforeData: sourceSnapshot,
+      afterData: canonicalSnapshot,
+      metadata: {
+        operation: 'CHRONOLOGICAL_MERGE',
+        sourceAssetId: source.id,
+        canonicalAssetId: canonical.id,
+        reason: dto.reason,
+        sourceVersionNumber,
+        reparentedChildIds,
+        historicalReferencesRewritten: false,
+      },
+    }, manager);
+    return result;
+  }
+
+  private validatePair(source: MergeableAssetRow, canonical: MergeableAssetRow): void {
+    const sourceType = source.typeCode.toLowerCase();
+    const targetType = canonical.typeCode.toLowerCase();
+    if (!MERGEABLE_TYPES.has(sourceType) || sourceType !== targetType) throw new BadRequestException({
+      code: 'INVENTORY_MERGE_TYPE_INVALID',
+      message: 'Sólo se pueden fusionar Instalaciones entre sí o Subinstalaciones entre sí',
+    });
+    if (source.informationStatus === 'INACTIVE') throw new ConflictException({
+      code: 'INVENTORY_MERGE_SOURCE_INACTIVE',
+      message: 'El registro de origen ya está inactivo',
+    });
+    if (canonical.informationStatus === 'INACTIVE') throw new ConflictException({
+      code: 'INVENTORY_MERGE_CANONICAL_INACTIVE',
+      message: 'El registro canónico no puede estar inactivo',
+    });
+    if (!source.operationalAreaId || !source.operatorCompanyId
+      || source.operationalAreaId !== canonical.operationalAreaId
+      || source.operatorCompanyId !== canonical.operatorCompanyId) {
+      throw new BadRequestException({
+        code: 'INVENTORY_MERGE_CONTEXT_MISMATCH',
+        message: 'Los registros deben pertenecer a la misma Área y Operadora',
+      });
+    }
+  }
+
+  private async loadAsset(manager: EntityManager, id: string, lock: boolean): Promise<MergeableAssetRow> {
+    const lockSql = lock ? 'FOR UPDATE OF asset' : '';
+    const rows = (await manager.query(`
+      SELECT asset.id,asset.code,asset.name,type.code AS "typeCode",
+        asset.parent_id AS "parentId",
+        asset.operational_area_id AS "operationalAreaId",
+        asset.operator_company_id AS "operatorCompanyId",
+        asset.inventory_family_id AS "inventoryFamilyId",
+        asset.information_status AS "informationStatus"
+      FROM assets asset JOIN asset_types type ON type.id=asset.asset_type_id
+      WHERE asset.id=$1::uuid ${lockSql}
+    `, [id])) as MergeableAssetRow[];
+    if (!rows[0]) throw new NotFoundException({ code: 'ASSET_NOT_FOUND', message: 'Registro de Inventario no encontrado' });
+    return rows[0];
+  }
+
+  private async currentMerge(manager: EntityManager, sourceAssetId: string): Promise<MergeRow | null> {
+    const rows = (await manager.query(`
+      SELECT id,source_asset_id AS "sourceAssetId",canonical_asset_id AS "canonicalAssetId",
+        reason,merged_at AS "mergedAt",merged_by AS "mergedBy",source,request_id AS "requestId"
+      FROM asset_merges WHERE source_asset_id=$1::uuid
+    `, [sourceAssetId])) as MergeRow[];
+    return rows[0] ?? null;
+  }
+
+  private async resolveCanonicalId(manager: EntityManager, assetId: string): Promise<string> {
+    const rows = (await manager.query(`
+      WITH RECURSIVE chain AS (
+        SELECT source_asset_id,canonical_asset_id,1 AS depth
+        FROM asset_merges WHERE source_asset_id=$1::uuid
+        UNION ALL
+        SELECT merge_record.source_asset_id,merge_record.canonical_asset_id,chain.depth+1
+        FROM asset_merges merge_record
+        JOIN chain ON merge_record.source_asset_id=chain.canonical_asset_id
+        WHERE chain.depth<32
+      )
+      SELECT canonical_asset_id AS id FROM chain ORDER BY depth DESC LIMIT 1
+    `, [assetId])) as Array<{ id: string }>;
+    return rows[0]?.id ?? assetId;
+  }
+
+  private async mergeChain(assetId: string): Promise<MergeRow[]> {
+    return (await this.dataSource.query(`
+      WITH RECURSIVE chain AS (
+        SELECT id,source_asset_id,canonical_asset_id,reason,merged_at,merged_by,source,request_id,1 AS depth
+        FROM asset_merges WHERE source_asset_id=$1::uuid
+        UNION ALL
+        SELECT merge_record.id,merge_record.source_asset_id,merge_record.canonical_asset_id,
+          merge_record.reason,merge_record.merged_at,merge_record.merged_by,merge_record.source,merge_record.request_id,
+          chain.depth+1
+        FROM asset_merges merge_record
+        JOIN chain ON merge_record.source_asset_id=chain.canonical_asset_id
+        WHERE chain.depth<32
+      )
+      SELECT id,source_asset_id AS "sourceAssetId",canonical_asset_id AS "canonicalAssetId",
+        reason,merged_at AS "mergedAt",merged_by AS "mergedBy",source,request_id AS "requestId"
+      FROM chain ORDER BY depth
+    `, [assetId])) as MergeRow[];
+  }
+
+  private async aliasesFor(canonicalAssetId: string) {
+    return this.dataSource.query(`
+      WITH RECURSIVE aliases AS (
+        SELECT source_asset_id,canonical_asset_id,reason,merged_at,1 AS depth
+        FROM asset_merges WHERE canonical_asset_id=$1::uuid
+        UNION ALL
+        SELECT merge_record.source_asset_id,merge_record.canonical_asset_id,
+          merge_record.reason,merge_record.merged_at,aliases.depth+1
+        FROM asset_merges merge_record
+        JOIN aliases ON merge_record.canonical_asset_id=aliases.source_asset_id
+        WHERE aliases.depth<32
+      )
+      SELECT alias.source_asset_id AS id,asset.code,asset.name,alias.reason,
+        alias.merged_at AS "mergedAt",alias.depth
+      FROM aliases alias
+      JOIN assets asset ON asset.id=alias.source_asset_id
+      ORDER BY alias.merged_at,alias.depth
+    `, [canonicalAssetId]);
+  }
+
+  private async snapshot(manager: EntityManager, assetId: string): Promise<Record<string, unknown>> {
+    const rows = (await manager.query(`
+      SELECT TO_JSONB(asset) || JSONB_BUILD_OBJECT(
+        'typeCode',type.code,
+        'typeName',type.name,
+        'inventoryFamily',CASE WHEN family.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
+          'id',family.id,'code',family.code,'name',family.name,'level',family.level
+        ) END
+      ) AS snapshot
+      FROM assets asset
+      JOIN asset_types type ON type.id=asset.asset_type_id
+      LEFT JOIN inventory_families family ON family.id=asset.inventory_family_id
+      WHERE asset.id=$1::uuid
+    `, [assetId])) as Array<{ snapshot: Record<string, unknown> }>;
+    if (!rows[0]) throw new NotFoundException({ code: 'ASSET_NOT_FOUND', message: 'Registro de Inventario no encontrado' });
+    return rows[0].snapshot;
+  }
+}

api-v3/src/asset-master/inventory-structure.controller.ts

@@ -0,0 +1,36 @@
+import { Body, Controller, Get, Param, Post, Query, Req } from '@nestjs/common';
+import { CurrentAuth } from '../auth/decorators/current-auth.decorator';
+import { RequirePermissions } from '../authorization/decorators/require-permissions.decorator';
+import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
+import { CreateInventoryStructureDto } from './dto/create-inventory-structure.dto';
+import { InventoryStructureService } from './inventory-structure.service';
+
+@Controller('inventory-structure')
+export class InventoryStructureController {
+  constructor(private readonly inventoryStructure: InventoryStructureService) {}
+
+  @Get()
+  @RequirePermissions('assets.read')
+  options() {
+    return this.inventoryStructure.options();
+  }
+
+  @Get('parents/:kind')
+  @RequirePermissions('assets.read')
+  parents(
+    @Param('kind') kind: string,
+    @Query('search') search?: string,
+  ) {
+    return this.inventoryStructure.parents(kind, search);
+  }
+
+  @Post()
+  @RequirePermissions('assets.create')
+  create(
+    @Body() dto: CreateInventoryStructureDto,
+    @CurrentAuth() principal: AuthPrincipal,
+    @Req() request: RequestWithContext,
+  ) {
+    return this.inventoryStructure.create(dto, principal, request);
+  }
+}

api-v3/src/asset-master/inventory-structure.service.ts

@@ -0,0 +1,372 @@
+import { randomUUID } from 'node:crypto';
+import {
+  BadRequestException,
+  ConflictException,
+  Injectable,
+  NotFoundException,
+} from '@nestjs/common';
+import { DataSource, EntityManager } from 'typeorm';
+import { administrationAuditContext, isUniqueViolation } from '../administration/common/administration-audit';
+import { AuditService } from '../audit/audit.service';
+import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
+import {
+  AssetDataOrigin,
+  AssetInformationStatus,
+  AssetOperationalStatus,
+  AssetVersionChangeType,
+  AuditAction,
+} from '../database/entities';
+import type { CreateInventoryStructureDto, InventoryStructureKind } from './dto/create-inventory-structure.dto';
+import { AssetHistoryService } from './asset-history.service';
+
+type StructureTypeRow = { id: string; code: string; name: string };
+type FamilyRow = {
+  id: string;
+  code: string;
+  name: string;
+  level: 'INSTALLATION' | 'SUBINSTALLATION';
+  legacyTypeCode: string | null;
+  informationLabels: string[];
+  parentFamilyId: string | null;
+  parentFamilyCode: string | null;
+  parentFamilyName: string | null;
+};
+type ParentRow = {
+  id: string;
+  code: string;
+  name: string;
+  typeCode: string;
+  operationalAreaId: string | null;
+  operatorCompanyId: string | null;
+  inventoryFamilyId: string | null;
+};
+
+const TYPE_CODE_BY_KIND: Record<InventoryStructureKind, string> = {
+  AREA: 'area',
+  YACIMIENTO: 'yacimiento',
+  INSTALACION: 'instalacion',
+  SUBINSTALACION: 'subinstalacion',
+};
+const PARENT_TYPE_BY_KIND: Record<InventoryStructureKind, string | null> = {
+  AREA: null,
+  YACIMIENTO: 'area',
+  INSTALACION: 'yacimiento',
+  SUBINSTALACION: 'instalacion',
+};
+const FAMILY_LEVEL_BY_KIND: Partial<Record<InventoryStructureKind, FamilyRow['level']>> = {
+  INSTALACION: 'INSTALLATION',
+  SUBINSTALACION: 'SUBINSTALLATION',
+};
+
+@Injectable()
+export class InventoryStructureService {
+  constructor(
+    private readonly dataSource: DataSource,
+    private readonly audit: AuditService,
+    private readonly history: AssetHistoryService,
+  ) {}
+
+  async options() {
+    const types = (await this.dataSource.query(`
+      SELECT id,code,name
+      FROM asset_types
+      WHERE lower(code) IN ('area','yacimiento','instalacion','subinstalacion')
+        AND is_active=true
+      ORDER BY CASE lower(code)
+        WHEN 'area' THEN 1 WHEN 'yacimiento' THEN 2
+        WHEN 'instalacion' THEN 3 WHEN 'subinstalacion' THEN 4 ELSE 9 END
+    `)) as StructureTypeRow[];
+    if (types.length !== 4) {
+      throw new ConflictException({
+        code: 'INVENTORY_STRUCTURE_TYPES_INCOMPLETE',
+        message: 'La estructura del Inventario todavía no está completamente configurada',
+      });
+    }
+    const families = (await this.dataSource.query(`
+      SELECT family.id,family.code,family.name,family.level,
+        family.legacy_type_code AS "legacyTypeCode",
+        family.information_labels AS "informationLabels",
+        parent.id AS "parentFamilyId",parent.code AS "parentFamilyCode",parent.name AS "parentFamilyName"
+      FROM inventory_families family
+      LEFT JOIN inventory_family_parent_rules rule ON rule.child_family_id=family.id
+      LEFT JOIN inventory_families parent ON parent.id=rule.parent_family_id
+      WHERE family.is_active=true
+      ORDER BY family.level,family.name,family.code
+    `)) as FamilyRow[];
+    return {
+      levels: [
+        { kind: 'AREA', label: 'Área', type: types.find((item) => item.code.toLowerCase()==='area'), parentKind: null, requiresFamily: false },
+        { kind: 'YACIMIENTO', label: 'Yacimiento', type: types.find((item) => item.code.toLowerCase()==='yacimiento'), parentKind: 'AREA', requiresFamily: false },
+        { kind: 'INSTALACION', label: 'Instalación', type: types.find((item) => item.code.toLowerCase()==='instalacion'), parentKind: 'YACIMIENTO', requiresFamily: true },
+        { kind: 'SUBINSTALACION', label: 'Subinstalación', type: types.find((item) => item.code.toLowerCase()==='subinstalacion'), parentKind: 'INSTALACION', requiresFamily: true },
+      ],
+      installationFamilies: families.filter((item) => item.level==='INSTALLATION'),
+      subinstallationFamilies: families.filter((item) => item.level==='SUBINSTALLATION'),
+    };
+  }
+
+  async parents(kindValue: string, search?: string) {
+    const kind = kindValue.toUpperCase() as InventoryStructureKind;
+    if (!(kind in PARENT_TYPE_BY_KIND) || kind === 'AREA') {
+      throw new BadRequestException({
+        code: 'INVENTORY_STRUCTURE_PARENT_KIND_INVALID',
+        message: 'El nivel indicado no requiere un registro padre',
+      });
+    }
+    const expectedType = PARENT_TYPE_BY_KIND[kind];
+    const parameters: unknown[] = [expectedType];
+    let searchSql = '';
+    if (search?.trim()) {
+      parameters.push(`%${search.trim()}%`);
+      searchSql = `AND (asset.code ILIKE $2 OR asset.name ILIKE $2 OR COALESCE(asset.common_name,'') ILIKE $2)`;
+    }
+    const rows = await this.dataSource.query(`
+      SELECT
+        asset.id,asset.code,asset.name,asset.common_name AS "commonName",
+        JSONB_BUILD_OBJECT('id',type.id,'code',type.code,'name',type.name) AS type,
+        CASE WHEN family.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
+          'id',family.id,'code',family.code,'name',family.name,'level',family.level,
+          'informationLabels',family.information_labels
+        ) END AS "inventoryFamily",
+        CASE WHEN parent.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
+          'id',parent.id,'code',parent.code,'name',parent.name
+        ) END AS parent
+      FROM assets asset
+      JOIN asset_types type ON type.id=asset.asset_type_id
+      LEFT JOIN inventory_families family ON family.id=asset.inventory_family_id
+      LEFT JOIN assets parent ON parent.id=asset.parent_id
+      WHERE lower(type.code)=lower($1::text)
+        AND asset.information_status<>'INACTIVE'
+        ${searchSql}
+      ORDER BY asset.name,asset.code
+      LIMIT 80
+    `, parameters);
+    return { data: rows };
+  }
+
+  async create(
+    dto: CreateInventoryStructureDto,
+    principal: AuthPrincipal,
+    request: RequestWithContext,
+  ) {
+    try {
+      return await this.dataSource.transaction(async (manager) => {
+        const type = await this.requireStructureType(manager, dto.kind);
+        const parent = await this.requireParent(manager, dto.kind, dto.parentId ?? null);
+        const family = await this.requireFamily(manager, dto.kind, dto.familyId ?? null, parent);
+        const code = dto.code?.trim().toUpperCase() || this.generatedCode(dto.kind, dto.name);
+        const operationalAreaId = parent?.operationalAreaId ?? null;
+        const operatorCompanyId = parent?.operatorCompanyId ?? null;
+
+        const inserted = (await manager.query(`
+          INSERT INTO assets (
+            asset_type_id,parent_id,operational_area_id,operator_company_id,inventory_family_id,
+            code,name,common_name,description,information_status,operational_status,
+            data_origin,source_name,source_reference,source_notes,created_by,updated_by,provenance_updated_by
+          ) VALUES (
+            $1::uuid,$2::uuid,$3::uuid,$4::uuid,$5::uuid,
+            $6::varchar,$7::varchar,$8::varchar,$9::text,$10::asset_information_status,$11::asset_operational_status,
+            $12::varchar,$13::varchar,$14::varchar,$15::text,$16::uuid,$16::uuid,$16::uuid
+          ) RETURNING id
+        `, [
+          type.id,
+          parent?.id ?? null,
+          operationalAreaId,
+          operatorCompanyId,
+          family?.id ?? null,
+          code,
+          dto.name,
+          dto.commonName ?? null,
+          dto.description ?? null,
+          AssetInformationStatus.DRAFT,
+          AssetOperationalStatus.UNKNOWN,
+          AssetDataOrigin.MANUAL,
+          'Inventario estructural F3.1',
+          `inventory-structure:${dto.kind.toLowerCase()}`,
+          family ? `Familia técnica: ${family.code} · ${family.name}` : null,
+          principal.userId,
+        ])) as Array<{ id: string }>;
+        const id = inserted[0]?.id;
+        if (!id) throw new Error('No se pudo crear el registro estructural');
+
+        const versionNumber = await this.history.capture(
+          manager,
+          id,
+          AssetVersionChangeType.CREATED,
+          principal,
+          request,
+        );
+        await manager.query(`
+          INSERT INTO asset_context_history (
+            asset_id,parent_id,operational_area_id,operator_company_id,valid_from,
+            change_reason,asset_version_number,source,request_id,created_by
+          ) VALUES ($1,$2,$3,$4,CURRENT_TIMESTAMP,$5,$6,'WEB',$7,$8)
+        `, [
+          id,
+          parent?.id ?? null,
+          operationalAreaId,
+          operatorCompanyId,
+          'Alta guiada de Inventario estructural F3.1',
+          versionNumber,
+          request.requestId,
+          principal.userId,
+        ]);
+        const created = await this.loadView(manager, id);
+        await this.audit.record({
+          ...administrationAuditContext(principal, request),
+          action: AuditAction.ASSET_CREATED,
+          entityType: 'asset',
+          entityId: id,
+          afterData: created as unknown as Record<string, unknown>,
+          metadata: {
+            versionNumber,
+            inventoryStructureKind: dto.kind,
+            inventoryFamilyId: family?.id ?? null,
+            inventoryFamilyCode: family?.code ?? null,
+          },
+        }, manager);
+        return created;
+      });
+    } catch (error) {
+      if (isUniqueViolation(error)) {
+        throw new ConflictException({
+          code: 'ASSET_CODE_ALREADY_EXISTS',
+          message: 'Ya existe un registro de Inventario con ese código',
+        });
+      }
+      throw error;
+    }
+  }
+
+  private async requireStructureType(manager: EntityManager, kind: InventoryStructureKind): Promise<StructureTypeRow> {
+    const rows = (await manager.query(`
+      SELECT id,code,name FROM asset_types
+      WHERE lower(code)=lower($1::text) AND is_active=true LIMIT 1
+    `, [TYPE_CODE_BY_KIND[kind]])) as StructureTypeRow[];
+    if (!rows[0]) {
+      throw new ConflictException({
+        code: 'INVENTORY_STRUCTURE_TYPE_NOT_CONFIGURED',
+        message: `El nivel ${kind} no está configurado`,
+      });
+    }
+    return rows[0];
+  }
+
+  private async requireParent(
+    manager: EntityManager,
+    kind: InventoryStructureKind,
+    parentId: string | null,
+  ): Promise<ParentRow | null> {
+    const expectedType = PARENT_TYPE_BY_KIND[kind];
+    if (!expectedType) {
+      if (parentId) {
+        throw new BadRequestException({
+          code: 'INVENTORY_AREA_MUST_BE_ROOT',
+          message: 'Un Área se crea como registro raíz y no puede tener padre',
+        });
+      }
+      return null;
+    }
+    if (!parentId) {
+      throw new BadRequestException({
+        code: 'INVENTORY_STRUCTURE_PARENT_REQUIRED',
+        message: `Para crear ${kind.toLowerCase()} primero tenés que elegir su ${expectedType}`,
+      });
+    }
+    const rows = (await manager.query(`
+      SELECT asset.id,asset.code,asset.name,type.code AS "typeCode",
+        asset.operational_area_id AS "operationalAreaId",
+        asset.operator_company_id AS "operatorCompanyId",
+        asset.inventory_family_id AS "inventoryFamilyId"
+      FROM assets asset
+      JOIN asset_types type ON type.id=asset.asset_type_id
+      WHERE asset.id=$1::uuid AND asset.information_status<>'INACTIVE'
+      FOR KEY SHARE
+    `, [parentId])) as ParentRow[];
+    const parent = rows[0];
+    if (!parent) throw new NotFoundException({ code: 'INVENTORY_STRUCTURE_PARENT_NOT_FOUND', message: 'El registro padre no existe' });
+    if (parent.typeCode.toLowerCase() !== expectedType) {
+      throw new BadRequestException({
+        code: 'INVENTORY_STRUCTURE_PARENT_INVALID',
+        message: 'La jerarquía requerida es Área → Yacimiento → Instalación → Subinstalación',
+      });
+    }
+    return parent;
+  }
+
+  private async requireFamily(
+    manager: EntityManager,
+    kind: InventoryStructureKind,
+    familyId: string | null,
+    parent: ParentRow | null,
+  ): Promise<FamilyRow | null> {
+    const expectedLevel = FAMILY_LEVEL_BY_KIND[kind];
+    if (!expectedLevel) {
+      if (familyId) throw new BadRequestException({
+        code: 'INVENTORY_STRUCTURE_FAMILY_NOT_ALLOWED',
+        message: 'Área y Yacimiento no llevan familia técnica',
+      });
+      return null;
+    }
+    if (!familyId) throw new BadRequestException({
+      code: 'INVENTORY_STRUCTURE_FAMILY_REQUIRED',
+      message: `Elegí la familia técnica de la ${kind.toLowerCase()}`,
+    });
+    const rows = (await manager.query(`
+      SELECT family.id,family.code,family.name,family.level,
+        family.legacy_type_code AS "legacyTypeCode",
+        family.information_labels AS "informationLabels",
+        parent.id AS "parentFamilyId",parent.code AS "parentFamilyCode",parent.name AS "parentFamilyName"
+      FROM inventory_families family
+      LEFT JOIN inventory_family_parent_rules rule ON rule.child_family_id=family.id
+      LEFT JOIN inventory_families parent ON parent.id=rule.parent_family_id
+      WHERE family.id=$1::uuid AND family.is_active=true
+      LIMIT 1
+    `, [familyId])) as FamilyRow[];
+    const family = rows[0];
+    if (!family) throw new NotFoundException({ code: 'INVENTORY_FAMILY_NOT_FOUND', message: 'La familia técnica no existe' });
+    if (family.level !== expectedLevel) throw new BadRequestException({
+      code: 'INVENTORY_FAMILY_LEVEL_INVALID',
+      message: 'La familia técnica no corresponde al nivel seleccionado',
+    });
+    if (kind === 'SUBINSTALACION' && family.parentFamilyId !== parent?.inventoryFamilyId) {
+      throw new BadRequestException({
+        code: 'INVENTORY_SUBINSTALLATION_FAMILY_PARENT_INVALID',
+        message: 'La Subinstalación elegida no pertenece a la familia de la Instalación seleccionada',
+      });
+    }
+    return family;
+  }
+
+  private generatedCode(kind: InventoryStructureKind, name: string): string {
+    const prefix = kind === 'YACIMIENTO' ? 'YAC' : kind === 'INSTALACION' ? 'INST' : kind === 'SUBINSTALACION' ? 'SUB' : 'AREA';
+    const readable = name
+      .normalize('NFD')
+      .replace(/[\u0300-\u036f]/g, '')
+      .toUpperCase()
+      .replace(/[^A-Z0-9]+/g, '-')
+      .replace(/^-+|-+$/g, '')
+      .slice(0, 48) || 'REGISTRO';
+    return `${prefix}-${readable}-${randomUUID().slice(0, 8).toUpperCase()}`.slice(0, 120);
+  }
+
+  private async loadView(manager: EntityManager, id: string) {
+    const rows = await manager.query(`
+      SELECT asset.id,asset.code,asset.name,asset.common_name AS "commonName",asset.description,
+        asset.information_status AS "informationStatus",asset.operational_status AS "operationalStatus",
+        JSONB_BUILD_OBJECT('id',type.id,'code',type.code,'name',type.name) AS type,
+        CASE WHEN parent.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT('id',parent.id,'code',parent.code,'name',parent.name) END AS parent,
+        CASE WHEN family.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
+          'id',family.id,'code',family.code,'name',family.name,'level',family.level,
+          'informationLabels',family.information_labels
+        ) END AS "inventoryFamily",
+        asset.created_at AS "createdAt",asset.updated_at AS "updatedAt"
+      FROM assets asset
+      JOIN asset_types type ON type.id=asset.asset_type_id
+      LEFT JOIN assets parent ON parent.id=asset.parent_id
+      LEFT JOIN inventory_families family ON family.id=asset.inventory_family_id
+      WHERE asset.id=$1::uuid
+    `, [id]);
+    return rows[0];
+  }
+}

api-v3/src/asset-master/merged-inventory-dossier.service.ts

@@ -0,0 +1,199 @@
+import { Injectable } from '@nestjs/common';
+import { AssetsService } from './assets.service';
+import { InventoryFunctionService } from './inventory-function.service';
+import { InventoryMergeService } from './inventory-merge.service';
+
+type LooseRecord = Record<string, any>;
+
+function dedupeById<T extends LooseRecord>(items: T[]): T[] {
+  const seen = new Set<string>();
+  const result: T[] = [];
+  for (const item of items) {
+    const id = String(item.id ?? '');
+    if (!id || seen.has(id)) continue;
+    seen.add(id);
+    result.push(item);
+  }
+  return result;
+}
+
+function sortDesc(items: LooseRecord[], fieldCandidates: string[]): LooseRecord[] {
+  return [...items].sort((a, b) => {
+    const first = fieldCandidates.map((field) => b[field]).find(Boolean) ?? 0;
+    const second = fieldCandidates.map((field) => a[field]).find(Boolean) ?? 0;
+    return new Date(String(first)).getTime() - new Date(String(second)).getTime();
+  });
+}
+
+@Injectable()
+export class MergedInventoryDossierService {
+  constructor(
+    private readonly assets: AssetsService,
+    private readonly merges: InventoryMergeService,
+    private readonly functions: InventoryFunctionService,
+  ) {}
+
+  async dossier(requestedAssetId: string): Promise<Record<string, unknown>> {
+    const mergeStatus = await this.merges.status(requestedAssetId) as LooseRecord;
+    const canonical = mergeStatus.canonical as LooseRecord;
+    const requested = mergeStatus.requested as LooseRecord;
+    const aliases = (mergeStatus.aliases ?? []) as LooseRecord[];
+    const inventoryIds = [canonical.id, ...aliases.map((alias) => alias.id)]
+      .filter(Boolean)
+      .map(String)
+      .filter((value, index, all) => all.indexOf(value) === index);
+
+    const dossiers = await Promise.all(inventoryIds.map(async (assetId) => {
+      const dossier = await this.assets.dossier(assetId) as LooseRecord;
+      const identity = dossier.asset as LooseRecord;
+      const functionDossier = await this.functions.getForAsset(assetId).catch(() => null) as LooseRecord | null;
+      return { assetId, identity, dossier, functionDossier };
+    }));
+
+    const enrich = (entry: LooseRecord, identity: LooseRecord): LooseRecord => ({
+      ...entry,
+      historicalInventory: {
+        id: identity.id,
+        code: identity.code,
+        name: identity.name,
+        commonName: identity.commonName ?? null,
+        isCanonical: identity.id === canonical.id,
+      },
+    });
+
+    const collect = (key: string): LooseRecord[] => dedupeById(
+      dossiers.flatMap(({ identity, dossier }) =>
+        ((dossier[key] ?? []) as LooseRecord[]).map((entry) => enrich(entry, identity)),
+      ),
+    );
+
+    const visits = sortDesc(collect('visits'), ['actualStartedAt', 'plannedStartAt', 'createdAt']);
+    const acts = sortDesc(collect('acts'), ['occurredAt', 'createdAt']);
+    const findings = sortDesc(collect('findings'), ['createdAt', 'updatedAt']);
+    const evidence = sortDesc(collect('evidence'), ['capturedAt', 'createdAt']);
+    const communications = sortDesc(collect('communications'), ['occurredAt', 'createdAt']);
+    const verificationResults = sortDesc(collect('verificationResults'), ['verifiedAt', 'resultRecordedAt']);
+    const documents = sortDesc(collect('documents'), ['documentDate', 'linkedAt']);
+    const inspectionReports = sortDesc(collect('inspectionReports'), ['generatedAt']);
+    const media = sortDesc(collect('media'), ['capturedAt', 'createdAt']);
+    const versions = sortDesc(collect('versions'), ['occurredAt']);
+
+    const functionHistory = sortDesc(
+      dossiers.flatMap(({ identity, functionDossier }) =>
+        (((functionDossier?.history ?? []) as LooseRecord[]).map((entry) => enrich(entry, identity))),
+      ),
+      ['validFrom', 'createdAt'],
+    );
+    const canonicalFunctionDossier = dossiers.find((item) => item.assetId === canonical.id)?.functionDossier ?? null;
+    const currentFunction = canonicalFunctionDossier?.currentFunction ?? null;
+
+    const timelineSource: LooseRecord[] = dossiers.flatMap(({ identity, dossier }) =>
+      ((dossier.timeline ?? []) as LooseRecord[]).map((event): LooseRecord => ({
+        ...event,
+        meta: {
+          ...(event.meta ?? {}),
+          historicalInventory: {
+            id: identity.id,
+            code: identity.code,
+            name: identity.name,
+            isCanonical: identity.id === canonical.id,
+          },
+        },
+      })),
+    );
+    const timeline: LooseRecord[] = dedupeById<LooseRecord>(timelineSource);
+
+    for (const assignment of functionHistory) {
+      timeline.push({
+        id: `function:${String(assignment.id)}`,
+        kind: 'FUNCTION_CHANGED',
+        occurredAt: assignment.validFrom,
+        title: `Cambio de función · ${String(assignment.functionName)}`,
+        description: assignment.reason ?? null,
+        meta: {
+          functionId: assignment.functionId,
+          functionCode: assignment.functionCode,
+          functionName: assignment.functionName,
+          validFrom: assignment.validFrom,
+          validUntil: assignment.validUntil,
+          changedByUsername: assignment.changedByUsername,
+          historicalInventory: assignment.historicalInventory,
+        },
+      });
+    }
+
+    for (const alias of aliases) {
+      timeline.push({
+        id: `merge:${String(alias.id)}:${String(alias.mergedAt)}`,
+        kind: 'MERGE',
+        occurredAt: alias.mergedAt,
+        title: `Inventario fusionado · ${String(alias.code)}`,
+        description: alias.reason,
+        meta: {
+          sourceAssetId: alias.id,
+          sourceCode: alias.code,
+          sourceName: alias.name,
+          canonicalAssetId: canonical.id,
+          canonicalCode: canonical.code,
+          canonicalName: canonical.name,
+          historyPreserved: true,
+        },
+      });
+    }
+    timeline.sort((a, b) => new Date(String(b.occurredAt ?? 0)).getTime() - new Date(String(a.occurredAt ?? 0)).getTime());
+
+    const reports = documents.filter((document) => document.documentType === 'TECHNICAL_REPORT');
+    const openFindings = findings.filter((finding) => finding.status === 'OPEN').length;
+    const closedFindings = findings.filter((finding) => finding.status === 'CLOSED').length;
+
+    return {
+      asset: {
+        id: canonical.id,
+        code: canonical.code,
+        name: canonical.name,
+        commonName: dossiers.find((item) => item.assetId === canonical.id)?.identity?.commonName ?? null,
+        currentFunction,
+      },
+      requestedAsset: {
+        id: requested.id,
+        code: requested.code,
+        name: requested.name,
+      },
+      merge: {
+        requestedWasMerged: requested.id !== canonical.id,
+        canonicalAssetId: canonical.id,
+        aliases,
+        chain: mergeStatus.chain ?? [],
+        aggregatedInventoryIds: inventoryIds,
+        historyPolicy: 'CHRONOLOGICAL_AGGREGATION_WITH_ORIGINAL_IDENTITY',
+      },
+      counters: {
+        inspections: visits.length,
+        acts: acts.length,
+        findings: findings.length,
+        verifications: verificationResults.length,
+        openFindings,
+        closedFindings,
+        evidence: evidence.length,
+        documents: documents.length + media.filter((item) => item.kind === 'DOCUMENT').length,
+        photos: evidence.filter((item) => item.kind === 'PHOTO').length + media.filter((item) => item.kind === 'PHOTO').length,
+        reports: reports.length + inspectionReports.length,
+        functionChanges: functionHistory.length,
+      },
+      currentFunction,
+      functionHistory,
+      visits,
+      acts,
+      findings,
+      evidence,
+      communications,
+      verificationResults,
+      documents,
+      inspectionReports,
+      reports,
+      media,
+      versions,
+      timeline: timeline.slice(0, 1000),
+    };
+  }
+}

api-v3/src/dashboard/dashboard.service.ts

@@ -19,12 +19,12 @@ interface DashboardCountsRow {
   inactiveUsers: number | string;
   activeSessions: number | string;
   openFindings: number | string;
-  awaitingCompanyResponse: number | string;
-  overdueCompanyResponses: number | string;
-  companyResponsesDueNext7Days: number | string;
-  awaitingVerificationSchedule: number | string;
+  findingsWithoutControlDate: number | string;
   overdueControls: number | string;
   controlsNext30Days: number | string;
+  reportsWorking: number | string;
+  reportsOfficialized: number | string;
+  sealedActsWithoutReport: number | string;
 }
 
 export interface DashboardUpcomingControl {
@@ -65,43 +65,54 @@ export class DashboardService {
             SELECT COUNT(*) FROM inspection_findings WHERE status = 'OPEN'
           ) AS "openFindings",
           (
-            SELECT COUNT(*) FROM inspection_findings
-            WHERE status = 'OPEN' AND company_response_received_on IS NULL
-          ) AS "awaitingCompanyResponse",
+            SELECT COUNT(*)
+            FROM inspection_findings finding
+            WHERE finding.status = 'OPEN'
+              AND finding.next_control_on IS NULL
+              AND COALESCE((
+                SELECT verification.outcome
+                FROM inspection_finding_verification_visits verification
+                WHERE verification.finding_id=finding.id AND verification.outcome IS NOT NULL
+                ORDER BY verification.result_recorded_at DESC NULLS LAST, verification.created_at DESC, verification.id DESC
+                LIMIT 1
+              ), '') <> 'RESOLVED'
+          ) AS "findingsWithoutControlDate",
           (
-            SELECT COUNT(*) FROM inspection_findings
-            WHERE status = 'OPEN'
-              AND company_response_received_on IS NULL
-              AND correction_due_on IS NOT NULL
-              AND correction_due_on < (CURRENT_TIMESTAMP AT TIME ZONE 'America/Argentina/Mendoza')::date
-          ) AS "overdueCompanyResponses",
-          (
-            SELECT COUNT(*) FROM inspection_findings
-            WHERE status = 'OPEN'
-              AND company_response_received_on IS NULL
-              AND correction_due_on BETWEEN
-                (CURRENT_TIMESTAMP AT TIME ZONE 'America/Argentina/Mendoza')::date
-                AND (CURRENT_TIMESTAMP AT TIME ZONE 'America/Argentina/Mendoza')::date + 7
-          ) AS "companyResponsesDueNext7Days",
-          (
-            SELECT COUNT(*) FROM inspection_findings
-            WHERE status = 'OPEN'
-              AND company_response_received_on IS NOT NULL
-              AND next_control_on IS NULL
-          ) AS "awaitingVerificationSchedule",
-          (
-            SELECT COUNT(*) FROM inspection_findings
-            WHERE status = 'OPEN'
-              AND company_response_received_on IS NOT NULL
-              AND next_control_on < (CURRENT_TIMESTAMP AT TIME ZONE 'America/Argentina/Mendoza')::date
+            SELECT COUNT(*)
+            FROM inspection_findings finding
+            WHERE finding.status = 'OPEN'
+              AND finding.next_control_on < (CURRENT_TIMESTAMP AT TIME ZONE 'America/Argentina/Mendoza')::date
+              AND COALESCE((
+                SELECT verification.outcome
+                FROM inspection_finding_verification_visits verification
+                WHERE verification.finding_id=finding.id AND verification.outcome IS NOT NULL
+                ORDER BY verification.result_recorded_at DESC NULLS LAST, verification.created_at DESC, verification.id DESC
+                LIMIT 1
+              ), '') <> 'RESOLVED'
           ) AS "overdueControls",
           (
-            SELECT COUNT(*) FROM inspection_findings
-            WHERE status = 'OPEN'
-              AND next_control_on BETWEEN
+            SELECT COUNT(*)
+            FROM inspection_findings finding
+            WHERE finding.status = 'OPEN'
+              AND finding.next_control_on BETWEEN
                 (CURRENT_TIMESTAMP AT TIME ZONE 'America/Argentina/Mendoza')::date
                 AND (CURRENT_TIMESTAMP AT TIME ZONE 'America/Argentina/Mendoza')::date + 30
-          ) AS "controlsNext30Days"
+              AND COALESCE((
+                SELECT verification.outcome
+                FROM inspection_finding_verification_visits verification
+                WHERE verification.finding_id=finding.id AND verification.outcome IS NOT NULL
+                ORDER BY verification.result_recorded_at DESC NULLS LAST, verification.created_at DESC, verification.id DESC
+                LIMIT 1
+              ), '') <> 'RESOLVED'
+          ) AS "controlsNext30Days",
+          (SELECT COUNT(*) FROM inspection_reports WHERE status='WORKING') AS "reportsWorking",
+          (SELECT COUNT(*) FROM inspection_reports WHERE status='OFFICIALIZED') AS "reportsOfficialized",
+          (
+            SELECT COUNT(*)
+            FROM inspection_acts act
+            WHERE act.status='SEALED'
+              AND NOT EXISTS (SELECT 1 FROM inspection_reports report WHERE report.act_id=act.id)
+          ) AS "sealedActsWithoutReport"
       `)) as DashboardCountsRow[];
 
       const recentAudit = (await manager.query(`
@@ -135,8 +146,14 @@ export class DashboardService {
         INNER JOIN inspection_visits visit ON visit.id = act.visit_id
         INNER JOIN assets asset ON asset.id = finding.asset_id
         WHERE finding.status = 'OPEN'
-          AND finding.company_response_received_on IS NOT NULL
           AND finding.next_control_on IS NOT NULL
+          AND COALESCE((
+            SELECT verification.outcome
+            FROM inspection_finding_verification_visits verification
+            WHERE verification.finding_id=finding.id AND verification.outcome IS NOT NULL
+            ORDER BY verification.result_recorded_at DESC NULLS LAST, verification.created_at DESC, verification.id DESC
+            LIMIT 1
+          ), '') <> 'RESOLVED'
         ORDER BY finding.next_control_on, finding.code
         LIMIT 8
       `)) as DashboardUpcomingControl[];
@@ -151,12 +168,12 @@ export class DashboardService {
           inactiveUsers: Number(counts?.inactiveUsers ?? 0),
           activeSessions: Number(counts?.activeSessions ?? 0),
           openFindings: Number(counts?.openFindings ?? 0),
-          awaitingCompanyResponse: Number(counts?.awaitingCompanyResponse ?? 0),
-          overdueCompanyResponses: Number(counts?.overdueCompanyResponses ?? 0),
-          companyResponsesDueNext7Days: Number(counts?.companyResponsesDueNext7Days ?? 0),
-          awaitingVerificationSchedule: Number(counts?.awaitingVerificationSchedule ?? 0),
+          findingsWithoutControlDate: Number(counts?.findingsWithoutControlDate ?? 0),
           overdueControls: Number(counts?.overdueControls ?? 0),
           controlsNext30Days: Number(counts?.controlsNext30Days ?? 0),
+          reportsWorking: Number(counts?.reportsWorking ?? 0),
+          reportsOfficialized: Number(counts?.reportsOfficialized ?? 0),
+          sealedActsWithoutReport: Number(counts?.sealedActsWithoutReport ?? 0),
         },
         recentAudit,
         upcomingControls,

api-v3/src/database/entities/asset-version.entity.ts

@@ -5,6 +5,7 @@ export enum AssetVersionChangeType {
   CREATED = 'CREATED',
   UPDATED = 'UPDATED',
   CONTEXT_CHANGED = 'CONTEXT_CHANGED',
+  FUNCTION_CHANGED = 'FUNCTION_CHANGED',
   STATUS_CHANGED = 'STATUS_CHANGED',
   OPERATIONAL_STATUS_CHANGED = 'OPERATIONAL_STATUS_CHANGED',
   REGISTRY_UPDATED = 'REGISTRY_UPDATED',

api-v3/src/database/entities/asset.entity.ts

@@ -33,6 +33,7 @@ export enum AssetDataOrigin {
 @Index('idx_assets_parent_id', ['parentId'])
 @Index('idx_assets_operational_area_id', ['operationalAreaId'])
 @Index('idx_assets_operator_company_id', ['operatorCompanyId'])
+@Index('idx_assets_inventory_family_id', ['inventoryFamilyId'])
 @Index('idx_assets_information_status', ['informationStatus'])
 @Index('idx_assets_operational_status', ['operationalStatus'])
 @Index('idx_assets_data_origin', ['dataOrigin'])
@@ -53,6 +54,9 @@ export class Asset extends TimestampedEntity {
   @Column({ name: 'operator_company_id', type: 'uuid', nullable: true })
   operatorCompanyId!: string | null;
 
+  @Column({ name: 'inventory_family_id', type: 'uuid', nullable: true })
+  inventoryFamilyId!: string | null;
+
   @Column({ type: 'varchar', length: 120 })
   code!: string;
 
@@ -112,4 +116,4 @@ export class Asset extends TimestampedEntity {
 
   @Column({ name: 'provenance_updated_by', type: 'uuid', nullable: true })
   provenanceUpdatedBy!: string | null;
-}
+}

api-v3/src/database/entities/audit-event.entity.ts

@@ -35,6 +35,9 @@ export enum AuditAction {
   ASSET_FIELD_DISCOVERY_REJECTED = 'ASSET_FIELD_DISCOVERY_REJECTED',
   ASSET_UPDATED = 'ASSET_UPDATED',
   ASSET_CONTEXT_CHANGED = 'ASSET_CONTEXT_CHANGED',
+  ASSET_FUNCTION_CHANGED = 'ASSET_FUNCTION_CHANGED',
+  INVENTORY_FUNCTION_CREATED = 'INVENTORY_FUNCTION_CREATED',
+  INVENTORY_FUNCTION_UPDATED = 'INVENTORY_FUNCTION_UPDATED',
   ASSET_INFORMATION_STATUS_CHANGED = 'ASSET_INFORMATION_STATUS_CHANGED',
   ASSET_OPERATIONAL_STATUS_CHANGED = 'ASSET_OPERATIONAL_STATUS_CHANGED',
   ASSET_REGISTRY_UPDATED = 'ASSET_REGISTRY_UPDATED',
@@ -82,15 +85,24 @@ export enum AuditAction {
   INSPECTION_ACT_UPDATED = 'INSPECTION_ACT_UPDATED',
   INSPECTION_ACT_CANCELLED = 'INSPECTION_ACT_CANCELLED',
   INSPECTION_ACT_RESPONSIBLE_UPDATED = 'INSPECTION_ACT_RESPONSIBLE_UPDATED',
+  INSPECTION_ACT_LOCKED = 'INSPECTION_ACT_LOCKED',
+  INSPECTION_ACT_SEALED = 'INSPECTION_ACT_SEALED',
   INSPECTION_ACT_READY = 'INSPECTION_ACT_READY',
   INSPECTION_ACT_REOPENED = 'INSPECTION_ACT_REOPENED',
   INSPECTION_ACT_SIGNATURE_RECORDED = 'INSPECTION_ACT_SIGNATURE_RECORDED',
   INSPECTION_ACT_COMPANY_OUTCOME_RECORDED = 'INSPECTION_ACT_COMPANY_OUTCOME_RECORDED',
   INSPECTION_ACT_CLOSED = 'INSPECTION_ACT_CLOSED',
   INSPECTION_REPORT_GENERATED = 'INSPECTION_REPORT_GENERATED',
+  INSPECTION_REPORT_UPDATED = 'INSPECTION_REPORT_UPDATED',
   INSPECTION_REPORT_REVISION_ADDED = 'INSPECTION_REPORT_REVISION_ADDED',
+  INSPECTION_REPORT_OFFICIALIZED = 'INSPECTION_REPORT_OFFICIALIZED',
+  INSPECTION_REPORT_FOLLOW_UP_ADDED = 'INSPECTION_REPORT_FOLLOW_UP_ADDED',
   INSPECTION_REPORT_APPROVED = 'INSPECTION_REPORT_APPROVED',
   INSPECTION_REPORT_SIGNED = 'INSPECTION_REPORT_SIGNED',
+  INSPECTION_DEADLINE_POLICY_UPDATED = 'INSPECTION_DEADLINE_POLICY_UPDATED',
+  INSPECTION_BUSINESS_CALENDAR_UPDATED = 'INSPECTION_BUSINESS_CALENDAR_UPDATED',
+  SMTP_SETTINGS_UPDATED = 'SMTP_SETTINGS_UPDATED',
+  SMTP_TEST_SENT = 'SMTP_TEST_SENT',
   DOCUMENT_DELIVERY_SETTINGS_UPDATED = 'DOCUMENT_DELIVERY_SETTINGS_UPDATED',
   DOCUMENT_DELIVERY_RETRY_REQUESTED = 'DOCUMENT_DELIVERY_RETRY_REQUESTED',
   DOCUMENT_DELIVERY_SENT = 'DOCUMENT_DELIVERY_SENT',

api-v3/src/database/entities/index.ts

@@ -6,14 +6,8 @@ export { Role } from './role.entity';
 export { UserRole } from './user-role.entity';
 export { User, UserStatus } from './user.entity';
 export { Asset, AssetDataOrigin, AssetInformationStatus, AssetOperationalStatus } from './asset.entity';
-export {
-  AssetVersion,
-  AssetVersionChangeType,
-} from './asset-version.entity';
-export {
-  AssetAttributeDataType,
-  AssetAttributeDefinition,
-} from './asset-attribute-definition.entity';
+export { AssetVersion, AssetVersionChangeType } from './asset-version.entity';
+export { AssetAttributeDataType, AssetAttributeDefinition } from './asset-attribute-definition.entity';
 export { AssetAttributeValue } from './asset-attribute-value.entity';
 export { AreaCompanyRelation, AreaOrganizationRole } from './area-company-relation.entity';
 export { OrganizationProfile, OrganizationKind } from './organization-profile.entity';
@@ -25,69 +19,33 @@ export { AreaLegalRight, AreaLegalRightType, AreaLegalRightStatus } from './area
 export { AreaLegalRightOrganization, AreaLegalRightOrganizationRole } from './area-legal-right-organization.entity';
 export { AssetTypeParentRule } from './asset-type-parent-rule.entity';
 export { AssetType, AssetTypeOperationalRole } from './asset-type.entity';
-export {
-  AssetGeometry,
-  AssetGeometrySource,
-  AssetGeometryType,
-} from './asset-geometry.entity';
-export {
-  AssetMedia,
-  AssetMediaKind,
-  AssetMediaSource,
-} from './asset-media.entity';
-export {
-  SurveyCampaign,
-  SurveyCampaignStatus,
-} from './survey-campaign.entity';
-export {
-  SurveyCampaignTarget,
-  SurveyTargetStatus,
-} from './survey-campaign-target.entity';
-export {
-  SurveyReportOutcome,
-  SurveyReportStatus,
-  SurveyTargetReport,
-} from './survey-target-report.entity';
-export { SurveyTargetReportMedia } from './survey-target-report-media.entity';
-export {
-  SurveyReportVersionEvent,
-  SurveyTargetReportVersion,
-} from './survey-target-report-version.entity';
-export {
-  InspectionVisit,
-  InspectionVisitStatus,
-} from './inspection-visit.entity';
+export { AssetGeometry, AssetGeometrySource, AssetGeometryType } from './asset-geometry.entity';
+export { AssetMedia, AssetMediaKind, AssetMediaSource } from './asset-media.entity';
+export { InspectionVisit, InspectionVisitStatus } from './inspection-visit.entity';
 export { InspectionVisitAsset, InspectionVisitAssetPlanningSource } from './inspection-visit-asset.entity';
 export { InspectionVisitMember } from './inspection-visit-member.entity';
-export {
-  DocumentAnnualSequence,
-  DocumentSequenceType,
-} from './document-annual-sequence.entity';
+export { DocumentAnnualSequence, DocumentSequenceType } from './document-annual-sequence.entity';
 export {
   InspectionAct,
   InspectionActStatus,
+  InspectionActUrgency,
+  InspectionDeadlineBasis,
+  InspectionDeadlineDayType,
 } from './inspection-act.entity';
 export { InspectionActAsset } from './inspection-act-asset.entity';
 export {
   InspectionReport,
   InspectionReportPdfStatus,
-  InspectionReportReviewStatus,
   InspectionReportStatus,
   InspectionReportWordStatus,
 } from './inspection-report.entity';
-export {
-  InspectionActVersion,
-  InspectionActVersionEvent,
-} from './inspection-act-version.entity';
+export { InspectionActVersion, InspectionActVersionEvent } from './inspection-act-version.entity';
 export {
   InspectionActResponsible,
   InspectionResponsibleAttendanceStatus,
   InspectionResponsibleDocumentType,
 } from './inspection-act-responsible.entity';
-export {
-  InspectionActClosure,
-  InspectionActUploadMode,
-} from './inspection-act-closure.entity';
+export { InspectionActClosure, InspectionActUploadMode } from './inspection-act-closure.entity';
 export {
   InspectionActSignature,
   InspectionActSignatureSource,
@@ -95,21 +53,18 @@ export {
   InspectionActSignerType,
   InspectionCompanySignatureManifestation,
 } from './inspection-act-signature.entity';
+export { InspectionDeadlinePolicy } from './inspection-deadline-policy.entity';
+export { InspectionBusinessCalendarDay } from './inspection-business-calendar-day.entity';
+export { InspectionReportFollowUp, InspectionReportFollowUpType } from './inspection-report-follow-up.entity';
+export { SystemSmtpSettings, SmtpSecurityMode } from './system-smtp-settings.entity';
 export { FindingCategory } from './finding-category.entity';
 export { FindingCatalogItem } from './finding-catalog-item.entity';
 export { FindingCatalogItemAssetType } from './finding-catalog-item-asset-type.entity';
 export { FindingCatalogAssetTypeProfile } from './finding-catalog-asset-type-profile.entity';
 export { FindingCatalogAssetOverride } from './finding-catalog-asset-override.entity';
 export { FindingCatalogProposal, FindingCatalogProposalStatus } from './finding-catalog-proposal.entity';
-export {
-  InspectionFinding,
-  InspectionFindingResponseDueBasis,
-  InspectionFindingStatus,
-} from './inspection-finding.entity';
-export {
-  InspectionFindingVersion,
-  InspectionFindingVersionEvent,
-} from './inspection-finding-version.entity';
+export { InspectionFinding, InspectionFindingResponseDueBasis, InspectionFindingStatus } from './inspection-finding.entity';
+export { InspectionFindingVersion, InspectionFindingVersionEvent } from './inspection-finding-version.entity';
 export {
   InspectionCommunicationChannel,
   InspectionCommunicationDirection,
@@ -122,14 +77,8 @@ export {
   InspectionEvidenceSource,
   InspectionFindingEvidence,
 } from './inspection-finding-evidence.entity';
-export {
-  InspectionFindingVerificationVisit,
-  InspectionVerificationOutcome,
-} from './inspection-finding-verification-visit.entity';
-export {
-  InspectionFindingVerificationEvent,
-  InspectionFindingVerificationEventType,
-} from './inspection-finding-verification-event.entity';
+export { InspectionFindingVerificationVisit, InspectionVerificationOutcome } from './inspection-finding-verification-visit.entity';
+export { InspectionFindingVerificationEvent, InspectionFindingVerificationEventType } from './inspection-finding-verification-event.entity';
 
 import { AuditEvent } from './audit-event.entity';
 import { AuthSession } from './auth-session.entity';
@@ -154,11 +103,6 @@ import { AreaLegalRightOrganization } from './area-legal-right-organization.enti
 import { AssetGeometry } from './asset-geometry.entity';
 import { AssetVersion } from './asset-version.entity';
 import { AssetMedia } from './asset-media.entity';
-import { SurveyCampaign } from './survey-campaign.entity';
-import { SurveyCampaignTarget } from './survey-campaign-target.entity';
-import { SurveyTargetReport } from './survey-target-report.entity';
-import { SurveyTargetReportMedia } from './survey-target-report-media.entity';
-import { SurveyTargetReportVersion } from './survey-target-report-version.entity';
 import { InspectionVisit } from './inspection-visit.entity';
 import { InspectionVisitAsset } from './inspection-visit-asset.entity';
 import { InspectionVisitMember } from './inspection-visit-member.entity';
@@ -170,6 +114,10 @@ import { InspectionActVersion } from './inspection-act-version.entity';
 import { InspectionActResponsible } from './inspection-act-responsible.entity';
 import { InspectionActClosure } from './inspection-act-closure.entity';
 import { InspectionActSignature } from './inspection-act-signature.entity';
+import { InspectionDeadlinePolicy } from './inspection-deadline-policy.entity';
+import { InspectionBusinessCalendarDay } from './inspection-business-calendar-day.entity';
+import { InspectionReportFollowUp } from './inspection-report-follow-up.entity';
+import { SystemSmtpSettings } from './system-smtp-settings.entity';
 import { FindingCategory } from './finding-category.entity';
 import { FindingCatalogItem } from './finding-catalog-item.entity';
 import { FindingCatalogItemAssetType } from './finding-catalog-item-asset-type.entity';
@@ -207,11 +155,6 @@ export const PHASE_A_ENTITIES = [
   AssetGeometry,
   AssetVersion,
   AssetMedia,
-  SurveyCampaign,
-  SurveyCampaignTarget,
-  SurveyTargetReport,
-  SurveyTargetReportMedia,
-  SurveyTargetReportVersion,
   InspectionVisit,
   InspectionVisitAsset,
   InspectionVisitMember,
@@ -223,6 +166,10 @@ export const PHASE_A_ENTITIES = [
   InspectionActResponsible,
   InspectionActClosure,
   InspectionActSignature,
+  InspectionDeadlinePolicy,
+  InspectionBusinessCalendarDay,
+  InspectionReportFollowUp,
+  SystemSmtpSettings,
   FindingCategory,
   FindingCatalogItem,
   FindingCatalogItemAssetType,

api-v3/src/database/entities/inspection-act-version.entity.ts

@@ -3,6 +3,8 @@ import { Column, Entity, Index, PrimaryGeneratedColumn } from 'typeorm';
 export enum InspectionActVersionEvent {
   CREATED = 'CREATED',
   UPDATED = 'UPDATED',
+  LOCKED = 'LOCKED',
+  SEALED = 'SEALED',
   READY = 'READY',
   REOPENED = 'REOPENED',
   CLOSED = 'CLOSED',

api-v3/src/database/entities/inspection-act.entity.ts

@@ -3,12 +3,33 @@ import { TimestampedEntity } from './timestamped.entity';
 
 export enum InspectionActStatus {
   DRAFT = 'DRAFT',
+  LOCKED = 'LOCKED',
+  SEALED = 'SEALED',
   READY = 'READY',
   CLOSED = 'CLOSED',
   CANCELLED = 'CANCELLED',
   RECTIFIED = 'RECTIFIED',
 }
 
+export enum InspectionActUrgency {
+  URGENT = 'URGENT',
+  NON_URGENT = 'NON_URGENT',
+}
+
+export enum InspectionDeadlineDayType {
+  BUSINESS = 'BUSINESS',
+  CALENDAR = 'CALENDAR',
+}
+
+export enum InspectionDeadlineBasis {
+  ACT_DATE = 'ACT_DATE',
+  // La columna F4 temprana usó GEDO_DATE. Se conserva el valor físico por
+  // compatibilidad de migración, pero funcionalmente significa "pendiente de
+  // fecha de notificación" hasta que el procedimiento defina el evento válido.
+  NOTIFICATION_DATE = 'GEDO_DATE',
+  GEDO_DATE = 'GEDO_DATE',
+}
+
 @Entity({ name: 'inspection_acts' })
 @Index('uq_inspection_acts_one_draft_per_visit', ['visitId'], { unique: true, where: "status = 'DRAFT'" })
 @Index('uq_inspection_acts_year_number', ['actYear', 'actNumber'], { unique: true })
@@ -16,6 +37,7 @@ export enum InspectionActStatus {
 @Index('idx_inspection_acts_visit_status', ['visitId', 'status'])
 @Index('idx_inspection_acts_occurred_at', ['occurredAt'])
 @Index('idx_inspection_acts_created_by', ['createdBy'])
+@Index('idx_inspection_acts_deadline', ['deadlineAt'])
 export class InspectionAct extends TimestampedEntity {
   @PrimaryGeneratedColumn('uuid')
   id!: string;
@@ -29,7 +51,7 @@ export class InspectionAct extends TimestampedEntity {
   @Column({ name: 'act_number', type: 'integer' })
   actNumber!: number;
 
-  @Column({ type: 'varchar', length: 24 })
+  @Column({ type: 'varchar', length: 40 })
   code!: string;
 
   @Column({ type: 'varchar', length: 24, default: InspectionActStatus.DRAFT })
@@ -47,6 +69,39 @@ export class InspectionAct extends TimestampedEntity {
   @Column({ type: 'text', nullable: true })
   observations!: string | null;
 
+  @Column({ name: 'urgency', type: 'varchar', length: 24, default: InspectionActUrgency.NON_URGENT })
+  urgency!: InspectionActUrgency;
+
+  @Column({ name: 'deadline_days', type: 'integer', nullable: true })
+  deadlineDays!: number | null;
+
+  @Column({ name: 'deadline_day_type', type: 'varchar', length: 24, nullable: true })
+  deadlineDayType!: InspectionDeadlineDayType | null;
+
+  @Column({ name: 'deadline_basis', type: 'varchar', length: 24, nullable: true })
+  deadlineBasis!: InspectionDeadlineBasis | null;
+
+  @Column({ name: 'deadline_base_at', type: 'timestamptz', nullable: true })
+  deadlineBaseAt!: Date | null;
+
+  @Column({ name: 'deadline_at', type: 'timestamptz', nullable: true })
+  deadlineAt!: Date | null;
+
+  @Column({ name: 'locked_at', type: 'timestamptz', nullable: true })
+  lockedAt!: Date | null;
+
+  @Column({ name: 'locked_by', type: 'uuid', nullable: true })
+  lockedBy!: string | null;
+
+  @Column({ name: 'locked_sha256', type: 'char', length: 64, nullable: true })
+  lockedSha256!: string | null;
+
+  @Column({ name: 'sealed_at', type: 'timestamptz', nullable: true })
+  sealedAt!: Date | null;
+
+  @Column({ name: 'sealed_by', type: 'uuid', nullable: true })
+  sealedBy!: string | null;
+
   @Column({ name: 'current_version', type: 'integer', default: 0 })
   currentVersion!: number;
 

api-v3/src/database/entities/inspection-business-calendar-day.entity.ts

@@ -0,0 +1,21 @@
+import { Column, Entity, Index, PrimaryGeneratedColumn } from 'typeorm';
+import { TimestampedEntity } from './timestamped.entity';
+
+@Entity({ name: 'inspection_business_calendar_days' })
+@Index('uq_inspection_business_calendar_day', ['date'], { unique: true })
+export class InspectionBusinessCalendarDay extends TimestampedEntity {
+  @PrimaryGeneratedColumn('uuid')
+  id!: string;
+
+  @Column({ type: 'date' })
+  date!: string;
+
+  @Column({ name: 'is_business_day', type: 'boolean', default: false })
+  isBusinessDay!: boolean;
+
+  @Column({ type: 'varchar', length: 200 })
+  label!: string;
+
+  @Column({ name: 'updated_by', type: 'uuid', nullable: true })
+  updatedBy!: string | null;
+}

api-v3/src/database/entities/inspection-deadline-policy.entity.ts

@@ -0,0 +1,24 @@
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+import { InspectionDeadlineDayType } from './inspection-act.entity';
+import { TimestampedEntity } from './timestamped.entity';
+
+@Entity({ name: 'inspection_deadline_policies' })
+export class InspectionDeadlinePolicy extends TimestampedEntity {
+  @PrimaryGeneratedColumn('uuid')
+  id!: string;
+
+  @Column({ name: 'urgent_days', type: 'integer', default: 5 })
+  urgentDays!: number;
+
+  @Column({ name: 'urgent_day_type', type: 'varchar', length: 24, default: InspectionDeadlineDayType.BUSINESS })
+  urgentDayType!: InspectionDeadlineDayType;
+
+  @Column({ name: 'non_urgent_days', type: 'integer', default: 10 })
+  nonUrgentDays!: number;
+
+  @Column({ name: 'non_urgent_day_type', type: 'varchar', length: 24, default: InspectionDeadlineDayType.BUSINESS })
+  nonUrgentDayType!: InspectionDeadlineDayType;
+
+  @Column({ name: 'updated_by', type: 'uuid', nullable: true })
+  updatedBy!: string | null;
+}

api-v3/src/database/entities/inspection-finding.entity.ts

@@ -1,6 +1,7 @@
 import { Column, Entity, Index, PrimaryGeneratedColumn } from 'typeorm';
 import { TimestampedEntity } from './timestamped.entity';
 
+/** @deprecated Los plazos de respuesta pasan al nivel Acta/Informe en F4. */
 export enum InspectionFindingResponseDueBasis {
   FINDING_DATE = 'FINDING_DATE',
   REPORT_NOTIFICATION = 'REPORT_NOTIFICATION',
@@ -18,6 +19,7 @@ export enum InspectionFindingStatus {
 @Index('idx_inspection_findings_status_control', ['status', 'nextControlOn'])
 @Index('idx_inspection_findings_asset_status', ['assetId', 'status'])
 @Index('idx_inspection_findings_catalog_item', ['catalogItemId'])
+@Index('idx_inspection_findings_recurrence_of', ['recurrenceOfFindingId'])
 export class InspectionFinding extends TimestampedEntity {
   @PrimaryGeneratedColumn('uuid')
   id!: string;
@@ -61,9 +63,16 @@ export class InspectionFinding extends TimestampedEntity {
   @Column({ type: 'smallint', nullable: true })
   severity!: number | null;
 
+  @Column({ name: 'is_recurrence', type: 'boolean', default: false })
+  isRecurrence!: boolean;
+
+  @Column({ name: 'recurrence_of_finding_id', type: 'uuid', nullable: true })
+  recurrenceOfFindingId!: string | null;
+
   @Column({ name: 'correction_due_on', type: 'date', nullable: true })
   correctionDueOn!: string | null;
 
+  // Campos legacy conservados temporalmente para migrar datos sin pérdida.
   @Column({ name: 'response_due_basis', type: 'varchar', length: 32, nullable: true })
   responseDueBasis!: InspectionFindingResponseDueBasis | null;
 

api-v3/src/database/entities/inspection-report-follow-up.entity.ts

@@ -0,0 +1,50 @@
+import { Column, Entity, Index, PrimaryGeneratedColumn } from 'typeorm';
+import { TimestampedEntity } from './timestamped.entity';
+
+export enum InspectionReportFollowUpType {
+  COMPANY_NOTE = 'COMPANY_NOTE',
+  COMPANY_DOCUMENT = 'COMPANY_DOCUMENT',
+  INTERNAL_NOTE = 'INTERNAL_NOTE',
+  VERIFICATION = 'VERIFICATION',
+  OTHER = 'OTHER',
+}
+
+@Entity({ name: 'inspection_report_follow_ups' })
+@Index('idx_inspection_report_follow_ups_report_created', ['reportId', 'createdAt'])
+export class InspectionReportFollowUp extends TimestampedEntity {
+  @PrimaryGeneratedColumn('uuid')
+  id!: string;
+
+  @Column({ name: 'report_id', type: 'uuid' })
+  reportId!: string;
+
+  @Column({ type: 'varchar', length: 40 })
+  type!: InspectionReportFollowUpType;
+
+  @Column({ name: 'external_reference', type: 'varchar', length: 255, nullable: true })
+  externalReference!: string | null;
+
+  @Column({ name: 'occurred_at', type: 'timestamptz' })
+  occurredAt!: Date;
+
+  @Column({ type: 'text', nullable: true })
+  description!: string | null;
+
+  @Column({ name: 'original_name', type: 'varchar', length: 255, nullable: true })
+  originalName!: string | null;
+
+  @Column({ name: 'stored_name', type: 'varchar', length: 255, nullable: true })
+  storedName!: string | null;
+
+  @Column({ name: 'mime_type', type: 'varchar', length: 120, nullable: true })
+  mimeType!: string | null;
+
+  @Column({ name: 'size_bytes', type: 'integer', nullable: true })
+  sizeBytes!: number | null;
+
+  @Column({ name: 'sha256', type: 'char', length: 64, nullable: true })
+  sha256!: string | null;
+
+  @Column({ name: 'created_by', type: 'uuid', nullable: true })
+  createdBy!: string | null;
+}

api-v3/src/database/entities/inspection-report.entity.ts

@@ -2,6 +2,8 @@ import { Column, Entity, Index, PrimaryGeneratedColumn } from 'typeorm';
 import { TimestampedEntity } from './timestamped.entity';
 
 export enum InspectionReportStatus {
+  WORKING = 'WORKING',
+  OFFICIALIZED = 'OFFICIALIZED',
   FROZEN = 'FROZEN',
   CANCELLED = 'CANCELLED',
 }
@@ -18,12 +20,6 @@ export enum InspectionReportWordStatus {
   FAILED = 'FAILED',
 }
 
-export enum InspectionReportReviewStatus {
-  PENDING_REVIEW = 'PENDING_REVIEW',
-  APPROVED = 'APPROVED',
-  SIGNED = 'SIGNED',
-}
-
 @Entity({ name: 'inspection_reports' })
 @Index('idx_inspection_reports_visit_id', ['visitId'])
 @Index('uq_inspection_reports_act', ['actId'], { unique: true })
@@ -31,6 +27,7 @@ export enum InspectionReportReviewStatus {
 @Index('uq_inspection_reports_code', ['code'], { unique: true })
 @Index('idx_inspection_reports_generated_at', ['generatedAt'])
 @Index('idx_inspection_reports_status', ['status', 'pdfStatus'])
+@Index('idx_inspection_reports_gedo_officialized_at', ['gedoOfficializedAt'])
 export class InspectionReport extends TimestampedEntity {
   @PrimaryGeneratedColumn('uuid')
   id!: string;
@@ -47,12 +44,39 @@ export class InspectionReport extends TimestampedEntity {
   @Column({ name: 'report_number', type: 'integer' })
   reportNumber!: number;
 
-  @Column({ type: 'varchar', length: 24 })
+  @Column({ type: 'varchar', length: 40 })
   code!: string;
 
-  @Column({ type: 'varchar', length: 24, default: InspectionReportStatus.FROZEN })
+  @Column({ type: 'varchar', length: 24, default: InspectionReportStatus.WORKING })
   status!: InspectionReportStatus;
 
+  @Column({ name: 'executive_summary', type: 'text', nullable: true })
+  executiveSummary!: string | null;
+
+  @Column({ name: 'report_description', type: 'text', nullable: true })
+  reportDescription!: string | null;
+
+  @Column({ name: 'gedo_if_identifier', type: 'varchar', length: 255, nullable: true })
+  gedoIfIdentifier!: string | null;
+
+  @Column({ name: 'gedo_officialized_at', type: 'timestamptz', nullable: true })
+  gedoOfficializedAt!: Date | null;
+
+  @Column({ name: 'gedo_pdf_original_name', type: 'varchar', length: 255, nullable: true })
+  gedoPdfOriginalName!: string | null;
+
+  @Column({ name: 'gedo_pdf_stored_name', type: 'varchar', length: 255, nullable: true })
+  gedoPdfStoredName!: string | null;
+
+  @Column({ name: 'gedo_pdf_mime_type', type: 'varchar', length: 120, nullable: true })
+  gedoPdfMimeType!: string | null;
+
+  @Column({ name: 'gedo_pdf_size_bytes', type: 'integer', nullable: true })
+  gedoPdfSizeBytes!: number | null;
+
+  @Column({ name: 'gedo_pdf_sha256', type: 'char', length: 64, nullable: true })
+  gedoPdfSha256!: string | null;
+
   @Column({ name: 'pdf_status', type: 'varchar', length: 24, default: InspectionReportPdfStatus.PENDING })
   pdfStatus!: InspectionReportPdfStatus;
 
@@ -80,27 +104,9 @@ export class InspectionReport extends TimestampedEntity {
   @Column({ name: 'word_error', type: 'varchar', length: 500, nullable: true })
   wordError!: string | null;
 
-  @Column({ name: 'review_status', type: 'varchar', length: 32, default: InspectionReportReviewStatus.PENDING_REVIEW })
-  reviewStatus!: InspectionReportReviewStatus;
-
   @Column({ name: 'current_revision_number', type: 'integer', default: 0 })
   currentRevisionNumber!: number;
 
-  @Column({ name: 'approved_revision_id', type: 'uuid', nullable: true })
-  approvedRevisionId!: string | null;
-
-  @Column({ name: 'approved_by', type: 'uuid', nullable: true })
-  approvedBy!: string | null;
-
-  @Column({ name: 'approved_at', type: 'timestamptz', nullable: true })
-  approvedAt!: Date | null;
-
-  @Column({ name: 'review_note', type: 'varchar', length: 1000, nullable: true })
-  reviewNote!: string | null;
-
-  @Column({ name: 'signed_at', type: 'timestamptz', nullable: true })
-  signedAt!: Date | null;
-
   @Column({ type: 'varchar', length: 220 })
   title!: string;
 

api-v3/src/database/entities/inspection-visit.entity.ts

@@ -14,7 +14,7 @@ export enum InspectionVisitStatus {
 @Index('idx_inspection_visits_status', ['status'])
 @Index('idx_inspection_visits_scope_asset_id', ['scopeAssetId'])
 @Index('idx_inspection_visits_lead_inspector_user_id', ['leadInspectorUserId'])
-@Index('idx_inspection_visits_planned_dates', ['plannedStartAt', 'plannedEndAt'])
+@Index('idx_inspection_visits_planned_start_at', ['plannedStartAt'])
 @Index('idx_inspection_visits_operational_context', ['operationalAreaId', 'operatorCompanyId'])
 export class InspectionVisit extends TimestampedEntity {
   @PrimaryGeneratedColumn('uuid')
@@ -23,9 +23,6 @@ export class InspectionVisit extends TimestampedEntity {
   @Column({ type: 'varchar', length: 80 })
   code!: string;
 
-  @Column({ type: 'varchar', length: 200 })
-  title!: string;
-
   @Column({ type: 'text', nullable: true })
   objective!: string | null;
 
@@ -47,9 +44,6 @@ export class InspectionVisit extends TimestampedEntity {
   @Column({ name: 'planned_start_at', type: 'timestamptz', nullable: true })
   plannedStartAt!: Date | null;
 
-  @Column({ name: 'planned_end_at', type: 'timestamptz', nullable: true })
-  plannedEndAt!: Date | null;
-
   @Column({ name: 'actual_started_at', type: 'timestamptz', nullable: true })
   actualStartedAt!: Date | null;
 

api-v3/src/database/entities/survey-campaign-target.entity.ts

@@ -1,44 +0,0 @@
-import { Column, Entity, Index, PrimaryGeneratedColumn } from 'typeorm';
-import { TimestampedEntity } from './timestamped.entity';
-
-export enum SurveyTargetStatus {
-  PENDING = 'PENDING',
-  IN_PROGRESS = 'IN_PROGRESS',
-  SUBMITTED = 'SUBMITTED',
-  COMPLETED = 'COMPLETED',
-  SKIPPED = 'SKIPPED',
-}
-
-@Entity({ name: 'survey_campaign_targets' })
-@Index('uq_survey_campaign_targets_campaign_asset', ['campaignId', 'assetId'], { unique: true })
-@Index('idx_survey_campaign_targets_campaign_status', ['campaignId', 'status'])
-@Index('idx_survey_campaign_targets_asset_id', ['assetId'])
-@Index('idx_survey_campaign_targets_assigned_user_id', ['assignedUserId'])
-export class SurveyCampaignTarget extends TimestampedEntity {
-  @PrimaryGeneratedColumn('uuid')
-  id!: string;
-
-  @Column({ name: 'campaign_id', type: 'uuid' })
-  campaignId!: string;
-
-  @Column({ name: 'asset_id', type: 'uuid' })
-  assetId!: string;
-
-  @Column({ name: 'assigned_user_id', type: 'uuid', nullable: true })
-  assignedUserId!: string | null;
-
-  @Column({ type: 'varchar', length: 24, default: SurveyTargetStatus.PENDING })
-  status!: SurveyTargetStatus;
-
-  @Column({ name: 'due_at', type: 'timestamptz', nullable: true })
-  dueAt!: Date | null;
-
-  @Column({ type: 'text', nullable: true })
-  instructions!: string | null;
-
-  @Column({ name: 'created_by', type: 'uuid', nullable: true })
-  createdBy!: string | null;
-
-  @Column({ name: 'updated_by', type: 'uuid', nullable: true })
-  updatedBy!: string | null;
-}

api-v3/src/database/entities/survey-campaign.entity.ts

@@ -1,51 +0,0 @@
-import { Column, Entity, Index, PrimaryGeneratedColumn } from 'typeorm';
-import { TimestampedEntity } from './timestamped.entity';
-
-export enum SurveyCampaignStatus {
-  DRAFT = 'DRAFT',
-  PLANNED = 'PLANNED',
-  IN_PROGRESS = 'IN_PROGRESS',
-  COMPLETED = 'COMPLETED',
-  CANCELLED = 'CANCELLED',
-}
-
-@Entity({ name: 'survey_campaigns' })
-@Index('uq_survey_campaigns_code', ['code'], { unique: true })
-@Index('idx_survey_campaigns_status', ['status'])
-@Index('idx_survey_campaigns_scope_asset_id', ['scopeAssetId'])
-@Index('idx_survey_campaigns_coordinator_user_id', ['coordinatorUserId'])
-@Index('idx_survey_campaigns_planned_dates', ['plannedStartAt', 'plannedEndAt'])
-export class SurveyCampaign extends TimestampedEntity {
-  @PrimaryGeneratedColumn('uuid')
-  id!: string;
-
-  @Column({ type: 'varchar', length: 80 })
-  code!: string;
-
-  @Column({ type: 'varchar', length: 200 })
-  name!: string;
-
-  @Column({ type: 'text', nullable: true })
-  description!: string | null;
-
-  @Column({ type: 'varchar', length: 24, default: SurveyCampaignStatus.DRAFT })
-  status!: SurveyCampaignStatus;
-
-  @Column({ name: 'planned_start_at', type: 'timestamptz', nullable: true })
-  plannedStartAt!: Date | null;
-
-  @Column({ name: 'planned_end_at', type: 'timestamptz', nullable: true })
-  plannedEndAt!: Date | null;
-
-  @Column({ name: 'scope_asset_id', type: 'uuid', nullable: true })
-  scopeAssetId!: string | null;
-
-  @Column({ name: 'coordinator_user_id', type: 'uuid', nullable: true })
-  coordinatorUserId!: string | null;
-
-  @Column({ name: 'created_by', type: 'uuid', nullable: true })
-  createdBy!: string | null;
-
-  @Column({ name: 'updated_by', type: 'uuid', nullable: true })
-  updatedBy!: string | null;
-}

api-v3/src/database/entities/survey-target-report-media.entity.ts

@@ -1,19 +0,0 @@
-import { Column, Entity, Index, PrimaryColumn } from 'typeorm';
-import { TimestampedEntity } from './timestamped.entity';
-
-@Entity({ name: 'survey_target_report_media' })
-@Index('idx_survey_target_report_media_media_id', ['mediaId'])
-@Index('idx_survey_target_report_media_included', ['reportId', 'included'])
-export class SurveyTargetReportMedia extends TimestampedEntity {
-  @PrimaryColumn({ name: 'report_id', type: 'uuid' })
-  reportId!: string;
-
-  @PrimaryColumn({ name: 'media_id', type: 'uuid' })
-  mediaId!: string;
-
-  @Column({ type: 'boolean', default: true })
-  included!: boolean;
-
-  @Column({ name: 'added_by', type: 'uuid', nullable: true })
-  addedBy!: string | null;
-}

api-v3/src/database/entities/survey-target-report-version.entity.ts

@@ -1,36 +0,0 @@
-import { Column, Entity, Index, PrimaryGeneratedColumn } from 'typeorm';
-
-export enum SurveyReportVersionEvent {
-  SUBMITTED = 'SUBMITTED',
-  APPROVED = 'APPROVED',
-  REJECTED = 'REJECTED',
-}
-
-@Entity({ name: 'survey_target_report_versions' })
-@Index('uq_survey_target_report_versions_number', ['reportId', 'versionNumber'], { unique: true })
-@Index('idx_survey_target_report_versions_created_at', ['createdAt'])
-export class SurveyTargetReportVersion {
-  @PrimaryGeneratedColumn('uuid')
-  id!: string;
-
-  @Column({ name: 'report_id', type: 'uuid' })
-  reportId!: string;
-
-  @Column({ name: 'version_number', type: 'integer' })
-  versionNumber!: number;
-
-  @Column({ type: 'varchar', length: 24 })
-  event!: SurveyReportVersionEvent;
-
-  @Column({ type: 'jsonb' })
-  snapshot!: Record<string, unknown>;
-
-  @Column({ name: 'actor_user_id', type: 'uuid', nullable: true })
-  actorUserId!: string | null;
-
-  @Column({ name: 'actor_username', type: 'varchar', length: 80, nullable: true })
-  actorUsername!: string | null;
-
-  @Column({ name: 'created_at', type: 'timestamptz', default: () => 'CURRENT_TIMESTAMP' })
-  createdAt!: Date;
-}

api-v3/src/database/entities/survey-target-report.entity.ts

@@ -1,73 +0,0 @@
-import { Column, Entity, Index, PrimaryGeneratedColumn } from 'typeorm';
-import { TimestampedEntity } from './timestamped.entity';
-
-export enum SurveyReportOutcome {
-  CONFIRMED = 'CONFIRMED',
-  CHANGES_RECORDED = 'CHANGES_RECORDED',
-  NOT_LOCATED = 'NOT_LOCATED',
-}
-
-export enum SurveyReportStatus {
-  DRAFT = 'DRAFT',
-  SUBMITTED = 'SUBMITTED',
-  APPROVED = 'APPROVED',
-  REJECTED = 'REJECTED',
-}
-
-@Entity({ name: 'survey_target_reports' })
-@Index('uq_survey_target_reports_target_id', ['targetId'], { unique: true })
-@Index('idx_survey_target_reports_status', ['status'])
-@Index('idx_survey_target_reports_submitted_by', ['submittedBy'])
-@Index('idx_survey_target_reports_reviewed_by', ['reviewedBy'])
-export class SurveyTargetReport extends TimestampedEntity {
-  @PrimaryGeneratedColumn('uuid')
-  id!: string;
-
-  @Column({ name: 'target_id', type: 'uuid' })
-  targetId!: string;
-
-  @Column({ type: 'varchar', length: 32, nullable: true })
-  outcome!: SurveyReportOutcome | null;
-
-  @Column({ type: 'varchar', length: 24, default: SurveyReportStatus.DRAFT })
-  status!: SurveyReportStatus;
-
-  @Column({ name: 'observed_at', type: 'timestamptz', nullable: true })
-  observedAt!: Date | null;
-
-  @Column({ type: 'numeric', precision: 9, scale: 6, nullable: true })
-  latitude!: string | null;
-
-  @Column({ type: 'numeric', precision: 9, scale: 6, nullable: true })
-  longitude!: string | null;
-
-  @Column({ name: 'accuracy_m', type: 'numeric', precision: 12, scale: 3, nullable: true })
-  accuracyM!: string | null;
-
-  @Column({ type: 'text', nullable: true })
-  notes!: string | null;
-
-  @Column({ name: 'asset_version_at_submission', type: 'integer', nullable: true })
-  assetVersionAtSubmission!: number | null;
-
-  @Column({ name: 'submitted_at', type: 'timestamptz', nullable: true })
-  submittedAt!: Date | null;
-
-  @Column({ name: 'submitted_by', type: 'uuid', nullable: true })
-  submittedBy!: string | null;
-
-  @Column({ name: 'reviewed_at', type: 'timestamptz', nullable: true })
-  reviewedAt!: Date | null;
-
-  @Column({ name: 'reviewed_by', type: 'uuid', nullable: true })
-  reviewedBy!: string | null;
-
-  @Column({ name: 'review_notes', type: 'text', nullable: true })
-  reviewNotes!: string | null;
-
-  @Column({ name: 'created_by', type: 'uuid', nullable: true })
-  createdBy!: string | null;
-
-  @Column({ name: 'updated_by', type: 'uuid', nullable: true })
-  updatedBy!: string | null;
-}

api-v3/src/database/entities/system-smtp-settings.entity.ts

@@ -0,0 +1,44 @@
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+import { TimestampedEntity } from './timestamped.entity';
+
+export enum SmtpSecurityMode {
+  NONE = 'NONE',
+  STARTTLS = 'STARTTLS',
+  TLS = 'TLS',
+}
+
+@Entity({ name: 'system_smtp_settings' })
+export class SystemSmtpSettings extends TimestampedEntity {
+  @PrimaryGeneratedColumn('uuid')
+  id!: string;
+
+  @Column({ type: 'varchar', length: 255 })
+  host!: string;
+
+  @Column({ type: 'integer' })
+  port!: number;
+
+  @Column({ name: 'security_mode', type: 'varchar', length: 24, default: SmtpSecurityMode.STARTTLS })
+  securityMode!: SmtpSecurityMode;
+
+  @Column({ type: 'varchar', length: 255, nullable: true })
+  username!: string | null;
+
+  @Column({ name: 'password_enc', type: 'text', nullable: true })
+  passwordEnc!: string | null;
+
+  @Column({ name: 'from_name', type: 'varchar', length: 200 })
+  fromName!: string;
+
+  @Column({ name: 'from_email', type: 'varchar', length: 320 })
+  fromEmail!: string;
+
+  @Column({ name: 'reply_to', type: 'varchar', length: 320, nullable: true })
+  replyTo!: string | null;
+
+  @Column({ type: 'boolean', default: true })
+  enabled!: boolean;
+
+  @Column({ name: 'updated_by', type: 'uuid', nullable: true })
+  updatedBy!: string | null;
+}

api-v3/src/database/entities/user.entity.ts

@@ -19,6 +19,18 @@ export class User extends TimestampedEntity {
   @Column({ type: 'varchar', length: 320, nullable: true })
   email!: string | null;
 
+  @Column({ type: 'varchar', length: 32, nullable: true })
+  dni!: string | null;
+
+  @Column({ type: 'varchar', length: 40, nullable: true })
+  phone!: string | null;
+
+  @Column({ name: 'job_title', type: 'varchar', length: 160, nullable: true })
+  jobTitle!: string | null;
+
+  @Column({ name: 'employee_number', type: 'varchar', length: 80, nullable: true })
+  employeeNumber!: string | null;
+
   @Column({ name: 'password_hash', type: 'text', select: false })
   passwordHash!: string;
 

api-v3/src/database/migrations/1789844400000-phase-f3-1-inventory-structure-catalog.ts

@@ -0,0 +1,359 @@
+import { createHash } from 'node:crypto';
+import { MigrationInterface, QueryRunner } from 'typeorm';
+import {
+  F31_FINDING_GROUPS,
+  F31_INSTALLATION_FAMILIES,
+  F31_SUBINSTALLATION_FAMILIES,
+  F31_UNIVERSAL_FINDINGS,
+} from '../../reference-data/f3-1-inventory-excel';
+
+function quoteIdentifier(identifier: string): string {
+  return `"${identifier.replaceAll('"', '""')}"`;
+}
+
+function findingKey(value: string): string {
+  return value
+    .normalize('NFD')
+    .replace(/[\u0300-\u036f]/g, '')
+    .toLowerCase()
+    .replace(/[^a-z0-9]+/g, ' ')
+    .trim()
+    .replace(/\s+/g, ' ');
+}
+
+function findingCode(title: string): string {
+  return `APP26R2-${createHash('sha1').update(findingKey(title)).digest('hex').slice(0, 12).toUpperCase()}`;
+}
+
+type IdRow = { id: string };
+type CountRow = { total: string };
+
+export class PhaseF31InventoryStructureCatalog1789844400000 implements MigrationInterface {
+  name = 'PhaseF31InventoryStructureCatalog1789844400000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      INSERT INTO source_documents (document_type,document_number,title,issuer,notes)
+      SELECT 'SPREADSHEET','DH-F31-APP','APLICACION APP(2).xlsx','Dirección de Hidrocarburos',
+        'F3.1: revisión estructural. Hoja1 define Instalaciones/Subinstalaciones; Hoja2 define catálogo contextual.'
+      WHERE NOT EXISTS (
+        SELECT 1 FROM source_documents
+        WHERE document_number='DH-F31-APP' AND issuer='Dirección de Hidrocarburos'
+      )
+    `);
+
+    await queryRunner.query(`
+      INSERT INTO asset_types (code,name,description,can_be_root,is_active,operational_role)
+      SELECT 'subinstalacion','Subinstalación',
+        'Unidad física subordinada a una Instalación. Su familia técnica determina el catálogo contextual de Hallazgos.',
+        false,true,'GENERIC'
+      WHERE NOT EXISTS (SELECT 1 FROM asset_types WHERE lower(code)='subinstalacion')
+    `);
+    await queryRunner.query(`
+      INSERT INTO asset_type_parent_rules (child_type_id,parent_type_id)
+      SELECT child.id,parent.id
+      FROM asset_types child CROSS JOIN asset_types parent
+      WHERE lower(child.code)='subinstalacion' AND lower(parent.code)='instalacion'
+      ON CONFLICT DO NOTHING
+    `);
+
+    await queryRunner.query(`
+      CREATE TABLE inventory_families (
+        id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+        code varchar(120) NOT NULL UNIQUE,
+        name varchar(240) NOT NULL,
+        level varchar(24) NOT NULL,
+        legacy_type_code varchar(120),
+        information_labels jsonb NOT NULL DEFAULT '[]'::jsonb,
+        source_reference varchar(240),
+        is_active boolean NOT NULL DEFAULT true,
+        created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        updated_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        CONSTRAINT chk_inventory_families_level CHECK (level IN ('INSTALLATION','SUBINSTALLATION')),
+        CONSTRAINT chk_inventory_families_information_labels CHECK (jsonb_typeof(information_labels)='array')
+      )
+    `);
+    await queryRunner.query(`
+      CREATE INDEX idx_inventory_families_level_active
+      ON inventory_families(level,is_active,name)
+    `);
+    await queryRunner.query(`
+      CREATE TABLE inventory_family_parent_rules (
+        child_family_id uuid PRIMARY KEY,
+        parent_family_id uuid NOT NULL,
+        created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        CONSTRAINT fk_inventory_family_parent_child FOREIGN KEY (child_family_id)
+          REFERENCES inventory_families(id) ON DELETE CASCADE,
+        CONSTRAINT fk_inventory_family_parent_parent FOREIGN KEY (parent_family_id)
+          REFERENCES inventory_families(id) ON DELETE CASCADE,
+        CONSTRAINT chk_inventory_family_parent_distinct CHECK (child_family_id <> parent_family_id)
+      )
+    `);
+    await queryRunner.query(`
+      CREATE INDEX idx_inventory_family_parent_parent
+      ON inventory_family_parent_rules(parent_family_id,child_family_id)
+    `);
+    await queryRunner.query(`
+      ALTER TABLE assets ADD COLUMN inventory_family_id uuid
+    `);
+    await queryRunner.query(`
+      ALTER TABLE assets ADD CONSTRAINT fk_assets_inventory_family
+      FOREIGN KEY (inventory_family_id) REFERENCES inventory_families(id) ON DELETE RESTRICT
+    `);
+    await queryRunner.query(`
+      CREATE INDEX idx_assets_inventory_family ON assets(inventory_family_id)
+    `);
+    await queryRunner.query(`
+      CREATE TABLE finding_catalog_item_inventory_families (
+        id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+        catalog_item_id uuid NOT NULL,
+        inventory_family_id uuid NOT NULL,
+        created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        CONSTRAINT uq_finding_catalog_item_inventory_family UNIQUE (catalog_item_id,inventory_family_id),
+        CONSTRAINT fk_finding_catalog_family_item FOREIGN KEY (catalog_item_id)
+          REFERENCES finding_catalog_items(id) ON DELETE CASCADE,
+        CONSTRAINT fk_finding_catalog_family_family FOREIGN KEY (inventory_family_id)
+          REFERENCES inventory_families(id) ON DELETE CASCADE
+      )
+    `);
+    await queryRunner.query(`
+      CREATE INDEX idx_finding_catalog_family_family
+      ON finding_catalog_item_inventory_families(inventory_family_id,catalog_item_id)
+    `);
+
+    for (const family of F31_INSTALLATION_FAMILIES) {
+      await queryRunner.query(`
+        INSERT INTO inventory_families
+          (code,name,level,legacy_type_code,information_labels,source_reference,is_active)
+        VALUES ($1,$2,'INSTALLATION',$3,'[]'::jsonb,$4,true)
+        ON CONFLICT (code) DO UPDATE SET
+          name=EXCLUDED.name,
+          legacy_type_code=EXCLUDED.legacy_type_code,
+          source_reference=EXCLUDED.source_reference,
+          is_active=true,
+          updated_at=CURRENT_TIMESTAMP
+      `, [family.code, family.name, family.legacyTypeCode, `APLICACION APP(2).xlsx|Hoja1|fila:${family.sourceRow}`]);
+    }
+    for (const family of F31_SUBINSTALLATION_FAMILIES) {
+      await queryRunner.query(`
+        INSERT INTO inventory_families
+          (code,name,level,legacy_type_code,information_labels,source_reference,is_active)
+        VALUES ($1,$2,'SUBINSTALLATION',$3,$4::jsonb,$5,true)
+        ON CONFLICT (code) DO UPDATE SET
+          name=EXCLUDED.name,
+          legacy_type_code=EXCLUDED.legacy_type_code,
+          information_labels=EXCLUDED.information_labels,
+          source_reference=EXCLUDED.source_reference,
+          is_active=true,
+          updated_at=CURRENT_TIMESTAMP
+      `, [
+        family.code,
+        family.name,
+        family.legacyTypeCode,
+        JSON.stringify(family.informationLabels),
+        `APLICACION APP(2).xlsx|Hoja1|fila:${family.sourceRow}`,
+      ]);
+      await queryRunner.query(`
+        INSERT INTO inventory_family_parent_rules(child_family_id,parent_family_id)
+        SELECT child.id,parent.id
+        FROM inventory_families child CROSS JOIN inventory_families parent
+        WHERE child.code=$1 AND parent.code=$2
+        ON CONFLICT (child_family_id) DO UPDATE SET parent_family_id=EXCLUDED.parent_family_id
+      `, [family.code, family.parentCode]);
+    }
+
+    await queryRunner.query(`
+      UPDATE finding_categories SET is_active=false, updated_at=CURRENT_TIMESTAMP
+      WHERE lower(code)='app26'
+    `);
+    await queryRunner.query(`
+      INSERT INTO finding_categories(code,name,sort_order,is_active)
+      SELECT 'APP26R2','Aplicación APP 2026 · revisión estructural',261,true
+      WHERE NOT EXISTS (SELECT 1 FROM finding_categories WHERE lower(code)='app26r2')
+    `);
+    await queryRunner.query(`
+      UPDATE finding_categories
+      SET name='Aplicación APP 2026 · revisión estructural', sort_order=261,
+          is_active=true, updated_at=CURRENT_TIMESTAMP
+      WHERE lower(code)='app26r2'
+    `);
+    const categoryRows = (await queryRunner.query(
+      `SELECT id FROM finding_categories WHERE lower(code)='app26r2' LIMIT 1`,
+    )) as IdRow[];
+    const categoryId = categoryRows[0]?.id;
+    if (!categoryId) throw new Error('F3.1 could not resolve APP26R2 category');
+
+    const groupByKey = new Map(F31_FINDING_GROUPS.map((group) => [group.key, group]));
+    const titlesByFamily = new Map<string, Map<string,string>>();
+    const addFamilyTitle = (familyCode: string, title: string): void => {
+      const clean = title.trim();
+      if (!clean || /^idem\b/i.test(clean) || clean.toUpperCase()==='HALLAZGOS') return;
+      const key = findingKey(clean);
+      const map = titlesByFamily.get(familyCode) ?? new Map<string,string>();
+      if (!map.has(key)) map.set(key, clean);
+      titlesByFamily.set(familyCode, map);
+    };
+    const seedFamily = (family: { code: string; groupKeys: string[]; directFindings: string[] }): void => {
+      for (const title of F31_UNIVERSAL_FINDINGS) addFamilyTitle(family.code, title);
+      for (const groupKey of family.groupKeys) {
+        const group = groupByKey.get(groupKey);
+        if (!group) throw new Error(`F3.1 missing finding group ${groupKey}`);
+        for (const title of group.items) addFamilyTitle(family.code, title);
+      }
+      for (const title of family.directFindings) addFamilyTitle(family.code, title);
+    };
+    for (const family of F31_INSTALLATION_FAMILIES) seedFamily(family);
+    for (const family of F31_SUBINSTALLATION_FAMILIES) seedFamily(family);
+
+    const allTitles = new Map<string,string>();
+    for (const titles of titlesByFamily.values()) {
+      for (const [key,title] of titles) if (!allTitles.has(key)) allTitles.set(key,title);
+    }
+    const orderedTitles = [...allTitles.entries()].sort((a,b) => a[1].localeCompare(b[1],'es'));
+    const itemIdByKey = new Map<string,string>();
+    let sourceNumber = 1;
+    for (const [key,title] of orderedTitles) {
+      const code = findingCode(title);
+      let rows = (await queryRunner.query(
+        `SELECT id FROM finding_catalog_items WHERE lower(code)=lower($1::text) LIMIT 1`,
+        [code],
+      )) as IdRow[];
+      if (!rows[0]?.id) {
+        rows = (await queryRunner.query(`
+          INSERT INTO finding_catalog_items
+            (category_id,code,source_number,title,import_note,revision,is_active)
+          VALUES ($1::uuid,$2::varchar,$3::integer,$4::varchar,$5::text,1,true)
+          RETURNING id
+        `, [
+          categoryId,
+          code,
+          sourceNumber,
+          title,
+          'APLICACION APP(2).xlsx · F3.1 · catálogo estructural revisado',
+        ])) as IdRow[];
+      } else {
+        await queryRunner.query(`
+          UPDATE finding_catalog_items SET
+            category_id=$2::uuid,source_number=$3::integer,title=$4::varchar,
+            import_note=$5::text,is_active=true,updated_at=CURRENT_TIMESTAMP
+          WHERE id=$1::uuid
+        `, [rows[0].id, categoryId, sourceNumber, title, 'APLICACION APP(2).xlsx · F3.1 · catálogo estructural revisado']);
+      }
+      const itemId = rows[0]?.id;
+      if (!itemId) throw new Error(`F3.1 could not create catalog item ${title}`);
+      itemIdByKey.set(key,itemId);
+      await queryRunner.query(`
+        INSERT INTO finding_catalog_item_versions(item_id,revision,snapshot,actor_username)
+        SELECT item.id,item.revision,
+          jsonb_build_object(
+            'id',item.id,'categoryId',category.id,'categoryCode',category.code,
+            'categoryName',category.name,'code',item.code,'sourceNumber',item.source_number,
+            'title',item.title,'legalBasis',item.legal_basis,'glossary',item.glossary,
+            'importNote',item.import_note,'revision',item.revision,'isActive',item.is_active
+          ),'migration:F3.1'
+        FROM finding_catalog_items item
+        JOIN finding_categories category ON category.id=item.category_id
+        WHERE item.id=$1::uuid
+          AND NOT EXISTS (
+            SELECT 1 FROM finding_catalog_item_versions version
+            WHERE version.item_id=item.id AND version.revision=item.revision
+          )
+      `, [itemId]);
+      sourceNumber += 1;
+    }
+
+    await queryRunner.query(`DELETE FROM finding_catalog_item_inventory_families`);
+    const familyMeta = [
+      ...F31_INSTALLATION_FAMILIES,
+      ...F31_SUBINSTALLATION_FAMILIES,
+    ];
+    for (const family of familyMeta) {
+      const familyRows = (await queryRunner.query(
+        `SELECT id FROM inventory_families WHERE code=$1 LIMIT 1`,
+        [family.code],
+      )) as IdRow[];
+      const familyId = familyRows[0]?.id;
+      if (!familyId) throw new Error(`F3.1 missing inventory family ${family.code}`);
+      const titles = titlesByFamily.get(family.code) ?? new Map<string,string>();
+      for (const key of titles.keys()) {
+        const itemId = itemIdByKey.get(key);
+        if (!itemId) continue;
+        await queryRunner.query(`
+          INSERT INTO finding_catalog_item_inventory_families(catalog_item_id,inventory_family_id)
+          VALUES ($1::uuid,$2::uuid) ON CONFLICT DO NOTHING
+        `, [itemId,familyId]);
+      }
+
+      const legacyRows = (await queryRunner.query(
+        `SELECT id FROM asset_types WHERE lower(code)=lower($1::text) LIMIT 1`,
+        [family.legacyTypeCode],
+      )) as IdRow[];
+      const legacyTypeId = legacyRows[0]?.id;
+      if (legacyTypeId) {
+        await queryRunner.query(`
+          INSERT INTO finding_catalog_asset_type_profiles(asset_type_id,reason)
+          VALUES ($1::uuid,'F3.1: compatibilidad con activos técnicos históricos usando catálogo APP26R2')
+          ON CONFLICT (asset_type_id) DO UPDATE SET
+            reason=EXCLUDED.reason,updated_at=CURRENT_TIMESTAMP
+        `, [legacyTypeId]);
+        for (const key of titles.keys()) {
+          const itemId = itemIdByKey.get(key);
+          if (!itemId) continue;
+          await queryRunner.query(`
+            INSERT INTO finding_catalog_item_asset_types(catalog_item_id,asset_type_id)
+            VALUES ($1::uuid,$2::uuid) ON CONFLICT DO NOTHING
+          `, [itemId,legacyTypeId]);
+        }
+      }
+    }
+
+    await queryRunner.query(`
+      INSERT INTO finding_catalog_asset_type_profiles(asset_type_id,reason)
+      SELECT id,'F3.1: las altas estructurales usan familia técnica contextual; sin familia no se sugiere catálogo.'
+      FROM asset_types WHERE lower(code) IN ('instalacion','subinstalacion')
+      ON CONFLICT (asset_type_id) DO UPDATE SET
+        reason=EXCLUDED.reason,updated_at=CURRENT_TIMESTAMP
+    `);
+
+    const appRole = process.env.DB_APP_USER;
+    if (!appRole) throw new Error('Missing required environment variable: DB_APP_USER');
+    const roleRows = (await queryRunner.query('SELECT 1 FROM pg_roles WHERE rolname=$1',[appRole])) as unknown[];
+    if (roleRows.length !== 1) throw new Error('Configured DB_APP_USER does not exist');
+    const applicationRole = quoteIdentifier(appRole);
+    await queryRunner.query(`GRANT SELECT ON TABLE inventory_families TO ${applicationRole}`);
+    await queryRunner.query(`GRANT SELECT ON TABLE inventory_family_parent_rules TO ${applicationRole}`);
+    await queryRunner.query(`GRANT SELECT ON TABLE finding_catalog_item_inventory_families TO ${applicationRole}`);
+
+    const familyCounts = (await queryRunner.query(`
+      SELECT
+        COUNT(*) FILTER (WHERE level='INSTALLATION')::text AS installations,
+        COUNT(*) FILTER (WHERE level='SUBINSTALLATION')::text AS subinstallations
+      FROM inventory_families WHERE is_active=true
+    `)) as Array<{ installations: string; subinstallations: string }>;
+    if (Number(familyCounts[0]?.installations ?? 0) !== F31_INSTALLATION_FAMILIES.length) {
+      throw new Error('F3.1 verification failed: installation-family count mismatch');
+    }
+    if (Number(familyCounts[0]?.subinstallations ?? 0) !== F31_SUBINSTALLATION_FAMILIES.length) {
+      throw new Error('F3.1 verification failed: subinstallation-family count mismatch');
+    }
+    const catalogCounts = (await queryRunner.query(`
+      SELECT COUNT(*)::text AS total
+      FROM finding_catalog_items item
+      JOIN finding_categories category ON category.id=item.category_id
+      WHERE lower(category.code)='app26r2' AND item.is_active=true
+    `)) as CountRow[];
+    if (Number(catalogCounts[0]?.total ?? 0) !== orderedTitles.length) {
+      throw new Error('F3.1 verification failed: APP26R2 catalog count mismatch');
+    }
+    // eslint-disable-next-line no-console
+    console.log(
+      `[F3.1] families=${F31_INSTALLATION_FAMILIES.length}+${F31_SUBINSTALLATION_FAMILIES.length}; groups=${F31_FINDING_GROUPS.length}; catalog=${orderedTitles.length}`,
+    );
+  }
+
+  public async down(): Promise<void> {
+    throw new Error(
+      'F3.1 recarga catálogo y agrega familias estructurales; no se revierte destructivamente. Restaurar backup PRE si fuera necesario.',
+    );
+  }
+}

api-v3/src/database/migrations/1789844500000-phase-f3-1-family-catalog-sync.ts

@@ -0,0 +1,107 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class PhaseF31FamilyCatalogSync1789844500000 implements MigrationInterface {
+  name = 'PhaseF31FamilyCatalogSync1789844500000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      CREATE OR REPLACE FUNCTION sync_asset_inventory_family_catalog()
+      RETURNS trigger
+      LANGUAGE plpgsql
+      AS $$
+      BEGIN
+        DELETE FROM finding_catalog_asset_overrides
+        WHERE asset_id=NEW.id
+          AND reason LIKE 'F3.1 familia técnica:%';
+
+        IF NEW.inventory_family_id IS NOT NULL THEN
+          INSERT INTO finding_catalog_asset_overrides (
+            asset_id,catalog_item_id,is_enabled,reason,created_by,updated_by
+          )
+          SELECT
+            NEW.id,mapping.catalog_item_id,true,
+            'F3.1 familia técnica: catálogo contextual automático',
+            NEW.created_by,NEW.updated_by
+          FROM finding_catalog_item_inventory_families mapping
+          WHERE mapping.inventory_family_id=NEW.inventory_family_id
+          ON CONFLICT (asset_id,catalog_item_id) DO UPDATE SET
+            is_enabled=true,
+            reason='F3.1 familia técnica: catálogo contextual automático',
+            updated_by=NEW.updated_by,
+            updated_at=CURRENT_TIMESTAMP;
+        END IF;
+        RETURN NEW;
+      END;
+      $$
+    `);
+    await queryRunner.query(`
+      CREATE TRIGGER trg_assets_inventory_family_catalog
+      AFTER INSERT OR UPDATE OF inventory_family_id ON assets
+      FOR EACH ROW EXECUTE FUNCTION sync_asset_inventory_family_catalog()
+    `);
+
+    await queryRunner.query(`
+      CREATE OR REPLACE FUNCTION sync_inventory_family_mapping_assets()
+      RETURNS trigger
+      LANGUAGE plpgsql
+      AS $$
+      BEGIN
+        IF TG_OP='DELETE' THEN
+          DELETE FROM finding_catalog_asset_overrides override_record
+          USING assets asset
+          WHERE override_record.asset_id=asset.id
+            AND asset.inventory_family_id=OLD.inventory_family_id
+            AND override_record.catalog_item_id=OLD.catalog_item_id
+            AND override_record.reason LIKE 'F3.1 familia técnica:%';
+          RETURN OLD;
+        END IF;
+
+        INSERT INTO finding_catalog_asset_overrides (
+          asset_id,catalog_item_id,is_enabled,reason,created_by,updated_by
+        )
+        SELECT
+          asset.id,NEW.catalog_item_id,true,
+          'F3.1 familia técnica: catálogo contextual automático',
+          asset.created_by,asset.updated_by
+        FROM assets asset
+        WHERE asset.inventory_family_id=NEW.inventory_family_id
+        ON CONFLICT (asset_id,catalog_item_id) DO UPDATE SET
+          is_enabled=true,
+          reason='F3.1 familia técnica: catálogo contextual automático',
+          updated_at=CURRENT_TIMESTAMP;
+        RETURN NEW;
+      END;
+      $$
+    `);
+    await queryRunner.query(`
+      CREATE TRIGGER trg_inventory_family_mapping_assets
+      AFTER INSERT OR DELETE ON finding_catalog_item_inventory_families
+      FOR EACH ROW EXECUTE FUNCTION sync_inventory_family_mapping_assets()
+    `);
+
+    await queryRunner.query(`
+      INSERT INTO finding_catalog_asset_overrides (
+        asset_id,catalog_item_id,is_enabled,reason,created_by,updated_by
+      )
+      SELECT
+        asset.id,mapping.catalog_item_id,true,
+        'F3.1 familia técnica: catálogo contextual automático',
+        asset.created_by,asset.updated_by
+      FROM assets asset
+      JOIN finding_catalog_item_inventory_families mapping
+        ON mapping.inventory_family_id=asset.inventory_family_id
+      WHERE asset.inventory_family_id IS NOT NULL
+      ON CONFLICT (asset_id,catalog_item_id) DO UPDATE SET
+        is_enabled=true,
+        reason='F3.1 familia técnica: catálogo contextual automático',
+        updated_at=CURRENT_TIMESTAMP
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query('DROP TRIGGER IF EXISTS trg_inventory_family_mapping_assets ON finding_catalog_item_inventory_families');
+    await queryRunner.query('DROP FUNCTION IF EXISTS sync_inventory_family_mapping_assets()');
+    await queryRunner.query('DROP TRIGGER IF EXISTS trg_assets_inventory_family_catalog ON assets');
+    await queryRunner.query('DROP FUNCTION IF EXISTS sync_asset_inventory_family_catalog()');
+  }
+}

api-v3/src/database/migrations/1789844600000-phase-f3-1-asset-chronological-merge.ts

@@ -0,0 +1,48 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class PhaseF31AssetChronologicalMerge1789844600000 implements MigrationInterface {
+  name = 'PhaseF31AssetChronologicalMerge1789844600000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      CREATE TABLE asset_merges (
+        id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+        source_asset_id uuid NOT NULL REFERENCES assets(id) ON DELETE RESTRICT,
+        canonical_asset_id uuid NOT NULL REFERENCES assets(id) ON DELETE RESTRICT,
+        reason text NOT NULL,
+        merged_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        merged_by uuid NULL REFERENCES users(id) ON DELETE SET NULL,
+        source varchar(32) NOT NULL,
+        request_id varchar(128) NULL,
+        source_snapshot jsonb NOT NULL,
+        canonical_snapshot jsonb NOT NULL,
+        CONSTRAINT chk_asset_merges_distinct CHECK (source_asset_id <> canonical_asset_id),
+        CONSTRAINT uq_asset_merges_source UNIQUE (source_asset_id)
+      )
+    `);
+    await queryRunner.query(`CREATE INDEX idx_asset_merges_canonical ON asset_merges(canonical_asset_id)`);
+    await queryRunner.query(`CREATE INDEX idx_asset_merges_merged_at ON asset_merges(merged_at)`);
+
+    await queryRunner.query(`
+      CREATE OR REPLACE FUNCTION protect_asset_merges_append_only()
+      RETURNS trigger
+      LANGUAGE plpgsql
+      AS $$
+      BEGIN
+        RAISE EXCEPTION 'asset_merges es append-only; una fusión no puede editarse ni borrarse';
+      END;
+      $$
+    `);
+    await queryRunner.query(`
+      CREATE TRIGGER trg_asset_merges_append_only
+      BEFORE UPDATE OR DELETE ON asset_merges
+      FOR EACH ROW EXECUTE FUNCTION protect_asset_merges_append_only()
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query('DROP TRIGGER IF EXISTS trg_asset_merges_append_only ON asset_merges');
+    await queryRunner.query('DROP FUNCTION IF EXISTS protect_asset_merges_append_only()');
+    await queryRunner.query('DROP TABLE IF EXISTS asset_merges');
+  }
+}

api-v3/src/database/migrations/1789844700000-phase-f3-1-user-profile.ts

@@ -0,0 +1,77 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class PhaseF31UserProfile1789844700000 implements MigrationInterface {
+  name = 'PhaseF31UserProfile1789844700000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE users ADD COLUMN dni varchar(32) NULL`);
+    await queryRunner.query(`ALTER TABLE users ADD COLUMN phone varchar(40) NULL`);
+    await queryRunner.query(`ALTER TABLE users ADD COLUMN job_title varchar(160) NULL`);
+    await queryRunner.query(`ALTER TABLE users ADD COLUMN employee_number varchar(80) NULL`);
+    await queryRunner.query(`
+      CREATE UNIQUE INDEX uq_users_dni_not_null
+      ON users(dni) WHERE dni IS NOT NULL
+    `);
+
+    await queryRunner.query(`
+      CREATE OR REPLACE FUNCTION enforce_inspector_email_on_role()
+      RETURNS trigger
+      LANGUAGE plpgsql
+      AS $$
+      DECLARE selected_role_code varchar(80);
+      DECLARE selected_email varchar(320);
+      BEGIN
+        SELECT code INTO selected_role_code FROM roles WHERE id=NEW.role_id;
+        IF selected_role_code='inspector' THEN
+          SELECT email INTO selected_email FROM users WHERE id=NEW.user_id;
+          IF selected_email IS NULL OR btrim(selected_email)='' THEN
+            RAISE EXCEPTION 'INSPECTOR_EMAIL_REQUIRED';
+          END IF;
+        END IF;
+        RETURN NEW;
+      END;
+      $$
+    `);
+    await queryRunner.query(`
+      CREATE TRIGGER trg_user_roles_inspector_email
+      BEFORE INSERT OR UPDATE ON user_roles
+      FOR EACH ROW EXECUTE FUNCTION enforce_inspector_email_on_role()
+    `);
+
+    await queryRunner.query(`
+      CREATE OR REPLACE FUNCTION prevent_inspector_email_removal()
+      RETURNS trigger
+      LANGUAGE plpgsql
+      AS $$
+      BEGIN
+        IF (NEW.email IS NULL OR btrim(NEW.email)='') AND EXISTS (
+          SELECT 1
+          FROM user_roles user_role
+          JOIN roles role ON role.id=user_role.role_id
+          WHERE user_role.user_id=NEW.id AND role.code='inspector'
+        ) THEN
+          RAISE EXCEPTION 'INSPECTOR_EMAIL_REQUIRED';
+        END IF;
+        RETURN NEW;
+      END;
+      $$
+    `);
+    await queryRunner.query(`
+      CREATE TRIGGER trg_users_inspector_email
+      BEFORE UPDATE OF email ON users
+      FOR EACH ROW EXECUTE FUNCTION prevent_inspector_email_removal()
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query('DROP TRIGGER IF EXISTS trg_users_inspector_email ON users');
+    await queryRunner.query('DROP FUNCTION IF EXISTS prevent_inspector_email_removal()');
+    await queryRunner.query('DROP TRIGGER IF EXISTS trg_user_roles_inspector_email ON user_roles');
+    await queryRunner.query('DROP FUNCTION IF EXISTS enforce_inspector_email_on_role()');
+    await queryRunner.query('DROP INDEX IF EXISTS uq_users_dni_not_null');
+    await queryRunner.query('ALTER TABLE users DROP COLUMN IF EXISTS employee_number');
+    await queryRunner.query('ALTER TABLE users DROP COLUMN IF EXISTS job_title');
+    await queryRunner.query('ALTER TABLE users DROP COLUMN IF EXISTS phone');
+    await queryRunner.query('ALTER TABLE users DROP COLUMN IF EXISTS dni');
+  }
+}

api-v3/src/database/migrations/1789844800000-phase-f3-1-other-inventory-families.ts

@@ -0,0 +1,102 @@
+import { createHash } from 'node:crypto';
+import { MigrationInterface, QueryRunner } from 'typeorm';
+import {
+  F31_INSTALLATION_FAMILIES,
+  F31_UNIVERSAL_FINDINGS,
+} from '../../reference-data/f3-1-inventory-excel';
+
+const INSTALLATION_OTHER_CODE = 'F31-INST-OTRO';
+
+function subOtherCode(parentCode: string): string {
+  return `F31-SUB-OTRO-${createHash('sha1').update(parentCode).digest('hex').slice(0, 12).toUpperCase()}`;
+}
+
+export class PhaseF31OtherInventoryFamilies1789844800000 implements MigrationInterface {
+  name = 'PhaseF31OtherInventoryFamilies1789844800000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      INSERT INTO inventory_families(
+        code,name,level,legacy_type_code,information_labels,source_reference,is_active
+      ) VALUES ($1::varchar,'Otro / no catalogado','INSTALLATION',NULL,'[]'::jsonb,
+        'SYSTEM:F3.1:OTHER',true)
+      ON CONFLICT (code) DO UPDATE SET
+        name=EXCLUDED.name,is_active=true,updated_at=CURRENT_TIMESTAMP
+    `, [INSTALLATION_OTHER_CODE]);
+
+    for (const parent of F31_INSTALLATION_FAMILIES) {
+      const code = subOtherCode(parent.code);
+      await queryRunner.query(`
+        INSERT INTO inventory_families(
+          code,name,level,legacy_type_code,information_labels,source_reference,is_active
+        ) VALUES ($1::varchar,'Otro / no catalogado','SUBINSTALLATION',NULL,'[]'::jsonb,
+          $2::varchar,true)
+        ON CONFLICT (code) DO UPDATE SET
+          name=EXCLUDED.name,is_active=true,updated_at=CURRENT_TIMESTAMP
+      `, [code, `SYSTEM:F3.1:OTHER:${parent.code}`]);
+      await queryRunner.query(`
+        INSERT INTO inventory_family_parent_rules(child_family_id,parent_family_id)
+        SELECT child.id,parent.id
+        FROM inventory_families child
+        JOIN inventory_families parent ON parent.code=$2::varchar
+        WHERE child.code=$1::varchar
+        ON CONFLICT (child_family_id) DO UPDATE
+        SET parent_family_id=EXCLUDED.parent_family_id
+      `, [code, parent.code]);
+    }
+
+    // Si la Instalación misma es "Otro", también necesita una opción "Otro" hija.
+    const rootSubOther = subOtherCode(INSTALLATION_OTHER_CODE);
+    await queryRunner.query(`
+      INSERT INTO inventory_families(
+        code,name,level,legacy_type_code,information_labels,source_reference,is_active
+      ) VALUES ($1::varchar,'Otro / no catalogado','SUBINSTALLATION',NULL,'[]'::jsonb,
+        'SYSTEM:F3.1:OTHER:F31-INST-OTRO',true)
+      ON CONFLICT (code) DO UPDATE SET
+        name=EXCLUDED.name,is_active=true,updated_at=CURRENT_TIMESTAMP
+    `, [rootSubOther]);
+    await queryRunner.query(`
+      INSERT INTO inventory_family_parent_rules(child_family_id,parent_family_id)
+      SELECT child.id,parent.id
+      FROM inventory_families child
+      JOIN inventory_families parent ON parent.code=$2::varchar
+      WHERE child.code=$1::varchar
+      ON CONFLICT (child_family_id) DO UPDATE
+      SET parent_family_id=EXCLUDED.parent_family_id
+    `, [rootSubOther, INSTALLATION_OTHER_CODE]);
+
+    const otherCodes = [
+      INSTALLATION_OTHER_CODE,
+      ...F31_INSTALLATION_FAMILIES.map((parent) => subOtherCode(parent.code)),
+      rootSubOther,
+    ];
+    for (const familyCode of otherCodes) {
+      for (const title of F31_UNIVERSAL_FINDINGS) {
+        await queryRunner.query(`
+          INSERT INTO finding_catalog_item_inventory_families(catalog_item_id,inventory_family_id)
+          SELECT item.id,family.id
+          FROM finding_catalog_items item
+          JOIN finding_categories category ON category.id=item.category_id
+          CROSS JOIN inventory_families family
+          WHERE lower(category.code)='app26r2'
+            AND lower(btrim(item.title))=lower(btrim($2::text))
+            AND family.code=$1::varchar
+          ON CONFLICT (catalog_item_id,inventory_family_id) DO NOTHING
+        `, [familyCode, title]);
+      }
+    }
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    const codes = [
+      INSTALLATION_OTHER_CODE,
+      ...F31_INSTALLATION_FAMILIES.map((parent) => subOtherCode(parent.code)),
+      subOtherCode(INSTALLATION_OTHER_CODE),
+    ];
+    await queryRunner.query(`
+      DELETE FROM inventory_families
+      WHERE code=ANY($1::varchar[])
+        AND NOT EXISTS (SELECT 1 FROM assets asset WHERE asset.inventory_family_id=inventory_families.id)
+    `, [codes]);
+  }
+}

api-v3/src/database/migrations/1789844900000-phase-f3-1-finding-catalog-merge.ts

@@ -0,0 +1,46 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class PhaseF31FindingCatalogMerge1789844900000 implements MigrationInterface {
+  name = 'PhaseF31FindingCatalogMerge1789844900000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      CREATE TABLE finding_catalog_item_merges (
+        id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+        source_item_id uuid NOT NULL REFERENCES finding_catalog_items(id) ON DELETE RESTRICT,
+        canonical_item_id uuid NOT NULL REFERENCES finding_catalog_items(id) ON DELETE RESTRICT,
+        reason text NOT NULL,
+        merged_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        merged_by uuid NULL REFERENCES users(id) ON DELETE SET NULL,
+        request_id varchar(128) NULL,
+        source_snapshot jsonb NOT NULL,
+        canonical_snapshot jsonb NOT NULL,
+        CONSTRAINT chk_finding_catalog_item_merges_distinct CHECK (source_item_id <> canonical_item_id),
+        CONSTRAINT uq_finding_catalog_item_merges_source UNIQUE (source_item_id)
+      )
+    `);
+    await queryRunner.query(`CREATE INDEX idx_finding_catalog_item_merges_canonical ON finding_catalog_item_merges(canonical_item_id)`);
+    await queryRunner.query(`CREATE INDEX idx_finding_catalog_item_merges_at ON finding_catalog_item_merges(merged_at)`);
+    await queryRunner.query(`
+      CREATE OR REPLACE FUNCTION protect_finding_catalog_item_merges_append_only()
+      RETURNS trigger
+      LANGUAGE plpgsql
+      AS $$
+      BEGIN
+        RAISE EXCEPTION 'finding_catalog_item_merges es append-only; una fusión de catálogo no puede editarse ni borrarse';
+      END;
+      $$
+    `);
+    await queryRunner.query(`
+      CREATE TRIGGER trg_finding_catalog_item_merges_append_only
+      BEFORE UPDATE OR DELETE ON finding_catalog_item_merges
+      FOR EACH ROW EXECUTE FUNCTION protect_finding_catalog_item_merges_append_only()
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query('DROP TRIGGER IF EXISTS trg_finding_catalog_item_merges_append_only ON finding_catalog_item_merges');
+    await queryRunner.query('DROP FUNCTION IF EXISTS protect_finding_catalog_item_merges_append_only()');
+    await queryRunner.query('DROP TABLE IF EXISTS finding_catalog_item_merges');
+  }
+}

api-v3/src/database/migrations/1789845000000-phase-f3-1-inspector-document-delivery.ts

@@ -0,0 +1,56 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class PhaseF31InspectorDocumentDelivery1789845000000 implements MigrationInterface {
+  name = 'PhaseF31InspectorDocumentDelivery1789845000000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE inspection_document_deliveries
+      ADD COLUMN recipient_user_id uuid NULL
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_document_deliveries
+      ADD CONSTRAINT fk_inspection_document_deliveries_recipient_user
+      FOREIGN KEY (recipient_user_id) REFERENCES users(id) ON DELETE SET NULL
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_document_deliveries
+      DROP CONSTRAINT chk_inspection_document_deliveries_recipient_kind
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_document_deliveries
+      ADD CONSTRAINT chk_inspection_document_deliveries_recipient_kind
+      CHECK (recipient_kind IN ('COMPANY','OFFICE','DIRECTOR','INSPECTOR'))
+    `);
+    await queryRunner.query(`
+      CREATE INDEX idx_inspection_document_deliveries_recipient_user
+      ON inspection_document_deliveries(recipient_user_id)
+      WHERE recipient_user_id IS NOT NULL
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      DELETE FROM inspection_document_deliveries
+      WHERE recipient_kind='INSPECTOR'
+    `);
+    await queryRunner.query(`DROP INDEX IF EXISTS idx_inspection_document_deliveries_recipient_user`);
+    await queryRunner.query(`
+      ALTER TABLE inspection_document_deliveries
+      DROP CONSTRAINT chk_inspection_document_deliveries_recipient_kind
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_document_deliveries
+      ADD CONSTRAINT chk_inspection_document_deliveries_recipient_kind
+      CHECK (recipient_kind IN ('COMPANY','OFFICE','DIRECTOR'))
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_document_deliveries
+      DROP CONSTRAINT IF EXISTS fk_inspection_document_deliveries_recipient_user
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_document_deliveries
+      DROP COLUMN IF EXISTS recipient_user_id
+    `);
+  }
+}

api-v3/src/database/migrations/1790000000000-f4-document-workflow-foundation.ts

@@ -0,0 +1,161 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class F4DocumentWorkflowFoundation1790000000000 implements MigrationInterface {
+  name = 'F4DocumentWorkflowFoundation1790000000000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE inspection_acts ALTER COLUMN code TYPE varchar(40)`);
+    await queryRunner.query(`ALTER TABLE inspection_reports ALTER COLUMN code TYPE varchar(40)`);
+
+    await queryRunner.query(`ALTER TABLE inspection_acts ADD COLUMN IF NOT EXISTS urgency varchar(24) NOT NULL DEFAULT 'NON_URGENT'`);
+    await queryRunner.query(`ALTER TABLE inspection_acts ADD COLUMN IF NOT EXISTS deadline_days integer`);
+    await queryRunner.query(`ALTER TABLE inspection_acts ADD COLUMN IF NOT EXISTS deadline_day_type varchar(24)`);
+    await queryRunner.query(`ALTER TABLE inspection_acts ADD COLUMN IF NOT EXISTS deadline_basis varchar(24)`);
+    await queryRunner.query(`ALTER TABLE inspection_acts ADD COLUMN IF NOT EXISTS deadline_base_at timestamptz`);
+    await queryRunner.query(`ALTER TABLE inspection_acts ADD COLUMN IF NOT EXISTS deadline_at timestamptz`);
+    await queryRunner.query(`ALTER TABLE inspection_acts ADD COLUMN IF NOT EXISTS locked_at timestamptz`);
+    await queryRunner.query(`ALTER TABLE inspection_acts ADD COLUMN IF NOT EXISTS locked_by uuid`);
+    await queryRunner.query(`ALTER TABLE inspection_acts ADD COLUMN IF NOT EXISTS locked_sha256 char(64)`);
+    await queryRunner.query(`ALTER TABLE inspection_acts ADD COLUMN IF NOT EXISTS sealed_at timestamptz`);
+    await queryRunner.query(`ALTER TABLE inspection_acts ADD COLUMN IF NOT EXISTS sealed_by uuid`);
+    await queryRunner.query(`CREATE INDEX IF NOT EXISTS idx_inspection_acts_deadline ON inspection_acts(deadline_at)`);
+
+    await queryRunner.query(`ALTER TABLE inspection_findings ADD COLUMN IF NOT EXISTS is_recurrence boolean NOT NULL DEFAULT false`);
+    await queryRunner.query(`ALTER TABLE inspection_findings ADD COLUMN IF NOT EXISTS recurrence_of_finding_id uuid`);
+    await queryRunner.query(`CREATE INDEX IF NOT EXISTS idx_inspection_findings_recurrence_of ON inspection_findings(recurrence_of_finding_id)`);
+    await queryRunner.query(`
+      DO $$ BEGIN
+        ALTER TABLE inspection_findings
+          ADD CONSTRAINT fk_inspection_findings_recurrence_of
+          FOREIGN KEY (recurrence_of_finding_id) REFERENCES inspection_findings(id) ON DELETE RESTRICT;
+      EXCEPTION WHEN duplicate_object THEN NULL; END $$;
+    `);
+
+    await queryRunner.query(`ALTER TABLE inspection_reports ADD COLUMN IF NOT EXISTS executive_summary text`);
+    await queryRunner.query(`ALTER TABLE inspection_reports ADD COLUMN IF NOT EXISTS report_description text`);
+    await queryRunner.query(`ALTER TABLE inspection_reports ADD COLUMN IF NOT EXISTS gedo_if_identifier varchar(255)`);
+    await queryRunner.query(`ALTER TABLE inspection_reports ADD COLUMN IF NOT EXISTS gedo_officialized_at timestamptz`);
+    await queryRunner.query(`ALTER TABLE inspection_reports ADD COLUMN IF NOT EXISTS gedo_pdf_original_name varchar(255)`);
+    await queryRunner.query(`ALTER TABLE inspection_reports ADD COLUMN IF NOT EXISTS gedo_pdf_stored_name varchar(255)`);
+    await queryRunner.query(`ALTER TABLE inspection_reports ADD COLUMN IF NOT EXISTS gedo_pdf_mime_type varchar(120)`);
+    await queryRunner.query(`ALTER TABLE inspection_reports ADD COLUMN IF NOT EXISTS gedo_pdf_size_bytes integer`);
+    await queryRunner.query(`ALTER TABLE inspection_reports ADD COLUMN IF NOT EXISTS gedo_pdf_sha256 char(64)`);
+    await queryRunner.query(`CREATE INDEX IF NOT EXISTS idx_inspection_reports_gedo_officialized_at ON inspection_reports(gedo_officialized_at)`);
+
+    await queryRunner.query(`
+      CREATE TABLE IF NOT EXISTS inspection_deadline_policies (
+        id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+        urgent_days integer NOT NULL DEFAULT 5 CHECK (urgent_days > 0),
+        urgent_day_type varchar(24) NOT NULL DEFAULT 'BUSINESS',
+        non_urgent_days integer NOT NULL DEFAULT 10 CHECK (non_urgent_days > 0),
+        non_urgent_day_type varchar(24) NOT NULL DEFAULT 'BUSINESS',
+        updated_by uuid,
+        created_at timestamptz NOT NULL DEFAULT now(),
+        updated_at timestamptz NOT NULL DEFAULT now(),
+        CONSTRAINT ck_inspection_deadline_policy_urgent_type CHECK (urgent_day_type IN ('BUSINESS','CALENDAR')),
+        CONSTRAINT ck_inspection_deadline_policy_non_urgent_type CHECK (non_urgent_day_type IN ('BUSINESS','CALENDAR'))
+      )
+    `);
+    await queryRunner.query(`
+      INSERT INTO inspection_deadline_policies (urgent_days, urgent_day_type, non_urgent_days, non_urgent_day_type)
+      SELECT 5, 'BUSINESS', 10, 'BUSINESS'
+      WHERE NOT EXISTS (SELECT 1 FROM inspection_deadline_policies)
+    `);
+
+    await queryRunner.query(`
+      CREATE TABLE IF NOT EXISTS inspection_business_calendar_days (
+        id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+        date date NOT NULL,
+        is_business_day boolean NOT NULL DEFAULT false,
+        label varchar(200) NOT NULL,
+        updated_by uuid,
+        created_at timestamptz NOT NULL DEFAULT now(),
+        updated_at timestamptz NOT NULL DEFAULT now(),
+        CONSTRAINT uq_inspection_business_calendar_day UNIQUE(date)
+      )
+    `);
+
+    await queryRunner.query(`
+      CREATE TABLE IF NOT EXISTS inspection_report_follow_ups (
+        id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+        report_id uuid NOT NULL,
+        type varchar(40) NOT NULL,
+        external_reference varchar(255),
+        occurred_at timestamptz NOT NULL,
+        description text,
+        original_name varchar(255),
+        stored_name varchar(255),
+        mime_type varchar(120),
+        size_bytes integer,
+        sha256 char(64),
+        created_by uuid,
+        created_at timestamptz NOT NULL DEFAULT now(),
+        updated_at timestamptz NOT NULL DEFAULT now(),
+        CONSTRAINT fk_inspection_report_follow_ups_report FOREIGN KEY(report_id) REFERENCES inspection_reports(id) ON DELETE CASCADE,
+        CONSTRAINT ck_inspection_report_follow_up_type CHECK (type IN ('COMPANY_NOTE','COMPANY_DOCUMENT','INTERNAL_NOTE','VERIFICATION','OTHER'))
+      )
+    `);
+    await queryRunner.query(`CREATE INDEX IF NOT EXISTS idx_inspection_report_follow_ups_report_created ON inspection_report_follow_ups(report_id, created_at)`);
+
+    await queryRunner.query(`
+      CREATE TABLE IF NOT EXISTS system_smtp_settings (
+        id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+        host varchar(255) NOT NULL,
+        port integer NOT NULL CHECK (port > 0 AND port <= 65535),
+        security_mode varchar(24) NOT NULL DEFAULT 'STARTTLS',
+        username varchar(255),
+        password_enc text,
+        from_name varchar(200) NOT NULL,
+        from_email varchar(320) NOT NULL,
+        reply_to varchar(320),
+        enabled boolean NOT NULL DEFAULT true,
+        updated_by uuid,
+        created_at timestamptz NOT NULL DEFAULT now(),
+        updated_at timestamptz NOT NULL DEFAULT now(),
+        CONSTRAINT ck_system_smtp_security_mode CHECK (security_mode IN ('NONE','STARTTLS','TLS'))
+      )
+    `);
+
+    await queryRunner.query(`
+      UPDATE inspection_acts
+      SET
+        deadline_days = COALESCE(deadline_days, 10),
+        deadline_day_type = COALESCE(deadline_day_type, 'BUSINESS'),
+        deadline_basis = COALESCE(deadline_basis, 'GEDO_DATE')
+      WHERE deadline_days IS NULL OR deadline_day_type IS NULL OR deadline_basis IS NULL
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP TABLE IF EXISTS system_smtp_settings`);
+    await queryRunner.query(`DROP TABLE IF EXISTS inspection_report_follow_ups`);
+    await queryRunner.query(`DROP TABLE IF EXISTS inspection_business_calendar_days`);
+    await queryRunner.query(`DROP TABLE IF EXISTS inspection_deadline_policies`);
+
+    await queryRunner.query(`ALTER TABLE inspection_reports DROP COLUMN IF EXISTS gedo_pdf_sha256`);
+    await queryRunner.query(`ALTER TABLE inspection_reports DROP COLUMN IF EXISTS gedo_pdf_size_bytes`);
+    await queryRunner.query(`ALTER TABLE inspection_reports DROP COLUMN IF EXISTS gedo_pdf_mime_type`);
+    await queryRunner.query(`ALTER TABLE inspection_reports DROP COLUMN IF EXISTS gedo_pdf_stored_name`);
+    await queryRunner.query(`ALTER TABLE inspection_reports DROP COLUMN IF EXISTS gedo_pdf_original_name`);
+    await queryRunner.query(`ALTER TABLE inspection_reports DROP COLUMN IF EXISTS gedo_officialized_at`);
+    await queryRunner.query(`ALTER TABLE inspection_reports DROP COLUMN IF EXISTS gedo_if_identifier`);
+    await queryRunner.query(`ALTER TABLE inspection_reports DROP COLUMN IF EXISTS report_description`);
+    await queryRunner.query(`ALTER TABLE inspection_reports DROP COLUMN IF EXISTS executive_summary`);
+
+    await queryRunner.query(`ALTER TABLE inspection_findings DROP CONSTRAINT IF EXISTS fk_inspection_findings_recurrence_of`);
+    await queryRunner.query(`ALTER TABLE inspection_findings DROP COLUMN IF EXISTS recurrence_of_finding_id`);
+    await queryRunner.query(`ALTER TABLE inspection_findings DROP COLUMN IF EXISTS is_recurrence`);
+
+    await queryRunner.query(`ALTER TABLE inspection_acts DROP COLUMN IF EXISTS sealed_by`);
+    await queryRunner.query(`ALTER TABLE inspection_acts DROP COLUMN IF EXISTS sealed_at`);
+    await queryRunner.query(`ALTER TABLE inspection_acts DROP COLUMN IF EXISTS locked_sha256`);
+    await queryRunner.query(`ALTER TABLE inspection_acts DROP COLUMN IF EXISTS locked_by`);
+    await queryRunner.query(`ALTER TABLE inspection_acts DROP COLUMN IF EXISTS locked_at`);
+    await queryRunner.query(`ALTER TABLE inspection_acts DROP COLUMN IF EXISTS deadline_at`);
+    await queryRunner.query(`ALTER TABLE inspection_acts DROP COLUMN IF EXISTS deadline_base_at`);
+    await queryRunner.query(`ALTER TABLE inspection_acts DROP COLUMN IF EXISTS deadline_basis`);
+    await queryRunner.query(`ALTER TABLE inspection_acts DROP COLUMN IF EXISTS deadline_day_type`);
+    await queryRunner.query(`ALTER TABLE inspection_acts DROP COLUMN IF EXISTS deadline_days`);
+    await queryRunner.query(`ALTER TABLE inspection_acts DROP COLUMN IF EXISTS urgency`);
+  }
+}

api-v3/src/database/migrations/1790000100000-f4-inventory-function-history.ts

@@ -0,0 +1,80 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class F4InventoryFunctionHistory1790000100000 implements MigrationInterface {
+  name = 'F4InventoryFunctionHistory1790000100000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      CREATE TABLE inventory_functions (
+        id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+        code varchar(120) NOT NULL UNIQUE,
+        name varchar(240) NOT NULL,
+        description text,
+        is_active boolean NOT NULL DEFAULT true,
+        sort_order integer NOT NULL DEFAULT 0,
+        created_by uuid,
+        updated_by uuid,
+        created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        updated_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        CONSTRAINT fk_inventory_functions_created_by FOREIGN KEY (created_by)
+          REFERENCES users(id) ON DELETE SET NULL,
+        CONSTRAINT fk_inventory_functions_updated_by FOREIGN KEY (updated_by)
+          REFERENCES users(id) ON DELETE SET NULL
+      )
+    `);
+    await queryRunner.query(`
+      CREATE INDEX idx_inventory_functions_active_sort
+      ON inventory_functions(is_active,sort_order,name)
+    `);
+
+    await queryRunner.query(`
+      CREATE TABLE inventory_function_assignments (
+        id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+        asset_id uuid NOT NULL,
+        function_id uuid NOT NULL,
+        valid_from timestamptz NOT NULL,
+        valid_until timestamptz,
+        change_reason text,
+        changed_by uuid,
+        created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        CONSTRAINT fk_inventory_function_assignment_asset FOREIGN KEY (asset_id)
+          REFERENCES assets(id) ON DELETE CASCADE,
+        CONSTRAINT fk_inventory_function_assignment_function FOREIGN KEY (function_id)
+          REFERENCES inventory_functions(id) ON DELETE RESTRICT,
+        CONSTRAINT fk_inventory_function_assignment_user FOREIGN KEY (changed_by)
+          REFERENCES users(id) ON DELETE SET NULL,
+        CONSTRAINT chk_inventory_function_assignment_dates CHECK (
+          valid_until IS NULL OR valid_until > valid_from
+        )
+      )
+    `);
+    await queryRunner.query(`
+      CREATE UNIQUE INDEX uq_inventory_function_assignment_current
+      ON inventory_function_assignments(asset_id)
+      WHERE valid_until IS NULL
+    `);
+    await queryRunner.query(`
+      CREATE INDEX idx_inventory_function_assignment_history
+      ON inventory_function_assignments(asset_id,valid_from DESC,created_at DESC)
+    `);
+    await queryRunner.query(`
+      CREATE INDEX idx_inventory_function_assignment_function
+      ON inventory_function_assignments(function_id,valid_from DESC)
+    `);
+
+    await queryRunner.query(`
+      INSERT INTO inventory_functions(code,name,description,sort_order)
+      VALUES
+        ('BOMBEO_MECANICO_AIB','Bombeo mecánico AIB',
+          'Función técnica de bombeo mecánico mediante aparato individual de bombeo (AIB).',10),
+        ('BOMBEO_MECANICO_ROTAFLEX','Bombeo mecánico Rotaflex',
+          'Función técnica de bombeo mecánico mediante sistema Rotaflex.',20)
+      ON CONFLICT (code) DO NOTHING
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query('DROP TABLE IF EXISTS inventory_function_assignments');
+    await queryRunner.query('DROP TABLE IF EXISTS inventory_functions');
+  }
+}

api-v3/src/database/migrations/1790000200000-f4-company-signature-invites.ts

@@ -0,0 +1,51 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class F4CompanySignatureInvites1790000200000 implements MigrationInterface {
+  name = 'F4CompanySignatureInvites1790000200000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      CREATE TABLE inspection_act_company_signature_invites (
+        id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+        act_id uuid NOT NULL,
+        token_sha256 char(64) NOT NULL UNIQUE,
+        recipient_email varchar(320) NOT NULL,
+        recipient_name varchar(200),
+        recipient_document_type varchar(20),
+        recipient_document_number varchar(40),
+        recipient_position varchar(200),
+        status varchar(20) NOT NULL DEFAULT 'PENDING',
+        expires_at timestamptz NOT NULL,
+        sent_at timestamptz,
+        used_at timestamptz,
+        revoked_at timestamptz,
+        created_by uuid NOT NULL,
+        revoked_by uuid,
+        created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        updated_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        CONSTRAINT fk_company_signature_invite_act FOREIGN KEY (act_id)
+          REFERENCES inspection_acts(id) ON DELETE CASCADE,
+        CONSTRAINT fk_company_signature_invite_created_by FOREIGN KEY (created_by)
+          REFERENCES users(id) ON DELETE RESTRICT,
+        CONSTRAINT fk_company_signature_invite_revoked_by FOREIGN KEY (revoked_by)
+          REFERENCES users(id) ON DELETE SET NULL,
+        CONSTRAINT chk_company_signature_invite_status CHECK (
+          status IN ('PENDING','USED','REVOKED','EXPIRED')
+        )
+      )
+    `);
+    await queryRunner.query(`
+      CREATE INDEX idx_company_signature_invites_act_created
+      ON inspection_act_company_signature_invites(act_id,created_at DESC)
+    `);
+    await queryRunner.query(`
+      CREATE INDEX idx_company_signature_invites_pending_expiry
+      ON inspection_act_company_signature_invites(status,expires_at)
+      WHERE status='PENDING'
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query('DROP TABLE IF EXISTS inspection_act_company_signature_invites');
+  }
+}

api-v3/src/database/migrations/1790000300000-f4-remove-survey-subsystem.ts

@@ -0,0 +1,220 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+const surveyPermissions = [
+  'surveys.read',
+  'surveys.manage',
+  'surveys.assign',
+  'surveys.execute',
+  'surveys.read_reports',
+  'surveys.capture',
+  'surveys.review',
+] as const;
+
+const rolePermissionValues = `
+  ('admin', 'surveys.read'),
+  ('admin', 'surveys.manage'),
+  ('admin', 'surveys.assign'),
+  ('admin', 'surveys.execute'),
+  ('admin', 'surveys.read_reports'),
+  ('admin', 'surveys.capture'),
+  ('admin', 'surveys.review'),
+  ('director', 'surveys.read'),
+  ('director', 'surveys.read_reports'),
+  ('director', 'surveys.review'),
+  ('supervisor', 'surveys.read'),
+  ('supervisor', 'surveys.manage'),
+  ('supervisor', 'surveys.assign'),
+  ('supervisor', 'surveys.execute'),
+  ('supervisor', 'surveys.read_reports'),
+  ('supervisor', 'surveys.capture'),
+  ('supervisor', 'surveys.review'),
+  ('inspector', 'surveys.read'),
+  ('inspector', 'surveys.execute'),
+  ('inspector', 'surveys.read_reports'),
+  ('inspector', 'surveys.capture'),
+  ('auditor', 'surveys.read'),
+  ('auditor', 'surveys.read_reports')
+`;
+
+function quoteIdentifier(identifier: string): string {
+  return `"${identifier.replaceAll('"', '""')}"`;
+}
+
+export class F4RemoveSurveySubsystem1790000300000 implements MigrationInterface {
+  name = 'F4RemoveSurveySubsystem1790000300000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      DELETE FROM role_permissions
+      WHERE permission_id IN (
+        SELECT id FROM permissions WHERE code = ANY($1::varchar[])
+      )
+    `, [surveyPermissions]);
+    await queryRunner.query(
+      `DELETE FROM permissions WHERE code = ANY($1::varchar[])`,
+      [surveyPermissions],
+    );
+
+    // Deliberadamente sin CASCADE: una dependencia externa debe detener la migración.
+    await queryRunner.query(`DROP TABLE IF EXISTS survey_target_report_versions`);
+    await queryRunner.query(`DROP TABLE IF EXISTS survey_target_report_media`);
+    await queryRunner.query(`DROP TABLE IF EXISTS survey_target_reports`);
+    await queryRunner.query(`DROP TABLE IF EXISTS survey_campaign_targets`);
+    await queryRunner.query(`DROP TABLE IF EXISTS survey_campaigns`);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      CREATE TABLE IF NOT EXISTS survey_campaigns (
+        id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+        code varchar(80) NOT NULL UNIQUE,
+        name varchar(200) NOT NULL,
+        description text,
+        status varchar(24) NOT NULL DEFAULT 'DRAFT',
+        planned_start_at timestamptz,
+        planned_end_at timestamptz,
+        scope_asset_id uuid REFERENCES assets(id) ON DELETE RESTRICT,
+        coordinator_user_id uuid REFERENCES users(id) ON DELETE SET NULL,
+        created_by uuid REFERENCES users(id) ON DELETE SET NULL,
+        updated_by uuid REFERENCES users(id) ON DELETE SET NULL,
+        created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        updated_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        CONSTRAINT chk_survey_campaigns_status CHECK (
+          status IN ('DRAFT','PLANNED','IN_PROGRESS','COMPLETED','CANCELLED')
+        ),
+        CONSTRAINT chk_survey_campaigns_dates CHECK (
+          planned_start_at IS NULL OR planned_end_at IS NULL OR planned_end_at >= planned_start_at
+        )
+      )
+    `);
+    await queryRunner.query(`CREATE INDEX IF NOT EXISTS idx_survey_campaigns_status ON survey_campaigns(status)`);
+    await queryRunner.query(`CREATE INDEX IF NOT EXISTS idx_survey_campaigns_scope_asset_id ON survey_campaigns(scope_asset_id)`);
+    await queryRunner.query(`CREATE INDEX IF NOT EXISTS idx_survey_campaigns_coordinator_user_id ON survey_campaigns(coordinator_user_id)`);
+    await queryRunner.query(`CREATE INDEX IF NOT EXISTS idx_survey_campaigns_planned_dates ON survey_campaigns(planned_start_at,planned_end_at)`);
+
+    await queryRunner.query(`
+      CREATE TABLE IF NOT EXISTS survey_campaign_targets (
+        id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+        campaign_id uuid NOT NULL REFERENCES survey_campaigns(id) ON DELETE RESTRICT,
+        asset_id uuid NOT NULL REFERENCES assets(id) ON DELETE RESTRICT,
+        assigned_user_id uuid REFERENCES users(id) ON DELETE SET NULL,
+        status varchar(24) NOT NULL DEFAULT 'PENDING',
+        due_at timestamptz,
+        instructions text,
+        created_by uuid REFERENCES users(id) ON DELETE SET NULL,
+        updated_by uuid REFERENCES users(id) ON DELETE SET NULL,
+        created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        updated_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        CONSTRAINT uq_survey_campaign_targets_campaign_asset UNIQUE(campaign_id,asset_id),
+        CONSTRAINT chk_survey_campaign_targets_status CHECK (
+          status IN ('PENDING','IN_PROGRESS','SUBMITTED','COMPLETED','SKIPPED')
+        )
+      )
+    `);
+    await queryRunner.query(`CREATE INDEX IF NOT EXISTS idx_survey_campaign_targets_campaign_status ON survey_campaign_targets(campaign_id,status)`);
+    await queryRunner.query(`CREATE INDEX IF NOT EXISTS idx_survey_campaign_targets_asset_id ON survey_campaign_targets(asset_id)`);
+    await queryRunner.query(`CREATE INDEX IF NOT EXISTS idx_survey_campaign_targets_assigned_user_id ON survey_campaign_targets(assigned_user_id)`);
+
+    await queryRunner.query(`
+      CREATE TABLE IF NOT EXISTS survey_target_reports (
+        id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+        target_id uuid NOT NULL UNIQUE REFERENCES survey_campaign_targets(id) ON DELETE RESTRICT,
+        outcome varchar(32),
+        status varchar(24) NOT NULL DEFAULT 'DRAFT',
+        observed_at timestamptz,
+        latitude numeric(9,6),
+        longitude numeric(9,6),
+        accuracy_m numeric(12,3),
+        notes text,
+        asset_version_at_submission integer,
+        submitted_at timestamptz,
+        submitted_by uuid REFERENCES users(id) ON DELETE SET NULL,
+        reviewed_at timestamptz,
+        reviewed_by uuid REFERENCES users(id) ON DELETE SET NULL,
+        review_notes text,
+        created_by uuid REFERENCES users(id) ON DELETE SET NULL,
+        updated_by uuid REFERENCES users(id) ON DELETE SET NULL,
+        created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        updated_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        CONSTRAINT chk_survey_target_reports_outcome CHECK (
+          outcome IS NULL OR outcome IN ('CONFIRMED','CHANGES_RECORDED','NOT_LOCATED')
+        ),
+        CONSTRAINT chk_survey_target_reports_status CHECK (
+          status IN ('DRAFT','SUBMITTED','APPROVED','REJECTED')
+        ),
+        CONSTRAINT chk_survey_target_reports_coordinates CHECK (
+          (latitude IS NULL AND longitude IS NULL)
+          OR (latitude IS NOT NULL AND longitude IS NOT NULL
+            AND latitude BETWEEN -90 AND 90 AND longitude BETWEEN -180 AND 180)
+        ),
+        CONSTRAINT chk_survey_target_reports_accuracy CHECK (
+          accuracy_m IS NULL OR (accuracy_m >= 0 AND latitude IS NOT NULL AND longitude IS NOT NULL)
+        )
+      )
+    `);
+    await queryRunner.query(`CREATE INDEX IF NOT EXISTS idx_survey_target_reports_status ON survey_target_reports(status)`);
+    await queryRunner.query(`CREATE INDEX IF NOT EXISTS idx_survey_target_reports_submitted_by ON survey_target_reports(submitted_by)`);
+    await queryRunner.query(`CREATE INDEX IF NOT EXISTS idx_survey_target_reports_reviewed_by ON survey_target_reports(reviewed_by)`);
+
+    await queryRunner.query(`
+      CREATE TABLE IF NOT EXISTS survey_target_report_media (
+        report_id uuid NOT NULL REFERENCES survey_target_reports(id) ON DELETE RESTRICT,
+        media_id uuid NOT NULL REFERENCES asset_media(id) ON DELETE RESTRICT,
+        included boolean NOT NULL DEFAULT true,
+        added_by uuid REFERENCES users(id) ON DELETE SET NULL,
+        created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        updated_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        PRIMARY KEY(report_id,media_id)
+      )
+    `);
+    await queryRunner.query(`CREATE INDEX IF NOT EXISTS idx_survey_target_report_media_media_id ON survey_target_report_media(media_id)`);
+    await queryRunner.query(`CREATE INDEX IF NOT EXISTS idx_survey_target_report_media_included ON survey_target_report_media(report_id,included)`);
+
+    await queryRunner.query(`
+      CREATE TABLE IF NOT EXISTS survey_target_report_versions (
+        id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+        report_id uuid NOT NULL REFERENCES survey_target_reports(id) ON DELETE RESTRICT,
+        version_number integer NOT NULL,
+        event varchar(24) NOT NULL,
+        snapshot jsonb NOT NULL,
+        actor_user_id uuid REFERENCES users(id) ON DELETE SET NULL,
+        actor_username varchar(80),
+        created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        CONSTRAINT uq_survey_target_report_versions_number UNIQUE(report_id,version_number),
+        CONSTRAINT chk_survey_target_report_versions_event CHECK (
+          event IN ('SUBMITTED','APPROVED','REJECTED')
+        )
+      )
+    `);
+    await queryRunner.query(`CREATE INDEX IF NOT EXISTS idx_survey_target_report_versions_created_at ON survey_target_report_versions(created_at)`);
+
+    await queryRunner.query(`
+      INSERT INTO permissions(code,description) VALUES
+        ('surveys.read','Consultar planificación de relevamientos'),
+        ('surveys.manage','Crear y actualizar campañas de relevamiento'),
+        ('surveys.assign','Asignar objetivos de relevamiento'),
+        ('surveys.execute','Actualizar el avance de objetivos asignados'),
+        ('surveys.read_reports','Consultar capturas y versiones de relevamientos'),
+        ('surveys.capture','Capturar y enviar relevamientos de campo'),
+        ('surveys.review','Aprobar o rechazar relevamientos enviados')
+      ON CONFLICT(code) DO UPDATE SET description=EXCLUDED.description
+    `);
+    await queryRunner.query(`
+      WITH mapping(role_code,permission_code) AS (VALUES ${rolePermissionValues})
+      INSERT INTO role_permissions(role_id,permission_id)
+      SELECT role.id,permission.id
+      FROM mapping
+      JOIN roles role ON role.code=mapping.role_code
+      JOIN permissions permission ON permission.code=mapping.permission_code
+      ON CONFLICT(role_id,permission_id) DO NOTHING
+    `);
+
+    const appRole = process.env.DB_APP_USER;
+    if (!appRole) throw new Error('Missing required environment variable: DB_APP_USER');
+    const applicationRole = quoteIdentifier(appRole);
+    await queryRunner.query(`GRANT SELECT,INSERT,UPDATE ON TABLE survey_campaigns,survey_campaign_targets,survey_target_reports,survey_target_report_media TO ${applicationRole}`);
+    await queryRunner.query(`GRANT SELECT,INSERT ON TABLE survey_target_report_versions TO ${applicationRole}`);
+    await queryRunner.query(`REVOKE DELETE ON TABLE survey_campaigns,survey_campaign_targets,survey_target_reports,survey_target_report_media,survey_target_report_versions FROM ${applicationRole}`);
+    await queryRunner.query(`REVOKE UPDATE ON TABLE survey_target_report_versions FROM ${applicationRole}`);
+  }
+}

api-v3/src/database/migrations/1790000400000-f4-remove-director-report-legacy.ts

@@ -0,0 +1,113 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+const legacyDirectorPermissions = [
+  ['inspection_reports.revise', 'Cargar versiones corregidas del informe para revisión directiva'],
+  ['inspection_reports.review', 'Aprobar la versión vigente del informe'],
+  ['inspection_reports.sign_final', 'Firmar electrónicamente el informe final aprobado'],
+] as const;
+
+/**
+ * Retira definitivamente el circuito activo legacy Director -> revisión -> aprobación -> firma.
+ *
+ * current_revision_number e inspection_report_revisions se conservan porque forman parte del
+ * versionado útil del INF. inspection_report_signatures también se conserva como archivo
+ * histórico: F4 quita sus endpoints/permisos pero no destruye evidencia documental ya emitida.
+ */
+export class F4RemoveDirectorReportLegacy1790000400000 implements MigrationInterface {
+  name = 'F4RemoveDirectorReportLegacy1790000400000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    // Las entregas al Director pertenecían al flujo retirado y no deben seguir
+    // apareciendo como pendientes/reintentables en F4.
+    await queryRunner.query(`
+      DELETE FROM inspection_document_deliveries
+      WHERE recipient_kind = 'DIRECTOR'
+    `);
+
+    // Retira permisos huérfanos del circuito anterior para que tampoco aparezcan
+    // como capacidades administrables en RBAC una vez eliminados sus endpoints.
+    await queryRunner.query(`
+      DELETE FROM role_permissions
+      WHERE permission_id IN (
+        SELECT id FROM permissions
+        WHERE code IN (
+          'inspection_reports.revise',
+          'inspection_reports.review',
+          'inspection_reports.sign_final'
+        )
+      )
+    `);
+    await queryRunner.query(`
+      DELETE FROM permissions
+      WHERE code IN (
+        'inspection_reports.revise',
+        'inspection_reports.review',
+        'inspection_reports.sign_final'
+      )
+    `);
+
+    await queryRunner.query(`ALTER TABLE inspection_reports DROP COLUMN IF EXISTS approved_revision_id`);
+    await queryRunner.query(`ALTER TABLE inspection_reports DROP COLUMN IF EXISTS approved_by`);
+    await queryRunner.query(`ALTER TABLE inspection_reports DROP COLUMN IF EXISTS approved_at`);
+    await queryRunner.query(`ALTER TABLE inspection_reports DROP COLUMN IF EXISTS review_note`);
+    await queryRunner.query(`ALTER TABLE inspection_reports DROP COLUMN IF EXISTS signed_at`);
+    await queryRunner.query(`ALTER TABLE inspection_reports DROP COLUMN IF EXISTS review_status`);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    // El rollback reconstruye el contrato técnico legacy, pero no recrea entregas Director
+    // ni valores de aprobación eliminados. El backup PRE-F4 sigue siendo la fuente de
+    // recuperación de esos datos históricos si alguna vez fuera necesario volver al circuito.
+    await queryRunner.query(`
+      ALTER TABLE inspection_reports
+      ADD COLUMN IF NOT EXISTS review_status varchar(32) NOT NULL DEFAULT 'PENDING_REVIEW'
+    `);
+    await queryRunner.query(`ALTER TABLE inspection_reports ADD COLUMN IF NOT EXISTS approved_revision_id uuid`);
+    await queryRunner.query(`ALTER TABLE inspection_reports ADD COLUMN IF NOT EXISTS approved_by uuid`);
+    await queryRunner.query(`ALTER TABLE inspection_reports ADD COLUMN IF NOT EXISTS approved_at timestamptz`);
+    await queryRunner.query(`ALTER TABLE inspection_reports ADD COLUMN IF NOT EXISTS review_note varchar(1000)`);
+    await queryRunner.query(`ALTER TABLE inspection_reports ADD COLUMN IF NOT EXISTS signed_at timestamptz`);
+
+    await queryRunner.query(`
+      DO $$ BEGIN
+        ALTER TABLE inspection_reports
+          ADD CONSTRAINT chk_inspection_reports_review_status
+          CHECK (review_status IN ('PENDING_REVIEW','APPROVED','SIGNED'));
+      EXCEPTION WHEN duplicate_object THEN NULL; END $$;
+    `);
+    await queryRunner.query(`
+      DO $$ BEGIN
+        ALTER TABLE inspection_reports
+          ADD CONSTRAINT fk_inspection_reports_approved_by
+          FOREIGN KEY (approved_by) REFERENCES users(id) ON DELETE SET NULL;
+      EXCEPTION WHEN duplicate_object THEN NULL; END $$;
+    `);
+    await queryRunner.query(`
+      DO $$ BEGIN
+        ALTER TABLE inspection_reports
+          ADD CONSTRAINT fk_inspection_reports_approved_revision
+          FOREIGN KEY (approved_revision_id) REFERENCES inspection_report_revisions(id) ON DELETE RESTRICT;
+      EXCEPTION WHEN duplicate_object THEN NULL; END $$;
+    `);
+
+    for (const [code, description] of legacyDirectorPermissions) {
+      await queryRunner.query(
+        `INSERT INTO permissions (code, description) VALUES ($1, $2) ON CONFLICT (code) DO UPDATE SET description = EXCLUDED.description`,
+        [code, description],
+      );
+    }
+    await queryRunner.query(`
+      WITH mapping(role_code, permission_code) AS (VALUES
+        ('director', 'inspection_reports.revise'),
+        ('director', 'inspection_reports.review'),
+        ('director', 'inspection_reports.sign_final')
+      )
+      INSERT INTO role_permissions (role_id, permission_id)
+      SELECT role.id, permission.id
+      FROM mapping
+      JOIN roles role ON role.code = mapping.role_code
+      JOIN permissions permission ON permission.code = mapping.permission_code
+      ON CONFLICT (role_id, permission_id) DO NOTHING
+    `);
+  }
+}

api-v3/src/database/migrations/1790000500000-f4-remove-inspection-legacy-fields.ts

@@ -0,0 +1,118 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+/**
+ * F4 elimina dos campos heredados de la planificación original de Inspecciones:
+ * - title: la Inspección se identifica por su código autogenerado.
+ * - planned_end_at: la planificación sólo define la fecha/hora prevista de inicio.
+ *
+ * La migración conserva una copia técnica de los valores eliminados para que un
+ * rollback restaure los datos exactos existentes antes del cambio. Inspecciones
+ * creadas después del up() reciben code como title y planned_end_at NULL al bajar.
+ *
+ * Se conserva un índice sobre planned_start_at porque sigue siendo un criterio de
+ * orden y filtro operativo. Ninguna migración histórica se modifica.
+ */
+export class F4RemoveInspectionLegacyFields1790000500000 implements MigrationInterface {
+  name = 'F4RemoveInspectionLegacyFields1790000500000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      CREATE TABLE IF NOT EXISTS f4_inspection_visit_legacy_fields_backup (
+        visit_id uuid PRIMARY KEY,
+        title varchar(200) NOT NULL,
+        planned_end_at timestamptz NULL,
+        backed_up_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP
+      )
+    `);
+    await queryRunner.query(`
+      INSERT INTO f4_inspection_visit_legacy_fields_backup (
+        visit_id,
+        title,
+        planned_end_at,
+        backed_up_at
+      )
+      SELECT
+        id,
+        title,
+        planned_end_at,
+        CURRENT_TIMESTAMP
+      FROM inspection_visits
+      ON CONFLICT (visit_id) DO UPDATE SET
+        title = EXCLUDED.title,
+        planned_end_at = EXCLUDED.planned_end_at,
+        backed_up_at = EXCLUDED.backed_up_at
+    `);
+
+    await queryRunner.query(`DROP INDEX IF EXISTS idx_inspection_visits_planned_dates`);
+    await queryRunner.query(`
+      ALTER TABLE inspection_visits
+      DROP CONSTRAINT IF EXISTS chk_inspection_visits_planned_dates
+    `);
+
+    await queryRunner.query(`ALTER TABLE inspection_visits DROP COLUMN IF EXISTS planned_end_at`);
+    await queryRunner.query(`ALTER TABLE inspection_visits DROP COLUMN IF EXISTS title`);
+
+    await queryRunner.query(`
+      CREATE INDEX IF NOT EXISTS idx_inspection_visits_planned_start_at
+      ON inspection_visits (planned_start_at)
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP INDEX IF EXISTS idx_inspection_visits_planned_start_at`);
+
+    await queryRunner.query(`
+      ALTER TABLE inspection_visits
+      ADD COLUMN IF NOT EXISTS title varchar(200)
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_visits
+      ADD COLUMN IF NOT EXISTS planned_end_at timestamptz
+    `);
+
+    await queryRunner.query(`
+      UPDATE inspection_visits visit
+      SET
+        title = backup.title,
+        planned_end_at = backup.planned_end_at
+      FROM f4_inspection_visit_legacy_fields_backup backup
+      WHERE backup.visit_id = visit.id
+    `);
+    await queryRunner.query(`
+      UPDATE inspection_visits
+      SET title = code
+      WHERE title IS NULL
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_visits
+      ALTER COLUMN title SET NOT NULL
+    `);
+
+    await queryRunner.query(`
+      DO $$
+      BEGIN
+        IF NOT EXISTS (
+          SELECT 1
+          FROM pg_constraint
+          WHERE conname = 'chk_inspection_visits_planned_dates'
+            AND conrelid = 'inspection_visits'::regclass
+        ) THEN
+          ALTER TABLE inspection_visits
+          ADD CONSTRAINT chk_inspection_visits_planned_dates CHECK (
+            planned_start_at IS NULL
+            OR planned_end_at IS NULL
+            OR planned_end_at >= planned_start_at
+          );
+        END IF;
+      END
+      $$
+    `);
+
+    await queryRunner.query(`
+      CREATE INDEX IF NOT EXISTS idx_inspection_visits_planned_dates
+      ON inspection_visits (planned_start_at, planned_end_at)
+    `);
+
+    await queryRunner.query(`DROP TABLE IF EXISTS f4_inspection_visit_legacy_fields_backup`);
+  }
+}

api-v3/src/database/migrations/1790000600000-f4-align-document-lifecycle-constraints.ts

@@ -0,0 +1,274 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+/**
+ * Alinea las restricciones físicas heredadas de D5 con el ciclo documental F4.
+ *
+ * F4 incorpora estados LOCKED/SEALED para Actas y WORKING/OFFICIALIZED para INF.
+ * También usa el código visible ACT-NNNNN-DD-MM-YY y entrega copia al INSPECTOR.
+ * Las migraciones históricas conservaban CHECKs, triggers y contratos de D5, por lo
+ * que el servicio podía compilar pero PostgreSQL rechazaba las transiciones nuevas.
+ */
+export class F4AlignDocumentLifecycleConstraints1790000600000 implements MigrationInterface {
+  name = 'F4AlignDocumentLifecycleConstraints1790000600000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE inspection_reports
+      DROP CONSTRAINT IF EXISTS chk_inspection_reports_status
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_reports
+      ADD CONSTRAINT chk_inspection_reports_status CHECK (
+        status IN ('WORKING','OFFICIALIZED','FROZEN','CANCELLED')
+      )
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_reports
+      ALTER COLUMN status SET DEFAULT 'WORKING'
+    `);
+
+    await queryRunner.query(`
+      ALTER TABLE inspection_acts
+      DROP CONSTRAINT IF EXISTS chk_inspection_acts_status
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_acts
+      ADD CONSTRAINT chk_inspection_acts_status CHECK (
+        status IN ('DRAFT','LOCKED','SEALED','READY','CLOSED','CANCELLED','RECTIFIED')
+      )
+    `);
+
+    // Conservamos los códigos históricos ACTA-* ya emitidos y habilitamos el
+    // formato F4 realmente generado por InspectionActsService.
+    await queryRunner.query(`
+      ALTER TABLE inspection_acts
+      DROP CONSTRAINT IF EXISTS chk_inspection_acts_code
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_acts
+      ADD CONSTRAINT chk_inspection_acts_code CHECK (
+        code ~ '^(ACTA-[0-9]{4}-[0-9]{6}|ACT-[0-9]{5}-[0-9]{2}-[0-9]{2}-[0-9]{2})$'
+      )
+    `);
+
+    await queryRunner.query(`
+      ALTER TABLE inspection_act_versions
+      DROP CONSTRAINT IF EXISTS chk_inspection_act_versions_event
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_act_versions
+      ADD CONSTRAINT chk_inspection_act_versions_event CHECK (
+        event IN ('CREATED','UPDATED','LOCKED','SEALED','READY','REOPENED','CLOSED','CANCELLED')
+      )
+    `);
+
+    // El cierre físico F4 se representa como SEALED. Conservamos CLOSED como
+    // compatibilidad histórica y exigimos la misma integridad en ambos estados.
+    await queryRunner.query(`
+      ALTER TABLE inspection_acts
+      DROP CONSTRAINT IF EXISTS chk_inspection_acts_closure
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_acts
+      ADD CONSTRAINT chk_inspection_acts_closure CHECK (
+        status NOT IN ('SEALED','CLOSED')
+        OR (
+          closed_at IS NOT NULL
+          AND closed_by IS NOT NULL
+          AND closure_sha256 ~ '^[0-9a-f]{64}$'
+        )
+      )
+    `);
+
+    // F4 retira Director como destinatario activo y agrega copia al inspector.
+    // La migración 040 ya eliminó previamente las filas DIRECTOR existentes.
+    await queryRunner.query(`
+      ALTER TABLE inspection_document_deliveries
+      DROP CONSTRAINT IF EXISTS chk_inspection_document_deliveries_recipient_kind
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_document_deliveries
+      ADD CONSTRAINT chk_inspection_document_deliveries_recipient_kind CHECK (
+        recipient_kind IN ('COMPANY','OFFICE','INSPECTOR')
+      )
+    `);
+
+    // Las firmas F4 pertenecen al snapshot LOCKED. El trigger D5 exigía READY.
+    await queryRunner.query(`
+      CREATE OR REPLACE FUNCTION dhv2_guard_act_signature_ready()
+      RETURNS trigger LANGUAGE plpgsql AS $$
+      DECLARE current_status varchar(24);
+      DECLARE current_sha char(64);
+      BEGIN
+        SELECT act.status, closure.prepared_sha256
+        INTO current_status, current_sha
+        FROM inspection_acts act
+        INNER JOIN inspection_act_closures closure ON closure.act_id = act.id
+        WHERE act.id = NEW.act_id;
+        IF current_status <> 'LOCKED' OR current_sha IS DISTINCT FROM NEW.prepared_sha256 THEN
+          RAISE EXCEPTION 'La firma no corresponde a un acta bloqueada vigente';
+        END IF;
+        RETURN NEW;
+      END
+      $$
+    `);
+
+    // SEALED es tan inmutable como CLOSED/RECTIFIED en el contrato histórico.
+    await queryRunner.query(`
+      CREATE OR REPLACE FUNCTION dhv2_guard_closed_act_immutable()
+      RETURNS trigger LANGUAGE plpgsql AS $$
+      BEGIN
+        IF OLD.status IN ('SEALED','CLOSED','RECTIFIED') THEN
+          RAISE EXCEPTION 'El acta sellada es inmutable';
+        END IF;
+        RETURN NEW;
+      END
+      $$
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    // Primero restauramos la guarda D5. De otro modo el propio trigger F4 impediría
+    // traducir una fila SEALED a CLOSED durante el rollback.
+    await queryRunner.query(`
+      CREATE OR REPLACE FUNCTION dhv2_guard_closed_act_immutable()
+      RETURNS trigger LANGUAGE plpgsql AS $$
+      BEGIN
+        IF OLD.status IN ('CLOSED','RECTIFIED') THEN
+          RAISE EXCEPTION 'El acta cerrada es inmutable';
+        END IF;
+        RETURN NEW;
+      END
+      $$
+    `);
+
+    // Los códigos F4 se traducen antes de convertir SEALED a CLOSED, porque una vez
+    // restaurada la guarda D5 una fila CLOSED ya no puede modificarse.
+    await queryRunner.query(`
+      UPDATE inspection_acts
+      SET code='ACTA-' || act_year::text || '-' || LPAD(act_number::text, 6, '0')
+      WHERE code ~ '^ACT-[0-9]{5}-[0-9]{2}-[0-9]{2}-[0-9]{2}$'
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_acts
+      DROP CONSTRAINT IF EXISTS chk_inspection_acts_code
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_acts
+      ADD CONSTRAINT chk_inspection_acts_code CHECK (
+        code ~ '^ACTA-[0-9]{4}-[0-9]{6}$'
+      )
+    `);
+
+    // El contrato D5 no conoce los estados F4. Reducimos las representaciones
+    // nuevas a sus equivalentes históricos antes de restaurar sus CHECKs.
+    await queryRunner.query(`
+      UPDATE inspection_reports
+      SET status='FROZEN'
+      WHERE status IN ('WORKING','OFFICIALIZED')
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_reports
+      ALTER COLUMN status SET DEFAULT 'FROZEN'
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_reports
+      DROP CONSTRAINT IF EXISTS chk_inspection_reports_status
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_reports
+      ADD CONSTRAINT chk_inspection_reports_status CHECK (
+        status IN ('FROZEN','CANCELLED')
+      )
+    `);
+
+    await queryRunner.query(`
+      UPDATE inspection_acts
+      SET status=CASE
+        WHEN status='LOCKED' THEN 'READY'
+        WHEN status='SEALED' THEN 'CLOSED'
+        ELSE status
+      END
+      WHERE status IN ('LOCKED','SEALED')
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_acts
+      DROP CONSTRAINT IF EXISTS chk_inspection_acts_status
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_acts
+      ADD CONSTRAINT chk_inspection_acts_status CHECK (
+        status IN ('DRAFT','READY','CLOSED','CANCELLED','RECTIFIED')
+      )
+    `);
+
+    await queryRunner.query(`
+      UPDATE inspection_act_versions
+      SET event=CASE
+        WHEN event='LOCKED' THEN 'READY'
+        WHEN event='SEALED' THEN 'CLOSED'
+        ELSE event
+      END
+      WHERE event IN ('LOCKED','SEALED')
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_act_versions
+      DROP CONSTRAINT IF EXISTS chk_inspection_act_versions_event
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_act_versions
+      ADD CONSTRAINT chk_inspection_act_versions_event CHECK (
+        event IN ('CREATED','UPDATED','READY','REOPENED','CLOSED','CANCELLED')
+      )
+    `);
+
+    await queryRunner.query(`
+      ALTER TABLE inspection_acts
+      DROP CONSTRAINT IF EXISTS chk_inspection_acts_closure
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_acts
+      ADD CONSTRAINT chk_inspection_acts_closure CHECK (
+        status <> 'CLOSED'
+        OR (
+          closed_at IS NOT NULL
+          AND closed_by IS NOT NULL
+          AND closure_sha256 ~ '^[0-9a-f]{64}$'
+        )
+      )
+    `);
+
+    // Conservamos INSPECTOR en el CHECK de rollback para no destruir ni falsificar
+    // entregas F4 ya auditadas. D5 puede seguir operando con sus tres valores y el
+    // backup PRE-F4 sigue siendo la fuente de una restauración histórica exacta.
+    await queryRunner.query(`
+      ALTER TABLE inspection_document_deliveries
+      DROP CONSTRAINT IF EXISTS chk_inspection_document_deliveries_recipient_kind
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_document_deliveries
+      ADD CONSTRAINT chk_inspection_document_deliveries_recipient_kind CHECK (
+        recipient_kind IN ('COMPANY','OFFICE','DIRECTOR','INSPECTOR')
+      )
+    `);
+
+    await queryRunner.query(`
+      CREATE OR REPLACE FUNCTION dhv2_guard_act_signature_ready()
+      RETURNS trigger LANGUAGE plpgsql AS $$
+      DECLARE current_status varchar(24);
+      DECLARE current_sha char(64);
+      BEGIN
+        SELECT act.status, closure.prepared_sha256
+        INTO current_status, current_sha
+        FROM inspection_acts act
+        INNER JOIN inspection_act_closures closure ON closure.act_id = act.id
+        WHERE act.id = NEW.act_id;
+        IF current_status <> 'READY' OR current_sha IS DISTINCT FROM NEW.prepared_sha256 THEN
+          RAISE EXCEPTION 'La firma no corresponde a un acta preparada vigente';
+        END IF;
+        RETURN NEW;
+      END
+      $$
+    `);
+  }
+}

api-v3/src/database/migrations/1790000700000-f4-align-asset-version-function-change.ts

@@ -0,0 +1,44 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class F4AlignAssetVersionFunctionChange1790000700000 implements MigrationInterface {
+  name = 'F4AlignAssetVersionFunctionChange1790000700000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE asset_versions
+      DROP CONSTRAINT IF EXISTS chk_asset_versions_change_type
+    `);
+    await queryRunner.query(`
+      ALTER TABLE asset_versions
+      ADD CONSTRAINT chk_asset_versions_change_type CHECK (change_type IN (
+        'BASELINE', 'CREATED', 'UPDATED', 'CONTEXT_CHANGED', 'FUNCTION_CHANGED',
+        'STATUS_CHANGED', 'OPERATIONAL_STATUS_CHANGED', 'REGISTRY_UPDATED',
+        'GEOMETRY_UPDATED', 'GEOMETRY_REMOVED',
+        'MEDIA_UPLOADED', 'MEDIA_UPDATED', 'MEDIA_REMOVED',
+        'PROVENANCE_BASELINE', 'PROVENANCE_UPDATED', 'PROVENANCE_VERIFIED'
+      ))
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      UPDATE asset_versions
+      SET change_type='UPDATED'
+      WHERE change_type='FUNCTION_CHANGED'
+    `);
+    await queryRunner.query(`
+      ALTER TABLE asset_versions
+      DROP CONSTRAINT IF EXISTS chk_asset_versions_change_type
+    `);
+    await queryRunner.query(`
+      ALTER TABLE asset_versions
+      ADD CONSTRAINT chk_asset_versions_change_type CHECK (change_type IN (
+        'BASELINE', 'CREATED', 'UPDATED', 'CONTEXT_CHANGED',
+        'STATUS_CHANGED', 'OPERATIONAL_STATUS_CHANGED', 'REGISTRY_UPDATED',
+        'GEOMETRY_UPDATED', 'GEOMETRY_REMOVED',
+        'MEDIA_UPLOADED', 'MEDIA_UPDATED', 'MEDIA_REMOVED',
+        'PROVENANCE_BASELINE', 'PROVENANCE_UPDATED', 'PROVENANCE_VERIFIED'
+      ))
+    `);
+  }
+}

api-v3/src/inspection-acts/dto/create-inspection-act.dto.ts

@@ -4,6 +4,7 @@ import {
   ArrayMinSize,
   ArrayUnique,
   IsArray,
+  IsEnum,
   IsISO8601,
   IsOptional,
   IsString,
@@ -11,11 +12,15 @@ import {
   MaxLength,
   MinLength,
 } from 'class-validator';
+import { InspectionActUrgency } from '../../database/entities';
 
 export class CreateInspectionActDto {
   @IsISO8601({ strict: true })
   occurredAt!: string;
 
+  @IsEnum(InspectionActUrgency)
+  urgency!: InspectionActUrgency;
+
   @Transform(({ value }) => (typeof value === 'string' ? value.trim() : value))
   @IsString()
   @MinLength(1)

api-v3/src/inspection-acts/dto/update-inspection-act.dto.ts

@@ -4,6 +4,7 @@ import {
   ArrayMinSize,
   ArrayUnique,
   IsArray,
+  IsEnum,
   IsISO8601,
   IsOptional,
   IsString,
@@ -11,12 +12,17 @@ import {
   MaxLength,
   MinLength,
 } from 'class-validator';
+import { InspectionActUrgency } from '../../database/entities';
 
 export class UpdateInspectionActDto {
   @IsOptional()
   @IsISO8601({ strict: true })
   occurredAt?: string;
 
+  @IsOptional()
+  @IsEnum(InspectionActUrgency)
+  urgency?: InspectionActUrgency;
+
   @IsOptional()
   @Transform(({ value }) => (typeof value === 'string' ? value.trim() : value))
   @IsString()

api-v3/src/inspection-acts/inspection-acts.service.ts

@@ -14,6 +14,9 @@ import {
   DocumentSequenceType,
   InspectionAct,
   InspectionActStatus,
+  InspectionActUrgency,
+  InspectionDeadlineBasis,
+  InspectionDeadlineDayType,
   InspectionActVersionEvent,
   InspectionVisit,
   InspectionVisitStatus,
@@ -41,7 +44,6 @@ interface ActAsset {
 interface ActVisitSummary {
   id: string;
   code: string;
-  title: string;
   status: InspectionVisitStatus;
   actualStartedAt: Date | null;
 }
@@ -72,6 +74,17 @@ export interface InspectionActListItem {
   title: string;
   summary: string;
   observations: string | null;
+  urgency: InspectionActUrgency;
+  deadlineDays: number | null;
+  deadlineDayType: InspectionDeadlineDayType | null;
+  deadlineBasis: InspectionDeadlineBasis | null;
+  deadlineBaseAt: Date | null;
+  deadlineAt: Date | null;
+  lockedAt: Date | null;
+  lockedBy: string | null;
+  lockedSha256: string | null;
+  sealedAt: Date | null;
+  sealedBy: string | null;
   currentVersion: number;
   cancellationReason: string | null;
   closedAt: Date | null;
@@ -137,7 +150,6 @@ export class InspectionActsService {
         act.code ILIKE ${search}
         OR act.title ILIKE ${search}
         OR visit.code ILIKE ${search}
-        OR visit.title ILIKE ${search}
         OR EXISTS (
           SELECT 1
           FROM inspection_act_assets search_link
@@ -313,13 +325,16 @@ export class InspectionActsService {
       const occurredAt = new Date(dto.occurredAt);
       const actYear = await this.yearAtProjectTimezone(manager, occurredAt);
       const actNumber = await this.allocateNumber(manager, actYear);
-      if (actNumber > 999999) {
+      if (actNumber > 99999) {
         throw new ConflictException({
           code: 'INSPECTION_ACT_SEQUENCE_EXHAUSTED',
           message: 'La numeración anual de actas agotó su rango disponible',
         });
       }
-      const code = `ACTA-${actYear}-${String(actNumber).padStart(6, '0')}`;
+      const [dateRow] = (await manager.query(`
+        SELECT TO_CHAR($1::timestamptz AT TIME ZONE 'America/Argentina/Mendoza', 'DD-MM-YY') AS date_part
+      `, [occurredAt])) as Array<{ date_part: string }>;
+      const code = `ACT-${String(actNumber).padStart(5, '0')}-${dateRow.date_part}`;
       const act = manager.getRepository(InspectionAct).create({
         visitId,
         actYear,
@@ -330,6 +345,17 @@ export class InspectionActsService {
         title: dto.title,
         summary: dto.summary,
         observations: dto.observations ?? null,
+        urgency: dto.urgency,
+        deadlineDays: null,
+        deadlineDayType: null,
+        deadlineBasis: null,
+        deadlineBaseAt: null,
+        deadlineAt: null,
+        lockedAt: null,
+        lockedBy: null,
+        lockedSha256: null,
+        sealedAt: null,
+        sealedBy: null,
         currentVersion: 0,
         cancellationReason: null,
         createdBy: principal.userId,
@@ -384,6 +410,7 @@ export class InspectionActsService {
       await this.assertVisitAssets(manager, visit.id, nextAssetIds);
       const before = await this.loadView(manager, id);
       if (dto.occurredAt !== undefined) act.occurredAt = nextOccurredAt;
+      if (dto.urgency !== undefined) act.urgency = dto.urgency;
       if (dto.title !== undefined) act.title = dto.title;
       if (dto.summary !== undefined) act.summary = dto.summary;
       if (dto.observations !== undefined) act.observations = dto.observations;
@@ -462,7 +489,6 @@ export class InspectionActsService {
         JSONB_BUILD_OBJECT(
           'id', visit.id,
           'code', visit.code,
-          'title', visit.title,
           'status', visit.status,
           'actualStartedAt', visit.actual_started_at
         ) AS visit,
@@ -474,6 +500,17 @@ export class InspectionActsService {
         act.title,
         act.summary,
         act.observations,
+        act.urgency,
+        act.deadline_days AS "deadlineDays",
+        act.deadline_day_type AS "deadlineDayType",
+        act.deadline_basis AS "deadlineBasis",
+        act.deadline_base_at AS "deadlineBaseAt",
+        act.deadline_at AS "deadlineAt",
+        act.locked_at AS "lockedAt",
+        act.locked_by AS "lockedBy",
+        act.locked_sha256 AS "lockedSha256",
+        act.sealed_at AS "sealedAt",
+        act.sealed_by AS "sealedBy",
         act.current_version AS "currentVersion",
         act.cancellation_reason AS "cancellationReason",
         act.closed_at AS "closedAt",
@@ -645,7 +682,7 @@ export class InspectionActsService {
     if (rows.length > 0) {
       throw new ConflictException({
         code: 'INSPECTION_VISIT_DRAFT_ACT_ALREADY_EXISTS',
-        message: 'La inspección ya tiene un acta en borrador; preparala o cancelala antes de crear otra',
+        message: 'La inspección ya tiene un acta en borrador; finalizala o cancelala antes de crear otra',
       });
     }
   }
@@ -665,7 +702,7 @@ export class InspectionActsService {
     if (assetIds.length < 1 || Number(row?.count ?? 0) !== assetIds.length) {
       throw new BadRequestException({
         code: 'INSPECTION_ACT_ASSET_INVALID',
-        message: 'Cada activo del acta debe estar incluido en la visita',
+        message: 'Cada inventario del acta debe estar incluido en la inspección',
       });
     }
   }
@@ -758,6 +795,15 @@ export class InspectionActsService {
         'title', act.title,
         'summary', act.summary,
         'observations', act.observations,
+        'urgency', act.urgency,
+        'deadlineDays', act.deadline_days,
+        'deadlineDayType', act.deadline_day_type,
+        'deadlineBasis', act.deadline_basis,
+        'deadlineBaseAt', act.deadline_base_at,
+        'deadlineAt', act.deadline_at,
+        'lockedAt', act.locked_at,
+        'lockedSha256', act.locked_sha256,
+        'sealedAt', act.sealed_at,
         'currentVersion', act.current_version,
         'cancellationReason', act.cancellation_reason,
         'createdBy', act.created_by,
@@ -765,7 +811,6 @@ export class InspectionActsService {
         'visit', JSONB_BUILD_OBJECT(
           'id', visit.id,
           'code', visit.code,
-          'title', visit.title,
           'status', visit.status,
           'scopeAssetId', visit.scope_asset_id,
           'actualStartedAt', visit.actual_started_at
@@ -804,6 +849,15 @@ export class InspectionActsService {
       title: act.title,
       summary: act.summary,
       observations: act.observations,
+      urgency: act.urgency,
+      deadlineDays: act.deadlineDays,
+      deadlineDayType: act.deadlineDayType,
+      deadlineBasis: act.deadlineBasis,
+      deadlineBaseAt: act.deadlineBaseAt,
+      deadlineAt: act.deadlineAt,
+      lockedAt: act.lockedAt,
+      lockedSha256: act.lockedSha256,
+      sealedAt: act.sealedAt,
       currentVersion: act.currentVersion,
       cancellationReason: act.cancellationReason,
       closedAt: act.closedAt,

api-v3/src/inspection-closing/company-signature-invite.controller.ts

@@ -0,0 +1,77 @@
+import {
+  Body,
+  Controller,
+  Get,
+  Param,
+  ParseUUIDPipe,
+  Post,
+  Req,
+  UploadedFile,
+  UseInterceptors,
+} from '@nestjs/common';
+import { FileInterceptor } from '@nestjs/platform-express';
+import { CurrentAuth } from '../auth/decorators/current-auth.decorator';
+import { Public } from '../auth/decorators/public.decorator';
+import { SkipCsrf } from '../auth/decorators/skip-csrf.decorator';
+import { RequirePermissions } from '../authorization/decorators/require-permissions.decorator';
+import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
+import { CompanySignatureInviteService } from './company-signature-invite.service';
+import {
+  CreateCompanySignatureInviteDto,
+  PublicCompanyRefusalDto,
+  PublicCompanySignatureDto,
+} from './dto/company-signature-invite.dto';
+import {
+  MAX_INSPECTION_SIGNATURE_BYTES,
+  type UploadedInspectionSignatureFile,
+} from './inspection-signature-file';
+
+@Controller('inspection-acts/:actId/company-signature-invitations')
+export class CompanySignatureInviteController {
+  constructor(private readonly invites: CompanySignatureInviteService) {}
+
+  @Post()
+  @RequirePermissions('inspection_closure.sign')
+  create(
+    @Param('actId', new ParseUUIDPipe({ version: '4' })) actId: string,
+    @Body() dto: CreateCompanySignatureInviteDto,
+    @CurrentAuth() principal: AuthPrincipal,
+    @Req() request: RequestWithContext,
+  ) {
+    return this.invites.create(actId, dto, principal, request);
+  }
+}
+
+@Public()
+@SkipCsrf()
+@Controller('public/company-signatures')
+export class PublicCompanySignatureController {
+  constructor(private readonly invites: CompanySignatureInviteService) {}
+
+  @Get(':token')
+  view(@Param('token') token: string) {
+    return this.invites.view(token);
+  }
+
+  @Post(':token/sign')
+  @UseInterceptors(FileInterceptor('file', {
+    limits: { fileSize: MAX_INSPECTION_SIGNATURE_BYTES, files: 1 },
+  }))
+  sign(
+    @Param('token') token: string,
+    @Body() dto: PublicCompanySignatureDto,
+    @UploadedFile() file: UploadedInspectionSignatureFile | undefined,
+    @Req() request: RequestWithContext,
+  ) {
+    return this.invites.sign(token, dto, file, request);
+  }
+
+  @Post(':token/refuse')
+  refuse(
+    @Param('token') token: string,
+    @Body() dto: PublicCompanyRefusalDto,
+    @Req() request: RequestWithContext,
+  ) {
+    return this.invites.refuse(token, dto, request);
+  }
+}

api-v3/src/inspection-closing/company-signature-invite.service.ts

@@ -0,0 +1,624 @@
+import { createHash, randomBytes, randomUUID } from 'node:crypto';
+import { mkdir, unlink, writeFile } from 'node:fs/promises';
+import { isAbsolute, parse, resolve } from 'node:path';
+import {
+  ConflictException,
+  GoneException,
+  Injectable,
+  InternalServerErrorException,
+  NotFoundException,
+} from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
+import { DataSource, EntityManager } from 'typeorm';
+import { administrationAuditContext } from '../administration/common/administration-audit';
+import { AuditService } from '../audit/audit.service';
+import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
+import {
+  AuditSource,
+  InspectionActSignatureSource,
+  InspectionActSignatureStatus,
+  InspectionActSignerType,
+  InspectionCompanySignatureManifestation,
+} from '../database/entities';
+import { SmtpDeliveryService } from '../inspection-reports/smtp-delivery.service';
+import { sha256CanonicalJson } from './canonical-json';
+import type {
+  CreateCompanySignatureInviteDto,
+  PublicCompanyRefusalDto,
+  PublicCompanySignatureDto,
+} from './dto/company-signature-invite.dto';
+import {
+  inspectInspectionSignatureFile,
+  type UploadedInspectionSignatureFile,
+} from './inspection-signature-file';
+
+const REMOTE_CONSENT_VERSION = 'F4-1';
+const REMOTE_COMPANY_CONSENT = 'Declaro haber leído o recibido explicación del contenido del Acta y que esta firma se incorpora como constancia de recepción, sin implicar aceptación de los Hallazgos.';
+
+interface InviteContext {
+  id: string;
+  actId: string;
+  tokenSha256: string;
+  recipientEmail: string;
+  recipientName: string | null;
+  recipientDocumentType: string | null;
+  recipientDocumentNumber: string | null;
+  recipientPosition: string | null;
+  status: 'PENDING' | 'USED' | 'REVOKED' | 'EXPIRED';
+  expiresAt: Date;
+  sentAt: Date | null;
+  usedAt: Date | null;
+  createdBy: string;
+  actCode: string;
+  actStatus: string;
+  lockedSha256: string | null;
+  lockedAt: Date | null;
+  inspectionCode: string;
+  lockedSnapshot: Record<string, unknown> | null;
+}
+
+@Injectable()
+export class CompanySignatureInviteService {
+  private readonly signatureRoot: string;
+
+  constructor(
+    private readonly dataSource: DataSource,
+    private readonly audit: AuditService,
+    private readonly smtp: SmtpDeliveryService,
+    private readonly config: ConfigService,
+  ) {
+    const configured = config.get<string>('INSPECTION_SIGNATURE_ROOT')
+      ?? '/app/storage/asset-media/inspection-signatures';
+    if (!isAbsolute(configured)) throw new Error('INSPECTION_SIGNATURE_ROOT must be an absolute path');
+    this.signatureRoot = resolve(configured);
+    if (this.signatureRoot === parse(this.signatureRoot).root) {
+      throw new Error('INSPECTION_SIGNATURE_ROOT cannot be the filesystem root');
+    }
+  }
+
+  async create(
+    actId: string,
+    dto: CreateCompanySignatureInviteDto,
+    principal: AuthPrincipal,
+    request: RequestWithContext,
+  ) {
+    const token = randomBytes(32).toString('base64url');
+    const tokenSha256 = this.hashToken(token);
+    const expiresAt = new Date(Date.now() + (dto.expiresInDays ?? 7) * 24 * 60 * 60 * 1000);
+
+    const created = await this.dataSource.transaction(async (manager) => {
+      await this.assertActorAssigned(manager, actId, principal);
+      const [context] = await manager.query(`
+        SELECT
+          act.id,
+          act.code,
+          act.status,
+          act.locked_sha256 AS "lockedSha256",
+          responsible.full_name AS "fullName",
+          responsible.document_type AS "documentType",
+          responsible.document_number AS "documentNumber",
+          responsible.position,
+          responsible.email AS "responsibleEmail",
+          visit.code AS "inspectionCode",
+          (
+            SELECT profile.notification_email
+            FROM inspection_act_assets link
+            JOIN assets inventory ON inventory.id=link.asset_id
+            JOIN asset_types inventory_type ON inventory_type.id=inventory.asset_type_id
+            JOIN assets company ON company.id=COALESCE(
+              inventory.operator_company_id,
+              CASE WHEN inventory_type.operational_role='COMPANY' THEN inventory.id END
+            )
+            LEFT JOIN organization_profiles profile ON profile.asset_id=company.id
+            WHERE link.act_id=act.id AND link.included=true
+              AND profile.notification_email IS NOT NULL
+            ORDER BY company.id
+            LIMIT 1
+          ) AS "companyEmail"
+        FROM inspection_acts act
+        JOIN inspection_visits visit ON visit.id=act.visit_id
+        LEFT JOIN inspection_act_responsibles responsible ON responsible.act_id=act.id
+        WHERE act.id=$1
+        FOR UPDATE OF act
+      `, [actId]) as Array<{
+        id: string;
+        code: string;
+        status: string;
+        lockedSha256: string | null;
+        fullName: string | null;
+        documentType: string | null;
+        documentNumber: string | null;
+        position: string | null;
+        responsibleEmail: string | null;
+        inspectionCode: string;
+        companyEmail: string | null;
+      }>;
+      if (!context) {
+        throw new NotFoundException({ code: 'INSPECTION_ACT_NOT_FOUND', message: 'Acta no encontrada' });
+      }
+      if (context.status !== 'LOCKED' || !context.lockedSha256) {
+        throw new ConflictException({
+          code: 'COMPANY_SIGNATURE_INVITE_ACT_NOT_LOCKED',
+          message: 'La invitación de firma sólo puede emitirse para un Acta BLOQUEADA',
+        });
+      }
+      if (await this.hasCompanyOutcome(manager, actId)) {
+        throw new ConflictException({
+          code: 'COMPANY_SIGNATURE_ALREADY_RESOLVED',
+          message: 'La manifestación de la empresa ya fue registrada',
+        });
+      }
+      const recipientEmail = dto.recipientEmail
+        ?? context.responsibleEmail?.toLowerCase()
+        ?? context.companyEmail?.toLowerCase()
+        ?? null;
+      if (!recipientEmail) {
+        throw new ConflictException({
+          code: 'COMPANY_SIGNATURE_EMAIL_REQUIRED',
+          message: 'No hay email de responsable ni email institucional de empresa; indicá un destinatario',
+        });
+      }
+
+      await manager.query(`
+        UPDATE inspection_act_company_signature_invites
+        SET status='REVOKED',revoked_at=CURRENT_TIMESTAMP,revoked_by=$2,updated_at=CURRENT_TIMESTAMP
+        WHERE act_id=$1 AND status='PENDING'
+      `, [actId, principal.userId]);
+
+      const [invite] = await manager.query(`
+        INSERT INTO inspection_act_company_signature_invites(
+          act_id,token_sha256,recipient_email,recipient_name,recipient_document_type,
+          recipient_document_number,recipient_position,expires_at,created_by
+        ) VALUES($1,$2,$3,$4,$5,$6,$7,$8,$9)
+        RETURNING id,act_id AS "actId",recipient_email AS "recipientEmail",
+          expires_at AS "expiresAt",created_at AS "createdAt"
+      `, [
+        actId,
+        tokenSha256,
+        recipientEmail,
+        context.fullName,
+        context.documentType,
+        context.documentNumber,
+        context.position,
+        expiresAt,
+        principal.userId,
+      ]) as Array<{
+        id: string;
+        actId: string;
+        recipientEmail: string;
+        expiresAt: Date;
+        createdAt: Date;
+      }>;
+
+      await this.audit.record({
+        ...administrationAuditContext(principal, request),
+        action: 'INSPECTION_ACT_COMPANY_SIGNATURE_INVITE_CREATED',
+        entityType: 'inspection_act_company_signature_invite',
+        entityId: invite.id,
+        afterData: {
+          actId,
+          actCode: context.code,
+          recipientEmail,
+          expiresAt,
+        },
+        metadata: { tokenStoredAsHashOnly: true },
+      }, manager);
+      return { ...invite, actCode: context.code, inspectionCode: context.inspectionCode };
+    });
+
+    const publicBase = this.config.get<string>('COMPANY_SIGNATURE_PUBLIC_BASE_URL')?.trim().replace(/\/$/, '') ?? null;
+    const publicUrl = publicBase ? `${publicBase}?token=${encodeURIComponent(token)}` : null;
+    let emailSent = false;
+    let deliveryError: string | null = null;
+
+    if (!publicUrl) {
+      deliveryError = 'COMPANY_SIGNATURE_PUBLIC_BASE_URL no configurada';
+    } else if (!(await this.smtp.configured())) {
+      deliveryError = 'SMTP no configurado';
+    } else {
+      const body = [
+        `Se solicita revisar y manifestarse sobre el Acta ${created.actCode}.`,
+        `Inspección: ${created.inspectionCode}.`,
+        '',
+        'El enlace permite firmar en conformidad, firmar en disidencia o registrar una negativa a firmar.',
+        'El contenido del Acta está bloqueado y no puede modificarse desde este enlace.',
+        '',
+        `Enlace seguro: ${publicUrl}`,
+        `Válido hasta: ${new Date(created.expiresAt).toLocaleString('es-AR')}`,
+      ].join('\n');
+      try {
+        await this.smtp.send({
+          to: created.recipientEmail,
+          subject: `DH Inspección · Firma de ${created.actCode}`,
+          text: body,
+          attachment: {
+            filename: `${created.actCode}-instrucciones.txt`,
+            mimeType: 'text/plain',
+            content: Buffer.from(body, 'utf8'),
+          },
+        });
+        emailSent = true;
+        await this.dataSource.query(`
+          UPDATE inspection_act_company_signature_invites
+          SET sent_at=CURRENT_TIMESTAMP,updated_at=CURRENT_TIMESTAMP
+          WHERE id=$1
+        `, [created.id]);
+      } catch (error) {
+        deliveryError = error instanceof Error ? error.message.slice(0, 500) : 'No se pudo enviar el email';
+      }
+    }
+
+    return {
+      id: created.id,
+      actId: created.actId,
+      actCode: created.actCode,
+      recipientEmail: created.recipientEmail,
+      expiresAt: created.expiresAt,
+      emailSent,
+      deliveryError,
+      publicUrl,
+    };
+  }
+
+  async view(token: string) {
+    const invite = await this.resolveToken(this.dataSource.manager, token, false);
+    const locked = invite.lockedSnapshot ?? {};
+    const act = this.record(locked.act);
+    const inventories = this.records(locked.inventories);
+    const findings = this.records(locked.findings).map((finding) => ({
+      id: finding.id,
+      code: finding.code,
+      title: finding.title,
+      description: finding.description,
+      legalBasis: finding.legalBasis ?? null,
+      severity: finding.severity ?? null,
+      isRecurrence: finding.isRecurrence === true,
+      recurrenceOfFindingId: finding.recurrenceOfFindingId ?? null,
+    }));
+    return {
+      invitation: {
+        id: invite.id,
+        recipientEmail: invite.recipientEmail,
+        expiresAt: invite.expiresAt,
+      },
+      act: {
+        code: invite.actCode,
+        inspectionCode: invite.inspectionCode,
+        lockedAt: invite.lockedAt,
+        lockedSha256: invite.lockedSha256,
+        urgency: act.urgency ?? null,
+        summary: act.summary ?? null,
+        observations: act.observations ?? null,
+      },
+      responsibleDefaults: {
+        fullName: invite.recipientName,
+        documentType: invite.recipientDocumentType,
+        documentNumber: invite.recipientDocumentNumber,
+        position: invite.recipientPosition,
+      },
+      inventories: inventories.map((inventory) => ({
+        id: inventory.id,
+        code: inventory.code,
+        name: inventory.name,
+        typeName: inventory.typeName ?? inventory.typeCode ?? null,
+      })),
+      findings,
+      consent: REMOTE_COMPANY_CONSENT,
+      allowedActions: ['SIGN_CONFORMITY', 'SIGN_DISSENT', 'REFUSE'],
+    };
+  }
+
+  async sign(
+    token: string,
+    dto: PublicCompanySignatureDto,
+    file: UploadedInspectionSignatureFile | undefined,
+    request: RequestWithContext,
+  ) {
+    if (!dto.consentAccepted) {
+      throw new ConflictException({
+        code: 'COMPANY_SIGNATURE_CONSENT_REQUIRED',
+        message: 'Debe aceptarse la constancia antes de firmar',
+      });
+    }
+    const inspected = inspectInspectionSignatureFile(file);
+    const id = randomUUID();
+    const storedName = `${id}.png`;
+    const filePath = resolve(this.signatureRoot, storedName);
+    const imageSha256 = createHash('sha256').update(file!.buffer).digest('hex');
+    await mkdir(this.signatureRoot, { recursive: true, mode: 0o700 });
+    await writeFile(filePath, file!.buffer, { flag: 'wx', mode: 0o600 });
+
+    try {
+      const result = await this.dataSource.transaction(async (manager) => {
+        const invite = await this.resolveToken(manager, token, true);
+        await this.assertNoCompanyOutcome(manager, invite.actId);
+        const signedAt = new Date();
+        const manifestation = dto.manifestation === 'DISSENT'
+          ? InspectionCompanySignatureManifestation.DISSENT
+          : InspectionCompanySignatureManifestation.CONFORMITY;
+        const statement = manifestation === InspectionCompanySignatureManifestation.DISSENT
+          ? dto.statement?.trim() ?? null
+          : null;
+        const payload = {
+          invitationId: invite.id,
+          actId: invite.actId,
+          lockedSha256: invite.lockedSha256,
+          signerType: InspectionActSignerType.COMPANY_RESPONSIBLE,
+          signerName: dto.fullName,
+          documentType: dto.documentType,
+          documentNumber: dto.documentNumber,
+          position: dto.position,
+          status: InspectionActSignatureStatus.SIGNED,
+          companyManifestation: manifestation,
+          companyStatement: statement,
+          imageSha256,
+          consentText: REMOTE_COMPANY_CONSENT,
+          consentVersion: REMOTE_CONSENT_VERSION,
+          signedAt: signedAt.toISOString(),
+          source: InspectionActSignatureSource.WEB,
+        };
+        const signaturePayloadSha256 = sha256CanonicalJson(payload);
+        await manager.query(`
+          INSERT INTO inspection_act_signatures(
+            id,act_id,signer_type,signer_user_id,signer_name,document_type,document_number,
+            position,status,company_manifestation,company_statement,original_name,stored_name,
+            mime_type,size_bytes,image_sha256,consent_text,consent_version,consent_accepted_at,
+            signed_at,device_label,source,prepared_sha256,signature_payload_sha256,uploaded_by,created_at
+          ) VALUES(
+            $1,$2,'COMPANY_RESPONSIBLE',NULL,$3,$4,$5,$6,'SIGNED',$7,$8,$9,$10,$11,$12,$13,
+            $14,$15,$16,$16,'Firma remota por enlace seguro','WEB',$17,$18,$19,$16
+          )
+        `, [
+          id,
+          invite.actId,
+          dto.fullName,
+          dto.documentType,
+          dto.documentNumber,
+          dto.position,
+          manifestation,
+          statement,
+          inspected.originalName,
+          storedName,
+          inspected.mimeType,
+          file!.buffer.length,
+          imageSha256,
+          REMOTE_COMPANY_CONSENT,
+          REMOTE_CONSENT_VERSION,
+          signedAt,
+          invite.lockedSha256,
+          signaturePayloadSha256,
+          invite.createdBy,
+        ]);
+        await manager.query(`
+          UPDATE inspection_act_company_signature_invites
+          SET status='USED',used_at=$2,updated_at=$2
+          WHERE id=$1
+        `, [invite.id, signedAt]);
+        await this.audit.record({
+          action: 'INSPECTION_ACT_COMPANY_REMOTE_SIGNATURE_RECORDED',
+          entityType: 'inspection_act_signature',
+          entityId: id,
+          source: AuditSource.WEB,
+          actorUserId: null,
+          actorUsername: null,
+          requestId: request.requestId,
+          ip: request.ip ?? null,
+          userAgent: request.get('user-agent') ?? null,
+          afterData: payload,
+          metadata: {
+            invitationId: invite.id,
+            recipientEmail: invite.recipientEmail,
+            immutable: true,
+            signaturePayloadSha256,
+          },
+        }, manager);
+        return { actCode: invite.actCode, signatureId: id, manifestation };
+      });
+      return { ok: true, ...result };
+    } catch (error) {
+      await unlink(filePath).catch(() => undefined);
+      throw error;
+    }
+  }
+
+  async refuse(
+    token: string,
+    dto: PublicCompanyRefusalDto,
+    request: RequestWithContext,
+  ) {
+    return this.dataSource.transaction(async (manager) => {
+      const invite = await this.resolveToken(manager, token, true);
+      await this.assertNoCompanyOutcome(manager, invite.actId);
+      const createdAt = new Date();
+      const id = randomUUID();
+      const payload = {
+        invitationId: invite.id,
+        actId: invite.actId,
+        lockedSha256: invite.lockedSha256,
+        signerType: InspectionActSignerType.COMPANY_RESPONSIBLE,
+        signerName: dto.fullName,
+        documentType: dto.documentType,
+        documentNumber: dto.documentNumber,
+        position: dto.position,
+        status: InspectionActSignatureStatus.REFUSED,
+        reason: dto.reason,
+        source: InspectionActSignatureSource.WEB,
+        createdAt: createdAt.toISOString(),
+      };
+      const signaturePayloadSha256 = sha256CanonicalJson(payload);
+      await manager.query(`
+        INSERT INTO inspection_act_signatures(
+          id,act_id,signer_type,signer_user_id,signer_name,document_type,document_number,
+          position,status,reason,source,prepared_sha256,signature_payload_sha256,uploaded_by,created_at
+        ) VALUES($1,$2,'COMPANY_RESPONSIBLE',NULL,$3,$4,$5,$6,'REFUSED',$7,'WEB',$8,$9,$10,$11)
+      `, [
+        id,
+        invite.actId,
+        dto.fullName,
+        dto.documentType,
+        dto.documentNumber,
+        dto.position,
+        dto.reason,
+        invite.lockedSha256,
+        signaturePayloadSha256,
+        invite.createdBy,
+        createdAt,
+      ]);
+      await manager.query(`
+        UPDATE inspection_act_company_signature_invites
+        SET status='USED',used_at=$2,updated_at=$2
+        WHERE id=$1
+      `, [invite.id, createdAt]);
+      await this.audit.record({
+        action: 'INSPECTION_ACT_COMPANY_REMOTE_REFUSAL_RECORDED',
+        entityType: 'inspection_act_signature',
+        entityId: id,
+        source: AuditSource.WEB,
+        actorUserId: null,
+        actorUsername: null,
+        requestId: request.requestId,
+        ip: request.ip ?? null,
+        userAgent: request.get('user-agent') ?? null,
+        afterData: payload,
+        metadata: {
+          invitationId: invite.id,
+          recipientEmail: invite.recipientEmail,
+          immutable: true,
+          signaturePayloadSha256,
+        },
+      }, manager);
+      return { ok: true, actCode: invite.actCode, refusalId: id };
+    });
+  }
+
+  private async resolveToken(
+    manager: EntityManager,
+    token: string,
+    lock: boolean,
+  ): Promise<InviteContext> {
+    if (!/^[A-Za-z0-9_-]{40,120}$/.test(token)) throw this.invalidInvite();
+    const tokenSha256 = this.hashToken(token);
+    const [invite] = await manager.query(`
+      SELECT
+        invite.id,
+        invite.act_id AS "actId",
+        invite.token_sha256 AS "tokenSha256",
+        invite.recipient_email AS "recipientEmail",
+        invite.recipient_name AS "recipientName",
+        invite.recipient_document_type AS "recipientDocumentType",
+        invite.recipient_document_number AS "recipientDocumentNumber",
+        invite.recipient_position AS "recipientPosition",
+        invite.status,
+        invite.expires_at AS "expiresAt",
+        invite.sent_at AS "sentAt",
+        invite.used_at AS "usedAt",
+        invite.created_by AS "createdBy",
+        act.code AS "actCode",
+        act.status AS "actStatus",
+        act.locked_sha256 AS "lockedSha256",
+        act.locked_at AS "lockedAt",
+        visit.code AS "inspectionCode",
+        closure.prepared_snapshot AS "lockedSnapshot"
+      FROM inspection_act_company_signature_invites invite
+      JOIN inspection_acts act ON act.id=invite.act_id
+      JOIN inspection_visits visit ON visit.id=act.visit_id
+      JOIN inspection_act_closures closure ON closure.act_id=act.id
+      WHERE invite.token_sha256=$1
+      ${lock ? 'FOR UPDATE OF invite,act' : ''}
+    `, [tokenSha256]) as InviteContext[];
+    if (!invite) throw this.invalidInvite();
+    if (invite.status !== 'PENDING') {
+      throw new GoneException({
+        code: 'COMPANY_SIGNATURE_INVITE_NOT_ACTIVE',
+        message: invite.status === 'USED'
+          ? 'Este enlace ya fue utilizado'
+          : 'Este enlace ya no está vigente',
+      });
+    }
+    if (new Date(invite.expiresAt).getTime() <= Date.now()) {
+      await manager.query(`
+        UPDATE inspection_act_company_signature_invites
+        SET status='EXPIRED',updated_at=CURRENT_TIMESTAMP
+        WHERE id=$1 AND status='PENDING'
+      `, [invite.id]);
+      throw new GoneException({
+        code: 'COMPANY_SIGNATURE_INVITE_EXPIRED',
+        message: 'El enlace de firma venció. Solicitá una nueva invitación.',
+      });
+    }
+    if (invite.actStatus !== 'LOCKED' || !invite.lockedSha256 || !invite.lockedSnapshot) {
+      throw new ConflictException({
+        code: 'COMPANY_SIGNATURE_ACT_NOT_AVAILABLE',
+        message: 'El Acta ya no está disponible para manifestación remota',
+      });
+    }
+    return invite;
+  }
+
+  private async assertActorAssigned(
+    manager: EntityManager,
+    actId: string,
+    principal: AuthPrincipal,
+  ): Promise<void> {
+    if (principal.permissions.includes('inspections.manage')) return;
+    const [row] = await manager.query(`
+      SELECT 1
+      FROM inspection_acts act
+      JOIN inspection_visit_members member ON member.visit_id=act.visit_id
+      WHERE act.id=$1 AND member.user_id=$2 AND member.included=true
+      LIMIT 1
+    `, [actId, principal.userId]) as unknown[];
+    if (!row) {
+      throw new ConflictException({
+        code: 'COMPANY_SIGNATURE_INVITE_NOT_ASSIGNED',
+        message: 'Sólo un Inspector asignado puede emitir la invitación',
+      });
+    }
+  }
+
+  private async assertNoCompanyOutcome(manager: EntityManager, actId: string): Promise<void> {
+    if (await this.hasCompanyOutcome(manager, actId)) {
+      throw new ConflictException({
+        code: 'COMPANY_SIGNATURE_ALREADY_RESOLVED',
+        message: 'La manifestación de la empresa ya fue registrada',
+      });
+    }
+  }
+
+  private async hasCompanyOutcome(manager: EntityManager, actId: string): Promise<boolean> {
+    const rows = await manager.query(`
+      SELECT 1 FROM inspection_act_signatures
+      WHERE act_id=$1 AND signer_type='COMPANY_RESPONSIBLE'
+      LIMIT 1
+    `, [actId]) as unknown[];
+    return rows.length > 0;
+  }
+
+  private hashToken(token: string): string {
+    return createHash('sha256').update(token, 'utf8').digest('hex');
+  }
+
+  private invalidInvite(): NotFoundException {
+    return new NotFoundException({
+      code: 'COMPANY_SIGNATURE_INVITE_NOT_FOUND',
+      message: 'El enlace de firma no es válido',
+    });
+  }
+
+  private record(value: unknown): Record<string, unknown> {
+    return value && typeof value === 'object' && !Array.isArray(value)
+      ? value as Record<string, unknown>
+      : {};
+  }
+
+  private records(value: unknown): Array<Record<string, unknown>> {
+    return Array.isArray(value) ? value.map((item) => this.record(item)) : [];
+  }
+
+  private storageError(): InternalServerErrorException {
+    return new InternalServerErrorException({
+      code: 'COMPANY_SIGNATURE_STORAGE_ERROR',
+      message: 'No se pudo almacenar la firma remota',
+    });
+  }
+}

api-v3/src/inspection-closing/dto/company-signature-invite.dto.ts

@@ -0,0 +1,101 @@
+import { Transform, Type } from 'class-transformer';
+import {
+  IsBoolean,
+  IsEmail,
+  IsIn,
+  IsInt,
+  IsOptional,
+  IsString,
+  Max,
+  MaxLength,
+  Min,
+  MinLength,
+  ValidateIf,
+} from 'class-validator';
+
+export class CreateCompanySignatureInviteDto {
+  @IsOptional()
+  @Transform(({ value }) => typeof value === 'string' && value.trim() ? value.trim().toLowerCase() : undefined)
+  @IsEmail()
+  @MaxLength(320)
+  recipientEmail?: string;
+
+  @IsOptional()
+  @Type(() => Number)
+  @IsInt()
+  @Min(1)
+  @Max(30)
+  expiresInDays?: number;
+}
+
+export class PublicCompanySignatureDto {
+  @Transform(({ value }) => typeof value === 'string' ? value.trim() : value)
+  @IsString()
+  @MinLength(2)
+  @MaxLength(200)
+  fullName!: string;
+
+  @Transform(({ value }) => typeof value === 'string' ? value.trim().toUpperCase() : value)
+  @IsString()
+  @IsIn(['DNI', 'CUIL', 'PASSPORT', 'OTHER'])
+  documentType!: string;
+
+  @Transform(({ value }) => typeof value === 'string' ? value.trim() : value)
+  @IsString()
+  @MinLength(3)
+  @MaxLength(40)
+  documentNumber!: string;
+
+  @Transform(({ value }) => typeof value === 'string' ? value.trim() : value)
+  @IsString()
+  @MinLength(2)
+  @MaxLength(200)
+  position!: string;
+
+  @Transform(({ value }) => typeof value === 'string' ? value.trim().toUpperCase() : value)
+  @IsString()
+  @IsIn(['CONFORMITY', 'DISSENT'])
+  manifestation!: 'CONFORMITY' | 'DISSENT';
+
+  @ValidateIf((value: PublicCompanySignatureDto) => value.manifestation === 'DISSENT')
+  @Transform(({ value }) => typeof value === 'string' ? value.trim() : value)
+  @IsString()
+  @MinLength(10)
+  @MaxLength(8000)
+  statement?: string;
+
+  @Transform(({ value }) => value === true || value === 'true')
+  @IsBoolean()
+  consentAccepted!: boolean;
+}
+
+export class PublicCompanyRefusalDto {
+  @Transform(({ value }) => typeof value === 'string' ? value.trim() : value)
+  @IsString()
+  @MinLength(2)
+  @MaxLength(200)
+  fullName!: string;
+
+  @Transform(({ value }) => typeof value === 'string' ? value.trim().toUpperCase() : value)
+  @IsString()
+  @IsIn(['DNI', 'CUIL', 'PASSPORT', 'OTHER'])
+  documentType!: string;
+
+  @Transform(({ value }) => typeof value === 'string' ? value.trim() : value)
+  @IsString()
+  @MinLength(3)
+  @MaxLength(40)
+  documentNumber!: string;
+
+  @Transform(({ value }) => typeof value === 'string' ? value.trim() : value)
+  @IsString()
+  @MinLength(2)
+  @MaxLength(200)
+  position!: string;
+
+  @Transform(({ value }) => typeof value === 'string' ? value.trim() : value)
+  @IsString()
+  @MinLength(10)
+  @MaxLength(8000)
+  reason!: string;
+}

api-v3/src/inspection-closing/inspection-closing.controller.ts

@@ -48,9 +48,9 @@ export class InspectionClosingController {
     return this.closing.upsertResponsible(actId, dto, principal, request);
   }
 
-  @Post('ready')
+  @Post('lock')
   @RequirePermissions('inspection_closure.prepare')
-  ready(
+  lock(
     @Param('actId', new ParseUUIDPipe({ version: '4' })) actId: string,
     @CurrentAuth() principal: AuthPrincipal,
     @Req() request: RequestWithContext,
@@ -58,16 +58,6 @@ export class InspectionClosingController {
     return this.closing.prepare(actId, principal, request);
   }
 
-  @Post('reopen')
-  @RequirePermissions('inspection_closure.prepare')
-  reopen(
-    @Param('actId', new ParseUUIDPipe({ version: '4' })) actId: string,
-    @CurrentAuth() principal: AuthPrincipal,
-    @Req() request: RequestWithContext,
-  ) {
-    return this.closing.reopen(actId, principal, request);
-  }
-
   @Post('signatures/inspector')
   @RequirePermissions('inspection_closure.sign')
   @UseInterceptors(FileInterceptor('file', {
@@ -109,9 +99,9 @@ export class InspectionClosingController {
     return this.closing.recordCompanyOutcome(actId, dto, principal, request);
   }
 
-  @Post('close')
+  @Post('seal')
   @RequirePermissions('inspection_closure.close')
-  close(
+  seal(
     @Param('actId', new ParseUUIDPipe({ version: '4' })) actId: string,
     @Body() dto: CloseInspectionActDto,
     @CurrentAuth() principal: AuthPrincipal,

api-v3/src/inspection-closing/inspection-closing.module.ts

@@ -1,6 +1,11 @@
 import { Module } from '@nestjs/common';
 import { AuditModule } from '../audit/audit.module';
 import { InspectionReportsModule } from '../inspection-reports/inspection-reports.module';
+import {
+  CompanySignatureInviteController,
+  PublicCompanySignatureController,
+} from './company-signature-invite.controller';
+import { CompanySignatureInviteService } from './company-signature-invite.service';
 import {
   InspectionClosingController,
   InspectionSignatureContentController,
@@ -9,7 +14,12 @@ import { InspectionClosingService } from './inspection-closing.service';
 
 @Module({
   imports: [AuditModule, InspectionReportsModule],
-  controllers: [InspectionClosingController, InspectionSignatureContentController],
-  providers: [InspectionClosingService],
+  controllers: [
+    InspectionClosingController,
+    InspectionSignatureContentController,
+    CompanySignatureInviteController,
+    PublicCompanySignatureController,
+  ],
+  providers: [InspectionClosingService, CompanySignatureInviteService],
 })
 export class InspectionClosingModule {}

api-v3/src/inspection-findings/dto/merge-finding-catalog-item.dto.ts

@@ -0,0 +1,13 @@
+import { Transform } from 'class-transformer';
+import { IsString, IsUUID, MaxLength, MinLength } from 'class-validator';
+
+export class MergeFindingCatalogItemDto {
+  @IsUUID('4')
+  canonicalItemId!: string;
+
+  @Transform(({ value }) => (typeof value === 'string' ? value.trim() : value))
+  @IsString()
+  @MinLength(8)
+  @MaxLength(2000)
+  reason!: string;
+}

api-v3/src/inspection-findings/dto/set-finding-recurrence.dto.ts

@@ -0,0 +1,6 @@
+import { IsUUID } from 'class-validator';
+
+export class SetFindingRecurrenceDto {
+  @IsUUID('4')
+  recurrenceOfFindingId!: string;
+}

api-v3/src/inspection-findings/f3-finding-catalog-resolver.service.ts

@@ -0,0 +1,97 @@
+import { Injectable, NotFoundException } from '@nestjs/common';
+import { DataSource } from 'typeorm';
+import type { ListFindingCatalogQueryDto } from './dto/list-finding-catalog-query.dto';
+import { FindingCatalogService } from './finding-catalog.service';
+
+@Injectable()
+export class F3FindingCatalogResolverService {
+  constructor(
+    private readonly dataSource: DataSource,
+    private readonly legacyCatalog: FindingCatalogService,
+  ) {}
+
+  async listApplicableForAsset(assetId: string, query: ListFindingCatalogQueryDto) {
+    const [asset] = await this.dataSource.query(`
+      SELECT asset.id,asset.code,asset.name,
+        asset.inventory_family_id AS "familyId",
+        family.code AS "familyCode",family.name AS "familyName",family.level AS "familyLevel"
+      FROM assets asset
+      LEFT JOIN inventory_families family ON family.id=asset.inventory_family_id
+      WHERE asset.id=$1::uuid
+    `, [assetId]) as Array<{
+      id: string;
+      code: string;
+      name: string;
+      familyId: string | null;
+      familyCode: string | null;
+      familyName: string | null;
+      familyLevel: string | null;
+    }>;
+    if (!asset) {
+      throw new NotFoundException({ code: 'ASSET_NOT_FOUND', message: 'Registro de Inventario no encontrado' });
+    }
+    if (!asset.familyId) return this.legacyCatalog.listApplicableForAsset(assetId, query);
+
+    const filters = [
+      'mapping.inventory_family_id=$1::uuid',
+      'item.is_active=true',
+      'category.is_active=true',
+      'merge_record.source_item_id IS NULL',
+    ];
+    const params: unknown[] = [asset.familyId];
+    if (query.categoryId) {
+      params.push(query.categoryId);
+      filters.push(`category.id=$${params.length}::uuid`);
+    }
+    if (query.search?.trim()) {
+      params.push(`%${query.search.trim()}%`);
+      const token = `$${params.length}`;
+      filters.push(`(item.title ILIKE ${token} OR COALESCE(item.legal_basis,'') ILIKE ${token} OR COALESCE(item.glossary,'') ILIKE ${token})`);
+    }
+
+    const where = filters.join(' AND ');
+    const [categories, items] = await Promise.all([
+      this.dataSource.query(`
+        SELECT DISTINCT category.id,category.code,category.name,category.sort_order AS "sortOrder"
+        FROM finding_catalog_item_inventory_families mapping
+        JOIN finding_catalog_items item ON item.id=mapping.catalog_item_id
+        JOIN finding_categories category ON category.id=item.category_id
+        LEFT JOIN finding_catalog_item_merges merge_record ON merge_record.source_item_id=item.id
+        WHERE ${where}
+        ORDER BY category.sort_order,category.name,category.id
+      `, params),
+      this.dataSource.query(`
+        SELECT item.id,item.category_id AS "categoryId",item.code,
+          item.source_number AS "sourceNumber",item.title,item.legal_basis AS "legalBasis",
+          item.glossary,item.suggested_severity AS "suggestedSeverity",item.revision,
+          category.name AS "categoryName"
+        FROM finding_catalog_item_inventory_families mapping
+        JOIN finding_catalog_items item ON item.id=mapping.catalog_item_id
+        JOIN finding_categories category ON category.id=item.category_id
+        LEFT JOIN finding_catalog_item_merges merge_record ON merge_record.source_item_id=item.id
+        WHERE ${where}
+        ORDER BY category.sort_order,item.source_number,item.code
+      `, params),
+    ]);
+
+    return {
+      asset: { id: asset.id, code: asset.code, name: asset.name },
+      inventoryFamily: {
+        id: asset.familyId,
+        code: asset.familyCode,
+        name: asset.familyName,
+        level: asset.familyLevel,
+      },
+      typeConfigured: true,
+      configurationReason: `F3.1 · Catálogo del Excel asociado a ${asset.familyName ?? 'la familia técnica'}`,
+      categories,
+      items,
+      other: {
+        enabled: true,
+        code: 'OTHER',
+        label: 'OTROS',
+        help: 'Usalo cuando el hallazgo no exista en la familia técnica. Se enviará una propuesta a revisión de oficina.',
+      },
+    };
+  }
+}

api-v3/src/inspection-findings/finding-catalog-merge.service.ts

@@ -0,0 +1,268 @@
+import {
+  BadRequestException,
+  ConflictException,
+  Injectable,
+  NotFoundException,
+} from '@nestjs/common';
+import { DataSource, EntityManager } from 'typeorm';
+import { administrationAuditContext } from '../administration/common/administration-audit';
+import { AuditService } from '../audit/audit.service';
+import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
+import { AuditAction } from '../database/entities';
+import type { MergeFindingCatalogItemDto } from './dto/merge-finding-catalog-item.dto';
+
+type CatalogItemRow = {
+  id: string;
+  categoryId: string;
+  categoryCode: string;
+  categoryName: string;
+  code: string;
+  sourceNumber: number;
+  title: string;
+  legalBasis: string | null;
+  glossary: string | null;
+  importNote: string | null;
+  suggestedSeverity: number | null;
+  revision: number;
+  isActive: boolean;
+};
+
+@Injectable()
+export class FindingCatalogMergeService {
+  constructor(
+    private readonly dataSource: DataSource,
+    private readonly audit: AuditService,
+  ) {}
+
+  async status(itemId: string) {
+    const requested = await this.load(this.dataSource.manager, itemId, false);
+    const canonicalId = await this.resolveCanonicalId(this.dataSource.manager, itemId);
+    const canonical = canonicalId === itemId
+      ? requested
+      : await this.load(this.dataSource.manager, canonicalId, false);
+    const aliases = await this.dataSource.query(`
+      WITH RECURSIVE aliases AS (
+        SELECT source_item_id,canonical_item_id,reason,merged_at,1 AS depth
+        FROM finding_catalog_item_merges WHERE canonical_item_id=$1::uuid
+        UNION ALL
+        SELECT merge_record.source_item_id,merge_record.canonical_item_id,
+          merge_record.reason,merge_record.merged_at,aliases.depth+1
+        FROM finding_catalog_item_merges merge_record
+        JOIN aliases ON merge_record.canonical_item_id=aliases.source_item_id
+        WHERE aliases.depth<32
+      )
+      SELECT alias.source_item_id AS id,item.code,item.title,alias.reason,
+        alias.merged_at AS "mergedAt",alias.depth
+      FROM aliases alias
+      JOIN finding_catalog_items item ON item.id=alias.source_item_id
+      ORDER BY alias.merged_at,alias.depth
+    `, [canonicalId]);
+    return {
+      requested,
+      isMerged: canonicalId !== itemId,
+      canonical,
+      aliases,
+    };
+  }
+
+  async merge(
+    sourceItemId: string,
+    dto: MergeFindingCatalogItemDto,
+    principal: AuthPrincipal,
+    request: RequestWithContext,
+  ) {
+    return this.dataSource.transaction(async (manager) => {
+      const existing = await manager.query(`
+        SELECT canonical_item_id AS "canonicalItemId"
+        FROM finding_catalog_item_merges WHERE source_item_id=$1::uuid
+      `, [sourceItemId]) as Array<{ canonicalItemId: string }>;
+      if (existing[0]) {
+        throw new ConflictException({
+          code: 'FINDING_CATALOG_ALREADY_MERGED',
+          message: 'Este Hallazgo de catálogo ya fue fusionado',
+          canonicalItemId: existing[0].canonicalItemId,
+        });
+      }
+
+      const canonicalItemId = await this.resolveCanonicalId(manager, dto.canonicalItemId);
+      if (canonicalItemId === sourceItemId) {
+        throw new BadRequestException({
+          code: 'FINDING_CATALOG_MERGE_CYCLE',
+          message: 'La fusión generaría un ciclo en el catálogo',
+        });
+      }
+
+      const ids = [sourceItemId, canonicalItemId].sort();
+      const rows = await manager.query(`
+        SELECT item.id,item.category_id AS "categoryId",category.code AS "categoryCode",
+          category.name AS "categoryName",item.code,item.source_number AS "sourceNumber",
+          item.title,item.legal_basis AS "legalBasis",item.glossary,item.import_note AS "importNote",
+          item.suggested_severity AS "suggestedSeverity",item.revision,item.is_active AS "isActive"
+        FROM finding_catalog_items item
+        JOIN finding_categories category ON category.id=item.category_id
+        WHERE item.id=ANY($1::uuid[])
+        ORDER BY item.id
+        FOR UPDATE OF item
+      `, [ids]) as CatalogItemRow[];
+      const source = rows.find((item) => item.id === sourceItemId);
+      const canonical = rows.find((item) => item.id === canonicalItemId);
+      if (!source || !canonical) throw new NotFoundException({
+        code: 'FINDING_CATALOG_ITEM_NOT_FOUND',
+        message: 'Hallazgo de catálogo no encontrado',
+      });
+      if (!source.isActive) throw new ConflictException({
+        code: 'FINDING_CATALOG_MERGE_SOURCE_INACTIVE',
+        message: 'El Hallazgo de origen ya está inactivo',
+      });
+      if (!canonical.isActive) throw new ConflictException({
+        code: 'FINDING_CATALOG_MERGE_CANONICAL_INACTIVE',
+        message: 'El Hallazgo canónico debe estar activo',
+      });
+
+      const sourceSnapshot = this.snapshot(source);
+      const canonicalSnapshot = this.snapshot(canonical);
+
+      // La aplicabilidad futura pasa al canónico; los Hallazgos emitidos nunca se reescriben.
+      await manager.query(`
+        INSERT INTO finding_catalog_item_inventory_families(catalog_item_id,inventory_family_id)
+        SELECT $2::uuid,inventory_family_id
+        FROM finding_catalog_item_inventory_families
+        WHERE catalog_item_id=$1::uuid
+        ON CONFLICT (catalog_item_id,inventory_family_id) DO NOTHING
+      `, [source.id, canonical.id]);
+      await manager.query(`
+        INSERT INTO finding_catalog_item_asset_types(catalog_item_id,asset_type_id,created_by)
+        SELECT $2::uuid,asset_type_id,$3::uuid
+        FROM finding_catalog_item_asset_types
+        WHERE catalog_item_id=$1::uuid
+        ON CONFLICT (catalog_item_id,asset_type_id) DO NOTHING
+      `, [source.id, canonical.id, principal.userId]);
+      await manager.query(`
+        INSERT INTO finding_catalog_asset_overrides(
+          asset_id,catalog_item_id,is_enabled,reason,created_by,updated_by
+        )
+        SELECT asset_id,$2::uuid,is_enabled,
+          'F3.1 merge catálogo: ' || COALESCE(reason,''),$3::uuid,$3::uuid
+        FROM finding_catalog_asset_overrides source_override
+        WHERE source_override.catalog_item_id=$1::uuid
+          AND NOT EXISTS (
+            SELECT 1 FROM finding_catalog_asset_overrides target_override
+            WHERE target_override.asset_id=source_override.asset_id
+              AND target_override.catalog_item_id=$2::uuid
+          )
+      `, [source.id, canonical.id, principal.userId]);
+
+      const [mergeRecord] = await manager.query(`
+        INSERT INTO finding_catalog_item_merges(
+          source_item_id,canonical_item_id,reason,merged_by,request_id,
+          source_snapshot,canonical_snapshot
+        ) VALUES ($1::uuid,$2::uuid,$3::text,$4::uuid,$5::varchar,$6::jsonb,$7::jsonb)
+        RETURNING id,source_item_id AS "sourceItemId",canonical_item_id AS "canonicalItemId",
+          reason,merged_at AS "mergedAt",merged_by AS "mergedBy",request_id AS "requestId"
+      `, [
+        source.id,
+        canonical.id,
+        dto.reason,
+        principal.userId,
+        request.requestId,
+        sourceSnapshot,
+        canonicalSnapshot,
+      ]) as Array<Record<string, unknown>>;
+
+      await manager.query(`
+        UPDATE finding_catalog_items
+        SET is_active=false,revision=revision+1,updated_at=CURRENT_TIMESTAMP
+        WHERE id=$1::uuid
+      `, [source.id]);
+      const updatedSource = await this.load(manager, source.id, false);
+      await manager.query(`
+        INSERT INTO finding_catalog_item_versions(
+          item_id,revision,snapshot,actor_user_id,actor_username
+        ) VALUES ($1::uuid,$2::integer,$3::jsonb,$4::uuid,$5::varchar)
+      `, [
+        updatedSource.id,
+        updatedSource.revision,
+        this.snapshot(updatedSource),
+        principal.userId,
+        principal.username,
+      ]);
+
+      await this.audit.record({
+        ...administrationAuditContext(principal, request),
+        action: AuditAction.FINDING_CATALOG_ITEM_UPDATED,
+        entityType: 'finding_catalog_item_merge',
+        entityId: String(mergeRecord.id),
+        beforeData: sourceSnapshot,
+        afterData: canonicalSnapshot,
+        metadata: {
+          operation: 'CHRONOLOGICAL_CATALOG_MERGE',
+          sourceItemId: source.id,
+          canonicalItemId: canonical.id,
+          reason: dto.reason,
+          historicalFindingsRewritten: false,
+          historicalProposalsRewritten: false,
+          futureApplicabilityMovedToCanonical: true,
+        },
+      }, manager);
+
+      return {
+        merge: mergeRecord,
+        source: updatedSource,
+        canonical,
+        historyPolicy: 'EMITTED_FINDINGS_PRESERVED',
+      };
+    });
+  }
+
+  private async resolveCanonicalId(manager: EntityManager, itemId: string): Promise<string> {
+    const rows = await manager.query(`
+      WITH RECURSIVE chain AS (
+        SELECT source_item_id,canonical_item_id,1 AS depth
+        FROM finding_catalog_item_merges WHERE source_item_id=$1::uuid
+        UNION ALL
+        SELECT merge_record.source_item_id,merge_record.canonical_item_id,chain.depth+1
+        FROM finding_catalog_item_merges merge_record
+        JOIN chain ON merge_record.source_item_id=chain.canonical_item_id
+        WHERE chain.depth<32
+      )
+      SELECT canonical_item_id AS id FROM chain ORDER BY depth DESC LIMIT 1
+    `, [itemId]) as Array<{ id: string }>;
+    return rows[0]?.id ?? itemId;
+  }
+
+  private async load(manager: EntityManager, itemId: string, lock: boolean): Promise<CatalogItemRow> {
+    const lockSql = lock ? 'FOR UPDATE OF item' : '';
+    const rows = await manager.query(`
+      SELECT item.id,item.category_id AS "categoryId",category.code AS "categoryCode",
+        category.name AS "categoryName",item.code,item.source_number AS "sourceNumber",
+        item.title,item.legal_basis AS "legalBasis",item.glossary,item.import_note AS "importNote",
+        item.suggested_severity AS "suggestedSeverity",item.revision,item.is_active AS "isActive"
+      FROM finding_catalog_items item
+      JOIN finding_categories category ON category.id=item.category_id
+      WHERE item.id=$1::uuid ${lockSql}
+    `, [itemId]) as CatalogItemRow[];
+    if (!rows[0]) throw new NotFoundException({
+      code: 'FINDING_CATALOG_ITEM_NOT_FOUND',
+      message: 'Hallazgo de catálogo no encontrado',
+    });
+    return rows[0];
+  }
+
+  private snapshot(item: CatalogItemRow): Record<string, unknown> {
+    return {
+      id: item.id,
+      categoryId: item.categoryId,
+      categoryCode: item.categoryCode,
+      categoryName: item.categoryName,
+      code: item.code,
+      sourceNumber: item.sourceNumber,
+      title: item.title,
+      legalBasis: item.legalBasis,
+      glossary: item.glossary,
+      importNote: item.importNote,
+      suggestedSeverity: item.suggestedSeverity,
+      revision: item.revision,
+      isActive: item.isActive,
+    };
+  }
+}

api-v3/src/inspection-findings/finding-catalog.controller.ts

@@ -6,15 +6,22 @@ import { CreateFindingCatalogItemDto } from './dto/create-finding-catalog-item.d
 import { CreateFindingCategoryDto } from './dto/create-finding-category.dto';
 import { ListFindingCatalogProposalsQueryDto } from './dto/list-finding-catalog-proposals-query.dto';
 import { ListFindingCatalogQueryDto } from './dto/list-finding-catalog-query.dto';
+import { MergeFindingCatalogItemDto } from './dto/merge-finding-catalog-item.dto';
 import { ReplaceFindingCatalogSelectionDto } from './dto/replace-finding-catalog-selection.dto';
 import { ReviewFindingCatalogProposalDto } from './dto/review-finding-catalog-proposal.dto';
 import { UpdateFindingCatalogItemDto } from './dto/update-finding-catalog-item.dto';
 import { UpdateFindingCategoryDto } from './dto/update-finding-category.dto';
+import { F3FindingCatalogResolverService } from './f3-finding-catalog-resolver.service';
+import { FindingCatalogMergeService } from './finding-catalog-merge.service';
 import { FindingCatalogService } from './finding-catalog.service';
 
 @Controller('finding-catalog')
 export class FindingCatalogController {
-  constructor(private readonly catalog: FindingCatalogService) {}
+  constructor(
+    private readonly catalog: FindingCatalogService,
+    private readonly applicableCatalog: F3FindingCatalogResolverService,
+    private readonly catalogMerges: FindingCatalogMergeService,
+  ) {}
 
   @Get()
   @RequirePermissions('finding_catalog.read')
@@ -27,8 +34,8 @@ export class FindingCatalogController {
   applicable(
     @Param('assetId', new ParseUUIDPipe({ version: '4' })) assetId: string,
     @Query() query: ListFindingCatalogQueryDto,
-  ) {
-    return this.catalog.listApplicableForAsset(assetId, query);
+  ): Promise<unknown> {
+    return this.applicableCatalog.listApplicableForAsset(assetId, query);
   }
 
   @Get('admin')
@@ -123,6 +130,25 @@ export class FindingCatalogController {
     return this.catalog.createItem(dto, principal, request);
   }
 
+  @Get('items/:id/merge-status')
+  @RequirePermissions('finding_catalog.manage')
+  mergeStatus(
+    @Param('id', new ParseUUIDPipe({ version: '4' })) id: string,
+  ): Promise<unknown> {
+    return this.catalogMerges.status(id);
+  }
+
+  @Post('items/:id/merge')
+  @RequirePermissions('finding_catalog.manage')
+  mergeItem(
+    @Param('id', new ParseUUIDPipe({ version: '4' })) id: string,
+    @Body() dto: MergeFindingCatalogItemDto,
+    @CurrentAuth() principal: AuthPrincipal,
+    @Req() request: RequestWithContext,
+  ): Promise<unknown> {
+    return this.catalogMerges.merge(id, dto, principal, request);
+  }
+
   @Patch('items/:id')
   @RequirePermissions('finding_catalog.manage')
   updateItem(

api-v3/src/inspection-findings/finding-recurrence.controller.ts

@@ -0,0 +1,53 @@
+import {
+  Body,
+  Controller,
+  Delete,
+  Get,
+  Param,
+  ParseUUIDPipe,
+  Post,
+  Req,
+} from '@nestjs/common';
+import { CurrentAuth } from '../auth/decorators/current-auth.decorator';
+import { RequirePermissions } from '../authorization/decorators/require-permissions.decorator';
+import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
+import { SetFindingRecurrenceDto } from './dto/set-finding-recurrence.dto';
+import { FindingRecurrenceService } from './finding-recurrence.service';
+
+@Controller('inspection-findings')
+export class FindingRecurrenceController {
+  constructor(private readonly recurrence: FindingRecurrenceService) {}
+
+  @Get(':id/recurrence')
+  @RequirePermissions('inspection_findings.read')
+  state(@Param('id', new ParseUUIDPipe({ version: '4' })) id: string) {
+    return this.recurrence.state(id);
+  }
+
+  @Get(':id/recurrence-candidates')
+  @RequirePermissions('inspection_findings.read')
+  candidates(@Param('id', new ParseUUIDPipe({ version: '4' })) id: string) {
+    return this.recurrence.candidates(id);
+  }
+
+  @Post(':id/recurrence')
+  @RequirePermissions('inspection_findings.update')
+  link(
+    @Param('id', new ParseUUIDPipe({ version: '4' })) id: string,
+    @Body() dto: SetFindingRecurrenceDto,
+    @CurrentAuth() principal: AuthPrincipal,
+    @Req() request: RequestWithContext,
+  ) {
+    return this.recurrence.link(id, dto, principal, request);
+  }
+
+  @Delete(':id/recurrence')
+  @RequirePermissions('inspection_findings.update')
+  clear(
+    @Param('id', new ParseUUIDPipe({ version: '4' })) id: string,
+    @CurrentAuth() principal: AuthPrincipal,
+    @Req() request: RequestWithContext,
+  ) {
+    return this.recurrence.clear(id, principal, request);
+  }
+}

api-v3/src/inspection-findings/finding-recurrence.service.ts

@@ -0,0 +1,268 @@
+import {
+  BadRequestException,
+  ConflictException,
+  ForbiddenException,
+  Injectable,
+  NotFoundException,
+} from '@nestjs/common';
+import { DataSource, EntityManager } from 'typeorm';
+import { administrationAuditContext } from '../administration/common/administration-audit';
+import { AuditService } from '../audit/audit.service';
+import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
+import { AuditAction } from '../database/entities';
+import { assertMobileInspector } from '../inspection-operations/mobile-inspector-policy';
+import type { SetFindingRecurrenceDto } from './dto/set-finding-recurrence.dto';
+import { InspectionFindingsService } from './inspection-findings.service';
+import type { InspectionFindingView } from './inspection-findings.service';
+
+interface FindingRecurrenceContext {
+  id: string;
+  assetId: string;
+  catalogItemId: string | null;
+  title: string;
+  createdAt: Date;
+  actId: string;
+  actStatus: string;
+  visitId: string;
+  visitStatus: string;
+}
+
+export interface FindingRecurrenceState {
+  isRecurrence: boolean;
+  recurrenceOfFindingId: string | null;
+  recurrenceOfFindingCode: string | null;
+}
+
+export type FindingWithRecurrenceView = InspectionFindingView & FindingRecurrenceState;
+
+function comparable(value: string): string {
+  return value
+    .normalize('NFD')
+    .replace(/[\u0300-\u036f]/g, '')
+    .toLowerCase()
+    .replace(/[^a-z0-9]+/g, ' ')
+    .trim()
+    .replace(/\s+/g, ' ');
+}
+
+@Injectable()
+export class FindingRecurrenceService {
+  constructor(
+    private readonly dataSource: DataSource,
+    private readonly audit: AuditService,
+    private readonly findings: InspectionFindingsService,
+  ) {}
+
+  async state(id: string): Promise<FindingRecurrenceState> {
+    const [row] = await this.dataSource.query(`
+      SELECT
+        finding.is_recurrence AS "isRecurrence",
+        finding.recurrence_of_finding_id AS "recurrenceOfFindingId",
+        antecedent.code AS "recurrenceOfFindingCode"
+      FROM inspection_findings finding
+      LEFT JOIN inspection_findings antecedent ON antecedent.id = finding.recurrence_of_finding_id
+      WHERE finding.id = $1
+    `, [id]) as FindingRecurrenceState[];
+    if (!row) {
+      throw new NotFoundException({
+        code: 'INSPECTION_FINDING_NOT_FOUND',
+        message: 'Hallazgo no encontrado',
+      });
+    }
+    return row;
+  }
+
+  async candidates(id: string) {
+    const current = await this.requireFinding(this.dataSource.manager, id, false);
+    const rows = await this.dataSource.query(`
+      SELECT
+        finding.id,finding.code,finding.title,finding.description,finding.status,
+        finding.catalog_item_id AS "catalogItemId",finding.created_at AS "createdAt",
+        act.id AS "actId",act.code AS "actCode",act.occurred_at AS "actOccurredAt",
+        visit.id AS "visitId",visit.code AS "visitCode",visit.status AS "visitStatus"
+      FROM inspection_findings finding
+      JOIN inspection_acts act ON act.id=finding.act_id
+      JOIN inspection_visits visit ON visit.id=act.visit_id
+      WHERE finding.asset_id=$1
+        AND finding.id<>$2
+        AND finding.status<>'VOIDED'
+        AND finding.created_at<$3
+        AND (
+          ($4::uuid IS NOT NULL AND finding.catalog_item_id=$4::uuid)
+          OR ($4::uuid IS NULL AND lower(btrim(finding.title))=lower(btrim($5)))
+        )
+      ORDER BY finding.created_at DESC,finding.id DESC
+      LIMIT 20
+    `, [current.assetId, current.id, current.createdAt, current.catalogItemId, current.title]);
+    return {
+      findingId: current.id,
+      assetId: current.assetId,
+      hasCandidates: rows.length > 0,
+      data: rows,
+    };
+  }
+
+  async link(
+    id: string,
+    dto: SetFindingRecurrenceDto,
+    principal: AuthPrincipal,
+    request: RequestWithContext,
+  ): Promise<FindingWithRecurrenceView> {
+    assertMobileInspector(principal);
+    await this.dataSource.transaction(async (manager) => {
+      const current = await this.requireFinding(manager, id, true);
+      this.assertEditable(current);
+      await this.assertActorAssigned(manager, current.visitId, principal);
+      if (id === dto.recurrenceOfFindingId) {
+        throw new BadRequestException({
+          code: 'FINDING_CANNOT_RECUR_FROM_SELF',
+          message: 'Un Hallazgo no puede ser reincidencia de sí mismo',
+        });
+      }
+      const previous = await this.requireFinding(manager, dto.recurrenceOfFindingId, false);
+      if (previous.assetId !== current.assetId) {
+        throw new ConflictException({
+          code: 'FINDING_RECURRENCE_DIFFERENT_INVENTORY',
+          message: 'La reincidencia debe referir a un Hallazgo anterior del mismo Inventario',
+        });
+      }
+      if (new Date(previous.createdAt).getTime() >= new Date(current.createdAt).getTime()) {
+        throw new ConflictException({
+          code: 'FINDING_RECURRENCE_NOT_PREVIOUS',
+          message: 'El Hallazgo de referencia debe ser anterior al actual',
+        });
+      }
+      const sameCatalog = current.catalogItemId && previous.catalogItemId
+        ? current.catalogItemId === previous.catalogItemId
+        : current.catalogItemId === previous.catalogItemId;
+      const sameTitle = comparable(current.title) === comparable(previous.title);
+      if (!sameCatalog && !sameTitle) {
+        throw new ConflictException({
+          code: 'FINDING_RECURRENCE_NOT_EQUIVALENT',
+          message: 'El antecedente seleccionado no corresponde al mismo tipo de Hallazgo',
+        });
+      }
+
+      const [before] = await manager.query(`
+        SELECT is_recurrence AS "isRecurrence",recurrence_of_finding_id AS "recurrenceOfFindingId"
+        FROM inspection_findings WHERE id=$1 FOR UPDATE
+      `, [id]) as Array<{ isRecurrence: boolean; recurrenceOfFindingId: string | null }>;
+      await manager.query(`
+        UPDATE inspection_findings
+        SET is_recurrence=true,recurrence_of_finding_id=$2,updated_by=$3,updated_at=CURRENT_TIMESTAMP
+        WHERE id=$1
+      `, [id, previous.id, principal.userId]);
+      await this.audit.record({
+        ...administrationAuditContext(principal, request),
+        action: AuditAction.INSPECTION_FINDING_UPDATED,
+        entityType: 'inspection_finding',
+        entityId: id,
+        beforeData: before ?? { isRecurrence: false, recurrenceOfFindingId: null },
+        afterData: {
+          isRecurrence: true,
+          recurrenceOfFindingId: previous.id,
+          recurrenceOfFindingCode: await this.codeForFinding(manager, previous.id),
+        },
+        metadata: { actId: current.actId, visitId: current.visitId, recurrenceAction: 'LINKED' },
+      }, manager);
+    });
+    const [finding, recurrence] = await Promise.all([
+      this.findings.getById(id),
+      this.state(id),
+    ]);
+    return { ...finding, ...recurrence };
+  }
+
+  async clear(
+    id: string,
+    principal: AuthPrincipal,
+    request: RequestWithContext,
+  ): Promise<FindingWithRecurrenceView> {
+    assertMobileInspector(principal);
+    await this.dataSource.transaction(async (manager) => {
+      const current = await this.requireFinding(manager, id, true);
+      this.assertEditable(current);
+      await this.assertActorAssigned(manager, current.visitId, principal);
+      const [before] = await manager.query(`
+        SELECT is_recurrence AS "isRecurrence",recurrence_of_finding_id AS "recurrenceOfFindingId"
+        FROM inspection_findings WHERE id=$1 FOR UPDATE
+      `, [id]) as Array<{ isRecurrence: boolean; recurrenceOfFindingId: string | null }>;
+      if (!before?.isRecurrence && !before?.recurrenceOfFindingId) return;
+      await manager.query(`
+        UPDATE inspection_findings
+        SET is_recurrence=false,recurrence_of_finding_id=NULL,updated_by=$2,updated_at=CURRENT_TIMESTAMP
+        WHERE id=$1
+      `, [id, principal.userId]);
+      await this.audit.record({
+        ...administrationAuditContext(principal, request),
+        action: AuditAction.INSPECTION_FINDING_UPDATED,
+        entityType: 'inspection_finding',
+        entityId: id,
+        beforeData: before,
+        afterData: { isRecurrence: false, recurrenceOfFindingId: null },
+        metadata: { actId: current.actId, visitId: current.visitId, recurrenceAction: 'CLEARED' },
+      }, manager);
+    });
+    const [finding, recurrence] = await Promise.all([
+      this.findings.getById(id),
+      this.state(id),
+    ]);
+    return { ...finding, ...recurrence };
+  }
+
+  private async requireFinding(
+    manager: EntityManager,
+    id: string,
+    lock: boolean,
+  ): Promise<FindingRecurrenceContext> {
+    const [row] = await manager.query(`
+      SELECT finding.id,finding.asset_id AS "assetId",finding.catalog_item_id AS "catalogItemId",
+        finding.title,finding.created_at AS "createdAt",finding.act_id AS "actId",
+        act.status AS "actStatus",visit.id AS "visitId",visit.status AS "visitStatus"
+      FROM inspection_findings finding
+      JOIN inspection_acts act ON act.id=finding.act_id
+      JOIN inspection_visits visit ON visit.id=act.visit_id
+      WHERE finding.id=$1
+      ${lock ? 'FOR UPDATE OF finding,act,visit' : ''}
+    `, [id]) as FindingRecurrenceContext[];
+    if (!row) {
+      throw new NotFoundException({
+        code: 'INSPECTION_FINDING_NOT_FOUND',
+        message: 'Hallazgo no encontrado',
+      });
+    }
+    return row;
+  }
+
+  private assertEditable(finding: FindingRecurrenceContext): void {
+    if (finding.actStatus !== 'DRAFT' || finding.visitStatus !== 'IN_PROGRESS') {
+      throw new ConflictException({
+        code: 'FINDING_RECURRENCE_IMMUTABLE',
+        message: 'La reincidencia sólo puede definirse mientras el Acta está en BORRADOR y la Inspección en curso',
+      });
+    }
+  }
+
+  private async assertActorAssigned(
+    manager: EntityManager,
+    visitId: string,
+    principal: AuthPrincipal,
+  ): Promise<void> {
+    if (principal.permissions.includes('inspections.manage')) return;
+    const [row] = await manager.query(`
+      SELECT 1 FROM inspection_visit_members
+      WHERE visit_id=$1 AND user_id=$2 AND included=true LIMIT 1
+    `, [visitId, principal.userId]) as unknown[];
+    if (!row) {
+      throw new ForbiddenException({
+        code: 'INSPECTION_NOT_ASSIGNED',
+        message: 'La Inspección no está asignada al usuario actual',
+      });
+    }
+  }
+
+  private async codeForFinding(manager: EntityManager, id: string): Promise<string | null> {
+    const [row] = await manager.query('SELECT code FROM inspection_findings WHERE id=$1', [id]) as Array<{ code: string }>;
+    return row?.code ?? null;
+  }
+}

api-v3/src/inspection-findings/inspection-finding-worklist.service.ts

@@ -0,0 +1,331 @@
+import { Injectable } from '@nestjs/common';
+import { DataSource } from 'typeorm';
+import type { ListInspectionFindingsQueryDto } from './dto/list-inspection-findings-query.dto';
+
+export interface InspectionFindingWorklistCounters {
+  open: number;
+  withoutControlDate: number;
+  toVerify: number;
+  verificationOverdue: number;
+  verificationNext30Days: number;
+  readyToClose: number;
+  closed: number;
+}
+
+export interface InspectionFindingWorklistItem {
+  id: string;
+  actId: string;
+  assetId: string;
+  code: string;
+  status: 'OPEN' | 'CLOSED' | 'VOIDED';
+  title: string;
+  description: string;
+  severity: number | null;
+  nextControlOn: string | null;
+  closedAt: Date | null;
+  closureNotes: string | null;
+  asset: {
+    id: string;
+    code: string;
+    name: string;
+    commonName: string | null;
+    typeName: string;
+    operatorCompany: { id: string; code: string; name: string } | null;
+    operationalArea: { id: string; code: string; name: string } | null;
+  };
+  document: {
+    actId: string;
+    actCode: string;
+    actStatus: string;
+    visitId: string;
+    visitCode: string;
+    visitStatus: string;
+  };
+  verificationVisit: {
+    id: string;
+    code: string;
+    status: string;
+    plannedStartAt: Date | null;
+  } | null;
+  latestVerification: {
+    visitId: string;
+    visitCode: string;
+    visitStatus: string;
+    targetControlOn: string | null;
+    outcome: 'RESOLVED' | 'NOT_RESOLVED' | 'REQUIRES_NEW_DATE' | null;
+    resultNotes: string | null;
+    verifiedAt: Date | null;
+    resultRecordedAt: Date | null;
+    rescheduledControlOn: string | null;
+    evidenceCount: number;
+  } | null;
+  createdAt: Date;
+  updatedAt: Date;
+}
+
+export interface InspectionFindingWorklistPage {
+  data: InspectionFindingWorklistItem[];
+  meta: { page: number; pageSize: number; total: number; totalPages: number };
+  counters: InspectionFindingWorklistCounters;
+}
+
+@Injectable()
+export class InspectionFindingWorklistService {
+  constructor(private readonly dataSource: DataSource) {}
+
+  async list(query: ListInspectionFindingsQueryDto): Promise<InspectionFindingWorklistPage> {
+    const page = query.page ?? 1;
+    const pageSize = query.pageSize ?? 25;
+    const workflow = query.workflow ?? 'OPEN';
+    const values: unknown[] = [];
+    const contextFilters: string[] = [];
+    const today = `(CURRENT_TIMESTAMP AT TIME ZONE 'America/Argentina/Mendoza')::date`;
+    const latestOutcome = `(SELECT latest_verification.outcome
+      FROM inspection_finding_verification_visits latest_verification
+      WHERE latest_verification.finding_id = finding.id
+        AND latest_verification.outcome IS NOT NULL
+      ORDER BY latest_verification.result_recorded_at DESC NULLS LAST,
+               latest_verification.created_at DESC,
+               latest_verification.id DESC
+      LIMIT 1)`;
+    const latestVisitStatus = `(SELECT latest_visit.status
+      FROM inspection_finding_verification_visits latest_verification
+      INNER JOIN inspection_visits latest_visit ON latest_visit.id = latest_verification.visit_id
+      WHERE latest_verification.finding_id = finding.id
+        AND latest_verification.outcome IS NOT NULL
+      ORDER BY latest_verification.result_recorded_at DESC NULLS LAST,
+               latest_verification.created_at DESC,
+               latest_verification.id DESC
+      LIMIT 1)`;
+
+    const add = (value: unknown): string => {
+      values.push(value);
+      return `$${values.length}`;
+    };
+
+    if (query.search) {
+      const parameter = add(`%${query.search}%`);
+      contextFilters.push(`(
+        finding.code ILIKE ${parameter}
+        OR finding.title ILIKE ${parameter}
+        OR finding.description ILIKE ${parameter}
+        OR asset.code ILIKE ${parameter}
+        OR asset.name ILIKE ${parameter}
+        OR company.name ILIKE ${parameter}
+        OR area.name ILIKE ${parameter}
+        OR act.code ILIKE ${parameter}
+      )`);
+    }
+    if (query.companyId) contextFilters.push(`company.id = ${add(query.companyId)}::uuid`);
+    if (query.areaId) contextFilters.push(`area.id = ${add(query.areaId)}::uuid`);
+    if (query.inspectorId) {
+      const inspector = add(query.inspectorId);
+      contextFilters.push(`(
+        visit.lead_inspector_user_id = ${inspector}::uuid
+        OR EXISTS (
+          SELECT 1 FROM inspection_visit_members member_filter
+          WHERE member_filter.visit_id = visit.id
+            AND member_filter.included = true
+            AND member_filter.user_id = ${inspector}::uuid
+        )
+      )`);
+    }
+    if (query.dateFrom) contextFilters.push(`act.occurred_at::date >= ${add(query.dateFrom)}::date`);
+    if (query.dateTo) contextFilters.push(`act.occurred_at::date <= ${add(query.dateTo)}::date`);
+
+    const workflowFilters: string[] = [];
+    if (workflow === 'OPEN') workflowFilters.push(`finding.status = 'OPEN'`);
+    if (workflow === 'TO_SCHEDULE_VERIFICATION') {
+      workflowFilters.push(`finding.status = 'OPEN' AND finding.next_control_on IS NULL AND COALESCE(${latestOutcome}, '') <> 'RESOLVED'`);
+    }
+    if (workflow === 'TO_VERIFY') {
+      workflowFilters.push(`finding.status = 'OPEN' AND finding.next_control_on IS NOT NULL AND COALESCE(${latestOutcome}, '') <> 'RESOLVED'`);
+    }
+    if (workflow === 'VERIFICATION_OVERDUE') {
+      workflowFilters.push(`finding.status = 'OPEN' AND finding.next_control_on IS NOT NULL AND finding.next_control_on < ${today} AND COALESCE(${latestOutcome}, '') <> 'RESOLVED'`);
+    }
+    if (workflow === 'READY_TO_CLOSE') {
+      workflowFilters.push(`finding.status = 'OPEN' AND ${latestOutcome} = 'RESOLVED' AND ${latestVisitStatus} = 'CLOSED'`);
+    }
+    if (workflow === 'CLOSED') workflowFilters.push(`finding.status = 'CLOSED'`);
+    if (workflow === 'WAITING_COMPANY' || workflow === 'COMPANY_OVERDUE') {
+      // Compatibilidad de URL histórica: estos estados dejaron de existir en F4.
+      workflowFilters.push(`finding.status = 'OPEN'`);
+    }
+
+    const joins = `
+      INNER JOIN inspection_acts act ON act.id = finding.act_id
+      INNER JOIN inspection_visits visit ON visit.id = act.visit_id
+      INNER JOIN assets asset ON asset.id = finding.asset_id
+      INNER JOIN asset_types asset_type ON asset_type.id = asset.asset_type_id
+      LEFT JOIN assets company ON company.id = asset.operator_company_id
+      LEFT JOIN assets area ON area.id = asset.operational_area_id
+    `;
+    const filters = [...contextFilters, ...workflowFilters];
+    const where = filters.length ? `WHERE ${filters.join(' AND ')}` : '';
+    const contextWhere = contextFilters.length ? `WHERE ${contextFilters.join(' AND ')}` : '';
+
+    const [countRow] = await this.dataSource.query(`
+      SELECT COUNT(*)::integer AS total
+      FROM inspection_findings finding
+      ${joins}
+      ${where}
+    `, values) as Array<{ total: number }>;
+    const total = Number(countRow?.total ?? 0);
+
+    const listValues = [...values, pageSize, (page - 1) * pageSize];
+    const limitParameter = `$${values.length + 1}`;
+    const offsetParameter = `$${values.length + 2}`;
+    const data = await this.dataSource.query(`
+      SELECT
+        finding.id,
+        finding.act_id AS "actId",
+        finding.asset_id AS "assetId",
+        finding.code,
+        finding.status,
+        finding.title,
+        finding.description,
+        finding.severity,
+        finding.next_control_on AS "nextControlOn",
+        finding.closed_at AS "closedAt",
+        finding.closure_notes AS "closureNotes",
+        JSONB_BUILD_OBJECT(
+          'id', asset.id,
+          'code', asset.code,
+          'name', asset.name,
+          'commonName', asset.common_name,
+          'typeName', asset_type.name,
+          'operatorCompany', CASE WHEN company.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
+            'id', company.id, 'code', company.code, 'name', company.name
+          ) END,
+          'operationalArea', CASE WHEN area.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
+            'id', area.id, 'code', area.code, 'name', area.name
+          ) END
+        ) AS asset,
+        JSONB_BUILD_OBJECT(
+          'actId', act.id,
+          'actCode', act.code,
+          'actStatus', act.status,
+          'visitId', visit.id,
+          'visitCode', visit.code,
+          'visitStatus', visit.status
+        ) AS document,
+        CASE WHEN verification_visit.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
+          'id', verification_visit.id,
+          'code', verification_visit.code,
+          'status', verification_visit.status,
+          'plannedStartAt', verification_visit.planned_start_at
+        ) END AS "verificationVisit",
+        CASE WHEN latest_verification.visit_id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
+          'visitId', latest_verification.visit_id,
+          'visitCode', latest_verification.visit_code,
+          'visitStatus', latest_verification.visit_status,
+          'targetControlOn', latest_verification.target_control_on,
+          'outcome', latest_verification.outcome,
+          'resultNotes', latest_verification.result_notes,
+          'verifiedAt', latest_verification.verified_at,
+          'resultRecordedAt', latest_verification.result_recorded_at,
+          'rescheduledControlOn', latest_verification.rescheduled_control_on,
+          'evidenceCount', latest_verification.evidence_count
+        ) END AS "latestVerification",
+        finding.created_at AS "createdAt",
+        finding.updated_at AS "updatedAt"
+      FROM inspection_findings finding
+      ${joins}
+      LEFT JOIN LATERAL (
+        SELECT verification_target.id, verification_target.code,
+          verification_target.status, verification_target.planned_start_at
+        FROM inspection_finding_verification_visits verification_link
+        INNER JOIN inspection_visits verification_target ON verification_target.id = verification_link.visit_id
+        WHERE verification_link.finding_id = finding.id
+          AND verification_target.status IN ('DRAFT', 'PLANNED', 'IN_PROGRESS')
+        ORDER BY verification_link.created_at DESC, verification_link.id DESC
+        LIMIT 1
+      ) verification_visit ON true
+      LEFT JOIN LATERAL (
+        SELECT
+          verification_link.visit_id,
+          verification_target.code AS visit_code,
+          verification_target.status AS visit_status,
+          verification_link.target_control_on,
+          verification_link.outcome,
+          verification_link.result_notes,
+          verification_link.verified_at,
+          verification_link.result_recorded_at,
+          verification_link.rescheduled_control_on,
+          (SELECT COUNT(*)::integer
+           FROM inspection_finding_evidence evidence
+           WHERE evidence.finding_id = finding.id
+             AND evidence.verification_visit_id = verification_link.visit_id
+             AND evidence.purpose = 'VERIFICATION') AS evidence_count
+        FROM inspection_finding_verification_visits verification_link
+        INNER JOIN inspection_visits verification_target ON verification_target.id = verification_link.visit_id
+        WHERE verification_link.finding_id = finding.id
+        ORDER BY COALESCE(verification_link.result_recorded_at, verification_link.created_at) DESC,
+                 verification_link.id DESC
+        LIMIT 1
+      ) latest_verification ON true
+      ${where}
+      ORDER BY
+        CASE WHEN finding.status = 'OPEN' THEN 0 ELSE 1 END,
+        COALESCE(finding.next_control_on, '9999-12-31'::date),
+        finding.updated_at DESC,
+        finding.code
+      LIMIT ${limitParameter} OFFSET ${offsetParameter}
+    `, listValues) as InspectionFindingWorklistItem[];
+
+    const [counterRow] = await this.dataSource.query(`
+      SELECT
+        COUNT(*) FILTER (WHERE finding.status='OPEN')::integer AS "open",
+        COUNT(*) FILTER (
+          WHERE finding.status='OPEN'
+            AND finding.next_control_on IS NULL
+            AND COALESCE(${latestOutcome}, '') <> 'RESOLVED'
+        )::integer AS "withoutControlDate",
+        COUNT(*) FILTER (
+          WHERE finding.status='OPEN'
+            AND finding.next_control_on IS NOT NULL
+            AND COALESCE(${latestOutcome}, '') <> 'RESOLVED'
+        )::integer AS "toVerify",
+        COUNT(*) FILTER (
+          WHERE finding.status='OPEN'
+            AND finding.next_control_on IS NOT NULL
+            AND finding.next_control_on < ${today}
+            AND COALESCE(${latestOutcome}, '') <> 'RESOLVED'
+        )::integer AS "verificationOverdue",
+        COUNT(*) FILTER (
+          WHERE finding.status='OPEN'
+            AND finding.next_control_on BETWEEN ${today} AND ${today} + 30
+            AND COALESCE(${latestOutcome}, '') <> 'RESOLVED'
+        )::integer AS "verificationNext30Days",
+        COUNT(*) FILTER (
+          WHERE finding.status='OPEN'
+            AND ${latestOutcome}='RESOLVED'
+            AND ${latestVisitStatus}='CLOSED'
+        )::integer AS "readyToClose",
+        COUNT(*) FILTER (WHERE finding.status='CLOSED')::integer AS "closed"
+      FROM inspection_findings finding
+      ${joins}
+      ${contextWhere}
+    `, values) as InspectionFindingWorklistCounters[];
+
+    return {
+      data,
+      meta: {
+        page,
+        pageSize,
+        total,
+        totalPages: total === 0 ? 0 : Math.ceil(total / pageSize),
+      },
+      counters: {
+        open: Number(counterRow?.open ?? 0),
+        withoutControlDate: Number(counterRow?.withoutControlDate ?? 0),
+        toVerify: Number(counterRow?.toVerify ?? 0),
+        verificationOverdue: Number(counterRow?.verificationOverdue ?? 0),
+        verificationNext30Days: Number(counterRow?.verificationNext30Days ?? 0),
+        readyToClose: Number(counterRow?.readyToClose ?? 0),
+        closed: Number(counterRow?.closed ?? 0),
+      },
+    };
+  }
+}

api-v3/src/inspection-findings/inspection-findings.controller.ts

@@ -15,9 +15,12 @@ import type { AuthPrincipal, RequestWithContext } from '../common/http/request-c
 import { CloseInspectionFindingDto } from './dto/close-inspection-finding.dto';
 import { CreateInspectionFindingDto } from './dto/create-inspection-finding.dto';
 import { ListInspectionFindingsQueryDto } from './dto/list-inspection-findings-query.dto';
-import { UpdateInspectionFindingFollowUpDto } from './dto/update-inspection-finding-follow-up.dto';
 import { UpdateInspectionFindingDto } from './dto/update-inspection-finding.dto';
+import { FindingRecurrenceService } from './finding-recurrence.service';
+import type { FindingRecurrenceState } from './finding-recurrence.service';
+import { InspectionFindingWorklistService } from './inspection-finding-worklist.service';
 import { InspectionFindingsService } from './inspection-findings.service';
+import type { InspectionFindingView } from './inspection-findings.service';
 
 @Controller('inspection-acts/:actId/findings')
 export class InspectionActFindingsController {
@@ -43,18 +46,28 @@ export class InspectionActFindingsController {
 
 @Controller('inspection-findings')
 export class InspectionFindingsController {
-  constructor(private readonly findings: InspectionFindingsService) {}
+  constructor(
+    private readonly findings: InspectionFindingsService,
+    private readonly worklist: InspectionFindingWorklistService,
+    private readonly recurrence: FindingRecurrenceService,
+  ) {}
 
   @Get()
   @RequirePermissions('inspection_findings.read')
   list(@Query() query: ListInspectionFindingsQueryDto) {
-    return this.findings.listGlobal(query);
+    return this.worklist.list(query);
   }
 
   @Get(':id')
   @RequirePermissions('inspection_findings.read')
-  get(@Param('id', new ParseUUIDPipe({ version: '4' })) id: string) {
-    return this.findings.getById(id);
+  async get(
+    @Param('id', new ParseUUIDPipe({ version: '4' })) id: string,
+  ): Promise<InspectionFindingView & FindingRecurrenceState> {
+    const [finding, recurrence] = await Promise.all([
+      this.findings.getById(id),
+      this.recurrence.state(id),
+    ]);
+    return { ...finding, ...recurrence };
   }
 
   @Get(':id/verification-history')
@@ -84,15 +97,4 @@ export class InspectionFindingsController {
   ) {
     return this.findings.close(id, dto, principal, request);
   }
-
-  @Patch(':id/follow-up')
-  @RequirePermissions('inspection_findings.follow_up')
-  updateFollowUp(
-    @Param('id', new ParseUUIDPipe({ version: '4' })) id: string,
-    @Body() dto: UpdateInspectionFindingFollowUpDto,
-    @CurrentAuth() principal: AuthPrincipal,
-    @Req() request: RequestWithContext,
-  ) {
-    return this.findings.updateFollowUp(id, dto, principal, request);
-  }
 }

api-v3/src/inspection-findings/inspection-findings.module.ts

@@ -1,7 +1,12 @@
 import { Module } from '@nestjs/common';
 import { AuditModule } from '../audit/audit.module';
 import { FindingCatalogController } from './finding-catalog.controller';
+import { FindingCatalogMergeService } from './finding-catalog-merge.service';
 import { FindingCatalogService } from './finding-catalog.service';
+import { F3FindingCatalogResolverService } from './f3-finding-catalog-resolver.service';
+import { FindingRecurrenceController } from './finding-recurrence.controller';
+import { FindingRecurrenceService } from './finding-recurrence.service';
+import { InspectionFindingWorklistService } from './inspection-finding-worklist.service';
 import {
   InspectionActFindingsController,
   InspectionFindingsController,
@@ -20,14 +25,27 @@ import { InspectionEvidenceService } from './inspection-evidence.service';
     FindingCatalogController,
     InspectionActFindingsController,
     InspectionFindingsController,
+    FindingRecurrenceController,
     InspectionFindingEvidenceController,
     InspectionFindingCommunicationsController,
     InspectionEvidenceContentController,
   ],
   providers: [
     FindingCatalogService,
+    F3FindingCatalogResolverService,
+    FindingCatalogMergeService,
     InspectionFindingsService,
+    InspectionFindingWorklistService,
+    FindingRecurrenceService,
     InspectionEvidenceService,
   ],
+  exports: [
+    FindingCatalogService,
+    F3FindingCatalogResolverService,
+    FindingCatalogMergeService,
+    InspectionFindingsService,
+    InspectionFindingWorklistService,
+    FindingRecurrenceService,
+  ],
 })
 export class InspectionFindingsModule {}

api-v3/src/inspection-findings/inspection-findings.service.ts

@@ -62,7 +62,6 @@ interface FindingDocumentView {
   actStatus: InspectionActStatus;
   visitId: string;
   visitCode: string;
-  visitTitle: string;
   visitStatus: InspectionVisitStatus;
 }
 
@@ -99,7 +98,6 @@ export interface InspectionFindingListItem {
   verificationVisit: {
     id: string;
     code: string;
-    title: string;
     status: InspectionVisitStatus;
     plannedStartAt: Date | null;
   } | null;
@@ -143,7 +141,6 @@ export interface FindingVerificationHistoryEvent {
   verificationVisit: {
     id: string;
     code: string;
-    title: string;
     status: InspectionVisitStatus;
     plannedStartAt: Date | null;
   } | null;
@@ -811,13 +808,11 @@ export class InspectionFindingsService {
           'actStatus', act.status,
           'visitId', visit.id,
           'visitCode', visit.code,
-          'visitTitle', visit.title,
           'visitStatus', visit.status
         ) AS document,
         CASE WHEN verification_visit.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
           'id', verification_visit.id,
           'code', verification_visit.code,
-          'title', verification_visit.title,
           'status', verification_visit.status,
           'plannedStartAt', verification_visit.planned_start_at
         ) END AS "verificationVisit",
@@ -845,7 +840,7 @@ export class InspectionFindingsService {
       LEFT JOIN finding_catalog_items catalog ON catalog.id = finding.catalog_item_id
       LEFT JOIN finding_categories category ON category.id = catalog.category_id
       LEFT JOIN LATERAL (
-        SELECT verification_target.id, verification_target.code, verification_target.title,
+        SELECT verification_target.id, verification_target.code,
           verification_target.status, verification_target.planned_start_at
         FROM inspection_finding_verification_visits verification_link
         INNER JOIN inspection_visits verification_target ON verification_target.id = verification_link.visit_id
@@ -923,7 +918,6 @@ export class InspectionFindingsService {
         CASE WHEN visit.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
           'id', visit.id,
           'code', visit.code,
-          'title', visit.title,
           'status', visit.status,
           'plannedStartAt', visit.planned_start_at
         ) END AS "verificationVisit",

api-v3/src/inspection-reports/document-delivery.controller.ts

@@ -1,17 +1,128 @@
-import { Body, Controller, Get, Param, ParseUUIDPipe, Patch, Post, Req } from '@nestjs/common';
+import { Body, Controller, ForbiddenException, Get, Param, ParseUUIDPipe, Patch, Post, Put, Req } from '@nestjs/common';
 import { CurrentAuth } from '../auth/decorators/current-auth.decorator';
 import { RequirePermissions } from '../authorization/decorators/require-permissions.decorator';
 import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
+import { administrationAuditContext } from '../administration/common/administration-audit';
+import { AuditService } from '../audit/audit.service';
+import { AuditAction } from '../database/entities';
 import { InspectionDocumentDeliveryService } from './inspection-document-delivery.service';
 import type { DeliveryRow } from './inspection-document-delivery.service';
+import { SmtpDeliveryService } from './smtp-delivery.service';
 import { UpdateDocumentDeliverySettingsDto } from './dto/update-document-delivery-settings.dto';
+import { TestSmtpSettingsDto, UpdateSmtpSettingsDto } from './dto/update-smtp-settings.dto';
 
 @Controller('document-delivery')
 export class DocumentDeliveryController {
-  constructor(private readonly delivery:InspectionDocumentDeliveryService){}
-  @Get('settings') @RequirePermissions('document_delivery.read') settings(){return this.delivery.settings();}
-  @Patch('settings') @RequirePermissions('document_delivery.manage') update(@Body() dto:UpdateDocumentDeliverySettingsDto,@CurrentAuth() principal:AuthPrincipal,@Req() request:RequestWithContext){return this.delivery.updateSettings(dto,principal,request);}
-  @Get('outbox') @RequirePermissions('document_delivery.read') outbox(){return this.delivery.list();}
-  @Post('outbox/:id/retry') @RequirePermissions('document_delivery.manage') retry(@Param('id',new ParseUUIDPipe({version:'4'})) id:string,@CurrentAuth() principal:AuthPrincipal,@Req() request:RequestWithContext):Promise<DeliveryRow>{return this.delivery.retry(id,principal,request);}
-  @Post('outbox/retry-pending') @RequirePermissions('document_delivery.manage') retryPending(@CurrentAuth() principal:AuthPrincipal,@Req() request:RequestWithContext){return this.delivery.retryPending(principal,request);}
+  constructor(
+    private readonly delivery: InspectionDocumentDeliveryService,
+    private readonly smtp: SmtpDeliveryService,
+    private readonly audit: AuditService,
+  ) {}
+
+  @Get('settings')
+  @RequirePermissions('document_delivery.read')
+  settings() {
+    return this.delivery.settings();
+  }
+
+  @Patch('settings')
+  @RequirePermissions('document_delivery.manage')
+  update(
+    @Body() dto: UpdateDocumentDeliverySettingsDto,
+    @CurrentAuth() principal: AuthPrincipal,
+    @Req() request: RequestWithContext,
+  ) {
+    return this.delivery.updateSettings(dto, principal, request);
+  }
+
+  @Get('smtp')
+  @RequirePermissions('document_delivery.manage')
+  smtpSettings(@CurrentAuth() principal: AuthPrincipal) {
+    this.assertSystemAdmin(principal);
+    return this.smtp.publicSettings();
+  }
+
+  @Put('smtp')
+  @RequirePermissions('document_delivery.manage')
+  async updateSmtp(
+    @Body() dto: UpdateSmtpSettingsDto,
+    @CurrentAuth() principal: AuthPrincipal,
+    @Req() request: RequestWithContext,
+  ) {
+    this.assertSystemAdmin(principal);
+    const before = await this.smtp.publicSettings();
+    const after = await this.smtp.saveSettings(dto, principal.userId);
+    await this.audit.record({
+      ...administrationAuditContext(principal, request),
+      action: AuditAction.SMTP_SETTINGS_UPDATED,
+      entityType: 'system_smtp_settings',
+      entityId: 'singleton',
+      beforeData: before as Record<string, unknown>,
+      afterData: after as Record<string, unknown>,
+      metadata: { passwordNeverReturned: true, restrictedToRole: 'admin' },
+    });
+    return after;
+  }
+
+  @Post('smtp/test')
+  @RequirePermissions('document_delivery.manage')
+  async testSmtp(
+    @Body() dto: TestSmtpSettingsDto,
+    @CurrentAuth() principal: AuthPrincipal,
+    @Req() request: RequestWithContext,
+  ) {
+    this.assertSystemAdmin(principal);
+    const sent = await this.smtp.send({
+      to: dto.email,
+      subject: 'DH Inspección · Prueba SMTP',
+      text: 'Este correo confirma que la configuración SMTP de DH Inspección funciona correctamente.',
+      attachment: {
+        filename: 'dh-inspeccion-smtp-test.txt',
+        mimeType: 'text/plain',
+        content: Buffer.from('DH Inspección · Prueba SMTP OK\n', 'utf8'),
+      },
+    });
+    await this.audit.record({
+      ...administrationAuditContext(principal, request),
+      action: AuditAction.SMTP_TEST_SENT,
+      entityType: 'system_smtp_settings',
+      entityId: 'singleton',
+      afterData: { recipient: dto.email, messageId: sent.messageId },
+      metadata: { restrictedToRole: 'admin' },
+    });
+    return { ok: true, recipient: dto.email, messageId: sent.messageId };
+  }
+
+  @Get('outbox')
+  @RequirePermissions('document_delivery.read')
+  outbox() {
+    return this.delivery.list();
+  }
+
+  @Post('outbox/:id/retry')
+  @RequirePermissions('document_delivery.manage')
+  retry(
+    @Param('id', new ParseUUIDPipe({ version: '4' })) id: string,
+    @CurrentAuth() principal: AuthPrincipal,
+    @Req() request: RequestWithContext,
+  ): Promise<DeliveryRow> {
+    return this.delivery.retry(id, principal, request);
+  }
+
+  @Post('outbox/retry-pending')
+  @RequirePermissions('document_delivery.manage')
+  retryPending(
+    @CurrentAuth() principal: AuthPrincipal,
+    @Req() request: RequestWithContext,
+  ) {
+    return this.delivery.retryPending(principal, request);
+  }
+
+  private assertSystemAdmin(principal: AuthPrincipal): void {
+    if (principal.roles.includes('admin')) return;
+    throw new ForbiddenException({
+      code: 'SMTP_SUPERADMIN_REQUIRED',
+      message: 'La configuración SMTP está reservada al Superadmin del sistema',
+    });
+  }
 }

api-v3/src/inspection-reports/dto/create-inspection-report-follow-up.dto.ts

@@ -0,0 +1,23 @@
+import { Transform } from 'class-transformer';
+import { IsEnum, IsISO8601, IsOptional, IsString, MaxLength } from 'class-validator';
+import { InspectionReportFollowUpType } from '../../database/entities';
+
+export class CreateInspectionReportFollowUpDto {
+  @IsEnum(InspectionReportFollowUpType)
+  type!: InspectionReportFollowUpType;
+
+  @IsISO8601({ strict: true })
+  occurredAt!: string;
+
+  @IsOptional()
+  @Transform(({ value }) => typeof value === 'string' ? value.trim() || null : value)
+  @IsString()
+  @MaxLength(255)
+  externalReference?: string | null;
+
+  @IsOptional()
+  @Transform(({ value }) => typeof value === 'string' ? value.trim() || null : value)
+  @IsString()
+  @MaxLength(20000)
+  description?: string | null;
+}

api-v3/src/inspection-reports/dto/officialize-inspection-report.dto.ts

@@ -0,0 +1,13 @@
+import { Transform } from 'class-transformer';
+import { IsISO8601, IsString, MaxLength, MinLength } from 'class-validator';
+
+export class OfficializeInspectionReportDto {
+  @Transform(({ value }) => typeof value === 'string' ? value.trim() : value)
+  @IsString()
+  @MinLength(2)
+  @MaxLength(255)
+  gedoIfIdentifier!: string;
+
+  @IsISO8601({ strict: true })
+  gedoOfficializedAt!: string;
+}