F4.8 · pruebas de cierre de Inspección

Integra selección/creación explícita de Actas, flujo móvil de firmas/cierre, soporte de Actas READY paralelas, cierre validado por servidor y Actas de verificación sin Hallazgos nuevos.

.github/workflows/android.yml

@@ -1,10 +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'
@@ -54,7 +58,7 @@ jobs:
       - name: Upload APK
         uses: actions/upload-artifact@v4
         with:
-          name: DH-Inspeccion-F2.3-0.10.2-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:
@@ -62,5 +64,15 @@ jobs:
           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 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" \
+            "$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/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

.github/workflows/f4-ci.yml

@@ -0,0 +1,89 @@
+name: F4 Document Flow CI
+
+on:
+  push:
+    branches:
+      - 'feature/f4*'
+  pull_request:
+    branches:
+      - main
+    paths:
+      - 'api-v3/**'
+      - 'web-v2/**'
+      - 'android-app/**'
+      - 'scripts/**'
+      - '.github/workflows/f4-ci.yml'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  api:
+    name: API · F4
+    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:f4-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**  
+Repositorio del sistema DH Inspección V2.
-Fase: **D5.5.1 · Corrección de staging de planificación**
 
-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
+- `api-v3/`: API v3.
-
+- `web-v2/`: aplicación web.
-- selección web Área → Organización operadora vigente;
+- `scripts/`: utilidades operativas y de despliegue.
-- fecha y equipo inspector dentro del plan;
+- `docs/`: documentación técnica.
-- 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.

android-app/app/build.gradle.kts

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

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

@@ -10,11 +10,17 @@ 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
@@ -25,6 +31,7 @@ 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
@@ -47,10 +54,19 @@ 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()
@@ -82,8 +98,8 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
             inventory = emptyList()
             fieldTypes = emptyList()
             selectedFieldAsset = null
-            fieldFindingOptions = null
+            clearActState()
-            lastCreatedFinding = null
+            clearFindingState()
         }
     }
 
@@ -98,8 +114,8 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         inventory = emptyList()
         fieldTypes = emptyList()
         selectedFieldAsset = null
-        fieldFindingOptions = null
+        clearFindingState()
-        lastCreatedFinding = null
+        loadActsInternal(id, selectDraft = true)
     }
 
     fun closeVisitView() {
@@ -107,8 +123,8 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         inventory = emptyList()
         fieldTypes = emptyList()
         selectedFieldAsset = null
-        fieldFindingOptions = null
+        clearActState()
-        lastCreatedFinding = null
+        clearFindingState()
         loadVisits()
     }
 
@@ -117,10 +133,51 @@ 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() {
+        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 (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. Cerrala o cancelala antes de crear la siguiente."
+            return
+        }
+        launchBusy {
+            val created = actsRepository.create(currentVisit.id, asset.id, currentVisit.code)
+            selectedAct = created
+            actClosure = actsRepository.closure(created.id)
+            loadActsInternal(currentVisit.id, selectDraft = false)
+            notice = "${created.code} creada. 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 {
@@ -141,8 +198,13 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
             selectedFieldAsset = repository.selectFieldAsset(visitId, item.id)
             notice = "Inventario agregado a la inspección."
             inventory = repository.fieldInventory(visitId, null, null).data
-            if (selectedFieldAsset?.capture?.readyForFinding == true) {
+            val draft = selectedDraftAct()
-                loadFindingOptionsInternal(visitId, item.id)
+            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."
             }
         }
     }
@@ -150,6 +212,7 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
     fun createFieldAsset(
         type: FieldType,
         parentId: String?,
+        familyId: String?,
         name: String,
         commonName: String?,
         attributes: Map<String, Any?>,
@@ -162,10 +225,15 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
             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,
@@ -175,11 +243,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,
@@ -204,8 +302,13 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
                 "Fotografía registrada."
             }
             inventory = repository.fieldInventory(visitId, null, null).data
-            if (response.capture.readyForFinding) {
+            val draft = selectedDraftAct()
-                loadFindingOptionsInternal(visitId, asset.id)
+            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."
             }
         }
     }
@@ -213,7 +316,16 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
     fun openFindingForSelected() {
         val visitId = visit?.id ?: return
         val assetId = selectedFieldAsset?.asset?.id ?: return
-        launchBusy { loadFindingOptionsInternal(visitId, assetId) }
+        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(
@@ -226,6 +338,11 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
     ) {
         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
@@ -239,10 +356,12 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
             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() },
@@ -252,26 +371,247 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
                 ),
             )
             lastCreatedFinding = response.finding
-            notice = "Hallazgo ${response.finding.code} registrado."
+            notice = "Hallazgo ${response.finding.code} registrado en ${response.act.code}. Podés agregar evidencia fotográfica."
-            fieldFindingOptions = findingsRepository.options(visitId, assetId)
+            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."
+        }
+    }
+
+    fun prepareSelectedAct() {
+        val actId = selectedAct?.id ?: return
+        launchBusy {
+            actClosure = actsRepository.prepare(actId)
+            refreshSelectedActInternal(actId)
+            notice = "Acta preparada. Su contenido quedó congelado para las firmas."
+        }
+    }
+
+    fun reopenSelectedAct() {
+        val actId = selectedAct?.id ?: return
+        launchBusy {
+            actClosure = actsRepository.reopen(actId)
+            refreshSelectedActInternal(actId)
+            notice = "Acta reabierta. Podés corregirla antes de volver a preparar."
+        }
+    }
+
+    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 (reason.trim().length < 10) {
+            error = "Indicá un motivo de al menos 10 caracteres."
+            return
+        }
+        launchBusy {
+            actClosure = actsRepository.companyOutcome(actId, status, reason)
+            notice = if (status == "ABSENT") "Ausencia de empresa asentada." else "Negativa a firmar asentada."
+        }
+    }
+
+    fun closeSelectedAct() {
+        val currentVisit = visit ?: return
+        val actId = selectedAct?.id ?: return
+        launchBusy {
+            actClosure = actsRepository.closeAct(actId)
+            refreshSelectedActInternal(actId)
+            loadActsInternal(currentVisit.id, selectDraft = false)
+            clearFindingState()
+            notice = "${selectedAct?.code ?: "Acta"} cerrada e inmutable. Podés crear otra Acta o finalizar la inspección."
+        }
+    }
+
+    fun closeInspection() {
+        val visitId = visit?.id ?: return
+        launchBusy {
+            visit = actsRepository.closeVisit(visitId)
+            loadVisitsInternal()
+            notice = "Inspección cerrada. Las Actas y documentos quedan disponibles para oficina."
         }
     }
 
     fun clearFindingFlow() {
         fieldFindingOptions = null
         lastCreatedFinding = null
+        fieldFindingEvidence = emptyMap()
         error = null
     }
 
     fun clearSelectedFieldAsset() {
         selectedFieldAsset = null
-        fieldFindingOptions = null
+        clearFindingState()
-        lastCreatedFinding = null
     }
 
-    private suspend fun loadFindingOptionsInternal(visitId: String, assetId: String) {
+    private fun selectedDraftAct(): MobileActDetail? =
-        fieldFindingOptions = findingsRepository.options(visitId, assetId)
+        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

@@ -214,11 +214,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 +259,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 +277,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 +349,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 +500,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

@@ -6,15 +6,25 @@ 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,
@@ -64,15 +74,42 @@ data class FieldFindingItem(
     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,
@@ -86,6 +123,7 @@ data class FieldFindingCreateResponse(
     val capture: CaptureStatus = CaptureStatus(),
     val finding: FieldFindingItem,
     val canAddAnother: Boolean = true,
+    val actSelectionMode: String = "EXPLICIT",
 )
 
 private interface FieldFindingsApi {
@@ -94,6 +132,7 @@ private interface FieldFindingsApi {
         @Header("Authorization") authorization: String,
         @Path("visitId") visitId: String,
         @Path("assetId") assetId: String,
+        @Query("actId") actId: String,
     ): FieldFindingOptionsResponse
 
     @POST("inspection-visits/{visitId}/field-findings/{assetId}")
@@ -104,13 +143,36 @@ private interface FieldFindingsApi {
         @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 separado para F2.3. Comparte el almacén cifrado de sesión de la APK,
+ * Cliente de campo para Hallazgos y sus evidencias append-only.
- * pero mantiene el contrato de Hallazgos desacoplado del cliente F2.2.
+ * F3.2 exige que la APK identifique explícitamente el Acta activa.
  */
 class FieldFindingsRepository(context: Context) {
     private val store = SecureSessionStore(context.applicationContext)
@@ -123,9 +185,9 @@ class FieldFindingsRepository(context: Context) {
         .build()
         .create(FieldFindingsApi::class.java)
 
-    suspend fun options(visitId: String, assetId: String): FieldFindingOptionsResponse =
+    suspend fun options(visitId: String, assetId: String, actId: String): FieldFindingOptionsResponse =
         authorized { session ->
-            api.options("Bearer ${session.accessToken}", visitId, assetId)
+            api.options("Bearer ${session.accessToken}", visitId, assetId, actId)
         }
 
     suspend fun create(
@@ -136,6 +198,42 @@ class FieldFindingsRepository(context: Context) {
         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 {

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

@@ -0,0 +1,447 @@
+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 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 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 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 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 MobileCloseActRequest(
+    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}/ready")
+    suspend fun ready(
+        @Header("Authorization") authorization: String,
+        @Path("actId") actId: String,
+    ): MobileActClosure
+
+    @POST("inspection-acts/{actId}/reopen")
+    suspend fun reopen(
+        @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}/close")
+    suspend fun closeAct(
+        @Header("Authorization") authorization: String,
+        @Path("actId") actId: String,
+        @Body request: MobileCloseActRequest,
+    ): 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): MobileActDetail = authorized { session ->
+        api.createAct(
+            "Bearer ${session.accessToken}",
+            visitId,
+            CreateMobileActRequest(
+                occurredAt = Instant.now().toString(),
+                title = "Acta de inspección $visitCode",
+                summary = "Acta de inspección en curso. Los Hallazgos y observaciones se incorporan de forma trazable durante la visita.",
+                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 prepare(actId: String): MobileActClosure = authorized { session ->
+        api.ready("Bearer ${session.accessToken}", actId)
+    }
+
+    suspend fun reopen(actId: String): MobileActClosure = authorized { session ->
+        api.reopen("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 closeAct(actId: String): MobileActClosure = authorized { session ->
+        api.closeAct("Bearer ${session.accessToken}", actId, MobileCloseActRequest())
+    }
+
+    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

@@ -1,5 +1,12 @@
 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
@@ -8,7 +15,9 @@ 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
@@ -16,24 +25,47 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
-import androidx.compose.material3.Button
 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.foundation.text.KeyboardOptions
 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) }
@@ -43,6 +75,71 @@ fun FieldFindingScreen(model: MainViewModel) {
     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() ||
@@ -88,7 +185,7 @@ fun FieldFindingScreen(model: MainViewModel) {
                 Text(asset.name, fontWeight = FontWeight.Bold)
                 Text("${asset.code} · Acta ${options.act.code}", style = MaterialTheme.typography.bodySmall)
                 Text(
-                    "GPS + foto: ${if (options.capture.readyForFinding) "OK" else "pendiente"}",
+                    "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,
                 )
@@ -107,12 +204,30 @@ fun FieldFindingScreen(model: MainViewModel) {
         }
 
         if (options.findings.isNotEmpty()) {
-            Text("Hallazgos ya registrados en este Inventario", fontWeight = FontWeight.Bold)
+            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)) {
+                    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")
+                        }
                     }
                 }
             }
@@ -243,12 +358,64 @@ fun FieldFindingScreen(model: MainViewModel) {
                 Modifier.fillMaxWidth(),
                 colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer),
             ) {
-                Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(4.dp)) {
+                Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) {
                     Text("Hallazgo registrado", fontWeight = FontWeight.Bold)
                     Text("${finding.code} · ${finding.title}")
-                    Text("Podés registrar otro Hallazgo sobre el mismo Inventario.", style = MaterialTheme.typography.bodySmall)
+                    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

@@ -91,6 +91,7 @@ fun DhRoot(model: MainViewModel, activity: FragmentActivity) {
                     },
                 )
                 model.fieldFindingOptions != null -> FieldFindingScreen(model)
+                model.visit != null -> F3VisitRoot(model)
                 else -> DhApp(model)
             }
         }
@@ -192,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,425 @@
+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 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
+                    OutlinedButton(
+                        onClick = { model.selectAct(act.id) },
+                        modifier = Modifier.fillMaxWidth(),
+                    ) {
+                        Text(
+                            (if (active) "✓ " else "") +
+                                "${act.code} · ${actStatusLabel(act.status)} · ${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 == "READY" }) {
+                        Text(
+                            "Puede existir una nueva Acta en borrador aunque haya Actas preparadas pendientes de firma de empresa. Sólo se permite un borrador a la vez.",
+                            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() },
+                            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("${selected.findingCount} Hallazgo${if (selected.findingCount == 1) "" else "s"} · ${selected.assetCount} elemento${if (selected.assetCount == 1) "" else "s"} de Inventario")
+                    Text(selected.summary, style = MaterialTheme.typography.bodySmall)
+                    selected.closureSha256?.let { Text("Hash final: $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 a ${selected.code} de forma explícita. Un Acta de verificación puede prepararse sin Hallazgos nuevos si la verificación ya fue registrada.")
+                    Button(onClick = onGoInventory, modifier = Modifier.fillMaxWidth()) { Text("Ir a Inventario / Hallazgos") }
+
+                    HorizontalDivider()
+                    Text("3. Preparar Acta", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
+                    Text("Al preparar, el contenido se congela y se calcula su hash. El servidor exige al menos un Hallazgo o una verificación registrada.")
+                    Button(
+                        onClick = { model.prepareSelectedAct() },
+                        enabled = !model.busy && closure?.responsible != null,
+                        modifier = Modifier.fillMaxWidth(),
+                    ) { Text("Preparar Acta para firmas") }
+                }
+
+                "READY" -> {
+                    val signatures = closure?.signatures.orEmpty()
+                    val inspectorSigned = signatures.any { it.signerType == "INSPECTOR" && it.status == "SIGNED" }
+                    val companyOutcome = signatures.firstOrNull { it.signerType == "COMPANY_RESPONSIBLE" }
+
+                    Text("Acta preparada", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
+                    closure?.closure?.preparedSha256?.let { Text("Hash preparado: $it", style = MaterialTheme.typography.bodySmall) }
+                    if (signatures.isEmpty()) {
+                        OutlinedButton(onClick = { model.reopenSelectedAct() }, enabled = !model.busy, modifier = Modifier.fillMaxWidth()) {
+                            Text("Volver a borrador")
+                        }
+                    }
+
+                    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("Recepción de la empresa", fontWeight = FontWeight.Bold)
+                    if (companyOutcome != null) {
+                        val detail = when (companyOutcome.status) {
+                            "SIGNED" -> if (companyOutcome.companyManifestation == "DISSENT") "Firma en disidencia" else "Firma registrada"
+                            "REFUSED" -> "Negativa a firmar"
+                            "ABSENT" -> "Responsable ausente"
+                            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.")
+                        Button(
+                            onClick = {
+                                model.recordCompanyOutcome(
+                                    "ABSENT",
+                                    closure.responsible.absenceReason ?: "Responsable de empresa ausente durante la inspección",
+                                )
+                            },
+                            enabled = !model.busy && inspectorSigned,
+                            modifier = Modifier.fillMaxWidth(),
+                        ) { Text("Asentar ausencia en el Acta") }
+                    } 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 && companyOutcome != null) {
+                        Button(
+                            onClick = { model.closeSelectedAct() },
+                            enabled = !model.busy,
+                            modifier = Modifier.fillMaxWidth(),
+                        ) { Text("Cerrar Acta definitivamente") }
+                    } else if (inspectorSigned) {
+                        Text(
+                            "La inspección puede finalizar con la firma de empresa pendiente; el Acta permanecerá preparada hasta registrar firma, negativa o ausencia.",
+                            style = MaterialTheme.typography.bodySmall,
+                        )
+                    }
+                }
+
+                "CLOSED" -> {
+                    Card(
+                        Modifier.fillMaxWidth(),
+                        colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer),
+                    ) {
+                        Column(Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(5.dp)) {
+                            Text("Acta cerrada e inmutable", fontWeight = FontWeight.Bold)
+                            Text("El PDF, informe Word y entregas documentales se generan desde este cierre.")
+                            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 drafts = model.acts.count { it.status == "DRAFT" }
+            Text("Finalizar inspección", style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
+            Text(
+                "No puede quedar ninguna Acta en borrador. Al cerrar, el servidor verifica que cada Acta preparada tenga firma de inspector; si falta alguna, indicará cuál debe completarse.",
+            )
+            Button(
+                onClick = { model.closeInspection() },
+                enabled = !model.busy && drafts == 0,
+                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"
+    "READY" -> "Preparada para firmas"
+    "CLOSED" -> "Cerrada"
+    "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.23.0-1",
+  "version": "0.25.0-1",
   "private": true,
   "license": "UNLICENSED",
   "scripts": {

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

@@ -3,28 +3,27 @@ import { ConfigModule, ConfigService } from '@nestjs/config';
 import { APP_GUARD } from '@nestjs/core';
 import { ThrottlerGuard, ThrottlerModule } from '@nestjs/throttler';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { AuditModule } from './audit/audit.module';
+import { ActAdministrationModule } from './act-administration/act-administration.module';
 import { AdministrationModule } from './administration/administration.module';
-import { AuthorizationModule } from './authorization/authorization.module';
+import { AssetImportsModule } from './asset-imports/asset-imports.module';
-import { PermissionsGuard } from './authorization/guards/permissions.guard';
+import { AssetMasterModule } from './asset-master/asset-master.module';
+import { AuditModule } from './audit/audit.module';
 import { AuthModule } from './auth/auth.module';
 import { AccessTokenGuard } from './auth/guards/access-token.guard';
+import { AuthorizationModule } from './authorization/authorization.module';
+import { PermissionsGuard } from './authorization/guards/permissions.guard';
 import { CsrfGuard } from './auth/guards/csrf.guard';
 import { PhaseADataModule } from './core-data/phase-a-data.module';
+import { DashboardModule } from './dashboard/dashboard.module';
 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';
 import { InspectionClosingModule } from './inspection-closing/inspection-closing.module';
-import { AssetImportsModule } from './asset-imports/asset-imports.module';
+import { InspectionDeadlinesModule } from './inspection-deadlines/inspection-deadlines.module';
+import { InspectionFindingsModule } from './inspection-findings/inspection-findings.module';
 import { InspectionReportsModule } from './inspection-reports/inspection-reports.module';
 import { InspectionVerificationsModule } from './inspection-verifications/inspection-verifications.module';
-import { ActAdministrationModule } from './act-administration/act-administration.module';
+import { InspectionVisitsModule } from './inspection-visits/inspection-visits.module';
 
 function required(config: ConfigService, key: string): string {
   const value = config.get<string>(key);
@@ -34,10 +33,7 @@ function required(config: ConfigService, key: string): string {
 
 @Module({
   imports: [
-    ConfigModule.forRoot({
+    ConfigModule.forRoot({ isGlobal: true, ignoreEnvFile: true }),
-      isGlobal: true,
-      ignoreEnvFile: true,
-    }),
     TypeOrmModule.forRootAsync({
       inject: [ConfigService],
       useFactory: (config: ConfigService) => ({
@@ -55,13 +51,7 @@ function required(config: ConfigService, key: string): string {
         connectTimeoutMS: 5000,
       }),
     }),
-    ThrottlerModule.forRoot([
+    ThrottlerModule.forRoot([{ name: 'default', ttl: 60_000, limit: 120 }]),
-      {
-        name: 'default',
-        ttl: 60_000,
-        limit: 120,
-      },
-    ]),
     PhaseADataModule,
     AuditModule,
     AuthorizationModule,
@@ -69,12 +59,11 @@ function required(config: ConfigService, key: string): string {
     AdministrationModule,
     DashboardModule,
     AssetMasterModule,
-    SurveyPlanningModule,
-    SurveyExecutionModule,
     InspectionVisitsModule,
     InspectionActsModule,
     InspectionFindingsModule,
     InspectionClosingModule,
+    InspectionDeadlinesModule,
     InspectionReportsModule,
     InspectionVerificationsModule,
     ActAdministrationModule,

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

@@ -22,12 +22,23 @@ 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';
 
 @Module({
   imports: [AuditModule],
   controllers: [
     AssetTypesController,
     AssetsController,
+    InventoryStructureController,
+    InventoryFamilyCatalogController,
+    InventoryMergeController,
+    FieldInventoryMergeController,
     AssetGeometriesController,
     MapAssetsController,
     AssetHistoryController,
@@ -40,6 +51,10 @@ import { FieldDiscoveryInspectionLinkService } from '../inspection-operations/fi
   providers: [
     AssetTypesService,
     AssetsService,
+    InventoryStructureService,
+    InventoryFamilyCatalogService,
+    InventoryMergeService,
+    MergedInventoryDossierService,
     AssetGeometriesService,
     AssetHistoryService,
     AssetMediaService,
@@ -52,6 +67,8 @@ import { FieldDiscoveryInspectionLinkService } from '../inspection-operations/fi
   exports: [
     AssetHistoryService,
     AssetsService,
+    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) {
+  dossier(@Param('id', new ParseUUIDPipe({ version: '4' })) id: string): Promise<unknown> {
-    return this.assets.dossier(id);
+    return this.mergedDossier.dossier(id);
   }
 
   @Get(':id/context-history')

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/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-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,164 @@
+import { Injectable } from '@nestjs/common';
+import { AssetsService } from './assets.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,
+  ) {}
+
+  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;
+      return { assetId, identity, dossier };
+    }));
+
+    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 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 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,
+      },
+      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,
+      },
+      visits,
+      acts,
+      findings,
+      evidence,
+      communications,
+      verificationResults,
+      documents,
+      inspectionReports,
+      reports,
+      media,
+      versions,
+      timeline: timeline.slice(0, 1000),
+    };
+  }
+}

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/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 {
+export { AssetVersion, AssetVersionChangeType } from './asset-version.entity';
-  AssetVersion,
+export { AssetAttributeDataType, AssetAttributeDefinition } from './asset-attribute-definition.entity';
-  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,111 +19,35 @@ 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 {
+export { AssetGeometry, AssetGeometrySource, AssetGeometryType } from './asset-geometry.entity';
-  AssetGeometry,
+export { AssetMedia, AssetMediaKind, AssetMediaSource } from './asset-media.entity';
-  AssetGeometrySource,
+export { InspectionVisit, InspectionVisitStatus } from './inspection-visit.entity';
-  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 { InspectionVisitAsset, InspectionVisitAssetPlanningSource } from './inspection-visit-asset.entity';
 export { InspectionVisitMember } from './inspection-visit-member.entity';
-export {
+export { DocumentAnnualSequence, DocumentSequenceType } from './document-annual-sequence.entity';
-  DocumentAnnualSequence,
+export { InspectionAct, InspectionActStatus, InspectionActUrgency, InspectionDeadlineBasis, InspectionDeadlineDayType } from './inspection-act.entity';
-  DocumentSequenceType,
-} from './document-annual-sequence.entity';
-export {
-  InspectionAct,
-  InspectionActStatus,
-} from './inspection-act.entity';
 export { InspectionActAsset } from './inspection-act-asset.entity';
-export {
+export { InspectionDeadlinePolicy } from './inspection-deadline-policy.entity';
-  InspectionReport,
+export { InspectionNonWorkingDay } from './inspection-non-working-day.entity';
-  InspectionReportPdfStatus,
+export { InspectionReport, InspectionReportPdfStatus, InspectionReportReviewStatus, InspectionReportStatus, InspectionReportWordStatus } from './inspection-report.entity';
-  InspectionReportReviewStatus,
+export { InspectionReportFollowUp, InspectionReportFollowUpType } from './inspection-report-follow-up.entity';
-  InspectionReportStatus,
+export { InspectionReportFollowUpFile } from './inspection-report-follow-up-file.entity';
-  InspectionReportWordStatus,
+export { InspectionActVersion, InspectionActVersionEvent } from './inspection-act-version.entity';
-} from './inspection-report.entity';
+export { InspectionActResponsible, InspectionResponsibleAttendanceStatus, InspectionResponsibleDocumentType } from './inspection-act-responsible.entity';
-export {
+export { InspectionActClosure, InspectionActUploadMode } from './inspection-act-closure.entity';
-  InspectionActVersion,
+export { InspectionActSignature, InspectionActSignatureSource, InspectionActSignatureStatus, InspectionActSignerType, InspectionCompanySignatureManifestation } from './inspection-act-signature.entity';
-  InspectionActVersionEvent,
-} from './inspection-act-version.entity';
-export {
-  InspectionActResponsible,
-  InspectionResponsibleAttendanceStatus,
-  InspectionResponsibleDocumentType,
-} from './inspection-act-responsible.entity';
-export {
-  InspectionActClosure,
-  InspectionActUploadMode,
-} from './inspection-act-closure.entity';
-export {
-  InspectionActSignature,
-  InspectionActSignatureSource,
-  InspectionActSignatureStatus,
-  InspectionActSignerType,
-  InspectionCompanySignatureManifestation,
-} from './inspection-act-signature.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 {
+export { InspectionFinding, InspectionFindingResponseDueBasis, InspectionFindingStatus } from './inspection-finding.entity';
-  InspectionFinding,
+export { InspectionFindingVersion, InspectionFindingVersionEvent } from './inspection-finding-version.entity';
-  InspectionFindingResponseDueBasis,
+export { InspectionCommunicationChannel, InspectionCommunicationDirection, InspectionCommunicationType, InspectionFindingCommunication } from './inspection-finding-communication.entity';
-  InspectionFindingStatus,
+export { InspectionEvidenceKind, InspectionEvidencePurpose, InspectionEvidenceSource, InspectionFindingEvidence } from './inspection-finding-evidence.entity';
-} from './inspection-finding.entity';
+export { InspectionFindingVerificationVisit, InspectionVerificationOutcome } from './inspection-finding-verification-visit.entity';
-export {
+export { InspectionFindingVerificationEvent, InspectionFindingVerificationEventType } from './inspection-finding-verification-event.entity';
-  InspectionFindingVersion,
-  InspectionFindingVersionEvent,
-} from './inspection-finding-version.entity';
-export {
-  InspectionCommunicationChannel,
-  InspectionCommunicationDirection,
-  InspectionCommunicationType,
-  InspectionFindingCommunication,
-} from './inspection-finding-communication.entity';
-export {
-  InspectionEvidenceKind,
-  InspectionEvidencePurpose,
-  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';
 
 import { AuditEvent } from './audit-event.entity';
 import { AuthSession } from './auth-session.entity';
@@ -154,18 +72,17 @@ 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';
 import { DocumentAnnualSequence } from './document-annual-sequence.entity';
 import { InspectionAct } from './inspection-act.entity';
 import { InspectionActAsset } from './inspection-act-asset.entity';
+import { InspectionDeadlinePolicy } from './inspection-deadline-policy.entity';
+import { InspectionNonWorkingDay } from './inspection-non-working-day.entity';
 import { InspectionReport } from './inspection-report.entity';
+import { InspectionReportFollowUp } from './inspection-report-follow-up.entity';
+import { InspectionReportFollowUpFile } from './inspection-report-follow-up-file.entity';
 import { InspectionActVersion } from './inspection-act-version.entity';
 import { InspectionActResponsible } from './inspection-act-responsible.entity';
 import { InspectionActClosure } from './inspection-act-closure.entity';
@@ -184,55 +101,17 @@ import { InspectionFindingVerificationVisit } from './inspection-finding-verific
 import { InspectionFindingVerificationEvent } from './inspection-finding-verification-event.entity';
 
 export const PHASE_A_ENTITIES = [
-  User,
+  User, Role, Permission, UserRole, RolePermission, AuthSession, AuditEvent,
-  Role,
+  AssetType, AssetTypeParentRule, AssetAttributeDefinition, Asset, AssetAttributeValue,
-  Permission,
+  AreaCompanyRelation, OrganizationProfile, OrganizationMembership, SourceDocument,
-  UserRole,
+  AssetSourceDocument, AssetExternalIdentifier, AreaLegalRight, AreaLegalRightOrganization,
-  RolePermission,
+  AssetGeometry, AssetVersion, AssetMedia, InspectionVisit, InspectionVisitAsset,
-  AuthSession,
+  InspectionVisitMember, DocumentAnnualSequence, InspectionAct, InspectionActAsset,
-  AuditEvent,
+  InspectionDeadlinePolicy, InspectionNonWorkingDay, InspectionReport,
-  AssetType,
+  InspectionReportFollowUp, InspectionReportFollowUpFile, InspectionActVersion,
-  AssetTypeParentRule,
+  InspectionActResponsible, InspectionActClosure, InspectionActSignature, FindingCategory,
-  AssetAttributeDefinition,
+  FindingCatalogItem, FindingCatalogItemAssetType, FindingCatalogAssetTypeProfile,
-  Asset,
+  FindingCatalogAssetOverride, FindingCatalogProposal, InspectionFinding,
-  AssetAttributeValue,
+  InspectionFindingVersion, InspectionFindingCommunication, InspectionFindingEvidence,
-  AreaCompanyRelation,
+  InspectionFindingVerificationVisit, InspectionFindingVerificationEvent,
-  OrganizationProfile,
-  OrganizationMembership,
-  SourceDocument,
-  AssetSourceDocument,
-  AssetExternalIdentifier,
-  AreaLegalRight,
-  AreaLegalRightOrganization,
-  AssetGeometry,
-  AssetVersion,
-  AssetMedia,
-  SurveyCampaign,
-  SurveyCampaignTarget,
-  SurveyTargetReport,
-  SurveyTargetReportMedia,
-  SurveyTargetReportVersion,
-  InspectionVisit,
-  InspectionVisitAsset,
-  InspectionVisitMember,
-  DocumentAnnualSequence,
-  InspectionAct,
-  InspectionActAsset,
-  InspectionReport,
-  InspectionActVersion,
-  InspectionActResponsible,
-  InspectionActClosure,
-  InspectionActSignature,
-  FindingCategory,
-  FindingCatalogItem,
-  FindingCatalogItemAssetType,
-  FindingCatalogAssetTypeProfile,
-  FindingCatalogAssetOverride,
-  FindingCatalogProposal,
-  InspectionFinding,
-  InspectionFindingVersion,
-  InspectionFindingCommunication,
-  InspectionFindingEvidence,
-  InspectionFindingVerificationVisit,
-  InspectionFindingVerificationEvent,
 ];

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

@@ -9,6 +9,21 @@ export enum InspectionActStatus {
   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',
+  GEDO_LOAD_DATE = 'GEDO_LOAD_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 })
@@ -47,6 +62,42 @@ export class InspectionAct extends TimestampedEntity {
   @Column({ type: 'text', nullable: true })
   observations!: string | null;
 
+  @Column({ type: 'varchar', length: 20, nullable: true })
+  urgency!: InspectionActUrgency | null;
+
+  @Column({ name: 'deadline_days', type: 'integer', nullable: true })
+  deadlineDays!: number | null;
+
+  @Column({ name: 'deadline_day_type', type: 'varchar', length: 20, nullable: true })
+  deadlineDayType!: InspectionDeadlineDayType | null;
+
+  @Column({ name: 'deadline_basis', type: 'varchar', length: 24, nullable: true })
+  deadlineBasis!: InspectionDeadlineBasis | null;
+
+  @Column({ name: 'deadline_base_on', type: 'date', nullable: true })
+  deadlineBaseOn!: string | null;
+
+  @Column({ name: 'deadline_due_on', type: 'date', nullable: true })
+  deadlineDueOn!: string | null;
+
+  @Column({ name: 'deadline_policy_snapshot', type: 'jsonb', nullable: true })
+  deadlinePolicySnapshot!: Record<string, unknown> | 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-deadline-policy.entity.ts

@@ -0,0 +1,25 @@
+import { Column, Entity, PrimaryColumn } from 'typeorm';
+import { TimestampedEntity } from './timestamped.entity';
+import {
+  InspectionActUrgency,
+  InspectionDeadlineBasis,
+  InspectionDeadlineDayType,
+} from './inspection-act.entity';
+
+@Entity({ name: 'inspection_deadline_policies' })
+export class InspectionDeadlinePolicy extends TimestampedEntity {
+  @PrimaryColumn({ type: 'varchar', length: 20 })
+  urgency!: InspectionActUrgency;
+
+  @Column({ type: 'integer' })
+  days!: number;
+
+  @Column({ name: 'day_type', type: 'varchar', length: 20 })
+  dayType!: InspectionDeadlineDayType;
+
+  @Column({ type: 'varchar', length: 24 })
+  basis!: InspectionDeadlineBasis;
+
+  @Column({ name: 'updated_by', type: 'uuid', nullable: true })
+  updatedBy!: string | null;
+}

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

@@ -18,6 +18,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_antecedent', ['antecedentFindingId'])
 export class InspectionFinding extends TimestampedEntity {
   @PrimaryGeneratedColumn('uuid')
   id!: string;
@@ -61,6 +62,12 @@ 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: 'antecedent_finding_id', type: 'uuid', nullable: true })
+  antecedentFindingId!: string | null;
+
   @Column({ name: 'correction_due_on', type: 'date', nullable: true })
   correctionDueOn!: string | null;
 

api-v3/src/database/entities/inspection-non-working-day.entity.ts

@@ -0,0 +1,20 @@
+import { Column, Entity, PrimaryColumn } from 'typeorm';
+import { TimestampedEntity } from './timestamped.entity';
+
+@Entity({ name: 'inspection_non_working_days' })
+export class InspectionNonWorkingDay extends TimestampedEntity {
+  @PrimaryColumn({ type: 'date' })
+  day!: string;
+
+  @Column({ type: 'varchar', length: 200 })
+  label!: string;
+
+  @Column({ type: 'boolean', default: true })
+  enabled!: boolean;
+
+  @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/inspection-report-follow-up-file.entity.ts

@@ -0,0 +1,30 @@
+import { Column, Entity, Index, PrimaryGeneratedColumn } from 'typeorm';
+import { TimestampedEntity } from './timestamped.entity';
+
+@Entity({ name: 'inspection_report_follow_up_files' })
+@Index('idx_inspection_report_follow_up_files_follow_up', ['followUpId'])
+export class InspectionReportFollowUpFile extends TimestampedEntity {
+  @PrimaryGeneratedColumn('uuid')
+  id!: string;
+
+  @Column({ name: 'follow_up_id', type: 'uuid' })
+  followUpId!: string;
+
+  @Column({ name: 'original_name', type: 'varchar', length: 255 })
+  originalName!: string;
+
+  @Column({ name: 'stored_name', type: 'varchar', length: 255 })
+  storedName!: string;
+
+  @Column({ name: 'mime_type', type: 'varchar', length: 120 })
+  mimeType!: string;
+
+  @Column({ name: 'size_bytes', type: 'integer' })
+  sizeBytes!: number;
+
+  @Column({ type: 'char', length: 64 })
+  sha256!: string;
+
+  @Column({ name: 'created_by', type: 'uuid', nullable: true })
+  createdBy!: string | null;
+}

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

@@ -0,0 +1,36 @@
+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_occurred', ['reportId', 'occurredOn'])
+@Index('idx_inspection_report_follow_ups_type', ['eventType'])
+export class InspectionReportFollowUp extends TimestampedEntity {
+  @PrimaryGeneratedColumn('uuid')
+  id!: string;
+
+  @Column({ name: 'report_id', type: 'uuid' })
+  reportId!: string;
+
+  @Column({ name: 'event_type', type: 'varchar', length: 32 })
+  eventType!: InspectionReportFollowUpType;
+
+  @Column({ name: 'reference_number', type: 'varchar', length: 255, nullable: true })
+  referenceNumber!: string | null;
+
+  @Column({ name: 'occurred_on', type: 'date' })
+  occurredOn!: string;
+
+  @Column({ type: 'text', nullable: true })
+  description!: string | null;
+
+  @Column({ name: 'created_by', type: 'uuid', nullable: true })
+  createdBy!: string | null;
+}

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

@@ -31,6 +31,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_if_identifier', ['gedoIfIdentifier'])
 export class InspectionReport extends TimestampedEntity {
   @PrimaryGeneratedColumn('uuid')
   id!: string;
@@ -80,6 +81,57 @@ export class InspectionReport extends TimestampedEntity {
   @Column({ name: 'word_error', type: 'varchar', length: 500, nullable: true })
   wordError!: string | null;
 
+  @Column({ name: 'reference_text', type: 'text', nullable: true })
+  referenceText!: string | null;
+
+  @Column({ name: 'general_objective', type: 'text', nullable: true })
+  generalObjective!: string | null;
+
+  @Column({ name: 'specific_objective', type: 'text', nullable: true })
+  specificObjective!: string | null;
+
+  @Column({ type: 'text', nullable: true })
+  background!: string | null;
+
+  @Column({ name: 'legal_framework', type: 'text', nullable: true })
+  legalFramework!: string | null;
+
+  @Column({ name: 'executive_summary', type: 'text', nullable: true })
+  executiveSummary!: string | null;
+
+  @Column({ type: 'text', nullable: true })
+  description!: string | null;
+
+  @Column({ type: 'text', nullable: true })
+  conclusion!: string | null;
+
+  @Column({ name: 'gedo_if_identifier', type: 'varchar', length: 255, nullable: true })
+  gedoIfIdentifier!: string | null;
+
+  @Column({ name: 'gedo_officialized_on', type: 'date', nullable: true })
+  gedoOfficializedOn!: string | 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: 'gedo_pdf_uploaded_at', type: 'timestamptz', nullable: true })
+  gedoPdfUploadedAt!: Date | null;
+
+  @Column({ name: 'gedo_pdf_uploaded_by', type: 'uuid', nullable: true })
+  gedoPdfUploadedBy!: string | null;
+
   @Column({ name: 'review_status', type: 'varchar', length: 32, default: InspectionReportReviewStatus.PENDING_REVIEW })
   reviewStatus!: InspectionReportReviewStatus;
 

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/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/1790035200000-phase-f4-document-flow-foundation.ts

@@ -0,0 +1,263 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class PhaseF4DocumentFlowFoundation1790035200000 implements MigrationInterface {
+  name = 'PhaseF4DocumentFlowFoundation1790035200000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE inspection_acts
+        ADD COLUMN urgency varchar(20),
+        ADD COLUMN deadline_days integer,
+        ADD COLUMN deadline_day_type varchar(20),
+        ADD COLUMN deadline_basis varchar(24),
+        ADD COLUMN deadline_base_on date,
+        ADD COLUMN deadline_due_on date,
+        ADD COLUMN deadline_policy_snapshot jsonb,
+        ADD COLUMN locked_at timestamptz,
+        ADD COLUMN locked_by uuid,
+        ADD COLUMN locked_sha256 char(64),
+        ADD COLUMN sealed_at timestamptz,
+        ADD COLUMN sealed_by uuid
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_acts
+        ADD CONSTRAINT chk_inspection_acts_urgency
+          CHECK (urgency IS NULL OR urgency IN ('URGENT','NON_URGENT')),
+        ADD CONSTRAINT chk_inspection_acts_deadline_days
+          CHECK (deadline_days IS NULL OR deadline_days > 0),
+        ADD CONSTRAINT chk_inspection_acts_deadline_day_type
+          CHECK (deadline_day_type IS NULL OR deadline_day_type IN ('BUSINESS','CALENDAR')),
+        ADD CONSTRAINT chk_inspection_acts_deadline_basis
+          CHECK (deadline_basis IS NULL OR deadline_basis IN ('ACT_DATE','GEDO_LOAD_DATE')),
+        ADD CONSTRAINT fk_inspection_acts_locked_by
+          FOREIGN KEY (locked_by) REFERENCES users(id) ON DELETE SET NULL,
+        ADD CONSTRAINT fk_inspection_acts_sealed_by
+          FOREIGN KEY (sealed_by) REFERENCES users(id) ON DELETE SET NULL
+    `);
+    await queryRunner.query(`
+      CREATE INDEX idx_inspection_acts_deadline_due_on
+      ON inspection_acts(deadline_due_on)
+      WHERE deadline_due_on IS NOT NULL
+    `);
+
+    await queryRunner.query(`
+      CREATE TABLE inspection_deadline_policies (
+        urgency varchar(20) PRIMARY KEY,
+        days integer NOT NULL,
+        day_type varchar(20) NOT NULL,
+        basis varchar(24) NOT NULL,
+        updated_by uuid,
+        created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        updated_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        CONSTRAINT chk_inspection_deadline_policies_urgency
+          CHECK (urgency IN ('URGENT','NON_URGENT')),
+        CONSTRAINT chk_inspection_deadline_policies_days
+          CHECK (days > 0),
+        CONSTRAINT chk_inspection_deadline_policies_day_type
+          CHECK (day_type IN ('BUSINESS','CALENDAR')),
+        CONSTRAINT chk_inspection_deadline_policies_basis
+          CHECK (basis IN ('ACT_DATE','GEDO_LOAD_DATE')),
+        CONSTRAINT fk_inspection_deadline_policies_updated_by
+          FOREIGN KEY (updated_by) REFERENCES users(id) ON DELETE SET NULL
+      )
+    `);
+    await queryRunner.query(`
+      INSERT INTO inspection_deadline_policies (urgency, days, day_type, basis)
+      VALUES
+        ('URGENT', 5, 'BUSINESS', 'ACT_DATE'),
+        ('NON_URGENT', 10, 'BUSINESS', 'GEDO_LOAD_DATE')
+    `);
+
+    await queryRunner.query(`
+      CREATE TABLE inspection_non_working_days (
+        day date PRIMARY KEY,
+        label varchar(200) NOT NULL,
+        enabled boolean NOT NULL DEFAULT true,
+        created_by uuid,
+        updated_by uuid,
+        created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        updated_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        CONSTRAINT chk_inspection_non_working_days_label
+          CHECK (LENGTH(TRIM(label)) > 0),
+        CONSTRAINT fk_inspection_non_working_days_created_by
+          FOREIGN KEY (created_by) REFERENCES users(id) ON DELETE SET NULL,
+        CONSTRAINT fk_inspection_non_working_days_updated_by
+          FOREIGN KEY (updated_by) REFERENCES users(id) ON DELETE SET NULL
+      )
+    `);
+
+    await queryRunner.query(`
+      ALTER TABLE inspection_findings
+        ADD COLUMN is_recurrence boolean NOT NULL DEFAULT false,
+        ADD COLUMN antecedent_finding_id uuid
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_findings
+        ADD CONSTRAINT fk_inspection_findings_antecedent
+          FOREIGN KEY (antecedent_finding_id) REFERENCES inspection_findings(id) ON DELETE RESTRICT,
+        ADD CONSTRAINT chk_inspection_findings_recurrence_link
+          CHECK (
+            (is_recurrence = false AND antecedent_finding_id IS NULL)
+            OR (is_recurrence = true AND antecedent_finding_id IS NOT NULL)
+          ),
+        ADD CONSTRAINT chk_inspection_findings_not_self_antecedent
+          CHECK (antecedent_finding_id IS NULL OR antecedent_finding_id <> id)
+    `);
+    await queryRunner.query(`
+      CREATE INDEX idx_inspection_findings_antecedent
+      ON inspection_findings(antecedent_finding_id)
+      WHERE antecedent_finding_id IS NOT NULL
+    `);
+
+    await queryRunner.query(`
+      ALTER TABLE inspection_reports
+        ADD COLUMN reference_text text,
+        ADD COLUMN general_objective text,
+        ADD COLUMN specific_objective text,
+        ADD COLUMN background text,
+        ADD COLUMN legal_framework text,
+        ADD COLUMN executive_summary text,
+        ADD COLUMN description text,
+        ADD COLUMN conclusion text,
+        ADD COLUMN gedo_if_identifier varchar(255),
+        ADD COLUMN gedo_officialized_on date,
+        ADD COLUMN gedo_pdf_original_name varchar(255),
+        ADD COLUMN gedo_pdf_stored_name varchar(255),
+        ADD COLUMN gedo_pdf_mime_type varchar(120),
+        ADD COLUMN gedo_pdf_size_bytes integer,
+        ADD COLUMN gedo_pdf_sha256 char(64),
+        ADD COLUMN gedo_pdf_uploaded_at timestamptz,
+        ADD COLUMN gedo_pdf_uploaded_by uuid
+    `);
+    await queryRunner.query(`
+      ALTER TABLE inspection_reports
+        ADD CONSTRAINT chk_inspection_reports_gedo_pdf_size
+          CHECK (gedo_pdf_size_bytes IS NULL OR gedo_pdf_size_bytes >= 0),
+        ADD CONSTRAINT fk_inspection_reports_gedo_pdf_uploaded_by
+          FOREIGN KEY (gedo_pdf_uploaded_by) REFERENCES users(id) ON DELETE SET NULL
+    `);
+    await queryRunner.query(`
+      CREATE INDEX idx_inspection_reports_gedo_if_identifier
+      ON inspection_reports(gedo_if_identifier)
+      WHERE gedo_if_identifier IS NOT NULL
+    `);
+
+    await queryRunner.query(`
+      CREATE TABLE inspection_report_follow_ups (
+        id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+        report_id uuid NOT NULL,
+        event_type varchar(32) NOT NULL,
+        reference_number varchar(255),
+        occurred_on date NOT NULL,
+        description text,
+        created_by uuid,
+        created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        updated_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        CONSTRAINT chk_inspection_report_follow_ups_type
+          CHECK (event_type IN ('COMPANY_NOTE','COMPANY_DOCUMENT','INTERNAL_NOTE','VERIFICATION','OTHER')),
+        CONSTRAINT fk_inspection_report_follow_ups_report
+          FOREIGN KEY (report_id) REFERENCES inspection_reports(id) ON DELETE RESTRICT,
+        CONSTRAINT fk_inspection_report_follow_ups_created_by
+          FOREIGN KEY (created_by) REFERENCES users(id) ON DELETE SET NULL
+      )
+    `);
+    await queryRunner.query(`
+      CREATE INDEX idx_inspection_report_follow_ups_report_occurred
+      ON inspection_report_follow_ups(report_id, occurred_on, created_at)
+    `);
+    await queryRunner.query(`
+      CREATE INDEX idx_inspection_report_follow_ups_type
+      ON inspection_report_follow_ups(event_type)
+    `);
+
+    await queryRunner.query(`
+      CREATE TABLE inspection_report_follow_up_files (
+        id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
+        follow_up_id uuid NOT NULL,
+        original_name varchar(255) NOT NULL,
+        stored_name varchar(255) NOT NULL,
+        mime_type varchar(120) NOT NULL,
+        size_bytes integer NOT NULL,
+        sha256 char(64) NOT NULL,
+        created_by uuid,
+        created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        updated_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        CONSTRAINT chk_inspection_report_follow_up_files_size
+          CHECK (size_bytes >= 0),
+        CONSTRAINT fk_inspection_report_follow_up_files_follow_up
+          FOREIGN KEY (follow_up_id) REFERENCES inspection_report_follow_ups(id) ON DELETE RESTRICT,
+        CONSTRAINT fk_inspection_report_follow_up_files_created_by
+          FOREIGN KEY (created_by) REFERENCES users(id) ON DELETE SET NULL
+      )
+    `);
+    await queryRunner.query(`
+      CREATE INDEX idx_inspection_report_follow_up_files_follow_up
+      ON inspection_report_follow_up_files(follow_up_id)
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP TABLE IF EXISTS inspection_report_follow_up_files`);
+    await queryRunner.query(`DROP TABLE IF EXISTS inspection_report_follow_ups`);
+
+    await queryRunner.query(`DROP INDEX IF EXISTS idx_inspection_reports_gedo_if_identifier`);
+    await queryRunner.query(`
+      ALTER TABLE inspection_reports
+        DROP CONSTRAINT IF EXISTS fk_inspection_reports_gedo_pdf_uploaded_by,
+        DROP CONSTRAINT IF EXISTS chk_inspection_reports_gedo_pdf_size,
+        DROP COLUMN IF EXISTS gedo_pdf_uploaded_by,
+        DROP COLUMN IF EXISTS gedo_pdf_uploaded_at,
+        DROP COLUMN IF EXISTS gedo_pdf_sha256,
+        DROP COLUMN IF EXISTS gedo_pdf_size_bytes,
+        DROP COLUMN IF EXISTS gedo_pdf_mime_type,
+        DROP COLUMN IF EXISTS gedo_pdf_stored_name,
+        DROP COLUMN IF EXISTS gedo_pdf_original_name,
+        DROP COLUMN IF EXISTS gedo_officialized_on,
+        DROP COLUMN IF EXISTS gedo_if_identifier,
+        DROP COLUMN IF EXISTS conclusion,
+        DROP COLUMN IF EXISTS description,
+        DROP COLUMN IF EXISTS executive_summary,
+        DROP COLUMN IF EXISTS legal_framework,
+        DROP COLUMN IF EXISTS background,
+        DROP COLUMN IF EXISTS specific_objective,
+        DROP COLUMN IF EXISTS general_objective,
+        DROP COLUMN IF EXISTS reference_text
+    `);
+
+    await queryRunner.query(`DROP INDEX IF EXISTS idx_inspection_findings_antecedent`);
+    await queryRunner.query(`
+      ALTER TABLE inspection_findings
+        DROP CONSTRAINT IF EXISTS chk_inspection_findings_not_self_antecedent,
+        DROP CONSTRAINT IF EXISTS chk_inspection_findings_recurrence_link,
+        DROP CONSTRAINT IF EXISTS fk_inspection_findings_antecedent,
+        DROP COLUMN IF EXISTS antecedent_finding_id,
+        DROP COLUMN IF EXISTS is_recurrence
+    `);
+
+    await queryRunner.query(`DROP TABLE IF EXISTS inspection_non_working_days`);
+    await queryRunner.query(`DROP TABLE IF EXISTS inspection_deadline_policies`);
+
+    await queryRunner.query(`DROP INDEX IF EXISTS idx_inspection_acts_deadline_due_on`);
+    await queryRunner.query(`
+      ALTER TABLE inspection_acts
+        DROP CONSTRAINT IF EXISTS fk_inspection_acts_sealed_by,
+        DROP CONSTRAINT IF EXISTS fk_inspection_acts_locked_by,
+        DROP CONSTRAINT IF EXISTS chk_inspection_acts_deadline_basis,
+        DROP CONSTRAINT IF EXISTS chk_inspection_acts_deadline_day_type,
+        DROP CONSTRAINT IF EXISTS chk_inspection_acts_deadline_days,
+        DROP CONSTRAINT IF EXISTS chk_inspection_acts_urgency,
+        DROP COLUMN IF EXISTS sealed_by,
+        DROP COLUMN IF EXISTS sealed_at,
+        DROP COLUMN IF EXISTS locked_sha256,
+        DROP COLUMN IF EXISTS locked_by,
+        DROP COLUMN IF EXISTS locked_at,
+        DROP COLUMN IF EXISTS deadline_policy_snapshot,
+        DROP COLUMN IF EXISTS deadline_due_on,
+        DROP COLUMN IF EXISTS deadline_base_on,
+        DROP COLUMN IF EXISTS deadline_basis,
+        DROP COLUMN IF EXISTS deadline_day_type,
+        DROP COLUMN IF EXISTS deadline_days,
+        DROP COLUMN IF EXISTS urgency
+    `);
+  }
+}

api-v3/src/database/migrations/1790038800000-phase-f4-deadline-administration.ts

@@ -0,0 +1,38 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class PhaseF4DeadlineAdministration1790038800000 implements MigrationInterface {
+  name = 'PhaseF4DeadlineAdministration1790038800000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      INSERT INTO permissions (code, description)
+      VALUES ('inspection_deadlines.manage', 'Administrar plazos institucionales y calendario no laborable de Actas')
+      ON CONFLICT (code) DO UPDATE SET description = EXCLUDED.description
+    `);
+    await queryRunner.query(`
+      WITH mapping(role_code, permission_code) AS (
+        VALUES
+          ('admin', 'inspection_deadlines.manage'),
+          ('supervisor', 'inspection_deadlines.manage')
+      )
+      INSERT INTO role_permissions (role_id, permission_id)
+      SELECT role.id, permission.id
+      FROM mapping
+      INNER JOIN roles role ON role.code = mapping.role_code
+      INNER JOIN permissions permission ON permission.code = mapping.permission_code
+      ON CONFLICT DO NOTHING
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      DELETE FROM role_permissions
+      WHERE permission_id IN (
+        SELECT id FROM permissions WHERE code = 'inspection_deadlines.manage'
+      )
+    `);
+    await queryRunner.query(`
+      DELETE FROM permissions WHERE code = 'inspection_deadlines.manage'
+    `);
+  }
+}

api-v3/src/database/migrations/1790042400000-phase-f4-report-dossier-permissions.ts

@@ -0,0 +1,64 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class PhaseF4ReportDossierPermissions1790042400000 implements MigrationInterface {
+  name = 'PhaseF4ReportDossierPermissions1790042400000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      INSERT INTO permissions (code, description)
+      VALUES
+        ('inspection_reports.edit', 'Editar el contenido de trabajo del Informe de inspección'),
+        ('inspection_reports.officialize', 'Registrar el IF y PDF oficial generado por GEDO'),
+        ('inspection_reports.follow_up', 'Agregar respuestas, notas y documentos al seguimiento del Informe')
+      ON CONFLICT (code) DO UPDATE SET description = EXCLUDED.description
+    `);
+    await queryRunner.query(`
+      WITH mapping(role_code, permission_code) AS (
+        VALUES
+          ('admin', 'inspection_reports.edit'),
+          ('admin', 'inspection_reports.officialize'),
+          ('admin', 'inspection_reports.follow_up'),
+          ('supervisor', 'inspection_reports.edit'),
+          ('supervisor', 'inspection_reports.officialize'),
+          ('supervisor', 'inspection_reports.follow_up'),
+          ('inspector', 'inspection_reports.edit'),
+          ('inspector', 'inspection_reports.officialize'),
+          ('inspector', 'inspection_reports.follow_up')
+      )
+      INSERT INTO role_permissions (role_id, permission_id)
+      SELECT role.id, permission.id
+      FROM mapping
+      INNER JOIN roles role ON role.code = mapping.role_code
+      INNER JOIN permissions permission ON permission.code = mapping.permission_code
+      ON CONFLICT DO NOTHING
+    `);
+    await queryRunner.query(`
+      CREATE UNIQUE INDEX IF NOT EXISTS uq_inspection_reports_gedo_if_identifier
+      ON inspection_reports(gedo_if_identifier)
+      WHERE gedo_if_identifier IS NOT NULL
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP INDEX IF EXISTS uq_inspection_reports_gedo_if_identifier`);
+    await queryRunner.query(`
+      DELETE FROM role_permissions
+      WHERE permission_id IN (
+        SELECT id FROM permissions
+        WHERE code IN (
+          'inspection_reports.edit',
+          'inspection_reports.officialize',
+          'inspection_reports.follow_up'
+        )
+      )
+    `);
+    await queryRunner.query(`
+      DELETE FROM permissions
+      WHERE code IN (
+        'inspection_reports.edit',
+        'inspection_reports.officialize',
+        'inspection_reports.follow_up'
+      )
+    `);
+  }
+}

api-v3/src/database/migrations/1790046000000-phase-f4-document-numbering.ts

@@ -0,0 +1,144 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class PhaseF4DocumentNumbering1790046000000 implements MigrationInterface {
+  name = 'PhaseF4DocumentNumbering1790046000000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      DO $$
+      BEGIN
+        IF EXISTS (SELECT 1 FROM inspection_acts WHERE act_number > 99999) THEN
+          RAISE EXCEPTION 'F4 numbering requires inspection act numbers <= 99999';
+        END IF;
+        IF EXISTS (
+          SELECT 1
+          FROM inspection_visits
+          WHERE code ~ '^INS-[0-9]{4}-[0-9]{6}$'
+            AND RIGHT(code, 6)::integer > 99999
+        ) THEN
+          RAISE EXCEPTION 'F4 numbering requires inspection visit numbers <= 99999';
+        END IF;
+      END $$
+    `);
+
+    await queryRunner.query(`
+      UPDATE inspection_visits
+      SET code = 'INSP-'
+          || LPAD(RIGHT(code, 6)::integer::text, 5, '0')
+          || '-'
+          || TO_CHAR(
+            COALESCE(planned_start_at, created_at) AT TIME ZONE 'America/Argentina/Mendoza',
+            'DD-MM-YY'
+          ),
+          title = CASE
+            WHEN title = inspection_visits.code THEN 'INSP-'
+              || LPAD(RIGHT(inspection_visits.code, 6)::integer::text, 5, '0')
+              || '-'
+              || TO_CHAR(
+                COALESCE(planned_start_at, created_at) AT TIME ZONE 'America/Argentina/Mendoza',
+                'DD-MM-YY'
+              )
+            ELSE title
+          END
+      WHERE code ~ '^INS-[0-9]{4}-[0-9]{6}$'
+    `);
+
+    await queryRunner.query(`
+      UPDATE inspection_acts
+      SET code = 'ACT-'
+        || LPAD(act_number::text, 5, '0')
+        || '-'
+        || TO_CHAR(occurred_at AT TIME ZONE 'America/Argentina/Mendoza', 'DD-MM-YY')
+    `);
+
+    await queryRunner.query(`DROP INDEX IF EXISTS uq_inspection_reports_year_number`);
+    await queryRunner.query(`
+      UPDATE inspection_reports report
+      SET report_year = act.act_year,
+          report_number = act.act_number,
+          code = 'INF-'
+            || LPAD(act.act_number::text, 5, '0')
+            || '-'
+            || TO_CHAR(act.occurred_at AT TIME ZONE 'America/Argentina/Mendoza', 'DD-MM-YY')
+      FROM inspection_acts act
+      WHERE act.id = report.act_id
+    `);
+    await queryRunner.query(`
+      CREATE UNIQUE INDEX uq_inspection_reports_year_number
+      ON inspection_reports(report_year, report_number)
+    `);
+
+    await queryRunner.query(`
+      CREATE OR REPLACE FUNCTION dhv2_f4_set_act_code()
+      RETURNS trigger
+      LANGUAGE plpgsql
+      AS $$
+      BEGIN
+        IF NEW.act_number > 99999 THEN
+          RAISE EXCEPTION 'Inspection Act sequence exhausted for F4 institutional format';
+        END IF;
+        NEW.code := 'ACT-'
+          || LPAD(NEW.act_number::text, 5, '0')
+          || '-'
+          || TO_CHAR(NEW.occurred_at AT TIME ZONE 'America/Argentina/Mendoza', 'DD-MM-YY');
+        RETURN NEW;
+      END;
+      $$
+    `);
+    await queryRunner.query(`
+      DROP TRIGGER IF EXISTS trg_dhv2_f4_set_act_code ON inspection_acts
+    `);
+    await queryRunner.query(`
+      CREATE TRIGGER trg_dhv2_f4_set_act_code
+      BEFORE INSERT OR UPDATE OF act_number, occurred_at
+      ON inspection_acts
+      FOR EACH ROW
+      EXECUTE FUNCTION dhv2_f4_set_act_code()
+    `);
+
+    await queryRunner.query(`
+      CREATE OR REPLACE FUNCTION dhv2_f4_set_report_code()
+      RETURNS trigger
+      LANGUAGE plpgsql
+      AS $$
+      DECLARE
+        source_act inspection_acts%ROWTYPE;
+      BEGIN
+        SELECT * INTO source_act
+        FROM inspection_acts
+        WHERE id = NEW.act_id;
+        IF NOT FOUND THEN
+          RAISE EXCEPTION 'Inspection Act not found for report %', NEW.act_id;
+        END IF;
+        IF source_act.act_number > 99999 THEN
+          RAISE EXCEPTION 'Inspection Report sequence exhausted for F4 institutional format';
+        END IF;
+        NEW.report_year := source_act.act_year;
+        NEW.report_number := source_act.act_number;
+        NEW.code := 'INF-'
+          || LPAD(source_act.act_number::text, 5, '0')
+          || '-'
+          || TO_CHAR(source_act.occurred_at AT TIME ZONE 'America/Argentina/Mendoza', 'DD-MM-YY');
+        RETURN NEW;
+      END;
+      $$
+    `);
+    await queryRunner.query(`
+      DROP TRIGGER IF EXISTS trg_dhv2_f4_set_report_code ON inspection_reports
+    `);
+    await queryRunner.query(`
+      CREATE TRIGGER trg_dhv2_f4_set_report_code
+      BEFORE INSERT OR UPDATE OF act_id
+      ON inspection_reports
+      FOR EACH ROW
+      EXECUTE FUNCTION dhv2_f4_set_report_code()
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP TRIGGER IF EXISTS trg_dhv2_f4_set_report_code ON inspection_reports`);
+    await queryRunner.query(`DROP FUNCTION IF EXISTS dhv2_f4_set_report_code()`);
+    await queryRunner.query(`DROP TRIGGER IF EXISTS trg_dhv2_f4_set_act_code ON inspection_acts`);
+    await queryRunner.query(`DROP FUNCTION IF EXISTS dhv2_f4_set_act_code()`);
+  }
+}

api-v3/src/database/migrations/1790049600000-phase-f4-smtp-superadmin.ts

@@ -0,0 +1,87 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class PhaseF4SmtpSuperadmin1790049600000 implements MigrationInterface {
+  name = 'PhaseF4SmtpSuperadmin1790049600000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      CREATE TABLE smtp_settings (
+        id smallint PRIMARY KEY,
+        enabled boolean NOT NULL DEFAULT false,
+        host varchar(255),
+        port integer,
+        security_mode varchar(20),
+        username varchar(255),
+        password_encrypted text,
+        from_name varchar(160),
+        from_email varchar(255),
+        reply_to varchar(255),
+        updated_by uuid,
+        created_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        updated_at timestamptz NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        CONSTRAINT chk_smtp_settings_singleton CHECK (id = 1),
+        CONSTRAINT chk_smtp_settings_port CHECK (port IS NULL OR port BETWEEN 1 AND 65535),
+        CONSTRAINT chk_smtp_settings_security CHECK (
+          security_mode IS NULL OR security_mode IN ('TLS','STARTTLS')
+        ),
+        CONSTRAINT fk_smtp_settings_updated_by
+          FOREIGN KEY (updated_by) REFERENCES users(id) ON DELETE SET NULL
+      )
+    `);
+    await queryRunner.query(`
+      INSERT INTO smtp_settings (id, enabled)
+      VALUES (1, false)
+    `);
+    await queryRunner.query(`
+      INSERT INTO permissions (code, description)
+      VALUES ('system_mail.manage', 'Configurar la salida SMTP del sistema y probar el transporte')
+      ON CONFLICT (code) DO UPDATE SET description = EXCLUDED.description
+    `);
+    await queryRunner.query(`
+      INSERT INTO role_permissions (role_id, permission_id)
+      SELECT role.id, permission.id
+      FROM roles role
+      CROSS JOIN permissions permission
+      WHERE role.code = 'admin'
+        AND permission.code = 'system_mail.manage'
+      ON CONFLICT DO NOTHING
+    `);
+
+    await queryRunner.query(`
+      UPDATE inspection_document_deliveries delivery
+      SET recipient_kind = 'INSPECTOR',
+          recipient_user_id = visit.lead_inspector_user_id,
+          recipient_key = visit.lead_inspector_user_id,
+          recipient_email = inspector.email,
+          status = CASE WHEN inspector.email IS NULL THEN 'WAITING_RECIPIENT' ELSE 'PENDING' END,
+          last_error = NULL,
+          updated_at = CURRENT_TIMESTAMP
+      FROM inspection_acts act
+      INNER JOIN inspection_visits visit ON visit.id = act.visit_id
+      INNER JOIN users inspector ON inspector.id = visit.lead_inspector_user_id
+      WHERE delivery.act_id = act.id
+        AND delivery.document_kind = 'REPORT_WORD'
+        AND delivery.recipient_kind = 'DIRECTOR'
+        AND delivery.status <> 'SENT'
+        AND NOT EXISTS (
+          SELECT 1
+          FROM inspection_document_deliveries existing
+          WHERE existing.act_id = delivery.act_id
+            AND existing.document_kind = 'REPORT_WORD'
+            AND existing.recipient_kind = 'INSPECTOR'
+            AND existing.recipient_key = visit.lead_inspector_user_id
+        )
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      DELETE FROM role_permissions
+      WHERE permission_id IN (
+        SELECT id FROM permissions WHERE code = 'system_mail.manage'
+      )
+    `);
+    await queryRunner.query(`DELETE FROM permissions WHERE code = 'system_mail.manage'`);
+    await queryRunner.query(`DROP TABLE IF EXISTS smtp_settings`);
+  }
+}

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

@@ -0,0 +1,28 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class PhaseF4RemoveSurveySubsystem1790053200000 implements MigrationInterface {
+  name = 'PhaseF4RemoveSurveySubsystem1790053200000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      DELETE FROM role_permissions
+      WHERE permission_id IN (
+        SELECT id FROM permissions WHERE code LIKE 'surveys.%'
+      )
+    `);
+    await queryRunner.query(`
+      DELETE FROM permissions WHERE code LIKE 'surveys.%'
+    `);
+
+    await queryRunner.query(`DROP TABLE IF EXISTS survey_target_report_media`);
+    await queryRunner.query(`DROP TABLE IF EXISTS survey_target_report_versions`);
+    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> {
+    // Intentionally irreversible: historical migrations still document the old
+    // Survey schema, but restoring dropped campaign/report data would be unsafe.
+  }
+}

api-v3/src/database/migrations/1790056800000-phase-f4-sealed-acts.ts

@@ -0,0 +1,43 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class PhaseF4SealedActs1790056800000 implements MigrationInterface {
+  name = 'PhaseF4SealedActs1790056800000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      UPDATE inspection_acts
+      SET sealed_at = COALESCE(closed_at, updated_at, CURRENT_TIMESTAMP),
+          sealed_by = closed_by
+      WHERE status = 'CLOSED'
+        AND sealed_at IS NULL
+    `);
+    await queryRunner.query(`
+      CREATE OR REPLACE FUNCTION dhv2_f4_stamp_act_seal()
+      RETURNS trigger
+      LANGUAGE plpgsql
+      AS $$
+      BEGIN
+        IF NEW.status = 'CLOSED' AND OLD.status IS DISTINCT FROM 'CLOSED' THEN
+          NEW.sealed_at := COALESCE(NEW.closed_at, CURRENT_TIMESTAMP);
+          NEW.sealed_by := NEW.closed_by;
+        END IF;
+        RETURN NEW;
+      END;
+      $$
+    `);
+    await queryRunner.query(`
+      DROP TRIGGER IF EXISTS trg_dhv2_f4_stamp_act_seal ON inspection_acts
+    `);
+    await queryRunner.query(`
+      CREATE TRIGGER trg_dhv2_f4_stamp_act_seal
+      BEFORE UPDATE OF status ON inspection_acts
+      FOR EACH ROW
+      EXECUTE FUNCTION dhv2_f4_stamp_act_seal()
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP TRIGGER IF EXISTS trg_dhv2_f4_stamp_act_seal ON inspection_acts`);
+    await queryRunner.query(`DROP FUNCTION IF EXISTS dhv2_f4_stamp_act_seal()`);
+  }
+}

api-v3/src/inspection-closing/dto/lock-inspection-act.dto.ts

@@ -0,0 +1,7 @@
+import { IsEnum } from 'class-validator';
+import { InspectionActUrgency } from '../../database/entities';
+
+export class LockInspectionActDto {
+  @IsEnum(InspectionActUrgency)
+  urgency!: InspectionActUrgency;
+}

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

@@ -0,0 +1,22 @@
+import { Body, Controller, 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 { LockInspectionActDto } from './dto/lock-inspection-act.dto';
+import { InspectionActLifecycleService } from './inspection-act-lifecycle.service';
+
+@Controller('inspection-acts/:actId')
+export class InspectionActLifecycleController {
+  constructor(private readonly lifecycle: InspectionActLifecycleService) {}
+
+  @Post('lock')
+  @RequirePermissions('inspection_closure.prepare')
+  lock(
+    @Param('actId', new ParseUUIDPipe({ version: '4' })) actId: string,
+    @Body() dto: LockInspectionActDto,
+    @CurrentAuth() principal: AuthPrincipal,
+    @Req() request: RequestWithContext,
+  ) {
+    return this.lifecycle.lock(actId, dto, principal, request);
+  }
+}

api-v3/src/inspection-closing/inspection-act-lifecycle.service.ts

@@ -0,0 +1,509 @@
+import {
+  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,
+  InspectionActStatus,
+  InspectionActVersionEvent,
+  InspectionVisitStatus,
+} from '../database/entities';
+import { InspectionDeadlinesService } from '../inspection-deadlines/inspection-deadlines.service';
+import { assertMobileInspector } from '../inspection-operations/mobile-inspector-policy';
+import { sha256CanonicalJson } from './canonical-json';
+import type { LockInspectionActDto } from './dto/lock-inspection-act.dto';
+
+const CLOSURE_SCHEMA_VERSION = 'DH-ACT-CLOSURE-V2';
+
+interface LockContext {
+  id: string;
+  code: string;
+  visitId: string;
+  status: InspectionActStatus;
+  occurredAt: Date;
+  currentVersion: number;
+  visitStatus: InspectionVisitStatus;
+  leadInspectorUserId: string;
+}
+
+@Injectable()
+export class InspectionActLifecycleService {
+  constructor(
+    private readonly dataSource: DataSource,
+    private readonly audit: AuditService,
+    private readonly deadlines: InspectionDeadlinesService,
+  ) {}
+
+  async lock(
+    actId: string,
+    dto: LockInspectionActDto,
+    principal: AuthPrincipal,
+    request: RequestWithContext,
+  ) {
+    assertMobileInspector(principal);
+    return this.dataSource.transaction(async (manager) => {
+      const context = await this.lockContext(manager, actId);
+      if (context.status !== InspectionActStatus.DRAFT) {
+        throw new ConflictException({
+          code: 'INSPECTION_ACT_NOT_DRAFT',
+          message: 'Sólo puede finalizarse y bloquearse un Acta que esté en borrador',
+        });
+      }
+      if (context.visitStatus !== InspectionVisitStatus.IN_PROGRESS) {
+        throw new ConflictException({
+          code: 'INSPECTION_VISIT_NOT_IN_PROGRESS',
+          message: 'El Acta sólo puede bloquearse durante una inspección en curso',
+        });
+      }
+      await this.assertActorAssigned(manager, context, principal);
+      await this.requireResponsible(manager, actId);
+      await this.requireVerificationResults(manager, context.visitId);
+
+      const [signatureCount] = (await manager.query(`
+        SELECT COUNT(*)::integer AS total
+        FROM inspection_act_signatures
+        WHERE act_id = $1
+      `, [actId])) as Array<{ total: number }>;
+      if (Number(signatureCount?.total ?? 0) > 0) {
+        throw new ConflictException({
+          code: 'INSPECTION_ACT_ALREADY_SIGNED',
+          message: 'El Acta ya tiene una manifestación de firma y no puede volver a bloquearse',
+        });
+      }
+
+      const deadline = await this.deadlines.snapshotForLock(
+        manager,
+        dto.urgency,
+        new Date(context.occurredAt),
+      );
+      const lockedAt = new Date();
+      const [updated] = (await manager.query(`
+        UPDATE inspection_acts
+        SET status = 'READY',
+            urgency = $2,
+            deadline_days = $3,
+            deadline_day_type = $4,
+            deadline_basis = $5,
+            deadline_base_on = $6::date,
+            deadline_due_on = $7::date,
+            deadline_policy_snapshot = $8::jsonb,
+            locked_at = $9,
+            locked_by = $10,
+            current_version = current_version + 1,
+            updated_by = $10,
+            updated_at = CURRENT_TIMESTAMP
+        WHERE id = $1
+        RETURNING current_version AS "versionNumber"
+      `, [
+        actId,
+        dto.urgency,
+        deadline.snapshot.days,
+        deadline.snapshot.dayType,
+        deadline.snapshot.basis,
+        deadline.baseOn,
+        deadline.dueOn,
+        deadline.snapshot,
+        lockedAt,
+        principal.userId,
+      ])) as Array<{ versionNumber: number }>;
+
+      const preparedSnapshot = await this.buildPreparedSnapshot(manager, actId, lockedAt);
+      const preparedSha256 = sha256CanonicalJson(preparedSnapshot);
+      await manager.query(`
+        UPDATE inspection_acts
+        SET locked_sha256 = $2
+        WHERE id = $1
+      `, [actId, preparedSha256]);
+      await manager.query(`
+        INSERT INTO inspection_act_closures (
+          act_id, schema_version, prepared_snapshot, prepared_sha256,
+          prepared_at, prepared_by
+        ) VALUES ($1, $2, $3, $4, $5, $6)
+        ON CONFLICT (act_id) DO UPDATE SET
+          schema_version = EXCLUDED.schema_version,
+          prepared_snapshot = EXCLUDED.prepared_snapshot,
+          prepared_sha256 = EXCLUDED.prepared_sha256,
+          prepared_at = EXCLUDED.prepared_at,
+          prepared_by = EXCLUDED.prepared_by
+      `, [
+        actId,
+        CLOSURE_SCHEMA_VERSION,
+        preparedSnapshot,
+        preparedSha256,
+        lockedAt,
+        principal.userId,
+      ]);
+      await manager.query(`
+        INSERT INTO inspection_act_versions (
+          act_id, version_number, event, snapshot, actor_user_id, actor_username
+        ) VALUES ($1, $2, $3, $4, $5, $6)
+      `, [
+        actId,
+        Number(updated.versionNumber),
+        InspectionActVersionEvent.READY,
+        preparedSnapshot,
+        principal.userId,
+        principal.username,
+      ]);
+      await this.audit.record({
+        ...administrationAuditContext(principal, request),
+        action: AuditAction.INSPECTION_ACT_READY,
+        entityType: 'inspection_act',
+        entityId: actId,
+        afterData: {
+          status: 'LOCKED_PENDING_SIGNATURE',
+          physicalStatus: InspectionActStatus.READY,
+          urgency: dto.urgency,
+          deadlineDays: deadline.snapshot.days,
+          deadlineDayType: deadline.snapshot.dayType,
+          deadlineBasis: deadline.snapshot.basis,
+          deadlineBaseOn: deadline.baseOn,
+          deadlineDueOn: deadline.dueOn,
+          lockedAt: lockedAt.toISOString(),
+          preparedSha256,
+        },
+        metadata: {
+          actId,
+          visitId: context.visitId,
+          versionNumber: Number(updated.versionNumber),
+          immutable: true,
+        },
+      }, manager);
+
+      return {
+        id: actId,
+        code: context.code,
+        status: 'LOCKED_PENDING_SIGNATURE' as const,
+        physicalStatus: InspectionActStatus.READY,
+        urgency: dto.urgency,
+        deadline: {
+          days: deadline.snapshot.days,
+          dayType: deadline.snapshot.dayType,
+          basis: deadline.snapshot.basis,
+          baseOn: deadline.baseOn,
+          dueOn: deadline.dueOn,
+        },
+        lockedAt,
+        preparedSha256,
+        currentVersion: Number(updated.versionNumber),
+      };
+    });
+  }
+
+  private async lockContext(manager: EntityManager, actId: string): Promise<LockContext> {
+    const [row] = (await manager.query(`
+      SELECT
+        act.id,
+        act.code,
+        act.visit_id AS "visitId",
+        act.status,
+        act.occurred_at AS "occurredAt",
+        act.current_version AS "currentVersion",
+        visit.status AS "visitStatus",
+        visit.lead_inspector_user_id AS "leadInspectorUserId"
+      FROM inspection_acts act
+      INNER JOIN inspection_visits visit ON visit.id = act.visit_id
+      WHERE act.id = $1
+      FOR UPDATE OF act, visit
+    `, [actId])) as LockContext[];
+    if (!row) {
+      throw new NotFoundException({
+        code: 'INSPECTION_ACT_NOT_FOUND',
+        message: 'Acta de inspección no encontrada',
+      });
+    }
+    return row;
+  }
+
+  private async assertActorAssigned(
+    manager: EntityManager,
+    context: LockContext,
+    principal: AuthPrincipal,
+  ): Promise<void> {
+    if (context.leadInspectorUserId === principal.userId) return;
+    const [membership] = (await manager.query(`
+      SELECT 1 AS found
+      FROM inspection_visit_members
+      WHERE visit_id = $1
+        AND user_id = $2
+        AND included = true
+      LIMIT 1
+    `, [context.visitId, principal.userId])) as Array<{ found: number }>;
+    if (!membership) {
+      throw new ForbiddenException({
+        code: 'INSPECTION_ACT_ACTOR_NOT_ASSIGNED',
+        message: 'Sólo un inspector asignado a la inspección puede finalizar el Acta',
+      });
+    }
+  }
+
+  private async requireResponsible(manager: EntityManager, actId: string): Promise<void> {
+    const [row] = (await manager.query(`
+      SELECT act_id
+      FROM inspection_act_responsibles
+      WHERE act_id = $1
+    `, [actId])) as Array<{ act_id: string }>;
+    if (!row) {
+      throw new ConflictException({
+        code: 'INSPECTION_ACT_RESPONSIBLE_REQUIRED',
+        message: 'Antes de finalizar el Acta debe identificarse al responsable de la empresa o documentar su ausencia',
+      });
+    }
+  }
+
+  private async requireVerificationResults(manager: EntityManager, visitId: string): Promise<void> {
+    const [verification] = (await manager.query(`
+      SELECT
+        COUNT(*)::integer AS total,
+        COUNT(*) FILTER (WHERE outcome IS NOT NULL)::integer AS completed
+      FROM inspection_finding_verification_visits
+      WHERE visit_id = $1
+    `, [visitId])) as Array<{ total: number; completed: number }>;
+    const total = Number(verification?.total ?? 0);
+    const completed = Number(verification?.completed ?? 0);
+    if (total > 0 && completed !== total) {
+      throw new ConflictException({
+        code: 'INSPECTION_VERIFICATION_RESULTS_REQUIRED',
+        message: 'Registrá el resultado de todas las verificaciones antes de finalizar el Acta',
+      });
+    }
+  }
+
+  private async buildPreparedSnapshot(
+    manager: EntityManager,
+    actId: string,
+    preparedAt: Date,
+  ): Promise<Record<string, unknown>> {
+    const [act] = (await manager.query(`
+      SELECT
+        act.id,
+        act.code,
+        act.act_year AS "actYear",
+        act.act_number AS "actNumber",
+        act.status,
+        act.occurred_at AS "occurredAt",
+        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_on AS "deadlineBaseOn",
+        act.deadline_due_on AS "deadlineDueOn",
+        act.deadline_policy_snapshot AS "deadlinePolicySnapshot",
+        act.locked_at AS "lockedAt",
+        act.current_version AS "currentVersion",
+        act.created_at AS "createdAt",
+        act.updated_at AS "updatedAt",
+        JSONB_BUILD_OBJECT(
+          'id', visit.id,
+          'code', visit.code,
+          'title', visit.title,
+          'objective', visit.objective,
+          'status', visit.status,
+          'scopeAssetId', visit.scope_asset_id,
+          'leadInspectorUserId', visit.lead_inspector_user_id,
+          'plannedStartAt', visit.planned_start_at,
+          'plannedEndAt', visit.planned_end_at,
+          'actualStartedAt', visit.actual_started_at,
+          'instructions', visit.instructions
+        ) AS visit
+      FROM inspection_acts act
+      INNER JOIN inspection_visits visit ON visit.id = act.visit_id
+      WHERE act.id = $1
+    `, [actId])) as Array<Record<string, unknown>>;
+    if (!act) {
+      throw new NotFoundException({
+        code: 'INSPECTION_ACT_NOT_FOUND',
+        message: 'Acta de inspección no encontrada',
+      });
+    }
+    const [responsible] = (await manager.query(`
+      SELECT
+        act_id AS "actId",
+        attendance_status AS "attendanceStatus",
+        full_name AS "fullName",
+        document_type AS "documentType",
+        document_number AS "documentNumber",
+        position,
+        email,
+        phone,
+        absence_reason AS "absenceReason",
+        updated_by AS "updatedBy",
+        created_at AS "createdAt",
+        updated_at AS "updatedAt"
+      FROM inspection_act_responsibles
+      WHERE act_id = $1
+    `, [actId])) as Array<Record<string, unknown>>;
+    const team = await manager.query(`
+      SELECT
+        member.user_id AS "userId",
+        user_account.username,
+        user_account.first_name AS "firstName",
+        user_account.last_name AS "lastName",
+        user_account.email,
+        (visit.lead_inspector_user_id = member.user_id) AS "isLead"
+      FROM inspection_visit_members member
+      INNER JOIN inspection_visits visit ON visit.id = member.visit_id
+      INNER JOIN users user_account ON user_account.id = member.user_id
+      WHERE member.visit_id = $1 AND member.included = true
+      ORDER BY "isLead" DESC, user_account.username, member.user_id
+    `, [(act.visit as { id: string }).id]) as Array<Record<string, unknown>>;
+    const assets = await manager.query(`
+      SELECT
+        asset.id,
+        asset.code,
+        asset.name,
+        asset.common_name AS "commonName",
+        asset.description,
+        asset.parent_id AS "parentId",
+        CASE WHEN company.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
+          'id', company.id,
+          'code', company.code,
+          'name', company.name,
+          'commonName', company.common_name
+        ) END AS "operatorCompany",
+        CASE WHEN area.id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
+          'id', area.id,
+          'code', area.code,
+          'name', area.name,
+          'commonName', area.common_name
+        ) END AS "operationalArea",
+        asset.information_status AS "informationStatus",
+        asset.current_version AS "currentVersion",
+        asset.data_origin AS "dataOrigin",
+        asset.source_name AS "sourceName",
+        asset.source_reference AS "sourceReference",
+        asset.source_observed_at AS "sourceObservedAt",
+        asset_type.id AS "typeId",
+        asset_type.code AS "typeCode",
+        asset_type.name AS "typeName",
+        COALESCE((
+          SELECT JSONB_AGG(JSONB_BUILD_OBJECT(
+            'definitionId', definition.id,
+            'code', definition.code,
+            'name', definition.name,
+            'dataType', definition.data_type,
+            'value', attribute_value.value
+          ) ORDER BY definition.sort_order, definition.code, definition.id)
+          FROM asset_attribute_values attribute_value
+          INNER JOIN asset_attribute_definitions definition
+            ON definition.id = attribute_value.definition_id
+          WHERE attribute_value.asset_id = asset.id
+        ), '[]'::jsonb) AS attributes,
+        CASE WHEN geometry.asset_id IS NULL THEN NULL ELSE JSONB_BUILD_OBJECT(
+          'type', geometry.geometry_type,
+          'geojson', ST_AsGeoJSON(geometry.geometry)::jsonb,
+          'source', geometry.source,
+          'accuracyM', geometry.accuracy_m,
+          'capturedAt', geometry.captured_at,
+          'deviceLabel', geometry.device_label
+        ) END AS geometry
+      FROM inspection_act_assets link
+      INNER JOIN assets asset ON asset.id = link.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
+      LEFT JOIN asset_geometries geometry ON geometry.asset_id = asset.id
+      WHERE link.act_id = $1 AND link.included = true
+      ORDER BY asset.code, asset.id
+    `, [actId]) as Array<Record<string, unknown>>;
+    const findings = await manager.query(`
+      SELECT
+        finding.id,
+        finding.finding_number AS "findingNumber",
+        finding.code,
+        finding.status,
+        finding.asset_id AS "assetId",
+        finding.catalog_item_id AS "catalogItemId",
+        finding.title,
+        finding.description,
+        finding.legal_basis AS "legalBasis",
+        finding.glossary,
+        finding.catalog_revision AS "catalogRevision",
+        finding.suggested_severity AS "suggestedSeverity",
+        finding.severity,
+        finding.is_recurrence AS "isRecurrence",
+        finding.antecedent_finding_id AS "antecedentFindingId",
+        finding.correction_due_on AS "correctionDueOn",
+        finding.next_control_on AS "nextControlOn",
+        finding.current_version AS "currentVersion",
+        JSONB_BUILD_OBJECT(
+          'code', catalog.code,
+          'sourceNumber', catalog.source_number,
+          'title', catalog.title,
+          'revision', catalog.revision,
+          'suggestedSeverity', finding.suggested_severity,
+          'categoryCode', category.code,
+          'categoryName', category.name
+        ) AS catalog,
+        COALESCE((
+          SELECT JSONB_AGG(JSONB_BUILD_OBJECT(
+            'id', evidence.id,
+            'communicationId', evidence.communication_id,
+            'kind', evidence.kind,
+            'purpose', evidence.purpose,
+            'originalName', evidence.original_name,
+            'mimeType', evidence.mime_type,
+            'sizeBytes', evidence.size_bytes,
+            'sha256', evidence.sha256,
+            'title', evidence.title,
+            'description', evidence.description,
+            'capturedAt', evidence.captured_at,
+            'latitude', evidence.latitude,
+            'longitude', evidence.longitude,
+            'accuracyM', evidence.accuracy_m,
+            'deviceLabel', evidence.device_label,
+            'source', evidence.source,
+            'uploadedBy', evidence.uploaded_by,
+            'createdAt', evidence.created_at
+          ) ORDER BY evidence.created_at, evidence.id)
+          FROM inspection_finding_evidence evidence
+          WHERE evidence.finding_id = finding.id
+        ), '[]'::jsonb) AS evidence
+      FROM inspection_findings finding
+      LEFT JOIN finding_catalog_items catalog ON catalog.id = finding.catalog_item_id
+      LEFT JOIN finding_categories category ON category.id = catalog.category_id
+      WHERE finding.act_id = $1 AND finding.status <> 'VOIDED'
+      ORDER BY finding.finding_number, finding.id
+    `, [actId]) as Array<Record<string, unknown>>;
+    const verificationResults = await manager.query(`
+      SELECT
+        verification_link.finding_id AS "findingId",
+        finding.code AS "findingCode",
+        finding.title AS "findingTitle",
+        finding.description AS "findingDescription",
+        finding.asset_id AS "assetId",
+        asset.code AS "assetCode",
+        asset.name AS "assetName",
+        verification_link.target_control_on AS "targetControlOn",
+        verification_link.outcome,
+        verification_link.result_notes AS "resultNotes",
+        verification_link.verified_at AS "verifiedAt",
+        verification_link.result_recorded_at AS "resultRecordedAt",
+        verification_link.rescheduled_control_on AS "rescheduledControlOn"
+      FROM inspection_finding_verification_visits verification_link
+      INNER JOIN inspection_findings finding ON finding.id = verification_link.finding_id
+      INNER JOIN assets asset ON asset.id = finding.asset_id
+      WHERE verification_link.visit_id = $1
+      ORDER BY finding.code
+    `, [(act.visit as { id: string }).id]) as Array<Record<string, unknown>>;
+    return {
+      schemaVersion: CLOSURE_SCHEMA_VERSION,
+      preparedAt: preparedAt.toISOString(),
+      act,
+      responsible: responsible ?? null,
+      team,
+      assets,
+      findings,
+      verificationResults,
+    };
+  }
+}

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

@@ -48,26 +48,6 @@ export class InspectionClosingController {
     return this.closing.upsertResponsible(actId, dto, principal, request);
   }
 
-  @Post('ready')
-  @RequirePermissions('inspection_closure.prepare')
-  ready(
-    @Param('actId', new ParseUUIDPipe({ version: '4' })) actId: string,
-    @CurrentAuth() principal: AuthPrincipal,
-    @Req() request: RequestWithContext,
-  ) {
-    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', {

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

@@ -1,6 +1,9 @@
 import { Module } from '@nestjs/common';
 import { AuditModule } from '../audit/audit.module';
+import { InspectionDeadlinesModule } from '../inspection-deadlines/inspection-deadlines.module';
 import { InspectionReportsModule } from '../inspection-reports/inspection-reports.module';
+import { InspectionActLifecycleController } from './inspection-act-lifecycle.controller';
+import { InspectionActLifecycleService } from './inspection-act-lifecycle.service';
 import {
   InspectionClosingController,
   InspectionSignatureContentController,
@@ -8,8 +11,12 @@ import {
 import { InspectionClosingService } from './inspection-closing.service';
 
 @Module({
-  imports: [AuditModule, InspectionReportsModule],
+  imports: [AuditModule, InspectionDeadlinesModule, InspectionReportsModule],
-  controllers: [InspectionClosingController, InspectionSignatureContentController],
+  controllers: [
-  providers: [InspectionClosingService],
+    InspectionActLifecycleController,
+    InspectionClosingController,
+    InspectionSignatureContentController,
+  ],
+  providers: [InspectionActLifecycleService, InspectionClosingService],
 })
 export class InspectionClosingModule {}

api-v3/src/inspection-deadlines/dto/update-inspection-deadline-policy.dto.ts

@@ -0,0 +1,14 @@
+import { Transform } from 'class-transformer';
+import { IsEnum, IsInt, Max, Min } from 'class-validator';
+import { InspectionDeadlineDayType } from '../../database/entities';
+
+export class UpdateInspectionDeadlinePolicyDto {
+  @Transform(({ value }) => Number(value))
+  @IsInt()
+  @Min(1)
+  @Max(365)
+  days!: number;
+
+  @IsEnum(InspectionDeadlineDayType)
+  dayType!: InspectionDeadlineDayType;
+}

api-v3/src/inspection-deadlines/dto/upsert-inspection-non-working-day.dto.ts

@@ -0,0 +1,18 @@
+import { Transform } from 'class-transformer';
+import { IsBoolean, IsOptional, IsString, Matches, MaxLength, MinLength } from 'class-validator';
+
+export class UpsertInspectionNonWorkingDayDto {
+  @Matches(/^\d{4}-\d{2}-\d{2}$/)
+  day!: string;
+
+  @Transform(({ value }) => (typeof value === 'string' ? value.trim() : value))
+  @IsString()
+  @MinLength(2)
+  @MaxLength(200)
+  label!: string;
+
+  @IsOptional()
+  @Transform(({ value }) => value === true || value === 'true')
+  @IsBoolean()
+  enabled?: boolean;
+}

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

@@ -0,0 +1,46 @@
+import { Body, Controller, Get, Param, ParseEnumPipe, 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 { InspectionActUrgency } from '../database/entities';
+import { UpdateInspectionDeadlinePolicyDto } from './dto/update-inspection-deadline-policy.dto';
+import { UpsertInspectionNonWorkingDayDto } from './dto/upsert-inspection-non-working-day.dto';
+import { InspectionDeadlinesService } from './inspection-deadlines.service';
+
+@Controller('inspection-deadlines')
+export class InspectionDeadlinesController {
+  constructor(private readonly deadlines: InspectionDeadlinesService) {}
+
+  @Get('policies')
+  @RequirePermissions('inspection_deadlines.manage')
+  policies() {
+    return this.deadlines.listPolicies();
+  }
+
+  @Post('policies/:urgency')
+  @RequirePermissions('inspection_deadlines.manage')
+  updatePolicy(
+    @Param('urgency', new ParseEnumPipe(InspectionActUrgency)) urgency: InspectionActUrgency,
+    @Body() dto: UpdateInspectionDeadlinePolicyDto,
+    @CurrentAuth() principal: AuthPrincipal,
+    @Req() request: RequestWithContext,
+  ) {
+    return this.deadlines.updatePolicy(urgency, dto, principal, request);
+  }
+
+  @Get('non-working-days')
+  @RequirePermissions('inspection_deadlines.manage')
+  nonWorkingDays(@Query('year') year?: string) {
+    return this.deadlines.listNonWorkingDays(year);
+  }
+
+  @Post('non-working-days')
+  @RequirePermissions('inspection_deadlines.manage')
+  upsertNonWorkingDay(
+    @Body() dto: UpsertInspectionNonWorkingDayDto,
+    @CurrentAuth() principal: AuthPrincipal,
+    @Req() request: RequestWithContext,
+  ) {
+    return this.deadlines.upsertNonWorkingDay(dto, principal, request);
+  }
+}

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

@@ -0,0 +1,12 @@
+import { Module } from '@nestjs/common';
+import { AuditModule } from '../audit/audit.module';
+import { InspectionDeadlinesController } from './inspection-deadlines.controller';
+import { InspectionDeadlinesService } from './inspection-deadlines.service';
+
+@Module({
+  imports: [AuditModule],
+  controllers: [InspectionDeadlinesController],
+  providers: [InspectionDeadlinesService],
+  exports: [InspectionDeadlinesService],
+})
+export class InspectionDeadlinesModule {}

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

@@ -0,0 +1,302 @@
+import { BadRequestException, 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 {
+  InspectionActUrgency,
+  InspectionDeadlineBasis,
+  InspectionDeadlineDayType,
+  InspectionDeadlinePolicy,
+  InspectionNonWorkingDay,
+} from '../database/entities';
+import type { UpdateInspectionDeadlinePolicyDto } from './dto/update-inspection-deadline-policy.dto';
+import type { UpsertInspectionNonWorkingDayDto } from './dto/upsert-inspection-non-working-day.dto';
+
+export interface InspectionDeadlineSnapshot {
+  urgency: InspectionActUrgency;
+  days: number;
+  dayType: InspectionDeadlineDayType;
+  basis: InspectionDeadlineBasis;
+  capturedAt: string;
+}
+
+export interface InspectionDeadlineLockResult {
+  snapshot: InspectionDeadlineSnapshot;
+  baseOn: string | null;
+  dueOn: string | null;
+}
+
+@Injectable()
+export class InspectionDeadlinesService {
+  constructor(
+    private readonly dataSource: DataSource,
+    private readonly audit: AuditService,
+  ) {}
+
+  async listPolicies() {
+    const data = await this.dataSource.getRepository(InspectionDeadlinePolicy).find({
+      order: { urgency: 'ASC' },
+    });
+    return { data };
+  }
+
+  async updatePolicy(
+    urgency: InspectionActUrgency,
+    dto: UpdateInspectionDeadlinePolicyDto,
+    principal: AuthPrincipal,
+    request: RequestWithContext,
+  ) {
+    return this.dataSource.transaction(async (manager) => {
+      const repository = manager.getRepository(InspectionDeadlinePolicy);
+      const policy = await repository.findOne({ where: { urgency } });
+      if (!policy) {
+        throw new NotFoundException({
+          code: 'INSPECTION_DEADLINE_POLICY_NOT_FOUND',
+          message: 'No se encontró la política de plazo solicitada',
+        });
+      }
+      const before = {
+        urgency: policy.urgency,
+        days: policy.days,
+        dayType: policy.dayType,
+        basis: policy.basis,
+      };
+      policy.days = dto.days;
+      policy.dayType = dto.dayType;
+      policy.updatedBy = principal.userId;
+      await repository.save(policy);
+      const after = {
+        urgency: policy.urgency,
+        days: policy.days,
+        dayType: policy.dayType,
+        basis: policy.basis,
+      };
+      await this.audit.record({
+        ...administrationAuditContext(principal, request),
+        action: 'INSPECTION_DEADLINE_POLICY_UPDATED',
+        entityType: 'inspection_deadline_policy',
+        entityId: urgency,
+        beforeData: before,
+        afterData: after,
+      }, manager);
+      return policy;
+    });
+  }
+
+  async snapshotForLock(
+    manager: EntityManager,
+    urgency: InspectionActUrgency,
+    occurredAt: Date,
+  ): Promise<InspectionDeadlineLockResult> {
+    const [policy] = (await manager.query(`
+      SELECT
+        urgency,
+        days,
+        day_type AS "dayType",
+        basis
+      FROM inspection_deadline_policies
+      WHERE urgency = $1
+      FOR SHARE
+    `, [urgency])) as Array<{
+      urgency: InspectionActUrgency;
+      days: number;
+      dayType: InspectionDeadlineDayType;
+      basis: InspectionDeadlineBasis;
+    }>;
+    if (!policy) {
+      throw new NotFoundException({
+        code: 'INSPECTION_DEADLINE_POLICY_NOT_FOUND',
+        message: 'No existe una política de plazo para la urgencia seleccionada',
+      });
+    }
+
+    const snapshot: InspectionDeadlineSnapshot = {
+      urgency: policy.urgency,
+      days: Number(policy.days),
+      dayType: policy.dayType,
+      basis: policy.basis,
+      capturedAt: new Date().toISOString(),
+    };
+
+    if (policy.basis === InspectionDeadlineBasis.GEDO_LOAD_DATE) {
+      return { snapshot, baseOn: null, dueOn: null };
+    }
+
+    const [base] = (await manager.query(`
+      SELECT TO_CHAR(
+        $1::timestamptz AT TIME ZONE 'America/Argentina/Mendoza',
+        'YYYY-MM-DD'
+      ) AS day
+    `, [occurredAt])) as Array<{ day: string }>;
+    if (!base?.day) {
+      throw new BadRequestException({
+        code: 'INSPECTION_ACT_DATE_INVALID',
+        message: 'No se pudo determinar la fecha del Acta para calcular el plazo',
+      });
+    }
+    const dueOn = await this.calculateDueOn(
+      manager,
+      base.day,
+      snapshot.days,
+      snapshot.dayType,
+    );
+    return { snapshot, baseOn: base.day, dueOn };
+  }
+
+  async calculateDueOn(
+    manager: EntityManager,
+    baseOn: string,
+    days: number,
+    dayType: InspectionDeadlineDayType,
+  ): Promise<string> {
+    if (!Number.isInteger(days) || days < 1 || days > 365) {
+      throw new BadRequestException({
+        code: 'INSPECTION_DEADLINE_DAYS_INVALID',
+        message: 'La cantidad de días del plazo no es válida',
+      });
+    }
+
+    if (dayType === InspectionDeadlineDayType.CALENDAR) {
+      const [row] = (await manager.query(`
+        SELECT ($1::date + $2::integer)::text AS "dueOn"
+      `, [baseOn, days])) as Array<{ dueOn: string }>;
+      return row.dueOn;
+    }
+
+    const [row] = (await manager.query(`
+      SELECT candidate.day::text AS "dueOn"
+      FROM (
+        SELECT generated::date AS day
+        FROM generate_series(
+          $1::date + 1,
+          $1::date + (($2::integer * 3) + 31),
+          interval '1 day'
+        ) generated
+        WHERE EXTRACT(ISODOW FROM generated) BETWEEN 1 AND 5
+          AND NOT EXISTS (
+            SELECT 1
+            FROM inspection_non_working_days holiday
+            WHERE holiday.day = generated::date
+              AND holiday.enabled = true
+          )
+        ORDER BY generated
+        LIMIT 1 OFFSET ($2::integer - 1)
+      ) candidate
+    `, [baseOn, days])) as Array<{ dueOn: string }>;
+    if (!row?.dueOn) {
+      throw new BadRequestException({
+        code: 'INSPECTION_DEADLINE_CALCULATION_FAILED',
+        message: 'No se pudo calcular el vencimiento con el calendario configurado',
+      });
+    }
+    return row.dueOn;
+  }
+
+  async applyGedoOfficialization(
+    manager: EntityManager,
+    actId: string,
+    officializedOn: string,
+  ): Promise<string | null> {
+    const [act] = (await manager.query(`
+      SELECT
+        deadline_days AS "days",
+        deadline_day_type AS "dayType",
+        deadline_basis AS "basis"
+      FROM inspection_acts
+      WHERE id = $1
+      FOR UPDATE
+    `, [actId])) as Array<{
+      days: number | null;
+      dayType: InspectionDeadlineDayType | null;
+      basis: InspectionDeadlineBasis | null;
+    }>;
+    if (!act || act.basis !== InspectionDeadlineBasis.GEDO_LOAD_DATE) return null;
+    if (!act.days || !act.dayType) {
+      throw new BadRequestException({
+        code: 'INSPECTION_ACT_DEADLINE_SNAPSHOT_MISSING',
+        message: 'El Acta no conserva la política de plazo requerida',
+      });
+    }
+    const dueOn = await this.calculateDueOn(manager, officializedOn, Number(act.days), act.dayType);
+    await manager.query(`
+      UPDATE inspection_acts
+      SET deadline_base_on = $2::date,
+          deadline_due_on = $3::date,
+          updated_at = CURRENT_TIMESTAMP
+      WHERE id = $1
+    `, [actId, officializedOn, dueOn]);
+    return dueOn;
+  }
+
+  async listNonWorkingDays(year?: string) {
+    const parsedYear = year === undefined ? null : Number(year);
+    if (parsedYear !== null && (!Number.isInteger(parsedYear) || parsedYear < 2000 || parsedYear > 2200)) {
+      throw new BadRequestException({
+        code: 'INVALID_NON_WORKING_DAY_YEAR',
+        message: 'El año del calendario no es válido',
+      });
+    }
+    const parameters: unknown[] = [];
+    const where = parsedYear === null
+      ? ''
+      : `WHERE EXTRACT(YEAR FROM day)::integer = $1`;
+    if (parsedYear !== null) parameters.push(parsedYear);
+    const data = await this.dataSource.query(`
+      SELECT
+        day::text AS day,
+        label,
+        enabled,
+        created_at AS "createdAt",
+        updated_at AS "updatedAt"
+      FROM inspection_non_working_days
+      ${where}
+      ORDER BY day ASC
+    `, parameters);
+    return { data };
+  }
+
+  async upsertNonWorkingDay(
+    dto: UpsertInspectionNonWorkingDayDto,
+    principal: AuthPrincipal,
+    request: RequestWithContext,
+  ) {
+    const parsed = new Date(`${dto.day}T00:00:00Z`);
+    if (!Number.isFinite(parsed.getTime()) || parsed.toISOString().slice(0, 10) !== dto.day) {
+      throw new BadRequestException({
+        code: 'INVALID_NON_WORKING_DAY',
+        message: 'La fecha no laborable no es válida',
+      });
+    }
+    return this.dataSource.transaction(async (manager) => {
+      const repository = manager.getRepository(InspectionNonWorkingDay);
+      const existing = await repository.findOne({ where: { day: dto.day } });
+      const before = existing
+        ? { day: existing.day, label: existing.label, enabled: existing.enabled }
+        : null;
+      const row = existing ?? repository.create({
+        day: dto.day,
+        label: dto.label,
+        enabled: dto.enabled ?? true,
+        createdBy: principal.userId,
+        updatedBy: principal.userId,
+      });
+      row.label = dto.label;
+      row.enabled = dto.enabled ?? true;
+      row.updatedBy = principal.userId;
+      await repository.save(row);
+      const after = { day: row.day, label: row.label, enabled: row.enabled };
+      await this.audit.record({
+        ...administrationAuditContext(principal, request),
+        action: existing
+          ? 'INSPECTION_NON_WORKING_DAY_UPDATED'
+          : 'INSPECTION_NON_WORKING_DAY_CREATED',
+        entityType: 'inspection_non_working_day',
+        entityId: row.day,
+        beforeData: before,
+        afterData: after,
+      }, manager);
+      return row;
+    });
+  }
+}

api-v3/src/inspection-findings/dto/create-recurrent-inspection-finding.dto.ts

@@ -0,0 +1,38 @@
+import { Transform, Type } from 'class-transformer';
+import {
+  IsInt,
+  IsOptional,
+  IsString,
+  IsUUID,
+  Matches,
+  Max,
+  MaxLength,
+  Min,
+  MinLength,
+} from 'class-validator';
+
+const optionalText = ({ value }: { value: unknown }) =>
+  typeof value === 'string' && value.trim() ? value.trim() : null;
+
+export class CreateRecurrentInspectionFindingDto {
+  @IsUUID('4')
+  antecedentFindingId!: string;
+
+  @Transform(({ value }) => (typeof value === 'string' ? value.trim() : value))
+  @IsString()
+  @MinLength(1)
+  @MaxLength(20000)
+  description!: string;
+
+  @IsOptional()
+  @Type(() => Number)
+  @IsInt()
+  @Min(1)
+  @Max(10)
+  severity?: number;
+
+  @IsOptional()
+  @Transform(optionalText)
+  @Matches(/^\d{4}-\d{2}-\d{2}$/)
+  correctionDueOn?: string | null;
+}

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/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,
-  ) {
+  ): Promise<unknown> {
-    return this.catalog.listApplicableForAsset(assetId, query);
+    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/inspection-finding-recurrence.controller.ts

@@ -0,0 +1,31 @@
+import { Body, Controller, Get, Param, ParseUUIDPipe, 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 { CreateRecurrentInspectionFindingDto } from './dto/create-recurrent-inspection-finding.dto';
+import { InspectionFindingRecurrenceService } from './inspection-finding-recurrence.service';
+
+@Controller('inspection-acts/:actId/findings')
+export class InspectionFindingRecurrenceController {
+  constructor(private readonly recurrence: InspectionFindingRecurrenceService) {}
+
+  @Get('recurrence-candidates')
+  @RequirePermissions('inspection_findings.read')
+  candidates(
+    @Param('actId', new ParseUUIDPipe({ version: '4' })) actId: string,
+    @Query('assetId', new ParseUUIDPipe({ version: '4' })) assetId: string,
+  ) {
+    return this.recurrence.candidates(actId, assetId);
+  }
+
+  @Post('recurrence')
+  @RequirePermissions('inspection_findings.create')
+  create(
+    @Param('actId', new ParseUUIDPipe({ version: '4' })) actId: string,
+    @Body() dto: CreateRecurrentInspectionFindingDto,
+    @CurrentAuth() principal: AuthPrincipal,
+    @Req() request: RequestWithContext,
+  ) {
+    return this.recurrence.create(actId, dto, principal, request);
+  }
+}

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

@@ -0,0 +1,301 @@
+import {
+  ConflictException,
+  ForbiddenException,
+  Injectable,
+  NotFoundException,
+} from '@nestjs/common';
+import { DataSource } 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 { CreateRecurrentInspectionFindingDto } from './dto/create-recurrent-inspection-finding.dto';
+
+@Injectable()
+export class InspectionFindingRecurrenceService {
+  constructor(
+    private readonly dataSource: DataSource,
+    private readonly audit: AuditService,
+  ) {}
+
+  async candidates(actId: string, assetId: string) {
+    await this.requireDraftActAsset(actId, assetId);
+    const data = await this.dataSource.query(`
+      SELECT
+        finding.id,
+        finding.code,
+        finding.title,
+        finding.description,
+        finding.severity,
+        finding.catalog_item_id AS "catalogItemId",
+        finding.is_recurrence AS "isRecurrence",
+        finding.antecedent_finding_id AS "antecedentFindingId",
+        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"
+      FROM inspection_findings finding
+      INNER JOIN inspection_acts act ON act.id = finding.act_id
+      INNER JOIN inspection_visits visit ON visit.id = act.visit_id
+      WHERE finding.asset_id = $1
+        AND finding.status = 'OPEN'
+        AND finding.act_id <> $2
+      ORDER BY act.occurred_at DESC, finding.created_at DESC, finding.id DESC
+    `, [assetId, actId]);
+    return { data };
+  }
+
+  async create(
+    actId: string,
+    dto: CreateRecurrentInspectionFindingDto,
+    principal: AuthPrincipal,
+    request: RequestWithContext,
+  ) {
+    assertMobileInspector(principal);
+    return this.dataSource.transaction(async (manager) => {
+      const [act] = await manager.query(`
+        SELECT
+          act.id,
+          act.code,
+          act.status,
+          act.occurred_at AS "occurredAt",
+          act.visit_id AS "visitId",
+          visit.status AS "visitStatus"
+        FROM inspection_acts act
+        INNER JOIN inspection_visits visit ON visit.id = act.visit_id
+        WHERE act.id = $1
+        FOR UPDATE OF act, visit
+      `, [actId]) as Array<{
+        id: string;
+        code: string;
+        status: string;
+        occurredAt: Date;
+        visitId: string;
+        visitStatus: string;
+      }>;
+      if (!act) throw this.actNotFound();
+      if (act.status !== 'DRAFT' || act.visitStatus !== 'IN_PROGRESS') {
+        throw new ConflictException({
+          code: 'INSPECTION_FINDING_ACT_NOT_EDITABLE',
+          message: 'La reincidencia sólo puede registrarse mientras el Acta está en borrador y la inspección en curso',
+        });
+      }
+      if (!principal.permissions.includes('inspections.manage')) {
+        const [member] = await manager.query(`
+          SELECT 1 AS found
+          FROM inspection_visit_members
+          WHERE visit_id = $1
+            AND user_id = $2
+            AND included = true
+          LIMIT 1
+        `, [act.visitId, principal.userId]) as Array<{ found: number }>;
+        if (!member) {
+          throw new ForbiddenException({
+            code: 'INSPECTION_VISIT_NOT_ASSIGNED',
+            message: 'La inspección no está asignada al usuario actual',
+          });
+        }
+      }
+
+      const [antecedent] = await manager.query(`
+        SELECT
+          finding.id,
+          finding.act_id AS "actId",
+          finding.asset_id AS "assetId",
+          finding.catalog_item_id AS "catalogItemId",
+          finding.title,
+          finding.legal_basis AS "legalBasis",
+          finding.glossary,
+          finding.catalog_revision AS "catalogRevision",
+          finding.suggested_severity AS "suggestedSeverity",
+          finding.severity,
+          finding.status,
+          previous_act.code AS "actCode",
+          previous_act.occurred_at AS "occurredAt"
+        FROM inspection_findings finding
+        INNER JOIN inspection_acts previous_act ON previous_act.id = finding.act_id
+        WHERE finding.id = $1
+        FOR SHARE OF finding, previous_act
+      `, [dto.antecedentFindingId]) as Array<{
+        id: string;
+        actId: string;
+        assetId: string;
+        catalogItemId: string | null;
+        title: string;
+        legalBasis: string | null;
+        glossary: string | null;
+        catalogRevision: number | null;
+        suggestedSeverity: number | null;
+        severity: number | null;
+        status: string;
+        actCode: string;
+        occurredAt: Date;
+      }>;
+      if (!antecedent) {
+        throw new NotFoundException({
+          code: 'INSPECTION_FINDING_ANTECEDENT_NOT_FOUND',
+          message: 'No se encontró el Hallazgo antecedente seleccionado',
+        });
+      }
+      if (antecedent.status !== 'OPEN') {
+        throw new ConflictException({
+          code: 'INSPECTION_FINDING_ANTECEDENT_RESOLVED',
+          message: 'Sólo un Hallazgo anterior todavía abierto puede originar una reincidencia',
+        });
+      }
+      if (antecedent.actId === actId) {
+        throw new ConflictException({
+          code: 'INSPECTION_FINDING_RECURRENCE_SAME_ACT',
+          message: 'Una reincidencia debe referenciar un Hallazgo de un Acta anterior',
+        });
+      }
+      if (new Date(antecedent.occurredAt).getTime() > new Date(act.occurredAt).getTime()) {
+        throw new ConflictException({
+          code: 'INSPECTION_FINDING_ANTECEDENT_AFTER_ACT',
+          message: 'El antecedente no puede pertenecer a un Acta posterior a la actual',
+        });
+      }
+      const [assetLink] = await manager.query(`
+        SELECT 1 AS found
+        FROM inspection_act_assets
+        WHERE act_id = $1 AND asset_id = $2 AND included = true
+        LIMIT 1
+      `, [actId, antecedent.assetId]) as Array<{ found: number }>;
+      if (!assetLink) {
+        throw new ConflictException({
+          code: 'INSPECTION_FINDING_RECURRENCE_ASSET_NOT_IN_ACT',
+          message: 'El Inventario del Hallazgo antecedente no forma parte del Acta actual',
+        });
+      }
+
+      const [sequence] = await manager.query(`
+        SELECT COALESCE(MAX(finding_number), 0)::integer + 1 AS number
+        FROM inspection_findings
+        WHERE act_id = $1
+      `, [actId]) as Array<{ number: number }>;
+      const findingNumber = Number(sequence?.number ?? 1);
+      if (findingNumber > 999) {
+        throw new ConflictException({
+          code: 'INSPECTION_FINDING_SEQUENCE_EXHAUSTED',
+          message: 'El Acta alcanzó el máximo de 999 Hallazgos',
+        });
+      }
+      const code = `${act.code}-H${String(findingNumber).padStart(3, '0')}`;
+      const [created] = await manager.query(`
+        INSERT INTO inspection_findings (
+          act_id,
+          asset_id,
+          catalog_item_id,
+          finding_number,
+          code,
+          status,
+          title,
+          description,
+          legal_basis,
+          glossary,
+          catalog_revision,
+          suggested_severity,
+          severity,
+          is_recurrence,
+          antecedent_finding_id,
+          correction_due_on,
+          current_version,
+          created_by,
+          updated_by
+        ) VALUES (
+          $1,$2,$3,$4,$5,'OPEN',$6,$7,$8,$9,$10,$11,$12,true,$13,$14,1,$15,$15
+        )
+        RETURNING id, created_at AS "createdAt", updated_at AS "updatedAt"
+      `, [
+        actId,
+        antecedent.assetId,
+        antecedent.catalogItemId,
+        findingNumber,
+        code,
+        antecedent.title,
+        dto.description,
+        antecedent.legalBasis,
+        antecedent.glossary,
+        antecedent.catalogRevision,
+        antecedent.suggestedSeverity,
+        dto.severity ?? antecedent.severity ?? antecedent.suggestedSeverity,
+        antecedent.id,
+        dto.correctionDueOn ?? null,
+        principal.userId,
+      ]) as Array<{ id: string; createdAt: Date; updatedAt: Date }>;
+
+      const snapshot = {
+        id: created.id,
+        actId,
+        assetId: antecedent.assetId,
+        catalogItemId: antecedent.catalogItemId,
+        findingNumber,
+        code,
+        status: 'OPEN',
+        title: antecedent.title,
+        description: dto.description,
+        legalBasis: antecedent.legalBasis,
+        glossary: antecedent.glossary,
+        catalogRevision: antecedent.catalogRevision,
+        suggestedSeverity: antecedent.suggestedSeverity,
+        severity: dto.severity ?? antecedent.severity ?? antecedent.suggestedSeverity,
+        isRecurrence: true,
+        antecedentFindingId: antecedent.id,
+        antecedentCode: `${antecedent.actCode}`,
+        correctionDueOn: dto.correctionDueOn ?? null,
+        currentVersion: 1,
+        createdAt: created.createdAt,
+        updatedAt: created.updatedAt,
+      };
+      await manager.query(`
+        INSERT INTO inspection_finding_versions (
+          finding_id, version_number, event, snapshot, actor_user_id, actor_username
+        ) VALUES ($1, 1, 'CREATED', $2::jsonb, $3, $4)
+      `, [created.id, snapshot, principal.userId, principal.username]);
+      await this.audit.record({
+        ...administrationAuditContext(principal, request),
+        action: AuditAction.INSPECTION_FINDING_CREATED,
+        entityType: 'inspection_finding',
+        entityId: created.id,
+        afterData: snapshot,
+        metadata: {
+          actId,
+          visitId: act.visitId,
+          recurrence: true,
+          antecedentFindingId: antecedent.id,
+        },
+      }, manager);
+      return snapshot;
+    });
+  }
+
+  private async requireDraftActAsset(actId: string, assetId: string): Promise<void> {
+    const [row] = await this.dataSource.query(`
+      SELECT 1 AS found
+      FROM inspection_acts act
+      INNER JOIN inspection_visits visit ON visit.id = act.visit_id
+      INNER JOIN inspection_act_assets link
+        ON link.act_id = act.id AND link.asset_id = $2 AND link.included = true
+      WHERE act.id = $1
+        AND act.status = 'DRAFT'
+        AND visit.status = 'IN_PROGRESS'
+      LIMIT 1
+    `, [actId, assetId]) as Array<{ found: number }>;
+    if (!row) {
+      throw new ConflictException({
+        code: 'INSPECTION_FINDING_RECURRENCE_CONTEXT_INVALID',
+        message: 'El Inventario debe estar incluido en un Acta en borrador de una inspección en curso',
+      });
+    }
+  }
+
+  private actNotFound(): NotFoundException {
+    return new NotFoundException({
+      code: 'INSPECTION_ACT_NOT_FOUND',
+      message: 'Acta de inspección no encontrada',
+    });
+  }
+}

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

@@ -15,7 +15,6 @@ 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 { InspectionFindingsService } from './inspection-findings.service';
 
@@ -84,15 +83,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,11 @@
 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 { InspectionFindingRecurrenceController } from './inspection-finding-recurrence.controller';
+import { InspectionFindingRecurrenceService } from './inspection-finding-recurrence.service';
 import {
   InspectionActFindingsController,
   InspectionFindingsController,
@@ -19,6 +23,7 @@ import { InspectionEvidenceService } from './inspection-evidence.service';
   controllers: [
     FindingCatalogController,
     InspectionActFindingsController,
+    InspectionFindingRecurrenceController,
     InspectionFindingsController,
     InspectionFindingEvidenceController,
     InspectionFindingCommunicationsController,
@@ -26,9 +31,18 @@ import { InspectionEvidenceService } from './inspection-evidence.service';
   ],
   providers: [
     FindingCatalogService,
+    F3FindingCatalogResolverService,
+    FindingCatalogMergeService,
     InspectionFindingsService,
+    InspectionFindingRecurrenceService,
     InspectionEvidenceService,
   ],
-  exports: [FindingCatalogService, InspectionFindingsService],
+  exports: [
+    FindingCatalogService,
+    F3FindingCatalogResolverService,
+    FindingCatalogMergeService,
+    InspectionFindingsService,
+    InspectionFindingRecurrenceService,
+  ],
 })
 export class InspectionFindingsModule {}

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

@@ -0,0 +1,23 @@
+import { Transform } from 'class-transformer';
+import { IsEnum, IsOptional, IsString, Matches, MaxLength } from 'class-validator';
+import { InspectionReportFollowUpType } from '../../database/entities';
+
+export class CreateInspectionReportFollowUpDto {
+  @IsEnum(InspectionReportFollowUpType)
+  eventType!: InspectionReportFollowUpType;
+
+  @IsOptional()
+  @Transform(({ value }) => (typeof value === 'string' && value.trim() ? value.trim() : null))
+  @IsString()
+  @MaxLength(255)
+  referenceNumber?: string | null;
+
+  @Matches(/^\d{4}-\d{2}-\d{2}$/)
+  occurredOn!: string;
+
+  @IsOptional()
+  @Transform(({ value }) => (typeof value === 'string' && value.trim() ? value.trim() : null))
+  @IsString()
+  @MaxLength(20000)
+  description?: string | null;
+}

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

@@ -0,0 +1,13 @@
+import { Transform } from 'class-transformer';
+import { IsString, Matches, MaxLength, MinLength } from 'class-validator';
+
+export class OfficializeInspectionReportGedoDto {
+  @Transform(({ value }) => (typeof value === 'string' ? value.trim() : value))
+  @IsString()
+  @MinLength(3)
+  @MaxLength(255)
+  ifIdentifier!: string;
+
+  @Matches(/^\d{4}-\d{2}-\d{2}$/)
+  officializedOn!: string;
+}

api-v3/src/inspection-reports/dto/update-document-delivery-settings.dto.ts

@@ -1,2 +1,12 @@
-import { Transform } from 'class-transformer'; import { IsEmail,IsOptional,MaxLength } from 'class-validator';
+import { Transform } from 'class-transformer';
-export class UpdateDocumentDeliverySettingsDto { @IsOptional() @Transform(({value})=>typeof value==='string'&&value.trim()?value.trim().toLowerCase():null) @IsEmail() @MaxLength(320) officeEmail?:string|null; @IsOptional() @Transform(({value})=>typeof value==='string'&&value.trim()?value.trim().toLowerCase():null) @IsEmail() @MaxLength(320) directorEmail?:string|null; }
+import { IsEmail, IsOptional, MaxLength } from 'class-validator';
+
+export class UpdateDocumentDeliverySettingsDto {
+  @IsOptional()
+  @Transform(({ value }) =>
+    typeof value === 'string' && value.trim() ? value.trim().toLowerCase() : null,
+  )
+  @IsEmail()
+  @MaxLength(320)
+  officeEmail?: string | null;
+}

api-v3/src/inspection-reports/dto/update-inspection-report-content.dto.ts

@@ -0,0 +1,58 @@
+import { Transform } from 'class-transformer';
+import { IsOptional, IsString, MaxLength } from 'class-validator';
+
+function optionalText(value: unknown): unknown {
+  if (typeof value !== 'string') return value;
+  const trimmed = value.trim();
+  return trimmed.length ? trimmed : null;
+}
+
+export class UpdateInspectionReportContentDto {
+  @IsOptional()
+  @Transform(({ value }) => optionalText(value))
+  @IsString()
+  @MaxLength(10000)
+  referenceText?: string | null;
+
+  @IsOptional()
+  @Transform(({ value }) => optionalText(value))
+  @IsString()
+  @MaxLength(20000)
+  generalObjective?: string | null;
+
+  @IsOptional()
+  @Transform(({ value }) => optionalText(value))
+  @IsString()
+  @MaxLength(20000)
+  specificObjective?: string | null;
+
+  @IsOptional()
+  @Transform(({ value }) => optionalText(value))
+  @IsString()
+  @MaxLength(40000)
+  background?: string | null;
+
+  @IsOptional()
+  @Transform(({ value }) => optionalText(value))
+  @IsString()
+  @MaxLength(40000)
+  legalFramework?: string | null;
+
+  @IsOptional()
+  @Transform(({ value }) => optionalText(value))
+  @IsString()
+  @MaxLength(40000)
+  executiveSummary?: string | null;
+
+  @IsOptional()
+  @Transform(({ value }) => optionalText(value))
+  @IsString()
+  @MaxLength(80000)
+  description?: string | null;
+
+  @IsOptional()
+  @Transform(({ value }) => optionalText(value))
+  @IsString()
+  @MaxLength(40000)
+  conclusion?: string | null;
+}

api-v3/src/inspection-reports/dto/update-smtp-settings.dto.ts

@@ -0,0 +1,79 @@
+import { Transform } from 'class-transformer';
+import {
+  IsBoolean,
+  IsEmail,
+  IsEnum,
+  IsInt,
+  IsOptional,
+  IsString,
+  Max,
+  MaxLength,
+  Min,
+  MinLength,
+} from 'class-validator';
+
+export enum SmtpSecurityModeDto {
+  TLS = 'TLS',
+  STARTTLS = 'STARTTLS',
+}
+
+export class UpdateSmtpSettingsDto {
+  @Transform(({ value }) => value === true || value === 'true')
+  @IsBoolean()
+  enabled!: boolean;
+
+  @Transform(({ value }) => (typeof value === 'string' ? value.trim() : value))
+  @IsString()
+  @MinLength(1)
+  @MaxLength(255)
+  host!: string;
+
+  @Transform(({ value }) => Number(value))
+  @IsInt()
+  @Min(1)
+  @Max(65535)
+  port!: number;
+
+  @IsEnum(SmtpSecurityModeDto)
+  securityMode!: SmtpSecurityModeDto;
+
+  @IsOptional()
+  @Transform(({ value }) => (typeof value === 'string' && value.trim() ? value.trim() : null))
+  @IsString()
+  @MaxLength(255)
+  username?: string | null;
+
+  @IsOptional()
+  @IsString()
+  @MaxLength(2048)
+  password?: string;
+
+  @IsOptional()
+  @Transform(({ value }) => value === true || value === 'true')
+  @IsBoolean()
+  clearPassword?: boolean;
+
+  @Transform(({ value }) => (typeof value === 'string' ? value.trim() : value))
+  @IsString()
+  @MinLength(1)
+  @MaxLength(160)
+  fromName!: string;
+
+  @Transform(({ value }) => (typeof value === 'string' ? value.trim().toLowerCase() : value))
+  @IsEmail()
+  @MaxLength(255)
+  fromEmail!: string;
+
+  @IsOptional()
+  @Transform(({ value }) => (typeof value === 'string' && value.trim() ? value.trim().toLowerCase() : null))
+  @IsEmail()
+  @MaxLength(255)
+  replyTo?: string | null;
+}
+
+export class TestSmtpSettingsDto {
+  @Transform(({ value }) => (typeof value === 'string' ? value.trim().toLowerCase() : value))
+  @IsEmail()
+  @MaxLength(255)
+  to!: string;
+}

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

@@ -1,40 +1,492 @@
 import { Injectable, NotFoundException } from '@nestjs/common';
 import { DataSource } from 'typeorm';
-import { ConfigService } from '@nestjs/config';
+import { administrationAuditContext } from '../administration/common/administration-audit';
+import { AuditService } from '../audit/audit.service';
+import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
+import { AuditAction, AuditSource } from '../database/entities';
+import type { UpdateDocumentDeliverySettingsDto } from './dto/update-document-delivery-settings.dto';
 import { InspectionActPdfService } from './inspection-act-pdf.service';
 import { InspectionReportWordService } from './inspection-report-word.service';
 import { SmtpDeliveryService } from './smtp-delivery.service';
-import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
-import { AuditService } from '../audit/audit.service';
-import { administrationAuditContext } from '../administration/common/administration-audit';
-import { AuditAction, AuditSource } from '../database/entities';
-import type { UpdateDocumentDeliverySettingsDto } from './dto/update-document-delivery-settings.dto';
 
-export interface DeliveryRow { id:string; actId:string; reportId:string|null; documentKind:'ACT_PDF'|'REPORT_WORD'; recipientKind:'COMPANY'|'OFFICE'|'DIRECTOR'; recipientAssetId:string|null; recipientEmail:string|null; status:string; attempts:number; actCode:string; reportCode:string|null; }
+export type DeliveryRecipientKind = 'COMPANY' | 'OFFICE' | 'INSPECTOR' | 'DIRECTOR';
+
+export interface DeliveryRow {
+  id: string;
+  actId: string;
+  reportId: string | null;
+  documentKind: 'ACT_PDF' | 'REPORT_WORD';
+  recipientKind: DeliveryRecipientKind;
+  recipientAssetId: string | null;
+  recipientUserId: string | null;
+  recipientEmail: string | null;
+  status: string;
+  attempts: number;
+  actCode: string;
+  reportCode: string | null;
+}
 
 @Injectable()
 export class InspectionDocumentDeliveryService {
-  constructor(private readonly dataSource:DataSource, private readonly pdf:InspectionActPdfService, private readonly word:InspectionReportWordService, private readonly smtp:SmtpDeliveryService, private readonly audit:AuditService, private readonly config:ConfigService){}
+  constructor(
+    private readonly dataSource: DataSource,
+    private readonly pdf: InspectionActPdfService,
+    private readonly word: InspectionReportWordService,
+    private readonly smtp: SmtpDeliveryService,
+    private readonly audit: AuditService,
+  ) {}
 
-  async settings(){ const [row]=await this.dataSource.query(`SELECT office_email AS "officeEmail",director_email AS "directorEmail",updated_at AS "updatedAt" FROM institutional_delivery_settings WHERE id=1`) as Array<{officeEmail:string|null;directorEmail:string|null;updatedAt:Date}>; return {...row,smtpConfigured:this.smtp.configured(),mailFrom:this.config.get<string>('MAIL_FROM')??null}; }
+  async settings() {
-  async updateSettings(dto:UpdateDocumentDeliverySettingsDto,principal:AuthPrincipal,request:RequestWithContext){ const before=await this.settings(); await this.dataSource.query(`UPDATE institutional_delivery_settings SET office_email=$1,director_email=$2,updated_by=$3,updated_at=CURRENT_TIMESTAMP WHERE id=1`,[dto.officeEmail??null,dto.directorEmail??null,principal.userId]); const after=await this.settings(); await this.audit.record({...administrationAuditContext(principal,request),action:AuditAction.DOCUMENT_DELIVERY_SETTINGS_UPDATED,entityType:'institutional_delivery_settings',entityId:'1',beforeData:before,afterData:after}); return after; }
+    const [row] = await this.dataSource.query(`
-  async list(){ const data=await this.dataSource.query(`SELECT d.id,d.act_id AS "actId",d.report_id AS "reportId",d.document_kind AS "documentKind",d.recipient_kind AS "recipientKind",d.recipient_asset_id AS "recipientAssetId",d.recipient_email AS "recipientEmail",d.status,d.attempts,d.last_attempt_at AS "lastAttemptAt",d.sent_at AS "sentAt",d.provider_message_id AS "providerMessageId",d.last_error AS "lastError",d.created_at AS "createdAt",a.code AS "actCode",r.code AS "reportCode",recipient.name AS "recipientAssetName" FROM inspection_document_deliveries d JOIN inspection_acts a ON a.id=d.act_id LEFT JOIN inspection_reports r ON r.id=d.report_id LEFT JOIN assets recipient ON recipient.id=d.recipient_asset_id ORDER BY d.created_at DESC LIMIT 200`); return {data}; }
+      SELECT office_email AS "officeEmail", updated_at AS "updatedAt"
-
+      FROM institutional_delivery_settings
-  async dispatchForAct(actId:string):Promise<void>{ await this.pdf.ensure(actId).catch(()=>undefined); const [report]=await this.dataSource.query(`SELECT id FROM inspection_reports WHERE act_id=$1`,[actId]) as Array<{id:string}>; if(report)await this.word.ensure(report.id); await this.ensureRows(actId,report?.id??null); const rows=await this.rowsForAct(actId); for(const row of rows)await this.attempt(row).catch(()=>undefined); }
+      WHERE id = 1
-  async retry(id:string,principal:AuthPrincipal,request:RequestWithContext):Promise<DeliveryRow>{ const row=await this.load(id); await this.audit.record({...administrationAuditContext(principal,request),action:AuditAction.DOCUMENT_DELIVERY_RETRY_REQUESTED,entityType:'inspection_document_delivery',entityId:id,metadata:{actId:row.actId,documentKind:row.documentKind,recipientKind:row.recipientKind}}); await this.refreshRecipient(row); await this.attempt(await this.load(id)); return this.load(id); }
+    `) as Array<{ officeEmail: string | null; updatedAt: Date }>;
-  async retryPending(principal:AuthPrincipal,request:RequestWithContext){ const rows=await this.dataSource.query(`SELECT id FROM inspection_document_deliveries WHERE status<>'SENT' ORDER BY created_at ASC LIMIT 100`) as Array<{id:string}>; for(const item of rows)await this.retry(item.id,principal,request).catch(()=>undefined); return {processed:rows.length}; }
+    return {
-
+      ...row,
-  private async ensureRows(actId:string,reportId:string|null){ const [settings]=await this.dataSource.query(`SELECT office_email AS "officeEmail",director_email AS "directorEmail" FROM institutional_delivery_settings WHERE id=1`) as Array<{officeEmail:string|null;directorEmail:string|null}>; const companies=await this.dataSource.query(`SELECT DISTINCT company.id,profile.notification_email AS email FROM inspection_act_assets link JOIN assets asset ON asset.id=link.asset_id JOIN asset_types asset_type ON asset_type.id=asset.asset_type_id JOIN assets company ON company.id=COALESCE(asset.operator_company_id,CASE WHEN asset_type.operational_role='COMPANY' THEN asset.id END) LEFT JOIN organization_profiles profile ON profile.asset_id=company.id WHERE link.act_id=$1 AND link.included=true`,[actId]) as Array<{id:string;email:string|null}>;
+      smtpConfigured: this.smtp.configured(),
-    for(const company of companies)await this.upsertRow(actId,reportId,'ACT_PDF','COMPANY',company.id,company.email);
+      smtpSource: this.smtp.activeSource(),
-    await this.upsertRow(actId,reportId,'ACT_PDF','OFFICE',null,settings?.officeEmail??null);
+    };
-    if(reportId)await this.upsertRow(actId,reportId,'REPORT_WORD','DIRECTOR',null,settings?.directorEmail??null);
   }
-  private async upsertRow(actId:string,reportId:string|null,documentKind:string,recipientKind:string,recipientAssetId:string|null,recipientEmail:string|null){ await this.dataSource.query(`INSERT INTO inspection_document_deliveries (act_id,report_id,document_kind,recipient_kind,recipient_asset_id,recipient_key,recipient_email,status) VALUES ($1,$2,$3,$4,$5,COALESCE($5::uuid,'00000000-0000-0000-0000-000000000000'::uuid),$6,$7) ON CONFLICT (act_id,document_kind,recipient_kind,recipient_key) DO UPDATE SET report_id=COALESCE(EXCLUDED.report_id,inspection_document_deliveries.report_id),recipient_email=COALESCE(inspection_document_deliveries.recipient_email,EXCLUDED.recipient_email),updated_at=CURRENT_TIMESTAMP`,[actId,reportId,documentKind,recipientKind,recipientAssetId,recipientEmail,recipientEmail?'PENDING':'WAITING_RECIPIENT']); }
+
-  private async rowsForAct(actId:string){ return this.dataSource.query(`SELECT d.id,d.act_id AS "actId",d.report_id AS "reportId",d.document_kind AS "documentKind",d.recipient_kind AS "recipientKind",d.recipient_asset_id AS "recipientAssetId",d.recipient_email AS "recipientEmail",d.status,d.attempts,a.code AS "actCode",r.code AS "reportCode" FROM inspection_document_deliveries d JOIN inspection_acts a ON a.id=d.act_id LEFT JOIN inspection_reports r ON r.id=d.report_id WHERE d.act_id=$1 ORDER BY d.created_at`,[actId]) as Promise<DeliveryRow[]>; }
+  async updateSettings(
-  private async load(id:string){ const [row]=await this.dataSource.query(`SELECT d.id,d.act_id AS "actId",d.report_id AS "reportId",d.document_kind AS "documentKind",d.recipient_kind AS "recipientKind",d.recipient_asset_id AS "recipientAssetId",d.recipient_email AS "recipientEmail",d.status,d.attempts,a.code AS "actCode",r.code AS "reportCode" FROM inspection_document_deliveries d JOIN inspection_acts a ON a.id=d.act_id LEFT JOIN inspection_reports r ON r.id=d.report_id WHERE d.id=$1`,[id]) as DeliveryRow[]; if(!row)throw new NotFoundException({code:'DOCUMENT_DELIVERY_NOT_FOUND',message:'Entrega documental no encontrada'}); return row; }
+    dto: UpdateDocumentDeliverySettingsDto,
-  private async refreshRecipient(row:DeliveryRow){ let email:string|null=null; if(row.recipientKind==='COMPANY'&&row.recipientAssetId){ const [company]=await this.dataSource.query(`SELECT notification_email AS email FROM organization_profiles WHERE asset_id=$1`,[row.recipientAssetId]) as Array<{email:string|null}>; email=company?.email??null; } else { const [settings]=await this.dataSource.query(`SELECT office_email AS "officeEmail",director_email AS "directorEmail" FROM institutional_delivery_settings WHERE id=1`) as Array<{officeEmail:string|null;directorEmail:string|null}>; email=row.recipientKind==='OFFICE'?settings?.officeEmail??null:settings?.directorEmail??null; } await this.dataSource.query(`UPDATE inspection_document_deliveries SET recipient_email=$2,status=CASE WHEN $2::text IS NULL THEN 'WAITING_RECIPIENT' ELSE 'PENDING' END,last_error=NULL,updated_at=CURRENT_TIMESTAMP WHERE id=$1 AND status<>'SENT'`,[row.id,email]); }
+    principal: AuthPrincipal,
-  private async attempt(row:DeliveryRow){ if(row.status==='SENT')return; if(!row.recipientEmail){await this.setStatus(row.id,'WAITING_RECIPIENT','Destinatario no configurado');return;} if(!this.smtp.configured()){await this.setStatus(row.id,'WAITING_TRANSPORT','SMTP no configurado');return;} let attachment:{filename:string;mimeType:string;content:Buffer}; try{ if(row.documentKind==='ACT_PDF'){await this.pdf.ensure(row.actId); const file=await this.pdf.content(row.actId); attachment={filename:file.originalName,mimeType:file.mimeType,content:file.buffer};}else{if(!row.reportId)throw new Error('Informe no vinculado'); await this.word.ensure(row.reportId); const file=await this.word.content(row.reportId); const {readFile}=await import('node:fs/promises'); attachment={filename:file.originalName,mimeType:file.mimeType,content:await readFile(file.filePath)};}}catch(error){await this.setStatus(row.id,'WAITING_ARTIFACT',error instanceof Error?error.message:'Documento no disponible');return;}
+    request: RequestWithContext,
-    await this.dataSource.query(`UPDATE inspection_document_deliveries SET attempts=attempts+1,last_attempt_at=CURRENT_TIMESTAMP,status='PENDING',last_error=NULL,updated_at=CURRENT_TIMESTAMP WHERE id=$1`,[row.id]); try{ const label=row.documentKind==='ACT_PDF'?`Acta ${row.actCode}`:`Informe ${row.reportCode??''}`; const sent=await this.smtp.send({to:row.recipientEmail,subject:`DH Inspección · ${label}`,text:row.documentKind==='ACT_PDF'?`Se adjunta el acta cerrada e inmutable ${row.actCode}.`:`Se adjunta el informe Word automático ${row.reportCode??''} para revisión del Director de Hidrocarburos.`,attachment}); await this.dataSource.query(`UPDATE inspection_document_deliveries SET status='SENT',sent_at=CURRENT_TIMESTAMP,provider_message_id=$2,last_error=NULL,updated_at=CURRENT_TIMESTAMP WHERE id=$1`,[row.id,sent.messageId]); await this.audit.record({action:AuditAction.DOCUMENT_DELIVERY_SENT,entityType:'inspection_document_delivery',entityId:row.id,source:AuditSource.SYSTEM,actorUserId:null,actorUsername:null,requestId:null,ip:null,userAgent:null,beforeData:null,afterData:{recipientKind:row.recipientKind,documentKind:row.documentKind,status:'SENT'},metadata:{actId:row.actId,reportId:row.reportId}}); }catch(error){await this.setStatus(row.id,'FAILED',error instanceof Error?error.message:'Error de entrega');}
+  ) {
+    const before = await this.settings();
+    await this.dataSource.query(`
+      UPDATE institutional_delivery_settings
+      SET office_email = $1,
+          updated_by = $2,
+          updated_at = CURRENT_TIMESTAMP
+      WHERE id = 1
+    `, [dto.officeEmail ?? null, principal.userId]);
+    const after = await this.settings();
+    await this.audit.record({
+      ...administrationAuditContext(principal, request),
+      action: AuditAction.DOCUMENT_DELIVERY_SETTINGS_UPDATED,
+      entityType: 'institutional_delivery_settings',
+      entityId: '1',
+      beforeData: before,
+      afterData: after,
+    });
+    return after;
+  }
+
+  async list() {
+    const data = await this.dataSource.query(`
+      SELECT
+        delivery.id,
+        delivery.act_id AS "actId",
+        delivery.report_id AS "reportId",
+        delivery.document_kind AS "documentKind",
+        delivery.recipient_kind AS "recipientKind",
+        delivery.recipient_asset_id AS "recipientAssetId",
+        delivery.recipient_user_id AS "recipientUserId",
+        delivery.recipient_email AS "recipientEmail",
+        delivery.status,
+        delivery.attempts,
+        delivery.last_attempt_at AS "lastAttemptAt",
+        delivery.sent_at AS "sentAt",
+        delivery.provider_message_id AS "providerMessageId",
+        delivery.last_error AS "lastError",
+        delivery.created_at AS "createdAt",
+        act.code AS "actCode",
+        report.code AS "reportCode",
+        recipient.name AS "recipientAssetName",
+        CASE
+          WHEN recipient_user.id IS NULL THEN NULL
+          ELSE btrim(concat_ws(' ', recipient_user.first_name, recipient_user.last_name))
+        END AS "recipientUserName"
+      FROM inspection_document_deliveries delivery
+      JOIN inspection_acts act ON act.id = delivery.act_id
+      LEFT JOIN inspection_reports report ON report.id = delivery.report_id
+      LEFT JOIN assets recipient ON recipient.id = delivery.recipient_asset_id
+      LEFT JOIN users recipient_user ON recipient_user.id = delivery.recipient_user_id
+      ORDER BY delivery.created_at DESC
+      LIMIT 200
+    `);
+    return { data };
+  }
+
+  async dispatchForAct(actId: string): Promise<void> {
+    await this.pdf.ensure(actId).catch(() => undefined);
+    const [report] = await this.dataSource.query(
+      `SELECT id FROM inspection_reports WHERE act_id = $1`,
+      [actId],
+    ) as Array<{ id: string }>;
+    if (report) await this.word.ensure(report.id);
+    await this.ensureRows(actId, report?.id ?? null);
+    for (const row of await this.rowsForAct(actId)) {
+      await this.attempt(row).catch(() => undefined);
+    }
+  }
+
+  async retry(
+    id: string,
+    principal: AuthPrincipal,
+    request: RequestWithContext,
+  ): Promise<DeliveryRow> {
+    const row = await this.load(id);
+    await this.audit.record({
+      ...administrationAuditContext(principal, request),
+      action: AuditAction.DOCUMENT_DELIVERY_RETRY_REQUESTED,
+      entityType: 'inspection_document_delivery',
+      entityId: id,
+      metadata: {
+        actId: row.actId,
+        documentKind: row.documentKind,
+        recipientKind: row.recipientKind,
+        recipientUserId: row.recipientUserId,
+      },
+    });
+    await this.refreshRecipient(row);
+    await this.attempt(await this.load(id));
+    return this.load(id);
+  }
+
+  async retryPending(principal: AuthPrincipal, request: RequestWithContext) {
+    const rows = await this.dataSource.query(`
+      SELECT id
+      FROM inspection_document_deliveries
+      WHERE status <> 'SENT'
+      ORDER BY created_at ASC
+      LIMIT 100
+    `) as Array<{ id: string }>;
+    for (const item of rows) {
+      await this.retry(item.id, principal, request).catch(() => undefined);
+    }
+    return { processed: rows.length };
+  }
+
+  private async ensureRows(actId: string, reportId: string | null) {
+    const [settings] = await this.dataSource.query(`
+      SELECT office_email AS "officeEmail"
+      FROM institutional_delivery_settings
+      WHERE id = 1
+    `) as Array<{ officeEmail: string | null }>;
+
+    const companies = await this.dataSource.query(`
+      SELECT DISTINCT company.id, profile.notification_email AS email
+      FROM inspection_act_assets link
+      JOIN assets asset ON asset.id = link.asset_id
+      JOIN asset_types asset_type ON asset_type.id = asset.asset_type_id
+      JOIN assets company ON company.id = COALESCE(
+        asset.operator_company_id,
+        CASE WHEN asset_type.operational_role = 'COMPANY' THEN asset.id END
+      )
+      LEFT JOIN organization_profiles profile ON profile.asset_id = company.id
+      WHERE link.act_id = $1 AND link.included = true
+    `, [actId]) as Array<{ id: string; email: string | null }>;
+
+    const [inspector] = await this.dataSource.query(`
+      SELECT inspector.id, inspector.email
+      FROM inspection_acts act
+      JOIN inspection_visits visit ON visit.id = act.visit_id
+      JOIN users inspector ON inspector.id = visit.lead_inspector_user_id
+      WHERE act.id = $1
+    `, [actId]) as Array<{ id: string; email: string | null }>;
+
+    for (const company of companies) {
+      await this.upsertRow({
+        actId,
+        reportId,
+        documentKind: 'ACT_PDF',
+        recipientKind: 'COMPANY',
+        recipientAssetId: company.id,
+        recipientUserId: null,
+        recipientKey: company.id,
+        recipientEmail: company.email,
+      });
+    }
+
+    await this.upsertRow({
+      actId,
+      reportId,
+      documentKind: 'ACT_PDF',
+      recipientKind: 'OFFICE',
+      recipientAssetId: null,
+      recipientUserId: null,
+      recipientKey: '00000000-0000-0000-0000-000000000000',
+      recipientEmail: settings?.officeEmail ?? null,
+    });
+
+    if (inspector) {
+      await this.upsertRow({
+        actId,
+        reportId,
+        documentKind: 'ACT_PDF',
+        recipientKind: 'INSPECTOR',
+        recipientAssetId: null,
+        recipientUserId: inspector.id,
+        recipientKey: inspector.id,
+        recipientEmail: inspector.email,
+      });
+      if (reportId) {
+        await this.upsertRow({
+          actId,
+          reportId,
+          documentKind: 'REPORT_WORD',
+          recipientKind: 'INSPECTOR',
+          recipientAssetId: null,
+          recipientUserId: inspector.id,
+          recipientKey: inspector.id,
+          recipientEmail: inspector.email,
+        });
+      }
+    }
+  }
+
+  private async upsertRow(input: {
+    actId: string;
+    reportId: string | null;
+    documentKind: 'ACT_PDF' | 'REPORT_WORD';
+    recipientKind: Exclude<DeliveryRecipientKind, 'DIRECTOR'>;
+    recipientAssetId: string | null;
+    recipientUserId: string | null;
+    recipientKey: string;
+    recipientEmail: string | null;
+  }) {
+    const initialStatus = input.recipientEmail ? 'PENDING' : 'WAITING_RECIPIENT';
+    await this.dataSource.query(`
+      INSERT INTO inspection_document_deliveries (
+        act_id, report_id, document_kind, recipient_kind,
+        recipient_asset_id, recipient_user_id, recipient_key, recipient_email, status
+      ) VALUES ($1,$2,$3,$4,$5,$6,$7::uuid,$8,$9)
+      ON CONFLICT (act_id, document_kind, recipient_kind, recipient_key) DO UPDATE SET
+        report_id = COALESCE(EXCLUDED.report_id, inspection_document_deliveries.report_id),
+        recipient_asset_id = COALESCE(EXCLUDED.recipient_asset_id, inspection_document_deliveries.recipient_asset_id),
+        recipient_user_id = COALESCE(EXCLUDED.recipient_user_id, inspection_document_deliveries.recipient_user_id),
+        recipient_email = CASE
+          WHEN inspection_document_deliveries.status = 'SENT' THEN inspection_document_deliveries.recipient_email
+          ELSE EXCLUDED.recipient_email
+        END,
+        status = CASE
+          WHEN inspection_document_deliveries.status = 'SENT' THEN 'SENT'
+          WHEN EXCLUDED.recipient_email IS NULL THEN 'WAITING_RECIPIENT'
+          ELSE inspection_document_deliveries.status
+        END,
+        updated_at = CURRENT_TIMESTAMP
+    `, [
+      input.actId,
+      input.reportId,
+      input.documentKind,
+      input.recipientKind,
+      input.recipientAssetId,
+      input.recipientUserId,
+      input.recipientKey,
+      input.recipientEmail,
+      initialStatus,
+    ]);
+  }
+
+  private async rowsForAct(actId: string): Promise<DeliveryRow[]> {
+    return this.dataSource.query(`
+      SELECT
+        delivery.id,
+        delivery.act_id AS "actId",
+        delivery.report_id AS "reportId",
+        delivery.document_kind AS "documentKind",
+        delivery.recipient_kind AS "recipientKind",
+        delivery.recipient_asset_id AS "recipientAssetId",
+        delivery.recipient_user_id AS "recipientUserId",
+        delivery.recipient_email AS "recipientEmail",
+        delivery.status,
+        delivery.attempts,
+        act.code AS "actCode",
+        report.code AS "reportCode"
+      FROM inspection_document_deliveries delivery
+      JOIN inspection_acts act ON act.id = delivery.act_id
+      LEFT JOIN inspection_reports report ON report.id = delivery.report_id
+      WHERE delivery.act_id = $1
+      ORDER BY delivery.created_at
+    `, [actId]) as Promise<DeliveryRow[]>;
+  }
+
+  private async load(id: string): Promise<DeliveryRow> {
+    const [row] = await this.dataSource.query(`
+      SELECT
+        delivery.id,
+        delivery.act_id AS "actId",
+        delivery.report_id AS "reportId",
+        delivery.document_kind AS "documentKind",
+        delivery.recipient_kind AS "recipientKind",
+        delivery.recipient_asset_id AS "recipientAssetId",
+        delivery.recipient_user_id AS "recipientUserId",
+        delivery.recipient_email AS "recipientEmail",
+        delivery.status,
+        delivery.attempts,
+        act.code AS "actCode",
+        report.code AS "reportCode"
+      FROM inspection_document_deliveries delivery
+      JOIN inspection_acts act ON act.id = delivery.act_id
+      LEFT JOIN inspection_reports report ON report.id = delivery.report_id
+      WHERE delivery.id = $1
+    `, [id]) as DeliveryRow[];
+    if (!row) {
+      throw new NotFoundException({
+        code: 'DOCUMENT_DELIVERY_NOT_FOUND',
+        message: 'Entrega documental no encontrada',
+      });
+    }
+    return row;
+  }
+
+  private async refreshRecipient(row: DeliveryRow) {
+    let email: string | null = null;
+    if (row.recipientKind === 'COMPANY' && row.recipientAssetId) {
+      const [company] = await this.dataSource.query(`
+        SELECT notification_email AS email
+        FROM organization_profiles
+        WHERE asset_id = $1
+      `, [row.recipientAssetId]) as Array<{ email: string | null }>;
+      email = company?.email ?? null;
+    } else if (row.recipientKind === 'INSPECTOR' && row.recipientUserId) {
+      const [inspector] = await this.dataSource.query(`
+        SELECT email
+        FROM users
+        WHERE id = $1 AND is_active = true
+      `, [row.recipientUserId]) as Array<{ email: string | null }>;
+      email = inspector?.email ?? null;
+    } else if (row.recipientKind === 'OFFICE') {
+      const [settings] = await this.dataSource.query(`
+        SELECT office_email AS "officeEmail"
+        FROM institutional_delivery_settings
+        WHERE id = 1
+      `) as Array<{ officeEmail: string | null }>;
+      email = settings?.officeEmail ?? null;
+    } else if (row.recipientKind === 'DIRECTOR' && row.documentKind === 'REPORT_WORD') {
+      const [inspector] = await this.dataSource.query(`
+        SELECT user_account.email
+        FROM inspection_acts act
+        JOIN inspection_visits visit ON visit.id = act.visit_id
+        JOIN users user_account ON user_account.id = visit.lead_inspector_user_id
+        WHERE act.id = $1
+      `, [row.actId]) as Array<{ email: string | null }>;
+      email = inspector?.email ?? null;
+    }
+
+    await this.dataSource.query(`
+      UPDATE inspection_document_deliveries
+      SET recipient_email = $2,
+          status = CASE WHEN $2::text IS NULL THEN 'WAITING_RECIPIENT' ELSE 'PENDING' END,
+          last_error = NULL,
+          updated_at = CURRENT_TIMESTAMP
+      WHERE id = $1 AND status <> 'SENT'
+    `, [row.id, email]);
+  }
+
+  private async attempt(row: DeliveryRow) {
+    if (row.status === 'SENT') return;
+    if (!row.recipientEmail) {
+      await this.setStatus(row.id, 'WAITING_RECIPIENT', 'Destinatario no configurado');
+      return;
+    }
+    if (!this.smtp.configured()) {
+      await this.setStatus(row.id, 'WAITING_TRANSPORT', 'SMTP no configurado');
+      return;
+    }
+
+    let attachment: { filename: string; mimeType: string; content: Buffer };
+    try {
+      if (row.documentKind === 'ACT_PDF') {
+        await this.pdf.ensure(row.actId);
+        const file = await this.pdf.content(row.actId);
+        attachment = {
+          filename: file.originalName,
+          mimeType: file.mimeType,
+          content: file.buffer,
+        };
+      } else {
+        if (!row.reportId) throw new Error('Informe no vinculado');
+        await this.word.ensure(row.reportId);
+        const file = await this.word.content(row.reportId);
+        const { readFile } = await import('node:fs/promises');
+        attachment = {
+          filename: file.originalName,
+          mimeType: file.mimeType,
+          content: await readFile(file.filePath),
+        };
+      }
+    } catch (error) {
+      await this.setStatus(
+        row.id,
+        'WAITING_ARTIFACT',
+        error instanceof Error ? error.message : 'Documento no disponible',
+      );
+      return;
+    }
+
+    await this.dataSource.query(`
+      UPDATE inspection_document_deliveries
+      SET attempts = attempts + 1,
+          last_attempt_at = CURRENT_TIMESTAMP,
+          status = 'PENDING',
+          last_error = NULL,
+          updated_at = CURRENT_TIMESTAMP
+      WHERE id = $1
+    `, [row.id]);
+
+    try {
+      const label = row.documentKind === 'ACT_PDF'
+        ? `Acta ${row.actCode}`
+        : `Informe ${row.reportCode ?? ''}`;
+      const text = row.documentKind === 'REPORT_WORD'
+        ? `Se adjunta el Informe Word automático ${row.reportCode ?? ''} para revisión y edición del inspector responsable antes de su carga en GEDO.`
+        : row.recipientKind === 'INSPECTOR'
+          ? `Se adjunta copia del Acta ${row.actCode} correspondiente a tu inspección.`
+          : `Se adjunta el Acta ${row.actCode}.`;
+      const sent = await this.smtp.send({
+        to: row.recipientEmail,
+        subject: `DH Inspección · ${label}`,
+        text,
+        attachment,
+      });
+      await this.dataSource.query(`
+        UPDATE inspection_document_deliveries
+        SET status = 'SENT',
+            sent_at = CURRENT_TIMESTAMP,
+            provider_message_id = $2,
+            last_error = NULL,
+            updated_at = CURRENT_TIMESTAMP
+        WHERE id = $1
+      `, [row.id, sent.messageId]);
+      await this.audit.record({
+        action: AuditAction.DOCUMENT_DELIVERY_SENT,
+        entityType: 'inspection_document_delivery',
+        entityId: row.id,
+        source: AuditSource.SYSTEM,
+        actorUserId: null,
+        actorUsername: null,
+        requestId: null,
+        ip: null,
+        userAgent: null,
+        beforeData: null,
+        afterData: {
+          recipientKind: row.recipientKind,
+          recipientUserId: row.recipientUserId,
+          documentKind: row.documentKind,
+          status: 'SENT',
+        },
+        metadata: { actId: row.actId, reportId: row.reportId },
+      });
+    } catch (error) {
+      await this.setStatus(
+        row.id,
+        'FAILED',
+        error instanceof Error ? error.message : 'Error de entrega',
+      );
+    }
+  }
+
+  private async setStatus(id: string, status: string, error: string) {
+    await this.dataSource.query(`
+      UPDATE inspection_document_deliveries
+      SET status = $2,
+          last_error = $3,
+          updated_at = CURRENT_TIMESTAMP
+      WHERE id = $1
+    `, [id, status, error.slice(0, 500)]);
   }
-  private async setStatus(id:string,status:string,error:string){await this.dataSource.query(`UPDATE inspection_document_deliveries SET status=$2,last_error=$3,updated_at=CURRENT_TIMESTAMP WHERE id=$1`,[id,status,error.slice(0,500)]);}
 }

api-v3/src/inspection-reports/inspection-report-dossier-file.ts

@@ -0,0 +1,50 @@
+import { BadRequestException } from '@nestjs/common';
+
+export const MAX_REPORT_DOSSIER_PDF_BYTES = 25 * 1024 * 1024;
+
+export interface UploadedReportDossierFile {
+  buffer: Buffer;
+  originalname: string;
+  mimetype?: string;
+  size: number;
+}
+
+export interface InspectedReportDossierPdf {
+  originalName: string;
+  mimeType: 'application/pdf';
+  extension: '.pdf';
+}
+
+export function inspectReportDossierPdf(
+  file: UploadedReportDossierFile | undefined,
+): InspectedReportDossierPdf {
+  if (!file?.buffer?.length || file.size <= 0) {
+    throw new BadRequestException({
+      code: 'INSPECTION_REPORT_PDF_REQUIRED',
+      message: 'Debés adjuntar un archivo PDF no vacío',
+    });
+  }
+  if (file.size > MAX_REPORT_DOSSIER_PDF_BYTES || file.buffer.length > MAX_REPORT_DOSSIER_PDF_BYTES) {
+    throw new BadRequestException({
+      code: 'INSPECTION_REPORT_PDF_TOO_LARGE',
+      message: 'El PDF supera el máximo permitido de 25 MB',
+    });
+  }
+  if (file.buffer.length < 5 || file.buffer.subarray(0, 5).toString('ascii') !== '%PDF-') {
+    throw new BadRequestException({
+      code: 'INSPECTION_REPORT_PDF_INVALID',
+      message: 'El archivo adjunto no tiene una estructura PDF válida',
+    });
+  }
+  const originalName = file.originalname
+    .replace(/[\u0000-\u001f\u007f]/g, '')
+    .trim()
+    .slice(0, 255);
+  if (!originalName) {
+    throw new BadRequestException({
+      code: 'INSPECTION_REPORT_PDF_INVALID_NAME',
+      message: 'El nombre original del PDF no es válido',
+    });
+  }
+  return { originalName, mimeType: 'application/pdf', extension: '.pdf' };
+}

api-v3/src/inspection-reports/inspection-report-dossier.controller.ts

@@ -0,0 +1,128 @@
+import {
+  Body,
+  Controller,
+  Get,
+  Param,
+  ParseUUIDPipe,
+  Patch,
+  Post,
+  Req,
+  Res,
+  UploadedFile,
+  UploadedFiles,
+  UseInterceptors,
+} from '@nestjs/common';
+import { FileInterceptor, FilesInterceptor } from '@nestjs/platform-express';
+import type { Response } from 'express';
+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 { CreateInspectionReportFollowUpDto } from './dto/create-inspection-report-follow-up.dto';
+import { OfficializeInspectionReportGedoDto } from './dto/officialize-inspection-report-gedo.dto';
+import { UpdateInspectionReportContentDto } from './dto/update-inspection-report-content.dto';
+import {
+  MAX_REPORT_DOSSIER_PDF_BYTES,
+  type UploadedReportDossierFile,
+} from './inspection-report-dossier-file';
+import { InspectionReportDossierService } from './inspection-report-dossier.service';
+
+@Controller('inspection-reports/:reportId/dossier')
+export class InspectionReportDossierController {
+  constructor(private readonly dossier: InspectionReportDossierService) {}
+
+  @Get()
+  @RequirePermissions('inspection_reports.read')
+  get(@Param('reportId', new ParseUUIDPipe({ version: '4' })) reportId: string) {
+    return this.dossier.get(reportId);
+  }
+
+  @Patch('content')
+  @RequirePermissions('inspection_reports.edit')
+  updateContent(
+    @Param('reportId', new ParseUUIDPipe({ version: '4' })) reportId: string,
+    @Body() dto: UpdateInspectionReportContentDto,
+    @CurrentAuth() principal: AuthPrincipal,
+    @Req() request: RequestWithContext,
+  ) {
+    return this.dossier.updateContent(reportId, dto, principal, request);
+  }
+
+  @Post('gedo')
+  @RequirePermissions('inspection_reports.officialize')
+  @UseInterceptors(FileInterceptor('file', {
+    limits: { fileSize: MAX_REPORT_DOSSIER_PDF_BYTES, files: 1 },
+  }))
+  officializeGedo(
+    @Param('reportId', new ParseUUIDPipe({ version: '4' })) reportId: string,
+    @Body() dto: OfficializeInspectionReportGedoDto,
+    @UploadedFile() file: UploadedReportDossierFile | undefined,
+    @CurrentAuth() principal: AuthPrincipal,
+    @Req() request: RequestWithContext,
+  ) {
+    return this.dossier.officializeGedo(reportId, dto, file, principal, request);
+  }
+
+  @Get('gedo/pdf')
+  @RequirePermissions('inspection_reports.read')
+  async gedoPdf(
+    @Param('reportId', new ParseUUIDPipe({ version: '4' })) reportId: string,
+    @Res() response: Response,
+  ): Promise<void> {
+    const content = await this.dossier.gedoPdfContent(reportId);
+    response.setHeader('Content-Type', 'application/pdf');
+    response.setHeader('Content-Disposition', `attachment; filename="${content.originalName.replaceAll('"', '')}"`);
+    response.setHeader('Cache-Control', 'private, no-store');
+    response.setHeader('X-Content-Type-Options', 'nosniff');
+    await new Promise<void>((resolveSend, rejectSend) => {
+      response.sendFile(content.filePath, (error) => {
+        if (error) rejectSend(error);
+        else resolveSend();
+      });
+    });
+  }
+
+  @Get('follow-ups')
+  @RequirePermissions('inspection_reports.read')
+  followUps(@Param('reportId', new ParseUUIDPipe({ version: '4' })) reportId: string) {
+    return this.dossier.listFollowUps(reportId);
+  }
+
+  @Post('follow-ups')
+  @RequirePermissions('inspection_reports.follow_up')
+  @UseInterceptors(FilesInterceptor('files', 10, {
+    limits: { fileSize: MAX_REPORT_DOSSIER_PDF_BYTES, files: 10 },
+  }))
+  createFollowUp(
+    @Param('reportId', new ParseUUIDPipe({ version: '4' })) reportId: string,
+    @Body() dto: CreateInspectionReportFollowUpDto,
+    @UploadedFiles() files: UploadedReportDossierFile[] | undefined,
+    @CurrentAuth() principal: AuthPrincipal,
+    @Req() request: RequestWithContext,
+  ) {
+    return this.dossier.createFollowUp(reportId, dto, files ?? [], principal, request);
+  }
+}
+
+@Controller('inspection-report-follow-up-files')
+export class InspectionReportFollowUpFileController {
+  constructor(private readonly dossier: InspectionReportDossierService) {}
+
+  @Get(':fileId/content')
+  @RequirePermissions('inspection_reports.read')
+  async content(
+    @Param('fileId', new ParseUUIDPipe({ version: '4' })) fileId: string,
+    @Res() response: Response,
+  ): Promise<void> {
+    const content = await this.dossier.followUpFileContent(fileId);
+    response.setHeader('Content-Type', 'application/pdf');
+    response.setHeader('Content-Disposition', `attachment; filename="${content.originalName.replaceAll('"', '')}"`);
+    response.setHeader('Cache-Control', 'private, no-store');
+    response.setHeader('X-Content-Type-Options', 'nosniff');
+    await new Promise<void>((resolveSend, rejectSend) => {
+      response.sendFile(content.filePath, (error) => {
+        if (error) rejectSend(error);
+        else resolveSend();
+      });
+    });
+  }
+}

api-v3/src/inspection-reports/inspection-report-dossier.service.ts

@@ -0,0 +1,516 @@
+import { createHash, randomUUID } from 'node:crypto';
+import { mkdir, readFile, stat, unlink, writeFile } from 'node:fs/promises';
+import { isAbsolute, parse, resolve } from 'node:path';
+import {
+  BadRequestException,
+  ConflictException,
+  ForbiddenException,
+  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 {
+  InspectionReport,
+  InspectionReportFollowUp,
+  InspectionReportFollowUpFile,
+  InspectionReportFollowUpType,
+} from '../database/entities';
+import { InspectionDeadlinesService } from '../inspection-deadlines/inspection-deadlines.service';
+import type { CreateInspectionReportFollowUpDto } from './dto/create-inspection-report-follow-up.dto';
+import type { OfficializeInspectionReportGedoDto } from './dto/officialize-inspection-report-gedo.dto';
+import type { UpdateInspectionReportContentDto } from './dto/update-inspection-report-content.dto';
+import {
+  inspectReportDossierPdf,
+  type UploadedReportDossierFile,
+} from './inspection-report-dossier-file';
+
+interface ReportContext {
+  id: string;
+  code: string;
+  actId: string;
+  visitId: string;
+  actCode: string;
+  visitCode: string;
+  generatedBy: string;
+  gedoIfIdentifier: string | null;
+  gedoOfficializedOn: string | null;
+  gedoPdfStoredName: string | null;
+  gedoPdfSizeBytes: number | null;
+  gedoPdfSha256: string | null;
+}
+
+@Injectable()
+export class InspectionReportDossierService {
+  private readonly root: string;
+
+  constructor(
+    private readonly dataSource: DataSource,
+    private readonly audit: AuditService,
+    private readonly deadlines: InspectionDeadlinesService,
+    config: ConfigService,
+  ) {
+    const configured = config.get<string>('INSPECTION_REPORT_DOSSIER_ROOT')
+      ?? '/app/storage/asset-media/inspection-report-dossier';
+    if (!isAbsolute(configured)) {
+      throw new Error('INSPECTION_REPORT_DOSSIER_ROOT must be an absolute path');
+    }
+    this.root = resolve(configured);
+    if (this.root === parse(this.root).root) {
+      throw new Error('INSPECTION_REPORT_DOSSIER_ROOT cannot be the filesystem root');
+    }
+  }
+
+  async get(reportId: string) {
+    await this.requireReport(this.dataSource.manager, reportId);
+    const [report] = await this.dataSource.query(`
+      SELECT
+        report.id,
+        report.code,
+        report.reference_text AS "referenceText",
+        report.general_objective AS "generalObjective",
+        report.specific_objective AS "specificObjective",
+        report.background,
+        report.legal_framework AS "legalFramework",
+        report.executive_summary AS "executiveSummary",
+        report.description,
+        report.conclusion,
+        report.gedo_if_identifier AS "gedoIfIdentifier",
+        report.gedo_officialized_on::text AS "gedoOfficializedOn",
+        report.gedo_pdf_original_name AS "gedoPdfOriginalName",
+        report.gedo_pdf_mime_type AS "gedoPdfMimeType",
+        report.gedo_pdf_size_bytes AS "gedoPdfSizeBytes",
+        report.gedo_pdf_sha256 AS "gedoPdfSha256",
+        report.gedo_pdf_uploaded_at AS "gedoPdfUploadedAt",
+        act.id AS "actId",
+        act.code AS "actCode",
+        act.urgency,
+        act.deadline_days AS "deadlineDays",
+        act.deadline_day_type AS "deadlineDayType",
+        act.deadline_basis AS "deadlineBasis",
+        act.deadline_base_on::text AS "deadlineBaseOn",
+        act.deadline_due_on::text AS "deadlineDueOn",
+        act.status AS "actStatus",
+        visit.id AS "visitId",
+        visit.code AS "visitCode"
+      FROM inspection_reports report
+      INNER JOIN inspection_acts act ON act.id = report.act_id
+      INNER JOIN inspection_visits visit ON visit.id = report.visit_id
+      WHERE report.id = $1
+    `, [reportId]) as Array<Record<string, unknown>>;
+    const followUps = await this.listFollowUps(reportId);
+    return { ...report, followUps: followUps.data };
+  }
+
+  async updateContent(
+    reportId: string,
+    dto: UpdateInspectionReportContentDto,
+    principal: AuthPrincipal,
+    request: RequestWithContext,
+  ) {
+    return this.dataSource.transaction(async (manager) => {
+      const context = await this.requireReport(manager, reportId, true);
+      await this.assertCanWorkReport(manager, context, principal);
+      const repository = manager.getRepository(InspectionReport);
+      const report = await repository.findOne({ where: { id: reportId } });
+      if (!report) throw this.notFound();
+      const before = this.contentSnapshot(report);
+      const fields: Array<keyof UpdateInspectionReportContentDto> = [
+        'referenceText',
+        'generalObjective',
+        'specificObjective',
+        'background',
+        'legalFramework',
+        'executiveSummary',
+        'description',
+        'conclusion',
+      ];
+      let changed = false;
+      for (const field of fields) {
+        if (dto[field] !== undefined) {
+          (report as unknown as Record<string, unknown>)[field] = dto[field] ?? null;
+          changed = true;
+        }
+      }
+      if (!changed) {
+        throw new BadRequestException({
+          code: 'INSPECTION_REPORT_CONTENT_EMPTY_UPDATE',
+          message: 'No se recibió ningún campo del Informe para actualizar',
+        });
+      }
+      await repository.save(report);
+      const after = this.contentSnapshot(report);
+      await this.audit.record({
+        ...administrationAuditContext(principal, request),
+        action: 'INSPECTION_REPORT_CONTENT_UPDATED',
+        entityType: 'inspection_report',
+        entityId: reportId,
+        beforeData: before,
+        afterData: after,
+        metadata: { actId: context.actId, visitId: context.visitId },
+      }, manager);
+      return after;
+    });
+  }
+
+  async officializeGedo(
+    reportId: string,
+    dto: OfficializeInspectionReportGedoDto,
+    file: UploadedReportDossierFile | undefined,
+    principal: AuthPrincipal,
+    request: RequestWithContext,
+  ) {
+    const inspected = inspectReportDossierPdf(file);
+    this.assertDate(dto.officializedOn, 'La fecha de carga en GEDO no es válida');
+    await mkdir(this.root, { recursive: true, mode: 0o700 });
+    const storedName = `gedo-${reportId}-${randomUUID()}.pdf`;
+    const filePath = this.safePath(storedName);
+    const sha256 = createHash('sha256').update(file!.buffer).digest('hex');
+    await writeFile(filePath, file!.buffer, { mode: 0o600 });
+    try {
+      return await this.dataSource.transaction(async (manager) => {
+        const context = await this.requireReport(manager, reportId, true);
+        await this.assertCanWorkReport(manager, context, principal);
+        if (context.gedoIfIdentifier || context.gedoOfficializedOn || context.gedoPdfStoredName) {
+          throw new ConflictException({
+            code: 'INSPECTION_REPORT_ALREADY_OFFICIALIZED',
+            message: 'Este Informe ya tiene un IF oficial de GEDO y no puede sobrescribirse',
+          });
+        }
+        await manager.query(`
+          UPDATE inspection_reports
+          SET gedo_if_identifier = $2,
+              gedo_officialized_on = $3::date,
+              gedo_pdf_original_name = $4,
+              gedo_pdf_stored_name = $5,
+              gedo_pdf_mime_type = 'application/pdf',
+              gedo_pdf_size_bytes = $6,
+              gedo_pdf_sha256 = $7,
+              gedo_pdf_uploaded_at = CURRENT_TIMESTAMP,
+              gedo_pdf_uploaded_by = $8,
+              updated_at = CURRENT_TIMESTAMP
+          WHERE id = $1
+        `, [
+          reportId,
+          dto.ifIdentifier,
+          dto.officializedOn,
+          inspected.originalName,
+          storedName,
+          file!.buffer.length,
+          sha256,
+          principal.userId,
+        ]);
+        const deadlineDueOn = await this.deadlines.applyGedoOfficialization(
+          manager,
+          context.actId,
+          dto.officializedOn,
+        );
+        const after = {
+          gedoIfIdentifier: dto.ifIdentifier,
+          gedoOfficializedOn: dto.officializedOn,
+          gedoPdfOriginalName: inspected.originalName,
+          gedoPdfSizeBytes: file!.buffer.length,
+          gedoPdfSha256: sha256,
+          deadlineDueOn,
+        };
+        await this.audit.record({
+          ...administrationAuditContext(principal, request),
+          action: 'INSPECTION_REPORT_GEDO_OFFICIALIZED',
+          entityType: 'inspection_report',
+          entityId: reportId,
+          afterData: after,
+          metadata: {
+            actId: context.actId,
+            visitId: context.visitId,
+            officialLegalDocument: true,
+          },
+        }, manager);
+        return after;
+      });
+    } catch (error) {
+      await unlink(filePath).catch(() => undefined);
+      throw error;
+    }
+  }
+
+  async gedoPdfContent(reportId: string) {
+    const context = await this.requireReport(this.dataSource.manager, reportId);
+    if (!context.gedoPdfStoredName || !context.gedoPdfSizeBytes || !context.gedoPdfSha256) {
+      throw new NotFoundException({
+        code: 'INSPECTION_REPORT_GEDO_PDF_NOT_FOUND',
+        message: 'El Informe todavía no tiene un PDF oficial de GEDO',
+      });
+    }
+    const filePath = this.safePath(context.gedoPdfStoredName);
+    await this.verifyStoredFile(filePath, context.gedoPdfSizeBytes, context.gedoPdfSha256);
+    return { filePath, originalName: `${context.gedoIfIdentifier ?? context.code}.pdf` };
+  }
+
+  async listFollowUps(reportId: string) {
+    await this.requireReport(this.dataSource.manager, reportId);
+    const data = await this.dataSource.query(`
+      SELECT
+        follow_up.id,
+        follow_up.event_type AS "eventType",
+        follow_up.reference_number AS "referenceNumber",
+        follow_up.occurred_on::text AS "occurredOn",
+        follow_up.description,
+        follow_up.created_by AS "createdBy",
+        follow_up.created_at AS "createdAt",
+        COALESCE((
+          SELECT JSONB_AGG(JSONB_BUILD_OBJECT(
+            'id', file.id,
+            'originalName', file.original_name,
+            'mimeType', file.mime_type,
+            'sizeBytes', file.size_bytes,
+            'sha256', file.sha256,
+            'createdAt', file.created_at
+          ) ORDER BY file.created_at, file.id)
+          FROM inspection_report_follow_up_files file
+          WHERE file.follow_up_id = follow_up.id
+        ), '[]'::jsonb) AS files
+      FROM inspection_report_follow_ups follow_up
+      WHERE follow_up.report_id = $1
+      ORDER BY follow_up.occurred_on ASC, follow_up.created_at ASC, follow_up.id ASC
+    `, [reportId]);
+    return { data };
+  }
+
+  async createFollowUp(
+    reportId: string,
+    dto: CreateInspectionReportFollowUpDto,
+    files: UploadedReportDossierFile[],
+    principal: AuthPrincipal,
+    request: RequestWithContext,
+  ) {
+    this.assertDate(dto.occurredOn, 'La fecha del seguimiento no es válida');
+    if (files.length > 10) {
+      throw new BadRequestException({
+        code: 'INSPECTION_REPORT_FOLLOW_UP_TOO_MANY_FILES',
+        message: 'Se permiten hasta 10 archivos PDF por registro de seguimiento',
+      });
+    }
+    if (dto.eventType === InspectionReportFollowUpType.COMPANY_NOTE && files.length < 1) {
+      throw new BadRequestException({
+        code: 'INSPECTION_REPORT_COMPANY_NOTE_FILE_REQUIRED',
+        message: 'La respuesta formal de la empresa debe conservar al menos el PDF de la Nota recibida',
+      });
+    }
+    const inspectedFiles = files.map((file) => ({ file, inspected: inspectReportDossierPdf(file) }));
+    const followUpId = randomUUID();
+    const stored: Array<{
+      id: string;
+      storedName: string;
+      filePath: string;
+      originalName: string;
+      sizeBytes: number;
+      sha256: string;
+    }> = [];
+    await mkdir(this.root, { recursive: true, mode: 0o700 });
+    try {
+      for (const item of inspectedFiles) {
+        const id = randomUUID();
+        const storedName = `follow-up-${followUpId}-${id}.pdf`;
+        const filePath = this.safePath(storedName);
+        const sha256 = createHash('sha256').update(item.file.buffer).digest('hex');
+        await writeFile(filePath, item.file.buffer, { mode: 0o600 });
+        stored.push({
+          id,
+          storedName,
+          filePath,
+          originalName: item.inspected.originalName,
+          sizeBytes: item.file.buffer.length,
+          sha256,
+        });
+      }
+      await this.dataSource.transaction(async (manager) => {
+        const context = await this.requireReport(manager, reportId, true);
+        await this.assertCanWorkReport(manager, context, principal);
+        await manager.getRepository(InspectionReportFollowUp).insert({
+          id: followUpId,
+          reportId,
+          eventType: dto.eventType,
+          referenceNumber: dto.referenceNumber ?? null,
+          occurredOn: dto.occurredOn,
+          description: dto.description ?? null,
+          createdBy: principal.userId,
+        });
+        for (const file of stored) {
+          await manager.getRepository(InspectionReportFollowUpFile).insert({
+            id: file.id,
+            followUpId,
+            originalName: file.originalName,
+            storedName: file.storedName,
+            mimeType: 'application/pdf',
+            sizeBytes: file.sizeBytes,
+            sha256: file.sha256,
+            createdBy: principal.userId,
+          });
+        }
+        await this.audit.record({
+          ...administrationAuditContext(principal, request),
+          action: 'INSPECTION_REPORT_FOLLOW_UP_CREATED',
+          entityType: 'inspection_report_follow_up',
+          entityId: followUpId,
+          afterData: {
+            reportId,
+            eventType: dto.eventType,
+            referenceNumber: dto.referenceNumber ?? null,
+            occurredOn: dto.occurredOn,
+            description: dto.description ?? null,
+            files: stored.map((file) => ({
+              id: file.id,
+              originalName: file.originalName,
+              sizeBytes: file.sizeBytes,
+              sha256: file.sha256,
+            })),
+          },
+          metadata: {
+            actId: context.actId,
+            visitId: context.visitId,
+            appendOnly: true,
+          },
+        }, manager);
+      });
+      return this.listFollowUps(reportId);
+    } catch (error) {
+      await Promise.all(stored.map((file) => unlink(file.filePath).catch(() => undefined)));
+      throw error;
+    }
+  }
+
+  async followUpFileContent(fileId: string) {
+    const [file] = (await this.dataSource.query(`
+      SELECT
+        file.original_name AS "originalName",
+        file.stored_name AS "storedName",
+        file.size_bytes AS "sizeBytes",
+        file.sha256
+      FROM inspection_report_follow_up_files file
+      WHERE file.id = $1
+    `, [fileId])) as Array<{
+      originalName: string;
+      storedName: string;
+      sizeBytes: number;
+      sha256: string;
+    }>;
+    if (!file) {
+      throw new NotFoundException({
+        code: 'INSPECTION_REPORT_FOLLOW_UP_FILE_NOT_FOUND',
+        message: 'Documento de seguimiento no encontrado',
+      });
+    }
+    const filePath = this.safePath(file.storedName);
+    await this.verifyStoredFile(filePath, Number(file.sizeBytes), file.sha256);
+    return { filePath, originalName: file.originalName };
+  }
+
+  private async requireReport(
+    manager: EntityManager,
+    reportId: string,
+    lock = false,
+  ): Promise<ReportContext> {
+    const suffix = lock ? 'FOR UPDATE OF report' : '';
+    const [row] = (await manager.query(`
+      SELECT
+        report.id,
+        report.code,
+        report.act_id AS "actId",
+        report.visit_id AS "visitId",
+        report.generated_by AS "generatedBy",
+        report.gedo_if_identifier AS "gedoIfIdentifier",
+        report.gedo_officialized_on::text AS "gedoOfficializedOn",
+        report.gedo_pdf_stored_name AS "gedoPdfStoredName",
+        report.gedo_pdf_size_bytes AS "gedoPdfSizeBytes",
+        report.gedo_pdf_sha256 AS "gedoPdfSha256",
+        act.code AS "actCode",
+        visit.code AS "visitCode"
+      FROM inspection_reports report
+      INNER JOIN inspection_acts act ON act.id = report.act_id
+      INNER JOIN inspection_visits visit ON visit.id = report.visit_id
+      WHERE report.id = $1
+      ${suffix}
+    `, [reportId])) as ReportContext[];
+    if (!row) throw this.notFound();
+    return row;
+  }
+
+  private async assertCanWorkReport(
+    manager: EntityManager,
+    report: ReportContext,
+    principal: AuthPrincipal,
+  ): Promise<void> {
+    if (principal.roles.includes('admin') || principal.roles.includes('supervisor')) return;
+    if (report.generatedBy === principal.userId) return;
+    const [member] = (await manager.query(`
+      SELECT 1 AS found
+      FROM inspection_visit_members
+      WHERE visit_id = $1
+        AND user_id = $2
+        AND included = true
+      LIMIT 1
+    `, [report.visitId, principal.userId])) as Array<{ found: number }>;
+    if (member) return;
+    throw new ForbiddenException({
+      code: 'INSPECTION_REPORT_NOT_ASSIGNED',
+      message: 'Sólo el inspector asignado a la inspección o su jefatura puede trabajar este Informe',
+    });
+  }
+
+  private contentSnapshot(report: InspectionReport): Record<string, unknown> {
+    return {
+      referenceText: report.referenceText,
+      generalObjective: report.generalObjective,
+      specificObjective: report.specificObjective,
+      background: report.background,
+      legalFramework: report.legalFramework,
+      executiveSummary: report.executiveSummary,
+      description: report.description,
+      conclusion: report.conclusion,
+    };
+  }
+
+  private assertDate(value: string, message: string): void {
+    const parsed = new Date(`${value}T00:00:00Z`);
+    if (!Number.isFinite(parsed.getTime()) || parsed.toISOString().slice(0, 10) !== value) {
+      throw new BadRequestException({ code: 'INSPECTION_REPORT_DATE_INVALID', message });
+    }
+  }
+
+  private safePath(storedName: string): string {
+    const filePath = resolve(this.root, storedName);
+    if (!filePath.startsWith(`${this.root}/`)) {
+      throw new InternalServerErrorException({
+        code: 'INSPECTION_REPORT_STORAGE_INVALID_PATH',
+        message: 'Ruta de almacenamiento inválida',
+      });
+    }
+    return filePath;
+  }
+
+  private async verifyStoredFile(filePath: string, expectedSize: number, expectedSha256: string): Promise<void> {
+    const metadata = await stat(filePath).catch(() => null);
+    if (!metadata?.isFile() || metadata.size !== expectedSize) throw this.storageError();
+    const buffer = await readFile(filePath);
+    const actualSha256 = createHash('sha256').update(buffer).digest('hex');
+    if (actualSha256 !== expectedSha256) throw this.storageError();
+  }
+
+  private storageError(): InternalServerErrorException {
+    return new InternalServerErrorException({
+      code: 'INSPECTION_REPORT_STORAGE_INTEGRITY_ERROR',
+      message: 'El archivo almacenado no supera la verificación de integridad',
+    });
+  }
+
+  private notFound(): NotFoundException {
+    return new NotFoundException({
+      code: 'INSPECTION_REPORT_NOT_FOUND',
+      message: 'Informe de inspección no encontrado',
+    });
+  }
+}

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

@@ -1,31 +1,39 @@
 import { Module } from '@nestjs/common';
 import { AuditModule } from '../audit/audit.module';
+import { InspectionDeadlinesModule } from '../inspection-deadlines/inspection-deadlines.module';
 import { DocumentDeliveryController } from './document-delivery.controller';
 import { InspectionActPdfService } from './inspection-act-pdf.service';
 import { InspectionDocumentDeliveryService } from './inspection-document-delivery.service';
-import { InspectionReportReviewController, InspectionReportRevisionContentController } from './inspection-report-review.controller';
+import {
-import { InspectionReportReviewService } from './inspection-report-review.service';
+  InspectionReportDossierController,
+  InspectionReportFollowUpFileController,
+} from './inspection-report-dossier.controller';
+import { InspectionReportDossierService } from './inspection-report-dossier.service';
 import { InspectionReportWordService } from './inspection-report-word.service';
 import { InspectionActReportController, InspectionReportsController } from './inspection-reports.controller';
 import { InspectionReportsService } from './inspection-reports.service';
 import { SmtpDeliveryService } from './smtp-delivery.service';
+import { SmtpSettingsController } from './smtp-settings.controller';
+import { SmtpSettingsService } from './smtp-settings.service';
 
 @Module({
-  imports: [AuditModule],
+  imports: [AuditModule, InspectionDeadlinesModule],
   controllers: [
     InspectionReportsController,
     InspectionActReportController,
+    InspectionReportDossierController,
+    InspectionReportFollowUpFileController,
     DocumentDeliveryController,
-    InspectionReportReviewController,
+    SmtpSettingsController,
-    InspectionReportRevisionContentController,
   ],
   providers: [
     InspectionReportsService,
     InspectionReportWordService,
+    InspectionReportDossierService,
     InspectionActPdfService,
     InspectionDocumentDeliveryService,
     SmtpDeliveryService,
-    InspectionReportReviewService,
+    SmtpSettingsService,
   ],
   exports: [InspectionReportsService],
 })

api-v3/src/inspection-reports/smtp-delivery.service.ts

@@ -1,37 +1,328 @@
+import { randomUUID } from 'node:crypto';
 import { connect as connectNet, Socket } from 'node:net';
 import { connect as connectTls, TLSSocket } from 'node:tls';
-import { randomUUID } from 'node:crypto';
+import { Injectable, OnModuleInit } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
-import { Injectable } from '@nestjs/common';
+import { DataSource } from 'typeorm';
+import { decryptSmtpSecret } from './smtp-settings-crypto';
 
-interface MailAttachment { filename:string; mimeType:string; content:Buffer; }
+interface MailAttachment {
-interface MailInput { to:string; subject:string; text:string; attachment:MailAttachment; }
+  filename: string;
-interface Reply { code:number; text:string; }
+  mimeType: string;
+  content: Buffer;
+}
+
+interface MailInput {
+  to: string;
+  subject: string;
+  text: string;
+  attachment?: MailAttachment;
+}
+
+interface Reply {
+  code: number;
+  text: string;
+}
+
+interface RuntimeSmtpConfig {
+  source: 'DATABASE' | 'ENV';
+  host: string;
+  port: number;
+  securityMode: 'TLS' | 'STARTTLS';
+  user: string;
+  pass: string;
+  fromHeader: string;
+  fromEmail: string;
+  replyTo: string | null;
+}
 
 class SmtpSession {
-  private buffer=''; private waiters:Array<(reply:Reply)=>void>=[]; private replyLines:string[]=[];
+  private buffer = '';
-  private readonly dataHandler=(chunk:Buffer|string)=>this.onData(typeof chunk==='string'?chunk:chunk.toString('utf8'));
+  private waiters: Array<(reply: Reply) => void> = [];
-  constructor(private socket:Socket|TLSSocket){ this.attach(socket); }
+  private replyLines: string[] = [];
-  private attach(socket:Socket|TLSSocket){ socket.setEncoding('utf8'); socket.setTimeout(15000,()=>socket.destroy(new Error('SMTP timeout'))); socket.on('data',this.dataHandler); }
+  private readonly dataHandler = (chunk: Buffer | string) =>
-  detachForUpgrade(){ this.socket.off('data',this.dataHandler); this.socket.setTimeout(0); return this.socket; }
+    this.onData(typeof chunk === 'string' ? chunk : chunk.toString('utf8'));
-  replaceSocket(socket:Socket|TLSSocket){ this.socket=socket; this.buffer=''; this.attach(socket); }
+
-  private onData(chunk:string){ this.buffer+=chunk; const lines=this.buffer.split(/\r?\n/); this.buffer=lines.pop()??''; for(const line of lines){ if(!line)continue; this.replyLines.push(line); if(/^\d{3} /.test(line)){ const code=Number(line.slice(0,3)); const reply={code,text:this.replyLines.join('\n')}; this.replyLines=[]; const waiter=this.waiters.shift(); if(waiter)waiter(reply); } } }
+  constructor(private socket: Socket | TLSSocket) {
-  reply():Promise<Reply>{return new Promise((resolve,reject)=>{ const onError=(e:Error)=>{this.socket.off('error',onError);reject(e)}; this.socket.once('error',onError); this.waiters.push((reply)=>{this.socket.off('error',onError);resolve(reply)}); });}
+    this.attach(socket);
-  async command(command:string, expected:number|number[]){ this.socket.write(`${command}\r\n`); const reply=await this.reply(); const allowed=Array.isArray(expected)?expected:[expected]; if(!allowed.includes(reply.code))throw new Error(`SMTP ${reply.code}: ${reply.text}`); return reply; }
+  }
-  write(data:string){this.socket.write(data);}
+
-  end(){this.socket.end();}
+  private attach(socket: Socket | TLSSocket) {
-  current(){return this.socket;}
+    socket.setEncoding('utf8');
+    socket.setTimeout(15000, () => socket.destroy(new Error('SMTP timeout')));
+    socket.on('data', this.dataHandler);
+  }
+
+  detachForUpgrade() {
+    this.socket.off('data', this.dataHandler);
+    this.socket.setTimeout(0);
+    return this.socket;
+  }
+
+  replaceSocket(socket: Socket | TLSSocket) {
+    this.socket = socket;
+    this.buffer = '';
+    this.attach(socket);
+  }
+
+  private onData(chunk: string) {
+    this.buffer += chunk;
+    const lines = this.buffer.split(/\r?\n/);
+    this.buffer = lines.pop() ?? '';
+    for (const line of lines) {
+      if (!line) continue;
+      this.replyLines.push(line);
+      if (/^\d{3} /.test(line)) {
+        const code = Number(line.slice(0, 3));
+        const reply = { code, text: this.replyLines.join('\n') };
+        this.replyLines = [];
+        this.waiters.shift()?.(reply);
+      }
+    }
+  }
+
+  reply(): Promise<Reply> {
+    return new Promise((resolve, reject) => {
+      const onError = (error: Error) => {
+        this.socket.off('error', onError);
+        reject(error);
+      };
+      this.socket.once('error', onError);
+      this.waiters.push((reply) => {
+        this.socket.off('error', onError);
+        resolve(reply);
+      });
+    });
+  }
+
+  async command(command: string, expected: number | number[]) {
+    this.socket.write(`${command}\r\n`);
+    const reply = await this.reply();
+    const allowed = Array.isArray(expected) ? expected : [expected];
+    if (!allowed.includes(reply.code)) {
+      throw new Error(`SMTP ${reply.code}: ${reply.text}`);
+    }
+    return reply;
+  }
+
+  write(data: string) {
+    this.socket.write(data);
+  }
+
+  end() {
+    this.socket.end();
+  }
 }
 
-function subject(value:string){return `=?UTF-8?B?${Buffer.from(value,'utf8').toString('base64')}?=`;}
+function encodedSubject(value: string) {
-function envelope(value:string){const m=value.match(/<([^>]+)>/);return (m?.[1]??value).trim();}
+  return `=?UTF-8?B?${Buffer.from(value, 'utf8').toString('base64')}?=`;
-function mime(input:MailInput,from:string){ const boundary=`dh-${randomUUID()}`; const body=[`From: ${from}`,`To: ${input.to}`,`Subject: ${subject(input.subject)}`,'MIME-Version: 1.0',`Content-Type: multipart/mixed; boundary="${boundary}"`,'',`--${boundary}`,'Content-Type: text/plain; charset=utf-8','Content-Transfer-Encoding: base64','',Buffer.from(input.text,'utf8').toString('base64'),`--${boundary}`,`Content-Type: ${input.attachment.mimeType}; name="${input.attachment.filename.replaceAll('"','')}"`,'Content-Transfer-Encoding: base64',`Content-Disposition: attachment; filename="${input.attachment.filename.replaceAll('"','')}"`,'',input.attachment.content.toString('base64').replace(/(.{76})/g,'$1\r\n'),`--${boundary}--`,''].join('\r\n'); return body.replace(/^\./gm,'..'); }
+}
+
+function escapeHeader(value: string) {
+  return value.replace(/[\r\n]/g, ' ').replaceAll('"', "'");
+}
+
+function mime(input: MailInput, config: RuntimeSmtpConfig) {
+  const headers = [
+    `From: ${config.fromHeader}`,
+    `To: ${input.to}`,
+    `Subject: ${encodedSubject(input.subject)}`,
+    ...(config.replyTo ? [`Reply-To: ${config.replyTo}`] : []),
+    'MIME-Version: 1.0',
+  ];
+  if (!input.attachment) {
+    return [
+      ...headers,
+      'Content-Type: text/plain; charset=utf-8',
+      'Content-Transfer-Encoding: base64',
+      '',
+      Buffer.from(input.text, 'utf8').toString('base64'),
+      '',
+    ].join('\r\n').replace(/^\./gm, '..');
+  }
+  const boundary = `dh-${randomUUID()}`;
+  const filename = escapeHeader(input.attachment.filename);
+  return [
+    ...headers,
+    `Content-Type: multipart/mixed; boundary="${boundary}"`,
+    '',
+    `--${boundary}`,
+    'Content-Type: text/plain; charset=utf-8',
+    'Content-Transfer-Encoding: base64',
+    '',
+    Buffer.from(input.text, 'utf8').toString('base64'),
+    `--${boundary}`,
+    `Content-Type: ${input.attachment.mimeType}; name="${filename}"`,
+    'Content-Transfer-Encoding: base64',
+    `Content-Disposition: attachment; filename="${filename}"`,
+    '',
+    input.attachment.content.toString('base64').replace(/(.{76})/g, '$1\r\n'),
+    `--${boundary}--`,
+    '',
+  ].join('\r\n').replace(/^\./gm, '..');
+}
 
 @Injectable()
-export class SmtpDeliveryService {
+export class SmtpDeliveryService implements OnModuleInit {
-  constructor(private readonly config:ConfigService){}
+  private runtime: RuntimeSmtpConfig | null;
-  configured(){return Boolean(this.config.get<string>('SMTP_HOST')&&this.config.get<string>('MAIL_FROM'));}
+  private runtimeError: string | null = null;
-  async send(input:MailInput):Promise<{messageId:string}>{ const host=this.config.get<string>('SMTP_HOST'); const from=this.config.get<string>('MAIL_FROM'); if(!host||!from)throw new Error('SMTP no configurado'); const port=Number(this.config.get<string>('SMTP_PORT')??587); const secure=String(this.config.get<string>('SMTP_SECURE')??'false').toLowerCase()==='true'; const user=this.config.get<string>('SMTP_USER')??''; const pass=this.config.get<string>('SMTP_PASS')??''; const base=await new Promise<Socket|TLSSocket>((resolve,reject)=>{ if(secure){ const tls=connectTls({host,port,servername:host,rejectUnauthorized:true},()=>resolve(tls)); tls.once('error',reject); } else { const raw=connectNet({host,port},()=>resolve(raw)); raw.once('error',reject); } }); const session=new SmtpSession(base); const welcome=await session.reply(); if(welcome.code!==220)throw new Error(`SMTP ${welcome.code}: ${welcome.text}`); let ehlo=await session.command(`EHLO dh-inspeccion`,250); if(!secure){ if(!/STARTTLS/i.test(ehlo.text))throw new Error('El servidor SMTP no ofrece STARTTLS'); await session.command('STARTTLS',220); const rawForTls=session.detachForUpgrade() as Socket; const upgraded=await new Promise<TLSSocket>((resolve,reject)=>{ const tls=connectTls({socket:rawForTls,servername:host,rejectUnauthorized:true},()=>resolve(tls)); tls.once('error',reject); }); session.replaceSocket(upgraded); ehlo=await session.command('EHLO dh-inspeccion',250); }
+
-    if(user){ if(/AUTH[^\n]*PLAIN/i.test(ehlo.text)){ const token=Buffer.from(`\u0000${user}\u0000${pass}`,'utf8').toString('base64'); await session.command(`AUTH PLAIN ${token}`,235); } else { await session.command('AUTH LOGIN',334); await session.command(Buffer.from(user).toString('base64'),334); await session.command(Buffer.from(pass).toString('base64'),235); } }
+  constructor(
-    await session.command(`MAIL FROM:<${envelope(from)}>`,250); await session.command(`RCPT TO:<${input.to}>`,[250,251]); await session.command('DATA',354); session.write(`${mime(input,from)}\r\n.\r\n`); const sent=await session.reply(); if(sent.code!==250)throw new Error(`SMTP ${sent.code}: ${sent.text}`); await session.command('QUIT',221).catch(()=>undefined); session.end(); const match=sent.text.match(/(?:queued as|id=|message-id[=:]?)[\s<]*([^\s>]+)/i); return {messageId:match?.[1]??randomUUID()}; }
+    private readonly dataSource: DataSource,
+    private readonly config: ConfigService,
+  ) {
+    this.runtime = this.environmentConfig();
+  }
+
+  async onModuleInit(): Promise<void> {
+    await this.reload().catch((error) => {
+      this.runtime = null;
+      this.runtimeError = error instanceof Error ? error.message : 'SMTP configuration error';
+    });
+  }
+
+  configured() {
+    return Boolean(this.runtime);
+  }
+
+  activeSource() {
+    return this.runtime?.source ?? null;
+  }
+
+  async reload(): Promise<void> {
+    const [row] = (await this.dataSource.query(`
+      SELECT
+        enabled,
+        host,
+        port,
+        security_mode AS "securityMode",
+        username,
+        password_encrypted AS "passwordEncrypted",
+        from_name AS "fromName",
+        from_email AS "fromEmail",
+        reply_to AS "replyTo"
+      FROM smtp_settings
+      WHERE id = 1
+    `).catch(() => [])) as Array<{
+      enabled: boolean;
+      host: string | null;
+      port: number | null;
+      securityMode: 'TLS' | 'STARTTLS' | null;
+      username: string | null;
+      passwordEncrypted: string | null;
+      fromName: string | null;
+      fromEmail: string | null;
+      replyTo: string | null;
+    }>;
+
+    if (!row?.enabled) {
+      this.runtime = this.environmentConfig();
+      this.runtimeError = null;
+      return;
+    }
+    if (!row.host || !row.port || !row.securityMode || !row.fromName || !row.fromEmail) {
+      this.runtime = null;
+      this.runtimeError = 'La configuración SMTP del Superadmin está incompleta';
+      return;
+    }
+    let pass = '';
+    if (row.passwordEncrypted) {
+      const key = this.config.get<string>('SMTP_SETTINGS_ENCRYPTION_KEY');
+      if (!key) {
+        this.runtime = null;
+        this.runtimeError = 'Falta SMTP_SETTINGS_ENCRYPTION_KEY para descifrar la contraseña SMTP';
+        return;
+      }
+      pass = decryptSmtpSecret(row.passwordEncrypted, key);
+    }
+    this.runtime = {
+      source: 'DATABASE',
+      host: row.host,
+      port: Number(row.port),
+      securityMode: row.securityMode,
+      user: row.username ?? '',
+      pass,
+      fromHeader: `"${escapeHeader(row.fromName)}" <${row.fromEmail}>`,
+      fromEmail: row.fromEmail,
+      replyTo: row.replyTo,
+    };
+    this.runtimeError = null;
+  }
+
+  async send(input: MailInput): Promise<{ messageId: string }> {
+    if (!this.runtime) await this.reload();
+    const config = this.runtime;
+    if (!config) throw new Error(this.runtimeError ?? 'SMTP no configurado');
+
+    const base = await new Promise<Socket | TLSSocket>((resolve, reject) => {
+      if (config.securityMode === 'TLS') {
+        const tls = connectTls({
+          host: config.host,
+          port: config.port,
+          servername: config.host,
+          rejectUnauthorized: true,
+        }, () => resolve(tls));
+        tls.once('error', reject);
+      } else {
+        const raw = connectNet({ host: config.host, port: config.port }, () => resolve(raw));
+        raw.once('error', reject);
+      }
+    });
+    const session = new SmtpSession(base);
+    const welcome = await session.reply();
+    if (welcome.code !== 220) throw new Error(`SMTP ${welcome.code}: ${welcome.text}`);
+    let ehlo = await session.command('EHLO dh-inspeccion', 250);
+    if (config.securityMode === 'STARTTLS') {
+      if (!/STARTTLS/i.test(ehlo.text)) throw new Error('El servidor SMTP no ofrece STARTTLS');
+      await session.command('STARTTLS', 220);
+      const raw = session.detachForUpgrade() as Socket;
+      const upgraded = await new Promise<TLSSocket>((resolve, reject) => {
+        const tls = connectTls({ socket: raw, servername: config.host, rejectUnauthorized: true }, () => resolve(tls));
+        tls.once('error', reject);
+      });
+      session.replaceSocket(upgraded);
+      ehlo = await session.command('EHLO dh-inspeccion', 250);
+    }
+    if (config.user) {
+      if (/AUTH[^\n]*PLAIN/i.test(ehlo.text)) {
+        const token = Buffer.from(`\u0000${config.user}\u0000${config.pass}`, 'utf8').toString('base64');
+        await session.command(`AUTH PLAIN ${token}`, 235);
+      } else {
+        await session.command('AUTH LOGIN', 334);
+        await session.command(Buffer.from(config.user).toString('base64'), 334);
+        await session.command(Buffer.from(config.pass).toString('base64'), 235);
+      }
+    }
+    await session.command(`MAIL FROM:<${config.fromEmail}>`, 250);
+    await session.command(`RCPT TO:<${input.to}>`, [250, 251]);
+    await session.command('DATA', 354);
+    session.write(`${mime(input, config)}\r\n.\r\n`);
+    const sent = await session.reply();
+    if (sent.code !== 250) throw new Error(`SMTP ${sent.code}: ${sent.text}`);
+    await session.command('QUIT', 221).catch(() => undefined);
+    session.end();
+    const match = sent.text.match(/(?:queued as|id=|message-id[=:]?)[\s<]*([^\s>]+)/i);
+    return { messageId: match?.[1] ?? randomUUID() };
+  }
+
+  private environmentConfig(): RuntimeSmtpConfig | null {
+    const host = this.config.get<string>('SMTP_HOST');
+    const from = this.config.get<string>('MAIL_FROM');
+    if (!host || !from) return null;
+    const match = from.match(/^(?:\s*"?([^"<]+)"?\s*)?<([^>]+)>\s*$/);
+    const fromEmail = (match?.[2] ?? from).trim();
+    return {
+      source: 'ENV',
+      host,
+      port: Number(this.config.get<string>('SMTP_PORT') ?? 587),
+      securityMode: String(this.config.get<string>('SMTP_SECURE') ?? 'false').toLowerCase() === 'true'
+        ? 'TLS'
+        : 'STARTTLS',
+      user: this.config.get<string>('SMTP_USER') ?? '',
+      pass: this.config.get<string>('SMTP_PASS') ?? '',
+      fromHeader: from,
+      fromEmail,
+      replyTo: null,
+    };
+  }
 }

api-v3/src/inspection-reports/smtp-settings-crypto.ts

@@ -0,0 +1,38 @@
+import { createCipheriv, createDecipheriv, createHash, randomBytes } from 'node:crypto';
+
+function keyFromSecret(secret: string): Buffer {
+  if (secret.trim().length < 24) {
+    throw new Error('SMTP_SETTINGS_ENCRYPTION_KEY must contain at least 24 characters');
+  }
+  return createHash('sha256').update(secret, 'utf8').digest();
+}
+
+export function encryptSmtpSecret(value: string, secret: string): string {
+  const iv = randomBytes(12);
+  const cipher = createCipheriv('aes-256-gcm', keyFromSecret(secret), iv);
+  const encrypted = Buffer.concat([cipher.update(value, 'utf8'), cipher.final()]);
+  const tag = cipher.getAuthTag();
+  return [
+    'v1',
+    iv.toString('base64'),
+    tag.toString('base64'),
+    encrypted.toString('base64'),
+  ].join(':');
+}
+
+export function decryptSmtpSecret(value: string, secret: string): string {
+  const [version, ivEncoded, tagEncoded, encryptedEncoded] = value.split(':');
+  if (version !== 'v1' || !ivEncoded || !tagEncoded || encryptedEncoded === undefined) {
+    throw new Error('Invalid encrypted SMTP password payload');
+  }
+  const decipher = createDecipheriv(
+    'aes-256-gcm',
+    keyFromSecret(secret),
+    Buffer.from(ivEncoded, 'base64'),
+  );
+  decipher.setAuthTag(Buffer.from(tagEncoded, 'base64'));
+  return Buffer.concat([
+    decipher.update(Buffer.from(encryptedEncoded, 'base64')),
+    decipher.final(),
+  ]).toString('utf8');
+}

api-v3/src/inspection-reports/smtp-settings.controller.ts

@@ -0,0 +1,52 @@
+import { Body, Controller, Get, Put, 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 { TestSmtpSettingsDto, UpdateSmtpSettingsDto } from './dto/update-smtp-settings.dto';
+import { SmtpDeliveryService } from './smtp-delivery.service';
+import { SmtpSettingsService } from './smtp-settings.service';
+
+@Controller('system-mail-settings')
+export class SmtpSettingsController {
+  constructor(
+    private readonly settings: SmtpSettingsService,
+    private readonly smtp: SmtpDeliveryService,
+  ) {}
+
+  @Get()
+  @RequirePermissions('system_mail.manage')
+  async get() {
+    return {
+      ...(await this.settings.getPublic()),
+      transportConfigured: this.smtp.configured(),
+      activeSource: this.smtp.activeSource(),
+    };
+  }
+
+  @Put()
+  @RequirePermissions('system_mail.manage')
+  async update(
+    @Body() dto: UpdateSmtpSettingsDto,
+    @CurrentAuth() principal: AuthPrincipal,
+    @Req() request: RequestWithContext,
+  ) {
+    const result = await this.settings.update(dto, principal, request);
+    await this.smtp.reload();
+    return {
+      ...result,
+      transportConfigured: this.smtp.configured(),
+      activeSource: this.smtp.activeSource(),
+    };
+  }
+
+  @Post('test')
+  @RequirePermissions('system_mail.manage')
+  async test(@Body() dto: TestSmtpSettingsDto) {
+    const sent = await this.smtp.send({
+      to: dto.to,
+      subject: 'DH Inspección · Prueba SMTP',
+      text: 'Este correo confirma que la salida SMTP configurada en Superadmin funciona correctamente.',
+    });
+    return { sent: true, messageId: sent.messageId };
+  }
+}

api-v3/src/inspection-reports/smtp-settings.service.ts

@@ -0,0 +1,170 @@
+import { ConflictException, Injectable } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
+import { DataSource } 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 type { UpdateSmtpSettingsDto } from './dto/update-smtp-settings.dto';
+import { encryptSmtpSecret } from './smtp-settings-crypto';
+
+interface SmtpSettingsRow {
+  enabled: boolean;
+  host: string | null;
+  port: number | null;
+  securityMode: string | null;
+  username: string | null;
+  passwordEncrypted: string | null;
+  fromName: string | null;
+  fromEmail: string | null;
+  replyTo: string | null;
+  updatedAt: Date;
+}
+
+@Injectable()
+export class SmtpSettingsService {
+  constructor(
+    private readonly dataSource: DataSource,
+    private readonly config: ConfigService,
+    private readonly audit: AuditService,
+  ) {}
+
+  async getPublic() {
+    const row = await this.load();
+    return this.toPublic(row);
+  }
+
+  async update(
+    dto: UpdateSmtpSettingsDto,
+    principal: AuthPrincipal,
+    request: RequestWithContext,
+  ) {
+    const encryptionKey = this.config.get<string>('SMTP_SETTINGS_ENCRYPTION_KEY');
+    if (dto.password !== undefined && !encryptionKey) {
+      throw new ConflictException({
+        code: 'SMTP_SETTINGS_ENCRYPTION_KEY_MISSING',
+        message: 'Falta configurar la clave maestra del servidor para proteger la contraseña SMTP',
+      });
+    }
+    return this.dataSource.transaction(async (manager) => {
+      const [current] = (await manager.query(`
+        SELECT
+          enabled,
+          host,
+          port,
+          security_mode AS "securityMode",
+          username,
+          password_encrypted AS "passwordEncrypted",
+          from_name AS "fromName",
+          from_email AS "fromEmail",
+          reply_to AS "replyTo",
+          updated_at AS "updatedAt"
+        FROM smtp_settings
+        WHERE id = 1
+        FOR UPDATE
+      `)) as SmtpSettingsRow[];
+      let passwordEncrypted = current?.passwordEncrypted ?? null;
+      if (dto.clearPassword) passwordEncrypted = null;
+      if (dto.password !== undefined) {
+        passwordEncrypted = encryptSmtpSecret(dto.password, encryptionKey!);
+      }
+      await manager.query(`
+        UPDATE smtp_settings
+        SET enabled = $1,
+            host = $2,
+            port = $3,
+            security_mode = $4,
+            username = $5,
+            password_encrypted = $6,
+            from_name = $7,
+            from_email = $8,
+            reply_to = $9,
+            updated_by = $10,
+            updated_at = CURRENT_TIMESTAMP
+        WHERE id = 1
+      `, [
+        dto.enabled,
+        dto.host,
+        dto.port,
+        dto.securityMode,
+        dto.username ?? null,
+        passwordEncrypted,
+        dto.fromName,
+        dto.fromEmail,
+        dto.replyTo ?? null,
+        principal.userId,
+      ]);
+      const [after] = (await manager.query(`
+        SELECT
+          enabled,
+          host,
+          port,
+          security_mode AS "securityMode",
+          username,
+          password_encrypted AS "passwordEncrypted",
+          from_name AS "fromName",
+          from_email AS "fromEmail",
+          reply_to AS "replyTo",
+          updated_at AS "updatedAt"
+        FROM smtp_settings
+        WHERE id = 1
+      `)) as SmtpSettingsRow[];
+      const beforePublic = current ? this.toPublic(current) : null;
+      const afterPublic = this.toPublic(after);
+      await this.audit.record({
+        ...administrationAuditContext(principal, request),
+        action: 'SMTP_SETTINGS_UPDATED',
+        entityType: 'smtp_settings',
+        entityId: '1',
+        beforeData: beforePublic,
+        afterData: afterPublic,
+        metadata: { passwordChanged: dto.password !== undefined || Boolean(dto.clearPassword) },
+      }, manager);
+      return afterPublic;
+    });
+  }
+
+  private async load(): Promise<SmtpSettingsRow> {
+    const [row] = (await this.dataSource.query(`
+      SELECT
+        enabled,
+        host,
+        port,
+        security_mode AS "securityMode",
+        username,
+        password_encrypted AS "passwordEncrypted",
+        from_name AS "fromName",
+        from_email AS "fromEmail",
+        reply_to AS "replyTo",
+        updated_at AS "updatedAt"
+      FROM smtp_settings
+      WHERE id = 1
+    `)) as SmtpSettingsRow[];
+    return row ?? {
+      enabled: false,
+      host: null,
+      port: null,
+      securityMode: null,
+      username: null,
+      passwordEncrypted: null,
+      fromName: null,
+      fromEmail: null,
+      replyTo: null,
+      updatedAt: new Date(0),
+    };
+  }
+
+  private toPublic(row: SmtpSettingsRow): Record<string, unknown> {
+    return {
+      enabled: row.enabled,
+      host: row.host,
+      port: row.port,
+      securityMode: row.securityMode,
+      username: row.username,
+      passwordConfigured: Boolean(row.passwordEncrypted),
+      fromName: row.fromName,
+      fromEmail: row.fromEmail,
+      replyTo: row.replyTo,
+      updatedAt: row.updatedAt,
+    };
+  }
+}

api-v3/src/inspection-visits/dto/create-field-finding.dto.ts

@@ -18,8 +18,13 @@ const optionalText = ({ value }: { value: unknown }) =>
 /**
  * Hallazgo capturado desde la APK sobre un Inventario ya seleccionado.
  * El assetId se toma de la URL para evitar inconsistencias entre pantalla y payload.
+ * `actId` queda opcional sólo para compatibilidad con Android 0.11.0; F3.2 siempre lo envía.
  */
 export class CreateFieldFindingDto {
+  @IsOptional()
+  @IsUUID('4')
+  actId?: string;
+
   @IsOptional()
   @Transform(optionalText)
   @IsUUID('4')

api-v3/src/inspection-visits/dto/create-field-inventory.dto.ts

@@ -21,6 +21,10 @@ export class CreateFieldInventoryDto {
   @IsUUID('4')
   parentId?: string;
 
+  @IsOptional()
+  @IsUUID('4')
+  familyId?: string;
+
   @IsOptional()
   @Transform(({ value }) => typeof value === 'string' && value.trim() ? value.trim().toUpperCase() : undefined)
   @IsString()

api-v3/src/inspection-visits/dto/field-finding-act-query.dto.ts

@@ -0,0 +1,12 @@
+import { IsOptional, IsUUID } from 'class-validator';
+
+/**
+ * Selección explícita del Acta activa desde la APK.
+ * `actId` queda opcional sólo durante la transición desde Android 0.11.0;
+ * F3.2 móvil siempre lo informa.
+ */
+export class FieldFindingActQueryDto {
+  @IsOptional()
+  @IsUUID('4')
+  actId?: string;
+}

api-v3/src/inspection-visits/f3-field-inventory-structure.service.ts

@@ -0,0 +1,220 @@
+import {
+  BadRequestException,
+  ConflictException,
+  Injectable,
+} from '@nestjs/common';
+import { DataSource } from 'typeorm';
+import { administrationAuditContext } from '../administration/common/administration-audit';
+import { AssetHistoryService } from '../asset-master/asset-history.service';
+import { AuditService } from '../audit/audit.service';
+import type { AuthPrincipal, RequestWithContext } from '../common/http/request-context';
+import { AssetVersionChangeType, AuditAction } from '../database/entities';
+import type { CreateFieldInventoryDto } from './dto/create-field-inventory.dto';
+import { FieldInventoryService } from './field-inventory.service';
+
+type FamilyRow = {
+  id: string;
+  code: string;
+  name: string;
+  level: 'INSTALLATION' | 'SUBINSTALLATION';
+  informationLabels: string[];
+  sourceReference: string | null;
+  isOther: boolean;
+};
+
+type ParentRow = {
+  id: string;
+  typeCode: string;
+  inventoryFamilyId: string | null;
+};
+
+type FieldTypesBase = {
+  context: {
+    area: { id: string; code: string; name: string };
+    operatorCompany: { id: string; code: string; name: string };
+    inspection: { id: string; code: string; status: string };
+  };
+  parent: { id: string; code: string; name: string };
+  data: Array<Record<string, unknown> & { id: string; code: string; name: string }>;
+};
+
+const STRUCTURAL_CHILD: Record<string, string | undefined> = {
+  area: 'yacimiento',
+  yacimiento: 'instalacion',
+  instalacion: 'subinstalacion',
+};
+
+@Injectable()
+export class F3FieldInventoryStructureService {
+  constructor(
+    private readonly dataSource: DataSource,
+    private readonly fieldInventory: FieldInventoryService,
+    private readonly history: AssetHistoryService,
+    private readonly audit: AuditService,
+  ) {}
+
+  async types(
+    visitId: string,
+    parentId: string | undefined,
+    principal: AuthPrincipal,
+  ) {
+    const base = await this.fieldInventory.types(visitId, parentId, principal) as unknown as FieldTypesBase;
+    const effectiveParentId = parentId ?? base.context.area.id;
+    const parent = await this.parent(effectiveParentId);
+    const expectedTypeCode = STRUCTURAL_CHILD[parent.typeCode.toLowerCase()];
+    const data = expectedTypeCode
+      ? base.data.filter((type) => type.code.toLowerCase() === expectedTypeCode)
+      : [];
+    const families = await this.familiesFor(parent, expectedTypeCode);
+
+    return {
+      ...base,
+      data: data.map((type) => ({
+        ...type,
+        structuralKind: type.code.toUpperCase(),
+        families,
+        familyRequired: type.code.toLowerCase() === 'instalacion' || type.code.toLowerCase() === 'subinstalacion',
+      })),
+    };
+  }
+
+  async create(
+    visitId: string,
+    dto: CreateFieldInventoryDto,
+    principal: AuthPrincipal,
+    request: RequestWithContext,
+  ) {
+    const options = await this.types(visitId, dto.parentId, principal);
+    const selectedType = options.data.find((type) => type.id === dto.typeId);
+    if (!selectedType) {
+      throw new BadRequestException({
+        code: 'FIELD_INVENTORY_STRUCTURE_TYPE_INVALID',
+        message: 'El tipo elegido no corresponde al siguiente nivel estructural permitido',
+      });
+    }
+
+    const typeCode = String(selectedType.code).toLowerCase();
+    const familyRequired = typeCode === 'instalacion' || typeCode === 'subinstalacion';
+    const families = (selectedType.families ?? []) as FamilyRow[];
+    if (familyRequired && !dto.familyId) {
+      throw new BadRequestException({
+        code: 'FIELD_INVENTORY_FAMILY_REQUIRED',
+        message: 'Elegí la familia técnica o la opción Otro / no catalogado',
+      });
+    }
+    if (!familyRequired && dto.familyId) {
+      throw new BadRequestException({
+        code: 'FIELD_INVENTORY_FAMILY_NOT_ALLOWED',
+        message: 'Este nivel estructural no utiliza familia técnica',
+      });
+    }
+    const family = dto.familyId
+      ? families.find((item) => item.id === dto.familyId)
+      : null;
+    if (dto.familyId && !family) {
+      throw new BadRequestException({
+        code: 'FIELD_INVENTORY_FAMILY_INVALID',
+        message: 'La familia técnica no es válida para el padre seleccionado',
+      });
+    }
+
+    const created = await this.fieldInventory.create(visitId, dto, principal, request) as {
+      asset: { id: string; code: string; name: string };
+      [key: string]: unknown;
+    };
+    if (!family) return created;
+
+    await this.dataSource.transaction(async (manager) => {
+      const [current] = await manager.query(`
+        SELECT inventory_family_id AS "inventoryFamilyId"
+        FROM assets WHERE id=$1::uuid FOR UPDATE
+      `, [created.asset.id]) as Array<{ inventoryFamilyId: string | null }>;
+      if (!current) throw new ConflictException({
+        code: 'FIELD_INVENTORY_CREATED_ASSET_MISSING',
+        message: 'No se pudo clasificar el Inventario recién creado',
+      });
+      if (current.inventoryFamilyId === family.id) return;
+
+      await manager.query(`
+        UPDATE assets
+        SET inventory_family_id=$2::uuid,updated_by=$3::uuid,updated_at=CURRENT_TIMESTAMP
+        WHERE id=$1::uuid
+      `, [created.asset.id, family.id, principal.userId]);
+      const versionNumber = await this.history.capture(
+        manager,
+        created.asset.id,
+        AssetVersionChangeType.UPDATED,
+        principal,
+        request,
+      );
+      await this.audit.record({
+        ...administrationAuditContext(principal, request),
+        action: AuditAction.ASSET_UPDATED,
+        entityType: 'asset',
+        entityId: created.asset.id,
+        beforeData: { inventoryFamilyId: current.inventoryFamilyId },
+        afterData: {
+          inventoryFamilyId: family.id,
+          inventoryFamilyCode: family.code,
+          inventoryFamilyName: family.name,
+        },
+        metadata: {
+          operation: 'FIELD_INVENTORY_FAMILY_ASSIGNED',
+          visitId,
+          versionNumber,
+          isOtherFamily: family.isOther,
+        },
+      }, manager);
+    });
+
+    return this.fieldInventory.detail(visitId, created.asset.id, principal);
+  }
+
+  private async parent(parentId: string): Promise<ParentRow> {
+    const rows = await this.dataSource.query(`
+      SELECT asset.id,type.code AS "typeCode",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'
+    `, [parentId]) as ParentRow[];
+    if (!rows[0]) throw new BadRequestException({
+      code: 'FIELD_INVENTORY_PARENT_NOT_AVAILABLE',
+      message: 'El padre estructural elegido no está disponible',
+    });
+    return rows[0];
+  }
+
+  private async familiesFor(parent: ParentRow, expectedTypeCode: string | undefined): Promise<FamilyRow[]> {
+    if (expectedTypeCode === 'instalacion') {
+      return this.dataSource.query(`
+        SELECT id,code,name,level,information_labels AS "informationLabels",
+          source_reference AS "sourceReference",
+          (source_reference LIKE 'SYSTEM:F3.1:OTHER%') AS "isOther"
+        FROM inventory_families
+        WHERE level='INSTALLATION' AND is_active=true
+        ORDER BY (source_reference LIKE 'SYSTEM:F3.1:OTHER%') ASC,name,code
+      `) as Promise<FamilyRow[]>;
+    }
+    if (expectedTypeCode === 'subinstalacion') {
+      if (!parent.inventoryFamilyId) {
+        throw new ConflictException({
+          code: 'FIELD_INVENTORY_PARENT_FAMILY_REQUIRED',
+          message: 'La Instalación debe tener una familia técnica antes de agregar Subinstalaciones',
+        });
+      }
+      return this.dataSource.query(`
+        SELECT family.id,family.code,family.name,family.level,
+          family.information_labels AS "informationLabels",
+          family.source_reference AS "sourceReference",
+          (family.source_reference LIKE 'SYSTEM:F3.1:OTHER%') AS "isOther"
+        FROM inventory_family_parent_rules rule
+        JOIN inventory_families family ON family.id=rule.child_family_id
+        WHERE rule.parent_family_id=$1::uuid
+          AND family.level='SUBINSTALLATION'
+          AND family.is_active=true
+        ORDER BY (family.source_reference LIKE 'SYSTEM:F3.1:OTHER%') ASC,family.name,family.code
+      `, [parent.inventoryFamilyId]) as Promise<FamilyRow[]>;
+    }
+    return [];
+  }
+}